debugging fedi & upgrade

server/api/models/event.js

@@ -37,13 +37,13 @@ module.exports = (sequelize, DataTypes) => {
   }
 
   //
-  event.prototype.toAP = function (username = config.admin, follower) {
+  event.prototype.toAP = function (username, follower = []) {
     const tags = this.tags && this.tags.map(t => '#' + t.tag).join(' ')
-    const content = `<b><a href='${config.baseurl}/event/${this.id}'>${this.title}</a></b><br/>
+    const content = `<a href='${config.baseurl}/event/${this.id}'>${this.title}<br/>
     📍${this.place.name}<br/>
     ⏰ ${moment.unix(this.start_datetime).format('dddd, D MMMM (HH:mm)')}<br/><br/>
       ${this.description.length > 200 ? this.description.substr(0, 200) + '...' : this.description}<br/>
-      ${tags} <br/>`
+      ${tags} <br/></a>`
 
     const attachment = []
     if (this.image_path) {

server/federation/follows.js

@@ -2,7 +2,7 @@ const config = require('config')
 const Helpers = require('./helpers')
 const { user: User } = require('../api/models')
 const crypto = require('crypto')
-const debug = require('debug')('fedivers:follows')
+const debug = require('debug')('federation:follows')
 
 module.exports = {
   // follow request from fediverse

server/federation/helpers.js

@@ -3,7 +3,7 @@ const fetch = require('node-fetch')
 const crypto = require('crypto')
 const config = require('config')
 const httpSignature = require('http-signature')
-const debug = require('debug')('fediverse:helpers')
+const debug = require('debug')('federation:helpers')
 const { user: User } = require('../api/models')
 const url = require('url')
 
@@ -26,7 +26,7 @@ const Helpers = {
     const signature = signer.sign(privkey)
     const signature_b64 = signature.toString('base64')
     const header = `keyId="${config.baseurl}/federation/u/${user.username}",headers="(request-target) host date",signature="${signature_b64}"`
-    return await fetch(toInbox, {
+    const ret = await fetch(toInbox, {
       headers: {
         'Host': toOrigin.hostname,
         'Date': d.toUTCString(),
@@ -36,6 +36,7 @@ const Helpers = {
       },
       method: 'POST',
       body: JSON.stringify(message) })
+    debug('sign %s => %s', ret.status, await ret.text())
   },
 
   async sendEvent (event, user) {
@@ -48,35 +49,40 @@ const Helpers = {
     }
 
     for (const follower of instanceAdmin.followers) {
-      debug('Notify %s with event %s', follower, event.title)
-      const body = {
-        id: `${config.baseurl}/federation/m/c_${event.id}`,
-        type: 'Create',
-        actor: `${config.baseurl}/federation/u/${instanceAdmin.username}`,
-        url: `${config.baseurl}/federation/m/${event.id}`,
-        object: event.toAP(instanceAdmin.username, follower)
-      }
-      body['@context'] = 'https://www.w3.org/ns/activitystreams'
-      Helpers.signAndSend(body, user, follower)
-    }
-
-    // in case the event is published by the Admin itself do not republish
-    if (instanceAdmin.id === user.id) {
-      debug('')
-      return
-    }
-
-    if (!user.settings.enable_federation || !user.username) { return }
-    for (const follower of user.followers) {
-      debug('Notify %s with event %s', follower, event.title)
+      debug('Notify %s with event %s (from admin user %s)', follower, event.title, instanceAdmin.username)
       const body = {
         id: `${config.baseurl}/federation/m/${event.id}#create`,
         type: 'Create',
         to: ['https://www.w3.org/ns/activitystreams#Public'],
-        cc: [`${config.baseurl}/federation/u/${user.username}/followers`],
+        cc: [`${config.baseurl}/federation/u/${instanceAdmin.username}/followers`, follower],        
+        actor: `${config.baseurl}/federation/u/${instanceAdmin.username}`,
+        object: event.toAP(instanceAdmin.username, [`${config.baseurl}/federation/u/${instanceAdmin.username}/followers`, follower])
+      }
+      body['@context'] = 'https://www.w3.org/ns/activitystreams'
+      Helpers.signAndSend(body, instanceAdmin, follower)
+    }
+
+    // in case the event is published by the Admin itself do not republish
+    if (instanceAdmin.id === user.id) {
+      debug('Event published by instance Admin')
+      return
+    }
+
+    if (!user.settings.enable_federation || !user.username) {
+      debug('Federation disabled for user %d (%s)', user.id, user.username)
+      return
+    }
+
+    for (const follower of user.followers) {
+      debug('Notify %s with event %s (from user %s)', follower, event.title, user.username)
+      const body = {
+        id: `${config.baseurl}/federation/m/${event.id}#create`,
+        type: 'Create',
+        to: ['https://www.w3.org/ns/activitystreams#Public'],
+        cc: [`${config.baseurl}/federation/u/${user.username}/followers`, follower],
         published: event.createdAt,
         actor: `${config.baseurl}/federation/u/${user.username}`,
-        object: event.toAP(user.username, follower)
+        object: event.toAP(user.username, [`${config.baseurl}/federation/u/${user.username}/followers`, follower])
       }
       body['@context'] = 'https://www.w3.org/ns/activitystreams'
       Helpers.signAndSend(body, user, follower)

server/federation/users.js

@@ -28,7 +28,7 @@ module.exports = {
       }],
       icon: {
         type: 'Image',
-        mediaType: 'image/jpeg',
+        mediaType: 'image/x-icon',
         url: config.baseurl + '/favicon.ico'
       },
       publicKey: {