Use constants for common strings (#6)

TryGhost · Jul 31, 2024 · 55dcc09 · 55dcc09
1 parent 4cffa0c
commit 55dcc09
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/src/dispatchers.ts b/src/dispatchers.ts
@@ -14,13 +14,14 @@ import {
 import { v4 as uuidv4 } from 'uuid';
 import { addToList } from './kv-helpers';
 import { ContextData } from './app';
+import { ACTOR_DEFAULT_HANDLE } from './constants';
 import { getUserData, getUserKeypair } from './user';
 
 export async function actorDispatcher(
     ctx: RequestContext<ContextData>,
     handle: string,
 ) {
-    if (handle !== 'index') return null;
+    if (handle !== ACTOR_DEFAULT_HANDLE) return null;
 
     const data = await getUserData(ctx, handle);
 
@@ -30,7 +31,7 @@ export async function actorDispatcher(
 }
 
 export async function keypairDispatcher(ctx: Context<ContextData>, handle: string) {
-    if (handle !== 'index') return [];
+    if (handle !== ACTOR_DEFAULT_HANDLE) return [];
 
     const data = await getUserKeypair(ctx, handle);
 

diff --git a/src/dispatchers.unit.test.ts b/src/dispatchers.unit.test.ts
@@ -19,10 +19,11 @@ import {
     createDispatcher,
 } from './dispatchers';
 import { RequestContext } from '@fedify/fedify';
+import { ACTOR_DEFAULT_HANDLE } from './constants';
 
 describe('dispatchers', function () {
     describe('actorDispatcher', function () {
-        it('returns null if the handle is not "index"', async function () {
+        it(`returns null if the handle is not "${ACTOR_DEFAULT_HANDLE}"`, async function () {
             const ctx = {} as RequestContext<any>;
             const handle = 'anything';
 

diff --git a/src/handlers.ts b/src/handlers.ts
@@ -85,7 +85,7 @@ export async function followAction(
         db: ctx.get('db'),
         globaldb: ctx.get('globaldb'),
     });
-    const actor = await apCtx.getActor('index'); // TODO This should be the actor making the request
+    const actor = await apCtx.getActor(ACTOR_DEFAULT_HANDLE); // TODO This should be the actor making the request
     const followId = apCtx.getObjectUri(Follow, {
         id: uuidv4(),
     });
@@ -97,7 +97,7 @@ export async function followAction(
     const followJson = await follow.toJsonLd();
     ctx.get('globaldb').set([follow.id!.href], followJson);
 
-    apCtx.sendActivity({ handle: 'index' }, actorToFollow, follow);
+    apCtx.sendActivity({ handle: ACTOR_DEFAULT_HANDLE }, actorToFollow, follow);
     return new Response(JSON.stringify(followJson), {
         headers: {
             'Content-Type': 'application/activity+json',
@@ -121,7 +121,7 @@ export async function postPublishedWebhook(
         data?.post?.current,
     );
     if (article) {
-        const actor = await apCtx.getActor('index');
+        const actor = await apCtx.getActor(ACTOR_DEFAULT_HANDLE);
         const create = new Create({
             actor,
             object: article,
@@ -141,7 +141,7 @@ export async function postPublishedWebhook(
                 .get('globaldb')
                 .set([article.id!.href], await article.toJsonLd());
             await addToList(ctx.get('db'), ['outbox'], create.id!.href);
-            await apCtx.sendActivity({ handle: 'index' }, 'followers', create, {
+            await apCtx.sendActivity({ handle: ACTOR_DEFAULT_HANDLE }, 'followers', create, {
                 preferSharedInbox: true
             });
         } catch (err) {

diff --git a/src/user.ts b/src/user.ts
@@ -7,6 +7,11 @@ import {
     Context,
 } from '@fedify/fedify';
 import { ContextData } from './app';
+import {
+    ACTOR_DEFAULT_ICON,
+    ACTOR_DEFAULT_NAME,
+    ACTOR_DEFAULT_SUMMARY
+} from './constants';
 
 export type PersonData = {
     id: string;
@@ -49,10 +54,10 @@ export async function getUserData(ctx: RequestContext<ContextData>, handle: stri
 
     const data = {
         id: ctx.getActorUri(handle),
-        name: `Local Ghost site`,
-        summary: 'This is a summary',
+        name: ACTOR_DEFAULT_NAME,
+        summary: ACTOR_DEFAULT_SUMMARY,
         preferredUsername: handle,
-        icon: new Image({ url: new URL('https://ghost.org/favicon.ico') }),
+        icon: new Image({ url: new URL(ACTOR_DEFAULT_ICON) }),
         inbox: ctx.getInboxUri(handle),
         outbox: ctx.getOutboxUri(handle),
         following: ctx.getFollowingUri(handle),
@@ -67,14 +72,14 @@ export async function getUserData(ctx: RequestContext<ContextData>, handle: stri
         name: data.name,
         summary: data.summary,
         preferredUsername: data.preferredUsername,
-        icon: 'https://ghost.org/favicon.ico',
+        icon: ACTOR_DEFAULT_ICON,
         inbox: data.inbox.href,
         outbox: data.outbox.href,
         following: data.following.href,
         followers: data.followers.href,
     };
 
-    await ctx.data.db.set(['handle', handle], data);
+    await ctx.data.db.set(['handle', handle], dataToStore);
 
     return data;
 }