lint

Author: johnholdun

src/activity-pub-db.js

@@ -201,7 +201,7 @@ async function firstTimeSetup(actorName) {
         try {
           const actorInfo = await getActorInfo();
           const actorRecord = actorJson(actorInfo, publicKey);
-          const webfingerRecord = webfingerJson(account);
+          const webfingerRecord = webfingerJson(actorInfo.username);
 
           await db.run(
             'INSERT OR REPLACE INTO accounts (name, actor, pubkey, privkey, webfinger) VALUES (?, ?, ?, ?, ?)',
@@ -221,11 +221,6 @@ async function firstTimeSetup(actorName) {
 }
 
 function setup() {
-  // activitypub not set up yet, skip until we have the data we need
-  if (false) {
-    return;
-  }
-
   // Initialize the database
   const exists = fs.existsSync(dbFile);
 

src/activitypub.js

@@ -184,9 +184,7 @@ export async function lookupActorInfo(actorUsername) {
 }
 
 export async function broadcastMessage(bookmark, action, db, account, domain) {
-  if (false /* TODO actorInfo.disabled */) {
-    return; // no fediverse setup, so no purpose trying to send messages
-  }
+  // TODO bail if activitypub not set up
 
   const result = await db.getFollowers();
   const followers = JSON.parse(result);

src/database.js

@@ -7,7 +7,7 @@ const connect = new Promise((resolve, reject) => {
     if (error) {
       reject(error);
     } else {
-      console.log('i have hereby connected :)')
+      console.log('i have hereby connected :)');
       result.exec(schema, (execError) => {
         if (execError) {
           reject(execError);
@@ -19,18 +19,20 @@ const connect = new Promise((resolve, reject) => {
   });
 });
 
-const query = (method) => async (...args) => {
-  const db = await connect;
-  return new Promise((resolve, reject) => {
-    db[method](...args, (error, result) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve(result);
-      }
+const query =
+  (method) =>
+  async (...args) => {
+    const db = await connect;
+    return new Promise((resolve, reject) => {
+      db[method](...args, (error, result) => {
+        if (error) {
+          reject(error);
+        } else {
+          resolve(result);
+        }
+      });
     });
-  });
-}
+  };
 
 const run = query('run');
 const get = query('get');
@@ -50,7 +52,7 @@ export const getSetting = async (name) => {
   }
 
   return null;
-}
+};
 
 export const getSettings = async (names) => {
   // TODO: There must be a way to get node-sqlite3 to accept parameters for an
@@ -59,30 +61,47 @@ export const getSettings = async (names) => {
   // enforcing elsewhere in business logic, and this exact bit of code will
   // likely like to weird bugs in the future, but for now it's maybe better to
   // be safe!
-  if (!names.every(name => name.match(/^[a-z0-9-_ .\/]+$/i))) {
+  if (!names.every((name) => name.match(/^[a-z0-9-_ ./]+$/i))) {
     throw new Error('Names contain unexpected characters');
   }
 
   const rows = await all(`
     select name, value
     from settings
-    where name in (${names.map(n => `'${n}'`).join(',')})
+    where name in (${names.map((n) => `'${n}'`).join(',')})
   `);
 
   return Object.fromEntries(rows.map(({ name, value }) => [name, JSON.parse(value)]));
-}
+};
 
-export const setSetting = async (name, value) => {
-  const serializedValue = JSON.stringify(value);
+export const setSettings = async (obj) => {
+  // TODO: See caveat in getSettings
+  if (!Object.keys(obj).every((name) => name.match(/^[a-z0-9-_ ./]+$/i))) {
+    throw new Error('Names contain unexpected characters');
+  }
+
+  const values = Object.entries(obj).map(
+    ([name, value]) =>
+      // TODO: Escape this properly
+      `('${name}', '${JSON.stringify(value).replace("'", "\\'")}')`,
+  );
 
+  await run(`
+     insert into settings
+     (name, value)
+     values ${values.join(',')}
+     on conflict (name) do update set value = excluded.value
+   `);
+};
+
+export const setSetting = async (name, value) => {
   return run(
     `
       insert into settings (name, value)
       values (?, ?)
-      on conflict (name) do update set value = ?
+      on conflict (name) do update set value = excluded.value
     `,
     name,
-    serializedValue,
-    serializedValue
+    JSON.stringify(value),
   );
 };

src/routes/admin.js

@@ -42,7 +42,9 @@ router.get('/followers', isAuthenticated, async (req, res) => {
 
   const apDb = req.app.get('apDb');
 
-  if (false /* TODO actorinfo.disabled */) {
+  const { actorInfo } = await getActorInfo();
+  // TODO
+  if (actorInfo.disabled) {
     return res.render('nonfederated', params);
   }
 
@@ -75,7 +77,9 @@ router.get('/following', isAuthenticated, async (req, res) => {
 
   const apDb = req.app.get('apDb');
 
-  if (false /* TODO actorinfo.disabled */) {
+  const { actorInfo } = await getActorInfo();
+  // TODO
+  if (actorInfo.disabled) {
     return res.render('nonfederated', params);
   }
 

src/routes/core.js

@@ -10,7 +10,6 @@ router.get('/', async (req, res) => {
   const params = {};
 
   const bookmarksDb = req.app.get('bookmarksDb');
-  const db = req.app.get('db');
 
   const limit = Math.max(req.query?.limit || 10, 1);
   const offset = Math.max(req.query?.offset || 0, 0);

src/util.js

@@ -6,7 +6,7 @@ import * as db from './database.js';
 
 dotenv.config();
 
-const ACTOR_SETTING_NAMES = ['username', 'avatar', 'displayName', 'description']
+const ACTOR_SETTING_NAMES = ['username', 'avatar', 'displayName', 'description'];
 const IS_ACCOUNT_FILE_IMPORTED = 'isAccountFileImported';
 
 export const data = {
@@ -19,18 +19,17 @@ try {
   const accountFileData = JSON.parse(accountFile);
   const isAccountFileImported = await db.getSetting(IS_ACCOUNT_FILE_IMPORTED);
   if (isAccountFileImported) {
-    console.log('Postmarks detected an account.json file that will no longer be read. You should remove this file.')
+    console.log('Postmarks detected an account.json file that will no longer be read. You should remove this file.');
   } else {
-    for (const name of ACTOR_SETTING_NAMES) {
-      if (accountFileData.hasOwnProperty(name)) {
-        await db.setSetting(name, accountFileData[name]);
-      }
-    }
-    await db.setSetting(IS_ACCOUNT_FILE_IMPORTED, true);
-    console.log('Your account.json file has been imported to the database. You should now remove this file.')
+    await db.setSettings({
+      ...Object.fromEntries(Object.entries(accountFileData).filter(([name]) => ACTOR_SETTING_NAMES.includes(name))),
+      [IS_ACCOUNT_FILE_IMPORTED]: true,
+    });
+    console.log('Your account.json file has been imported to the database. You should now remove this file.');
   }
 } catch (e) {
-  console.log('uhhh', e)
+  // TODO: Check for existence of account.json instead of catching error
+  console.log('Failed to read account.json', e);
 }
 
 export const getActorInfo = () => db.getSettings(ACTOR_SETTING_NAMES);