Commit c93a9bec authored by Grant's avatar Grant
Browse files

Move away from ActivityPub handles (fixes #16)

parent 6f428ae7
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
@@ -6,14 +6,3 @@ SESSION_SECRET=abc123
PORT=3000

OIDC_ISSUER=http://localhost:3000

# Lemmy Polyfill
LEMMY_HOST=
LEMMY_USER=
LEMMY_PASS=
LEMMY_TOKEN=

# Mastodon & Recieve
MASTODON_HOST=
MASTODON_USER=
MASTODON_TOKEN=
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@
  },
  "scripts": {
    "dev": "tsx watch -r dotenv/config src/index.ts",
    "dev:client": "tsx -r dotenv/config src/tools/create-dev-client.ts",
    "build": "tsc",
    "start": "node dist/index.js"
  }
+14 −0
Original line number Diff line number Diff line
-- CreateTable
CREATE TABLE "FediverseUser" (
    "id" SERIAL NOT NULL,
    "handle" TEXT NOT NULL,
    "objectId" TEXT,
    "error" BOOLEAN NOT NULL DEFAULT false,
    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
    "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,

    CONSTRAINT "FediverseUser_pkey" PRIMARY KEY ("id")
);

-- CreateIndex
CREATE UNIQUE INDEX "FediverseUser_handle_key" ON "FediverseUser"("handle");
+10 −0
Original line number Diff line number Diff line
@@ -41,3 +41,13 @@ model FediverseKeyPair {
  keyType String
  value   String
}

model FediverseUser {
  id       Int     @id @default(autoincrement())
  handle   String  @unique
  objectId String?
  error    Boolean @default(false)

  createdAt DateTime @default(now())
  updatedAt DateTime @default(now()) @updatedAt
}
+32 −5
Original line number Diff line number Diff line
@@ -54,12 +54,39 @@ await configure({
  filters: {},
});

if (process.env.NODE_TYPE === "worker") {
  Jobs.start();
  FederationWorker.create().then(() => {
    console.log("FederationWorker started");
/**
 * Should the worker scripts run now?
 *
 * Any of:
 * - NODE_ENV = development
 * - NODE_TYPE = worker
 */
const shouldStartWorker =
  process.env.NODE_ENV === "development" || process.env.NODE_TYPE === "worker";
/**
 * Should the main scripts run now?
 *
 * Any of:
 * - NODE_ENV = development
 * - NODE_ENV = production & NODE_TYPE != worker
 */
const shouldStartMain =
  process.env.NODE_ENV === "development" ||
  (process.env.NODE_ENV === "production" && process.env.NODE_TYPE !== "worker");

console.log("\n");
console.log("Initializing fediverse-auth...", {
  "Start Main": shouldStartMain,
  "Start Worker": shouldStartWorker,
});
} else {
console.log("\n");

if (shouldStartWorker) {
  Jobs.start();
  void FederationWorker.create();
}

if (shouldStartMain) {
  Express.listen(process.env.PORT, () => {
    console.log("Listening on :" + process.env.PORT);
  });
Loading