Create @ditto/lang, @ditto/policies, @ditto/signers, @ditto/uploaders

deno.json

@@ -5,9 +5,13 @@
     "./packages/conf",
     "./packages/db",
     "./packages/ditto",
+    "./packages/lang",
     "./packages/metrics",
+    "./packages/policies",
     "./packages/ratelimiter",
+    "./packages/signers",
     "./packages/translators",
+    "./packages/uploaders",
     "./packages/utils"
   ],
   "tasks": {

packages/api/routes/timelinesRoute.ts

@@ -1,32 +1,17 @@
-import { NostrFilter } from '@nostrify/nostrify';
+import { DittoRoute } from '@ditto/api';
 import { z } from 'zod';
 
-import { type AppContext, type AppController } from '@/app.ts';
-import { getFeedPubkeys } from '@/queries.ts';
-import { booleanParamSchema, languageSchema } from '@/schema.ts';
-import { hydrateEvents } from '@/storages/hydrate.ts';
-import { paginated } from '@/utils/api.ts';
-import { getTagSet } from '@/utils/tags.ts';
-import { StatusView } from '@/views/mastodon/StatusView.ts';
-import { Hono } from '@hono/hono';
+import type { NostrFilter } from '@nostrify/nostrify';
+
+const route = new DittoRoute();
 
 const homeQuerySchema = z.object({
   exclude_replies: booleanParamSchema.optional(),
   only_media: booleanParamSchema.optional(),
 });
 
-export interface TimelineRouteOpts {
-}
-
-export class TimelineRoute {
-  private app: Hono;
-
-  constructor(private opts: TimelineRouteOpts) {
-    this.app = new Hono();
-  }
-}
-
-const homeTimelineController: AppController = async (c) => {
+route.get('/home', async (c) => {
+  c.req.valid('json');
   const { user, pagination } = c.var;
 
   const pubkey = await user!.signer.getPublicKey()!;
@@ -56,7 +41,7 @@ const homeTimelineController: AppController = async (c) => {
   }
 
   return renderStatuses(c, [filter]);
-};
+});
 
 const publicQuerySchema = z.object({
   local: booleanParamSchema.default('false'),

packages/ditto/DittoPipeline.ts

@@ -11,7 +11,7 @@ import { z } from 'zod';
 import { DittoPush } from '@/DittoPush.ts';
 import { DittoEvent } from '@/interfaces/DittoEvent.ts';
 import { RelayError } from '@/RelayError.ts';
-import { AdminSigner } from '@/signers/AdminSigner.ts';
+import { AdminSigner } from '../signers/AdminSigner.ts';
 import { type EventsDB } from '@/storages/EventsDB.ts';
 import { hydrateEvents } from '@/storages/hydrate.ts';
 import { eventAge, Time } from '@/utils.ts';

packages/ditto/controllers/api/ditto.ts

@@ -8,7 +8,7 @@ import { createEvent, paginated, parseBody, updateAdminEvent } from '../../../ut
 import { getInstanceMetadata } from '../../../utils/instance.ts';
 import { deleteTag } from '../../../utils/tags.ts';
 import { DittoZapSplits, getZapSplits } from '../../../utils/zap-split.ts';
-import { AdminSigner } from '@/signers/AdminSigner.ts';
+import { AdminSigner } from '../../../signers/AdminSigner.ts';
 import { screenshotsSchema } from '@/schemas/nostr.ts';
 import { booleanParamSchema, percentageSchema, wsUrlSchema } from '@/schema.ts';
 import { hydrateEvents } from '@/storages/hydrate.ts';

packages/ditto/controllers/api/pleroma.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 
 import { type AppController } from '@/app.ts';
 import { configSchema, elixirTupleSchema } from '@/schemas/pleroma-api.ts';
-import { AdminSigner } from '@/signers/AdminSigner.ts';
+import { AdminSigner } from '../../../signers/AdminSigner.ts';
 import { createAdminEvent, updateAdminEvent, updateUser } from '../../../utils/api.ts';
 import { lookupPubkey } from '../../../utils/lookup.ts';
 import { getPleromaConfigs } from '../../../utils/pleroma.ts';

packages/ditto/controllers/api/streaming.ts

@@ -11,7 +11,7 @@ import { Kysely } from 'kysely';
 import { z } from 'zod';
 
 import { type AppController } from '@/app.ts';
-import { MuteListPolicy } from '@/policies/MuteListPolicy.ts';
+import { MuteListPolicy } from '../../../policies/MuteListPolicy.ts';
 import { getFeedPubkeys } from '@/queries.ts';
 import { AdminStore } from '@/storages/AdminStore.ts';
 import { hydrateEvents } from '@/storages/hydrate.ts';

packages/ditto/middleware/signerMiddleware.ts

@@ -6,8 +6,8 @@ import { NostrSigner, NRelay, NSecSigner } from '@nostrify/nostrify';
 import { Kysely } from 'kysely';
 import { nip19 } from 'nostr-tools';
 
-import { ConnectSigner } from '@/signers/ConnectSigner.ts';
-import { ReadOnlySigner } from '@/signers/ReadOnlySigner.ts';
+import { ConnectSigner } from '../../signers/ConnectSigner.ts';
+import { ReadOnlySigner } from '../../signers/ReadOnlySigner.ts';
 import { aesDecrypt } from '../../utils/aes.ts';
 import { getTokenHash } from '../../utils/auth.ts';
 

packages/ditto/middleware/uploaderMiddleware.ts

@@ -2,9 +2,9 @@ import { BlossomUploader, NostrBuildUploader } from '@nostrify/nostrify/uploader
 import { safeFetch } from '@soapbox/safe-fetch';
 
 import { AppMiddleware } from '@/app.ts';
-import { DenoUploader } from '@/uploaders/DenoUploader.ts';
-import { IPFSUploader } from '@/uploaders/IPFSUploader.ts';
-import { S3Uploader } from '@/uploaders/S3Uploader.ts';
+import { DenoUploader } from '../../uploaders/DenoUploader.ts';
+import { IPFSUploader } from '../../uploaders/IPFSUploader.ts';
+import { S3Uploader } from '../../uploaders/S3Uploader.ts';
 
 /** Set an uploader for the user. */
 export const uploaderMiddleware: AppMiddleware = async (c, next) => {

packages/ditto/trends.ts

@@ -4,7 +4,7 @@ import { NostrFilter, NStore } from '@nostrify/nostrify';
 import { logi } from '@soapbox/logi';
 import { Kysely, sql } from 'kysely';
 
-import { AdminSigner } from '@/signers/AdminSigner.ts';
+import { AdminSigner } from '../signers/AdminSigner.ts';
 import { errorJson } from '../utils/log.ts';
 import { Time } from '../utils/time.ts';
 

packages/lang/deno.json

@@ -0,0 +1,6 @@
+{
+  "name": "@ditto/lang",
+  "exports": {
+    ".": "./language.ts"
+  }
+}

packages/policies/MuteListPolicy.test.ts

@@ -1,8 +1,8 @@
 import { MockRelay } from '@nostrify/nostrify/test';
 
 import { assertEquals } from '@std/assert';
-import { UserStore } from '@/storages/UserStore.ts';
-import { MuteListPolicy } from '@/policies/MuteListPolicy.ts';
+
+import { MuteListPolicy } from './MuteListPolicy.ts';
 
 import userBlack from '~/fixtures/events/kind-0-black.json' with { type: 'json' };
 import userMe from '~/fixtures/events/event-0-makes-repost-with-quote-repost.json' with { type: 'json' };

packages/policies/MuteListPolicy.ts

@@ -1,6 +1,6 @@
 import { NostrEvent, NostrRelayOK, NPolicy, NStore } from '@nostrify/nostrify';
 
-import { getTagSet } from '../../utils/tags.ts';
+import { getTagSet } from '@ditto/utils/tags';
 
 export class MuteListPolicy implements NPolicy {
   constructor(private pubkey: string, private store: NStore) {}

packages/policies/deno.json

@@ -0,0 +1,6 @@
+{
+  "name": "@ditto/policies",
+  "exports": {
+    ".": "./mod.ts"
+  }
+}

packages/policies/mod.ts

@@ -0,0 +1 @@
+export { MuteListPolicy } from './MuteListPolicy.ts';

packages/signers/deno.json

@@ -0,0 +1,6 @@
+{
+  "name": "@ditto/signers",
+  "exports": {
+    ".": "./mod.ts"
+  }
+}

packages/signers/mod.ts

@@ -0,0 +1,3 @@
+export { AdminSigner } from './AdminSigner.ts';
+export { ConnectSigner } from './ConnectSigner.ts';
+export { ReadOnlySigner } from './ReadOnlySigner.ts';

packages/uploaders/deno.json

@@ -0,0 +1,6 @@
+{
+  "name": "@ditto/uploaders",
+  "exports": {
+    ".": "./mod.ts"
+  }
+}

packages/uploaders/mod.ts

@@ -0,0 +1,3 @@
+export { DenoUploader } from './DenoUploader.ts';
+export { IPFSUploader } from './IPFSUploader.ts';
+export { S3Uploader } from './S3Uploader.ts';

packages/utils/api.ts

@@ -19,7 +19,6 @@ type EventStub = TypeFest.SetOptional<EventTemplate, 'content' | 'created_at' |
 interface CreateEventOpts {
   conf: DittoConf;
   store: NStore;
-  pool: NStore;
   user: {
     signer: NostrSigner;
   };

packages/utils/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditto/utils",
   "exports": {
-    ".": "./mod.ts"
+    "./tags": "./tags.ts"
   }
 }

scripts/admin-event.ts

@@ -2,7 +2,7 @@ import { DittoConf } from '@ditto/conf';
 import { JsonParseStream } from '@std/json/json-parse-stream';
 import { TextLineStream } from '@std/streams/text-line-stream';
 
-import { AdminSigner } from '../packages/ditto/signers/AdminSigner.ts';
+import { AdminSigner } from '../packages/signers/AdminSigner.ts';
 import { DittoStorages } from '../packages/ditto/DittoStorages.ts';
 import { type EventStub } from '../packages/utils/api.ts';
 import { nostrNow } from '../packages/ditto/utils.ts';

scripts/admin-role.ts

@@ -2,7 +2,7 @@ import { DittoConf } from '@ditto/conf';
 import { NSchema } from '@nostrify/nostrify';
 import { nip19 } from 'nostr-tools';
 
-import { AdminSigner } from '../packages/ditto/signers/AdminSigner.ts';
+import { AdminSigner } from '../packages/signers/AdminSigner.ts';
 import { DittoStorages } from '../packages/ditto/DittoStorages.ts';
 import { nostrNow } from '../packages/ditto/utils.ts';
 

scripts/setup-kind0.ts

@@ -2,7 +2,7 @@ import { DittoConf } from '@ditto/conf';
 import { Command } from 'commander';
 import { NostrEvent } from 'nostr-tools';
 
-import { AdminSigner } from '../packages/ditto/signers/AdminSigner.ts';
+import { AdminSigner } from '../packages/signers/AdminSigner.ts';
 import { DittoStorages } from '../packages/ditto/DittoStorages.ts';
 import { nostrNow } from '../packages/ditto/utils.ts';