logi: message -> msg

src/DittoPush.ts

@@ -24,7 +24,7 @@ export class DittoPush {
           logi({
             level: 'warn',
             ns: 'ditto.push',
-            message: 'VAPID keys are not set. Push notifications will be disabled.',
+            msg: 'VAPID keys are not set. Push notifications will be disabled.',
           });
         }
       })();

src/controllers/api/streaming.ts

@@ -128,7 +128,7 @@ const streamingController: AppController = async (c) => {
         }
       }
     } catch (e) {
-      logi({ level: 'error', ns: 'ditto.streaming', message: 'Error in streaming', error: errorJson(e) });
+      logi({ level: 'error', ns: 'ditto.streaming', msg: 'Error in streaming', error: errorJson(e) });
     }
   }
 

src/controllers/api/trends.ts

@@ -18,7 +18,7 @@ let trendingHashtagsCache = getTrendingHashtags().catch((e: unknown) => {
     level: 'error',
     ns: 'ditto.trends.api',
     type: 'tags',
-    message: 'Failed to get trending hashtags',
+    msg: 'Failed to get trending hashtags',
     error: errorJson(e),
   });
   return Promise.resolve([]);
@@ -33,7 +33,7 @@ Deno.cron('update trending hashtags cache', '35 * * * *', async () => {
       level: 'error',
       ns: 'ditto.trends.api',
       type: 'tags',
-      message: 'Failed to get trending hashtags',
+      msg: 'Failed to get trending hashtags',
       error: errorJson(e),
     });
   }
@@ -76,7 +76,7 @@ let trendingLinksCache = getTrendingLinks().catch((e: unknown) => {
     level: 'error',
     ns: 'ditto.trends.api',
     type: 'links',
-    message: 'Failed to get trending links',
+    msg: 'Failed to get trending links',
     error: errorJson(e),
   });
   return Promise.resolve([]);
@@ -91,7 +91,7 @@ Deno.cron('update trending links cache', '50 * * * *', async () => {
       level: 'error',
       ns: 'ditto.trends.api',
       type: 'links',
-      message: 'Failed to get trending links',
+      msg: 'Failed to get trending links',
       error: errorJson(e),
     });
   }

src/controllers/error.ts

@@ -19,7 +19,7 @@ export const errorHandler: ErrorHandler = (err, c) => {
     return c.json({ error: 'The server was unable to respond in a timely manner' }, 500);
   }
 
-  logi({ level: 'error', ns: 'ditto.http', message: 'Unhandled error', error: errorJson(err) });
+  logi({ level: 'error', ns: 'ditto.http', msg: 'Unhandled error', error: errorJson(err) });
 
   return c.json({ error: 'Something went wrong' }, 500);
 };

src/controllers/frontend.ts

@@ -27,7 +27,7 @@ export const frontendController: AppMiddleware = async (c) => {
         const meta = renderMetadata(c.req.url, entities);
         return c.html(content.replace(META_PLACEHOLDER, meta));
       } catch (e) {
-        logi({ level: 'error', ns: 'ditto.frontend', message: 'Error building meta tags', error: errorJson(e) });
+        logi({ level: 'error', ns: 'ditto.frontend', msg: 'Error building meta tags', error: errorJson(e) });
         return c.html(content);
       }
     }

src/controllers/nostr/relay.ts

@@ -168,7 +168,7 @@ function connectStream(socket: WebSocket, ip: string | undefined) {
         send(['OK', event.id, false, e.message]);
       } else {
         send(['OK', event.id, false, 'error: something went wrong']);
-        logi({ level: 'error', ns: 'ditto.relay', message: 'Error in relay', error: errorJson(e) });
+        logi({ level: 'error', ns: 'ditto.relay', msg: 'Error in relay', error: errorJson(e) });
       }
     }
   }

src/db/DittoDB.ts

@@ -39,14 +39,14 @@ export class DittoDB {
       }),
     });
 
