refactorin docker files

server/federation/helpers.js

@@ -6,7 +6,7 @@ const httpSignature = require('http-signature')
 const debug = require('debug')('federation:helpers')
 const { user: User, fed_users: FedUsers } = require('../api/models')
 const url = require('url')
-const settings = require('../api/controller/settings')
+const settingsController = require('../api/controller/settings')
 
 const Helpers = {
 
@@ -53,12 +53,11 @@ const Helpers = {
   },
 
   async sendEvent (event, user) {
-    if (!settings.settings.enable_federation) {
+    if (!settingsController.settings.enable_federation) {
       debug('event not send, federation disabled')
       return
     }
 
-
     // event is sent by user that published it and by the admin instance
     // collect followers from admin and user
     const instanceAdmin = await User.findOne({ where: { email: config.admin_email }, include: { model: FedUsers, as: 'followers'  } })
@@ -128,15 +127,6 @@ const Helpers = {
 
   },
 
-  // DO NOT USE THIS! (why is this needed btw?)
-  // async getFederatedUser (address) {
-  //   address = address.trim()
-  //   const [ username, host ] = address.split('@')
-  //   const url = `https://${host}/.well-known/webfinger?resource=acct:${username}@${host}`
-  //   return Helpers.getActor(url)
-  // },
-
-  // TODO: cache
   async getActor (url, force = false) {
     let fedi_user
     

server/federation/index.js

@@ -4,6 +4,7 @@ const cors = require('cors')
 const Follows = require('./follows')
 const Users = require('./users')
 const { event: Event, user: User, tag: Tag, place: Place } = require('../api/models')
+const settingsController = require('../api/controller/settings')
 const Comments = require('./comments')
 const Helpers = require('./helpers')
 const Ego = require('./ego')
@@ -14,6 +15,11 @@ const debug = require('debug')('federation')
  * ref: https://www.w3.org/TR/activitypub/#Overview
  */
 
+router.use((req, res, next) => {
+  if(settingsController.settings.enable_federation) next()
+  debug('Federation disabled!')
+  return res.status(401).send('Federation disabled')
+})
 
 router.use(cors())
 router.use(express.json({ type: ['application/json', 'application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'] }))