Merge branch 'local-timeline' into 'develop'

Local timeline

See merge request soapbox-pub/ditto!15

src/client.ts

@@ -29,6 +29,7 @@ function getPool(): Pool {
 
 /** Get events from a NIP-01 filter. */
 function getFilters<K extends number>(filters: Filter<K>[], opts: GetFiltersOpts = {}): Promise<Event<K>[]> {
+  if (!filters.length) return Promise.resolve([]);
   return new Promise((resolve) => {
     let tid: number;
     const results: Event[] = [];

src/controllers/api/timelines.ts

@@ -1,4 +1,6 @@
+import { z } from '@/deps.ts';
 import { getFeed, getPublicFeed } from '@/queries.ts';
+import { booleanParamSchema } from '@/schema.ts';
 import { toStatus } from '@/transformers/nostr-to-mastoapi.ts';
 import { buildLinkHeader, paginationSchema } from '@/utils.ts';
 
@@ -19,10 +21,15 @@ const homeController: AppController = async (c) => {
   return c.json(statuses, 200, link ? { link } : undefined);
 };
 
+const publicQuerySchema = z.object({
+  local: booleanParamSchema.catch(false),
+});
+
 const publicController: AppController = async (c) => {
   const params = paginationSchema.parse(c.req.query());
+  const { local } = publicQuerySchema.parse(c.req.query());
 
-  const events = await getPublicFeed(params);
+  const events = await getPublicFeed(params, local);
   if (!events.length) {
     return c.json([]);
   }

src/db/events.ts

@@ -64,7 +64,9 @@ function getFilterQuery(filter: DittoFilter) {
     ])
     .orderBy('events.created_at', 'desc');
 
-  for (const key of Object.keys(filter)) {
+  for (const [key, value] of Object.entries(filter)) {
+    if (value === undefined) continue;
+
     switch (key as keyof DittoFilter) {
       case 'ids':
         query = query.where('events.id', 'in', filter.ids!);
@@ -108,6 +110,7 @@ async function getFilters<K extends number>(
   filters: DittoFilter<K>[],
   opts: GetFiltersOpts = {},
 ): Promise<Event<K>[]> {
+  if (!filters.length) return Promise.resolve([]);
   let query = filters.map(getFilterQuery).reduce((acc, curr) => acc.union(curr));
 
   if (typeof opts.limit === 'number') {

src/mixer.ts

@@ -12,7 +12,7 @@ async function getFilters<K extends number>(
   opts?: GetFiltersOpts,
 ): Promise<Event<K>[]> {
   const results = await Promise.allSettled([
-    client.getFilters(filters, opts),
+    client.getFilters(filters.filter((filter) => !filter.local), opts),
     eventsDB.getFilters(filters, opts),
   ]);
 

src/queries.ts

@@ -57,8 +57,8 @@ async function getFeed(pubkey: string, params: PaginationParams): Promise<Event<
 }
 
 /** Get a feed of all known text notes. */
-function getPublicFeed(params: PaginationParams): Promise<Event<1>[]> {
-  return mixer.getFilters([{ kinds: [1], ...params }], { timeout: 5000 });
+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>[]> {

src/schema.ts

@@ -42,4 +42,7 @@ const hashtagSchema = z.string().regex(/^\w{1,30}$/);
  */
 const safeUrlSchema = z.string().max(2048).url();
 
-export { decode64Schema, emojiTagSchema, filteredArray, hashtagSchema, jsonSchema, safeUrlSchema };
+/** https://github.com/colinhacks/zod/issues/1630#issuecomment-1365983831 */
+const booleanParamSchema = z.enum(['true', 'false']).transform((value) => value === 'true');
+
+export { booleanParamSchema, decode64Schema, emojiTagSchema, filteredArray, hashtagSchema, jsonSchema, safeUrlSchema };