moon
/
ditto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timelines: add DRY renderStatuses function

This commit is contained in:
Alex Gleason 2023-08-29 13:01:47 -05:00
parent 4216a7931a
commit 4d211d637e
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 15 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/controllers/api/timelines.ts
View File

@ -1,51 +1,40 @@
import { z } from '@/deps.ts';
import { type DittoFilter } from '@/filter.ts';
import * as mixer from '@/mixer.ts';
import { getFeed, getPublicFeed } from '@/queries.ts';
import { getFeedPubkeys } from '@/queries.ts';
import { booleanParamSchema } from '@/schema.ts';
import { toStatus } from '@/transformers/nostr-to-mastoapi.ts';
import { paginated, paginationSchema } from '@/utils/web.ts';
import { Time } from '@/utils.ts';
import type { AppController } from '@/app.ts';
import type { AppContext, AppController } from '@/app.ts';
const homeTimelineController: AppController = async (c) => {
const params = paginationSchema.parse(c.req.query());
const pubkey = c.get('pubkey')!;
const events = await getFeed(pubkey, params);
if (!events.length) {
return c.json([]);
}
const statuses = await Promise.all(events.map(toStatus));
return paginated(c, events, statuses);
const authors = await getFeedPubkeys(pubkey);
return renderStatuses(c, [{ authors, kinds: [1], ...params }]);
};
const publicQuerySchema = z.object({
local: booleanParamSchema.catch(false),
});
const publicTimelineController: AppController = async (c) => {
const publicTimelineController: AppController = (c) => {
const params = paginationSchema.parse(c.req.query());
const { local } = publicQuerySchema.parse(c.req.query());
const events = await getPublicFeed(params, local);
if (!events.length) {
return c.json([]);
}
const statuses = await Promise.all(events.map(toStatus));
return paginated(c, events, statuses);
return renderStatuses(c, [{ kinds: [1], local, ...params }]);
};
const hashtagTimelineController: AppController = async (c) => {
const hashtagTimelineController: AppController = (c) => {
const hashtag = c.req.param('hashtag')!;
const params = paginationSchema.parse(c.req.query());
return renderStatuses(c, [{ kinds: [1], '#t': [hashtag], ...params }]);
};
const events = await mixer.getFilters(
[{ kinds: [1], '#t': [hashtag], ...params }],
{ timeout: Time.seconds(3) },
);
/** Render statuses for timelines. */
async function renderStatuses(c: AppContext, filters: DittoFilter<1>[]) {
const events = await mixer.getFilters(filters, { timeout: Time.seconds(3) });
if (!events.length) {
return c.json([]);
@ -53,6 +42,6 @@ const hashtagTimelineController: AppController = async (c) => {
const statuses = await Promise.all(events.map(toStatus));
return paginated(c, events, statuses);
};
}
export { hashtagTimelineController, homeTimelineController, publicTimelineController };

31
src/queries.ts
View File

@ -53,24 +53,6 @@ async function getFeedPubkeys(pubkey: string): Promise<string[]> {
return [...authors, pubkey];
}
/** Get events from people the user follows. */
async function getFeed(pubkey: string, params: PaginationParams): Promise<Event<1>[]> {
const authors = await getFeedPubkeys(pubkey);
const filter: Filter<1> = {
authors,
kinds: [1],
...params,
};
return mixer.getFilters([filter], { timeout: 5000 });
}
/** Get a feed of all known text notes. */
function getPublicFeed(params: PaginationParams, local: boolean): Promise<Event<1>[]> {
return mixer.getFilters([{ kinds: [1], local, ...params }], { timeout: 5000 });
}
async function getAncestors(event: Event<1>, result = [] as Event<1>[]): Promise<Event<1>[]> {
if (result.length < 100) {
const replyTag = findReplyTag(event);
@ -106,15 +88,4 @@ async function syncUser(pubkey: string): Promise<void> {
], { timeout: 5000 });
}
export {
getAncestors,
getAuthor,
getDescendants,
getEvent,
getFeed,
getFeedPubkeys,
getFollows,
getPublicFeed,
isLocallyFollowed,
syncUser,
};
export { getAncestors, getAuthor, getDescendants, getEvent, getFeedPubkeys, getFollows, isLocallyFollowed, syncUser };