From 4cb2e53acee027406801fbe6f31bf3c2157d596c Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 21 Oct 2024 03:47:04 +0200 Subject: [PATCH] Various changes to get the server to launch again --- .vscode/launch.json | 4 ++-- src/deno/server.ts | 2 +- src/dv/dotinoVeloce.ts | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 7da08ca..6a8bec7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -19,7 +19,7 @@ "--allow-read='.,$HOME/.cache/deno,$HOME/.cache/node_modules'", "--allow-env=DOTINO_POSTGRES_STRING,DOTINO_STRATZ_URL,DOTINO_STRATZ_KEY", "--allow-sys=uid,gid", - "--allow-net=0.0.0.0:8080", + "--allow-net", "--inspect-wait", "src/main.ts" ], @@ -40,7 +40,7 @@ "--allow-read='.'", "--allow-env=DOTINO_POSTGRES_STRING", "--allow-sys=uid,gid", - "--allow-net=0.0.0.0:8080", + "--allow-net", "--inspect-wait", "src/database/init/index.ts" ], diff --git a/src/deno/server.ts b/src/deno/server.ts index f868cc9..d0aaae7 100644 --- a/src/deno/server.ts +++ b/src/deno/server.ts @@ -18,7 +18,7 @@ export function doServe(router: Deno.ServeHandler) { async onError(error) { l.error`Error caught at the serve boundary: ${error}` return new Response( - "An internal server error has occoured.", + "An internal server error has occurred.", { status: 500, } diff --git a/src/dv/dotinoVeloce.ts b/src/dv/dotinoVeloce.ts index 2cea1d7..64ad4ed 100644 --- a/src/dv/dotinoVeloce.ts +++ b/src/dv/dotinoVeloce.ts @@ -1,5 +1,5 @@ // deno-lint-ignore-file require-await -import { createFederation, Person, Application, Image, PropertyValue, Organization, Federation, KvStore, Context, Actor, Follow } from "@fedify/fedify" +import { createFederation, Person, Application, Image, PropertyValue, Organization, Federation, KvStore, Context, Actor, Follow, Endpoints } from "@fedify/fedify" import { getLogger } from "https://jsr.io/@logtape/logtape/0.6.3/logtape/logger.ts" import { escapeHtml } from "@@x/escape" import { StratzAPI } from "../stratz/api.ts" @@ -23,7 +23,7 @@ export class DotinoVeloce { this.federation .setActorDispatcher("/users/{identifier}", this.#actorHandler.bind(this)) .mapHandle(this.#actorMapper.bind(this)) - .setKeyPairsDispatcher(this.#actorKeys.bind(this)) + // .setKeyPairsDispatcher(this.#actorKeys.bind(this)) this.federation .setInboxListeners("/inbox/{identifier}", "/inbox") @@ -35,6 +35,9 @@ export class DotinoVeloce { const properties = { id: ctx.getActorUri(handle), inbox: ctx.getInboxUri(handle), + endpoints: new Endpoints({ + sharedInbox: ctx.getInboxUri(), + }), preferredUsername: handle, // Akkoma expects URL to be equal to ID // Or does it? This makes no sense to me...