-    logi({ level: 'info', ns: 'ditto.db.migration', message: 'Running migrations...', state: 'started' });
+    logi({ level: 'info', ns: 'ditto.db.migration', msg: 'Running migrations...', state: 'started' });
     const { results, error } = await migrator.migrateToLatest();
 
     if (error) {
       logi({
         level: 'fatal',
         ns: 'ditto.db.migration',
-        message: 'Migration failed.',
+        msg: 'Migration failed.',
         state: 'failed',
         results: results as unknown as JsonValue,
         error: errorJson(error),
@@ -54,12 +54,12 @@ export class DittoDB {
       Deno.exit(1);
     } else {
       if (!results?.length) {
-        logi({ level: 'info', ns: 'ditto.db.migration', message: 'Everything up-to-date.', state: 'skipped' });
+        logi({ level: 'info', ns: 'ditto.db.migration', msg: 'Everything up-to-date.', state: 'skipped' });
       } else {
         logi({
           level: 'info',
           ns: 'ditto.db.migration',
-          message: 'Migrations finished!',
+          msg: 'Migrations finished!',
           state: 'migrated',
           results: results as unknown as JsonValue,
         });

src/sentry.ts

@@ -5,11 +5,11 @@ import { Conf } from '@/config.ts';
 
 // Sentry
 if (Conf.sentryDsn) {
-  logi({ level: 'info', ns: 'ditto.sentry', message: 'Sentry enabled.', enabled: true });
+  logi({ level: 'info', ns: 'ditto.sentry', msg: 'Sentry enabled.', enabled: true });
   Sentry.init({
     dsn: Conf.sentryDsn,
     tracesSampleRate: 1.0,
   });
 } else {
-  logi({ level: 'info', ns: 'ditto.sentry', message: 'Sentry not configured. Skipping.', enabled: false });
+  logi({ level: 'info', ns: 'ditto.sentry', msg: 'Sentry not configured. Skipping.', enabled: false });
 }

src/server.ts

@@ -9,6 +9,6 @@ import { Conf } from '@/config.ts';
 Deno.serve({
   port: Conf.port,
   onListen({ hostname, port }): void {
-    logi({ level: 'info', ns: 'ditto.server', message: `Listening on http://${hostname}:${port}`, hostname, port });
+    logi({ level: 'info', ns: 'ditto.server', msg: `Listening on http://${hostname}:${port}`, hostname, port });
   },
 }, app.fetch);

src/storages.ts

@@ -94,7 +94,7 @@ export class Storages {
         logi({
           level: 'info',
           ns: 'ditto.pool',
-          message: `connecting to ${activeRelays.length} relays`,
+          msg: `connecting to ${activeRelays.length} relays`,
           relays: activeRelays,
         });
 

src/trends.ts

@@ -75,7 +75,7 @@ export async function updateTrendingTags(
   values?: string[],
 ) {
   const params = { l, tagName, kinds, limit, extra, aliases, values };
-  logi({ level: 'info', ns: 'ditto.trends', message: 'Updating trending', ...params });
+  logi({ level: 'info', ns: 'ditto.trends', msg: 'Updating trending', ...params });
 
   const kysely = await Storages.kysely();
   const signal = AbortSignal.timeout(1000);
@@ -94,9 +94,9 @@ export async function updateTrendingTags(
     }, values);
 
     if (trends.length) {
-      logi({ level: 'info', ns: 'ditto.trends', message: 'Trends found', trends, ...params });
+      logi({ level: 'info', ns: 'ditto.trends', msg: 'Trends found', trends, ...params });
     } else {
-      logi({ level: 'info', ns: 'ditto.trends', message: 'No trends found. Skipping.', ...params });
+      logi({ level: 'info', ns: 'ditto.trends', msg: 'No trends found. Skipping.', ...params });
       return;
     }
 
@@ -114,9 +114,9 @@ export async function updateTrendingTags(
     });
 
     await handleEvent(label, { source: 'internal', signal });
-    logi({ level: 'info', ns: 'ditto.trends', message: 'Trends updated', ...params });
+    logi({ level: 'info', ns: 'ditto.trends', msg: 'Trends updated', ...params });
   } catch (e) {
-    logi({ level: 'error', ns: 'ditto.trends', message: 'Error updating trends', ...params, error: errorJson(e) });
+    logi({ level: 'error', ns: 'ditto.trends', msg: 'Error updating trends', ...params, error: errorJson(e) });
   }
 }
 

src/utils/log.ts

@@ -3,8 +3,8 @@ import { JsonValue } from '@std/json';
 /** Serialize an error into JSON for JSON logging. */
 export function errorJson(error: unknown): JsonValue {
   if (error instanceof Error) {
-    return { name: error.name, message: error.message, stack: error.stack };
+    return { name: error.name, msg: error.message, stack: error.stack };
   }
 
-  return { name: 'unknown', message: String(error) };
+  return { name: 'unknown', msg: String(error) };
 }

src/workers/policy.ts

@@ -56,7 +56,7 @@ class PolicyWorker implements NPolicy {
       logi({
         level: 'info',
         ns: 'ditto.system.policy',
-        message: 'Using custom policy',
+        msg: 'Using custom policy',
         path: Conf.policy,
         enabled: true,
       });
@@ -65,7 +65,7 @@ class PolicyWorker implements NPolicy {
         logi({
           level: 'info',
           ns: 'ditto.system.policy',
-          message: 'Custom policy not found <https://docs.soapbox.pub/ditto/policies/>',
+          msg: 'Custom policy not found <https://docs.soapbox.pub/ditto/policies/>',
           path: null,
           enabled: false,
         });
@@ -77,7 +77,7 @@ class PolicyWorker implements NPolicy {
         logi({
           level: 'warn',
           ns: 'ditto.system.policy',
-          message: 'Custom policies are not supported with PGlite. The policy is disabled.',
+          msg: 'Custom policies are not supported with PGlite. The policy is disabled.',
           path: Conf.policy,
           enabled: false,
         });