Merge branch 'main' into translate-status

Conflicts:
	deno.lock
        I have let the changes of main to prevail, I will update nostrify:db manually

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: denoland/deno:2.0.0-rc.3
+image: denoland/deno:2.0.0
 
 default:
   interruptible: true

.tool-versions

@@ -1 +1 @@
-deno 1.46.3
+deno 2.0.0

deno.json

@@ -10,7 +10,7 @@
     "nostr:pull": "deno run -A scripts/nostr-pull.ts",
     "debug": "deno run -A --inspect src/server.ts",
     "test": "deno test -A --junit-path=./deno-test.xml",
-    "check": "deno check src/server.ts",
+    "check": "deno check --allow-import src/server.ts",
     "nsec": "deno run scripts/nsec.ts",
     "admin:event": "deno run -A scripts/admin-event.ts",
     "admin:role": "deno run -A scripts/admin-role.ts",
@@ -68,7 +68,7 @@
     "formdata-helper": "npm:formdata-helper@^0.3.0",
     "hono-rate-limiter": "npm:hono-rate-limiter@^0.3.0",
     "iso-639-1": "npm:iso-639-1@2.1.15",
-    "isomorphic-dompurify": "npm:isomorphic-dompurify@^2.11.0",
+    "isomorphic-dompurify": "npm:isomorphic-dompurify@^2.16.0",
     "kysely": "npm:kysely@^0.27.4",
     "kysely-postgres-js": "npm:kysely-postgres-js@2.0.0",
     "lande": "npm:lande@^1.0.10",

src/controllers/api/instance.ts

@@ -7,6 +7,15 @@ import { getInstanceMetadata } from '@/utils/instance.ts';
 
 const version = `3.0.0 (compatible; Ditto ${denoJson.version})`;
 
+const features = [
+  'exposable_reactions',
+  'mastodon_api',
+  'mastodon_api_streaming',
+  'pleroma_emoji_reactions',
+  'quote_posting',
+  'v2_suggestions',
+];
+
 const instanceV1Controller: AppController = async (c) => {
   const { host, protocol } = Conf.url;
   const meta = await getInstanceMetadata(await Storages.db(), c.req.raw.signal);
@@ -39,14 +48,7 @@ const instanceV1Controller: AppController = async (c) => {
     },
     pleroma: {
       metadata: {
-        features: [
+        features,
-          'exposable_reactions',
-          'mastodon_api',
-          'mastodon_api_streaming',
-          'pleroma_emoji_reactions',
-          'quote_posting',
-          'v2_suggestions',
-        ],
       },
     },
     languages: ['en'],
@@ -114,7 +116,6 @@ const instanceV2Controller: AppController = async (c) => {
         characters_reserved_per_url: 23,
       },
       media_attachments: {
-        supported_mime_types: [],
         image_size_limit: 16777216,
         image_matrix_limit: 33177600,
         video_size_limit: 103809024,
@@ -131,6 +132,15 @@ const instanceV2Controller: AppController = async (c) => {
         enabled: true,
       },
     },
+    nostr: {
+      pubkey: Conf.pubkey,
+      relay: `${wsProtocol}//${host}/relay`,
+    },
+    pleroma: {
+      metadata: {
+        features,
+      },
+    },
     registrations: {
       enabled: false,
       approval_required: false,

src/workers/policy.ts

@@ -20,14 +20,16 @@ class PolicyWorker implements NPolicy {
         new URL('./policy.worker.ts', import.meta.url),
         {
           type: 'module',
-          deno: {
+          // FIXME: Disabled until Deno 2.0 adds support for `import` permission here.
-            permissions: {
+          // https://github.com/denoland/deno/issues/26074
-              read: [Conf.denoDir, Conf.policy, Conf.dataDir],
+          // deno: {
-              write: [Conf.dataDir],
+          //   permissions: {
-              net: 'inherit',
+          //     read: [Conf.denoDir, Conf.policy, Conf.dataDir],
-              env: false,
+          //     write: [Conf.dataDir],
-            },
+          //     net: 'inherit',
-          },
+          //     env: false,
+          //   },
+          // },
         },
       ),
     );