Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions components/Feed/Feed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ export const Feed: FC<FeedProps> = ({ defaultTab, initialFeedData }) => {
const orderingParam = searchParams.get('ordering');
const filterParam = searchParams.get('filter');
const userIdParam = searchParams.get('user_id');
const viewAsUserIdParam = searchParams.get('view_as_user_id');
const viewAsUserId =
viewAsUserIdParam && !Number.isNaN(Number(viewAsUserIdParam))
? Number(viewAsUserIdParam)
: undefined;
const [ordering, setOrdering] = useState<string | undefined>(
orderingParam || getDefaultOrdering(defaultTab)
);
Expand All @@ -62,6 +67,7 @@ export const Feed: FC<FeedProps> = ({ defaultTab, initialFeedData }) => {
ordering,
filter: filterParam || undefined,
userId: userIdParam || undefined,
viewAsUserId,
};

const {
Expand Down
6 changes: 5 additions & 1 deletion hooks/useFeed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ interface UseFeedOptions {
ordering?: string;
filter?: string;
userId?: string;
viewAsUserId?: number;
isDebugMode?: boolean;
initialData?: {
entries: FeedEntry[];
Expand Down Expand Up @@ -106,7 +107,8 @@ export const useFeed = (activeTab: FeedTab | FundingTab, options: UseFeedOptions
options.ordering !== currentOptions.ordering ||
options.isDebugMode !== currentOptions.isDebugMode ||
options.filter !== currentOptions.filter ||
options.userId !== currentOptions.userId;
options.userId !== currentOptions.userId ||
options.viewAsUserId !== currentOptions.viewAsUserId;

if (relevantOptionsChanged) {
setCurrentOptions(options);
Expand Down Expand Up @@ -148,6 +150,7 @@ export const useFeed = (activeTab: FeedTab | FundingTab, options: UseFeedOptions
includeHotScoreBreakdown: options.isDebugMode,
filter: options.filter,
userId: options.userId,
viewAsUserId: options.viewAsUserId,
});

setEntries(result.entries);
Expand Down Expand Up @@ -194,6 +197,7 @@ export const useFeed = (activeTab: FeedTab | FundingTab, options: UseFeedOptions
includeHotScoreBreakdown: options.isDebugMode,
filter: options.filter,
userId: options.userId,
viewAsUserId: options.viewAsUserId,
});
setEntries((prev) => [...prev, ...result.entries]);
setHasMore(result.hasMore);
Expand Down
4 changes: 4 additions & 0 deletions services/feed.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export class FeedService {
filter?: string;
status?: string;
userId?: string;
viewAsUserId?: number;
}): Promise<{ entries: FeedEntry[]; hasMore: boolean }> {
const queryParams = new URLSearchParams();
if (params?.page) queryParams.append('page', params.page.toString());
Expand All @@ -47,6 +48,9 @@ export class FeedService {
if (params?.filter) queryParams.append('filter', params.filter);
if (params?.status) queryParams.append('status', params.status);
if (params?.userId) queryParams.append('user_id', params.userId);
if (params?.viewAsUserId) {
queryParams.append('view_as_user_id', params.viewAsUserId.toString());
}

// Determine which endpoint to use
const basePath =
Expand Down