GKaszewski/thoughts
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add in_reply_to_url field to FeedRow and ThoughtRow, update related queries and handlers
All checks were successful
lint / lint (push) Successful in 16m58s
Details
test / unit (push) Successful in 20m24s
Details

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-07-04 15:46:19 +02:00
parent 052d8c67bb
commit 09f5caefe7
11 changed files with 15 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/adapters/postgres-search/src/lib.rs
View File

@@ -29,6 +29,7 @@ struct FeedRow {
t_user_id: uuid::Uuid, t_user_id: uuid::Uuid,
content: String, content: String,
in_reply_to_id: Option<uuid::Uuid>, in_reply_to_id: Option<uuid::Uuid>,
in_reply_to_url: Option<String>,
visibility: String, visibility: String,
content_warning: Option<String>, content_warning: Option<String>,
sensitive: bool, sensitive: bool,
@@ -57,7 +58,7 @@ fn feed_select(viewer: Option<uuid::Uuid>) -> String {
format!( format!(
"\n SELECT\n\ "\n SELECT\n\
t.id AS thought_id, t.user_id AS t_user_id, t.content,\n\ t.id AS thought_id, t.user_id AS t_user_id, t.content,\n\
t.in_reply_to_id,\n\ t.in_reply_to_id, t.in_reply_to_url,\n\
t.visibility, t.content_warning, t.sensitive, t.local AS t_local,\n\ t.visibility, t.content_warning, t.sensitive, t.local AS t_local,\n\
t.created_at AS thought_created_at, t.updated_at AS thought_updated_at, t.note_extensions, t.mood,\n\ t.created_at AS thought_created_at, t.updated_at AS thought_updated_at, t.note_extensions, t.mood,\n\
u.id, u.username, u.email, u.password_hash,\n\ u.id, u.username, u.email, u.password_hash,\n\
@@ -78,6 +79,7 @@ fn row_to_entry(r: FeedRow, viewer: Option<uuid::Uuid>) -> Result<FeedEntry, Dom
user_id: UserId::from_uuid(r.t_user_id), user_id: UserId::from_uuid(r.t_user_id),
content: Content::new_remote(r.content), content: Content::new_remote(r.content),
in_reply_to_id: r.in_reply_to_id.map(ThoughtId::from_uuid), in_reply_to_id: r.in_reply_to_id.map(ThoughtId::from_uuid),
in_reply_to_url: r.in_reply_to_url,
visibility: Visibility::from_db_str(&r.visibility)?, visibility: Visibility::from_db_str(&r.visibility)?,
content_warning: r.content_warning, content_warning: r.content_warning,
sensitive: r.sensitive, sensitive: r.sensitive,

1
crates/adapters/postgres/src/activitypub/mod.rs
View File

@@ -34,6 +34,7 @@ impl OutboxRow {
user_id: UserId::from_uuid(self.user_id), user_id: UserId::from_uuid(self.user_id),
content: Content::new_remote(self.content), content: Content::new_remote(self.content),
in_reply_to_id: self.in_reply_to_id.map(ThoughtId::from_uuid), in_reply_to_id: self.in_reply_to_id.map(ThoughtId::from_uuid),
in_reply_to_url: None,
visibility: Visibility::Public, visibility: Visibility::Public,
content_warning: self.content_warning, content_warning: self.content_warning,
sensitive: self.sensitive, sensitive: self.sensitive,

4
crates/adapters/postgres/src/feed/mod.rs
View File

@@ -29,6 +29,7 @@ struct FeedRow {
t_user_id: uuid::Uuid, t_user_id: uuid::Uuid,
content: String, content: String,
in_reply_to_id: Option<uuid::Uuid>, in_reply_to_id: Option<uuid::Uuid>,
in_reply_to_url: Option<String>,
visibility: String, visibility: String,
content_warning: Option<String>, content_warning: Option<String>,
sensitive: bool, sensitive: bool,
@@ -52,6 +53,7 @@ fn row_to_entry(r: FeedRow, viewer: Option<uuid::Uuid>) -> Result<FeedEntry, Dom
user_id: UserId::from_uuid(r.t_user_id), user_id: UserId::from_uuid(r.t_user_id),
content: Content::new_remote(r.content), content: Content::new_remote(r.content),
in_reply_to_id: r.in_reply_to_id.map(ThoughtId::from_uuid), in_reply_to_id: r.in_reply_to_id.map(ThoughtId::from_uuid),
in_reply_to_url: r.in_reply_to_url,
visibility: Visibility::from_db_str(&r.visibility)?, visibility: Visibility::from_db_str(&r.visibility)?,
content_warning: r.content_warning, content_warning: r.content_warning,
sensitive: r.sensitive, sensitive: r.sensitive,
@@ -111,7 +113,7 @@ impl<'a> FeedSqlBuilder<'a> {
" "
SELECT SELECT
t.id AS thought_id, t.user_id AS t_user_id, t.content, t.id AS thought_id, t.user_id AS t_user_id, t.content,
t.in_reply_to_id, t.in_reply_to_id, t.in_reply_to_url,
t.visibility, t.content_warning, t.sensitive, t.local AS t_local, t.visibility, t.content_warning, t.sensitive, t.local AS t_local,
t.created_at AS thought_created_at, t.updated_at AS thought_updated_at, t.created_at AS thought_created_at, t.updated_at AS thought_updated_at,
t.note_extensions, t.mood, t.note_extensions, t.mood,

8
crates/adapters/postgres/src/thought/mod.rs
View File

@@ -28,6 +28,7 @@ pub(crate) struct ThoughtRow {
pub user_id: uuid::Uuid, pub user_id: uuid::Uuid,
pub content: String, pub content: String,
pub in_reply_to_id: Option<uuid::Uuid>, pub in_reply_to_id: Option<uuid::Uuid>,
pub in_reply_to_url: Option<String>,
pub visibility: String, pub visibility: String,
pub content_warning: Option<String>, pub content_warning: Option<String>,
pub sensitive: bool, pub sensitive: bool,
@@ -46,6 +47,7 @@ impl TryFrom<ThoughtRow> for Thought {
user_id: UserId::from_uuid(r.user_id), user_id: UserId::from_uuid(r.user_id),
content: Content::new_remote(r.content), content: Content::new_remote(r.content),
in_reply_to_id: r.in_reply_to_id.map(ThoughtId::from_uuid), in_reply_to_id: r.in_reply_to_id.map(ThoughtId::from_uuid),
in_reply_to_url: r.in_reply_to_url,
visibility: Visibility::from_db_str(&r.visibility)?, visibility: Visibility::from_db_str(&r.visibility)?,
content_warning: r.content_warning, content_warning: r.content_warning,
sensitive: r.sensitive, sensitive: r.sensitive,
@@ -59,7 +61,7 @@ impl TryFrom<ThoughtRow> for Thought {
} }
const THOUGHT_SELECT: &str = const THOUGHT_SELECT: &str =
"SELECT id,user_id,content,in_reply_to_id,visibility,content_warning,sensitive,local,created_at,updated_at,note_extensions,mood FROM thoughts"; "SELECT id,user_id,content,in_reply_to_id,in_reply_to_url,visibility,content_warning,sensitive,local,created_at,updated_at,note_extensions,mood FROM thoughts";
#[async_trait] #[async_trait]
impl ThoughtRepository for PgThoughtRepository { impl ThoughtRepository for PgThoughtRepository {
@@ -121,11 +123,11 @@ impl ThoughtRepository for PgThoughtRepository {
// Recursive CTE: fetches the root thought and all nested replies at any depth. // Recursive CTE: fetches the root thought and all nested replies at any depth.
sqlx::query_as::<_, ThoughtRow>( sqlx::query_as::<_, ThoughtRow>(
"WITH RECURSIVE thread AS ( "WITH RECURSIVE thread AS (
SELECT id,user_id,content,in_reply_to_id, SELECT id,user_id,content,in_reply_to_id,in_reply_to_url,
visibility,content_warning,sensitive,local,created_at,updated_at,note_extensions,mood visibility,content_warning,sensitive,local,created_at,updated_at,note_extensions,mood
FROM thoughts WHERE id = $1 FROM thoughts WHERE id = $1
UNION ALL UNION ALL
SELECT t.id,t.user_id,t.content,t.in_reply_to_id, SELECT t.id,t.user_id,t.content,t.in_reply_to_id,t.in_reply_to_url,
t.visibility,t.content_warning,t.sensitive,t.local,t.created_at,t.updated_at,t.note_extensions,t.mood t.visibility,t.content_warning,t.sensitive,t.local,t.created_at,t.updated_at,t.note_extensions,t.mood
FROM thoughts t JOIN thread ON t.in_reply_to_id = thread.id FROM thoughts t JOIN thread ON t.in_reply_to_id = thread.id
) )

2
crates/domain/src/models/thought.rs
View File

@@ -15,6 +15,7 @@ pub struct Thought {
pub user_id: UserId, pub user_id: UserId,
pub content: Content, pub content: Content,
pub in_reply_to_id: Option<ThoughtId>, pub in_reply_to_id: Option<ThoughtId>,
pub in_reply_to_url: Option<String>,
pub visibility: Visibility, pub visibility: Visibility,
pub content_warning: Option<String>, pub content_warning: Option<String>,
pub sensitive: bool, pub sensitive: bool,
@@ -66,6 +67,7 @@ impl Thought {
user_id: p.user_id, user_id: p.user_id,
content: p.content, content: p.content,
in_reply_to_id: p.in_reply_to_id, in_reply_to_id: p.in_reply_to_id,
in_reply_to_url: None,
visibility: p.visibility, visibility: p.visibility,
content_warning: p.content_warning, content_warning: p.content_warning,
sensitive: p.sensitive, sensitive: p.sensitive,

2
crates/presentation/src/handlers/feed.rs
View File

@@ -97,7 +97,7 @@ pub fn to_thought_response(e: &domain::models::feed::FeedEntry) -> ThoughtRespon
content: e.thought.content.as_str().to_string(), content: e.thought.content.as_str().to_string(),
author: to_user_response(&e.author), author: to_user_response(&e.author),
in_reply_to_id: e.thought.in_reply_to_id.as_ref().map(|id| id.as_uuid()), in_reply_to_id: e.thought.in_reply_to_id.as_ref().map(|id| id.as_uuid()),
in_reply_to_url: None, in_reply_to_url: e.thought.in_reply_to_url.clone(),
visibility: e.thought.visibility.as_str().to_string(), visibility: e.thought.visibility.as_str().to_string(),
content_warning: e.thought.content_warning.clone(), content_warning: e.thought.content_warning.clone(),
sensitive: e.thought.sensitive, sensitive: e.thought.sensitive,

23
thoughts-frontend/app/actions/profile.ts
View File

@@ -1,23 +0,0 @@
"use server";
import { revalidateTag } from "next/cache";
import { cookies } from "next/headers";
import { updateProfile as apiUpdateProfile, UpdateProfileSchema } from "@/lib/api";
import { z } from "zod";
async function getToken(): Promise<string> {
const token = (await cookies()).get("auth_token")?.value;
if (!token) throw new Error("Not authenticated");
return token;
}
export async function updateProfile(
username: string,
data: z.infer<typeof UpdateProfileSchema>
) {
const token = await getToken();
const updated = await apiUpdateProfile(data, token);
revalidateTag(`profile:${username}`);
revalidateTag("me");
return updated;
}

28
thoughts-frontend/app/actions/social.ts
View File

@@ -1,28 +0,0 @@
"use server";
import { revalidateTag } from "next/cache";
import { cookies } from "next/headers";
import {
followUser as apiFollowUser,
unfollowUser as apiUnfollowUser,
} from "@/lib/api";
async function getToken(): Promise<string> {
const token = (await cookies()).get("auth_token")?.value;
if (!token) throw new Error("Not authenticated");
return token;
}
export async function followUser(username: string) {
const token = await getToken();
await apiFollowUser(username, token);
revalidateTag(`profile:${username}`);
revalidateTag("feed");
}
export async function unfollowUser(username: string) {
const token = await getToken();
await apiUnfollowUser(username, token);
revalidateTag(`profile:${username}`);
revalidateTag("feed");
}

30
thoughts-frontend/app/actions/thoughts.ts
View File

@@ -1,30 +0,0 @@
"use server";
import { revalidateTag } from "next/cache";
import { cookies } from "next/headers";
import {
createThought as apiCreateThought,
deleteThought as apiDeleteThought,
CreateThoughtSchema,
} from "@/lib/api";
import { z } from "zod";
async function getToken(): Promise<string> {
const token = (await cookies()).get("auth_token")?.value;
if (!token) throw new Error("Not authenticated");
return token;
}
export async function createThought(data: z.infer<typeof CreateThoughtSchema>) {
const token = await getToken();
const thought = await apiCreateThought(data, token);
revalidateTag("feed");
return thought;
}
export async function deleteThought(thoughtId: string) {
const token = await getToken();
await apiDeleteThought(thoughtId, token);
revalidateTag("feed");
revalidateTag(`thought:${thoughtId}`);
}

105
thoughts-frontend/components/top-friends-combobox.tsx
View File

@@ -1,105 +0,0 @@
"use client";
import * as React from "react";
import { Check, ChevronsUpDown } from "lucide-react";
import { cn } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import {
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
} from "@/components/ui/command";
import {
Popover,
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover";
import { getFriends, User } from "@/lib/api";
import { useAuth } from "@/hooks/use-auth";
import { Skeleton } from "./ui/skeleton";
interface TopFriendsComboboxProps {
value: string[];
onChange: (value: string[]) => void;
}
export function TopFriendsCombobox({
value,
onChange,
}: TopFriendsComboboxProps) {
const [open, setOpen] = React.useState(false);
const [friends, setFriends] = React.useState<User[]>([]);
const [isLoading, setIsLoading] = React.useState(true);
const { token } = useAuth();
React.useEffect(() => {
if (token) {
getFriends(token)
.then((data) => setFriends(data.users))
.catch(() => console.error("Failed to fetch friends"))
.finally(() => setIsLoading(false));
} else {
setIsLoading(false);
}
}, [token]);
if (isLoading) {
return <Skeleton className="h-10 w-full" />;
}
return (
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<Button
variant="outline"
role="combobox"
aria-expanded={open}
className="w-full justify-between"
>
{value.length > 0
? `${value.length} friend(s) selected`
: "Select up to 8 friends..."}
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
<PopoverContent className="w-full p-0">
<Command>
<CommandInput placeholder="Search friends..." />
<CommandList>
<CommandEmpty>No friends found.</CommandEmpty>
<CommandGroup>
{friends.map((friend) => (
<CommandItem
key={friend.id}
value={friend.username}
onSelect={(currentValue) => {
const newValue = value.includes(currentValue)
? value.filter((v) => v !== currentValue)
: [...value, currentValue];
if (newValue.length <= 8) {
onChange(newValue);
}
}}
>
<Check
className={cn(
"mr-2 h-4 w-4",
value.includes(friend.username)
? "opacity-100"
: "opacity-0"
)}
/>
{friend.username}
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
);
}

3
thoughts-frontend/lib/api.ts
View File

@@ -101,9 +101,6 @@ export const ApiKeyResponseSchema = ApiKeySchema.extend({
key: z.string().optional(), key: z.string().optional(),
}); });
export const ApiKeyListSchema = z.object({
keys: z.array(ApiKeySchema),
});
export const CreateApiKeySchema = z.object({ export const CreateApiKeySchema = z.object({
name: z.string().min(1, "Key name cannot be empty."), name: z.string().min(1, "Key name cannot be empty."),