From 8dc8b29ae7762306aea7e5f705d862cb4eeddf3f Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Wed, 31 Jul 2019 02:00:12 +0200
Subject: [PATCH] .

---
 server/api/controller/user.js |  1 +
 server/federation/follows.js  | 11 ++++++++++-
 server/federation/helpers.js  | 13 -------------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index 16862dd5..73951365 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -123,6 +123,7 @@ const userController = {
     res.json(event)
 
     federation.sendEvent(event, req.user)
+    res.json(200)
 
     // send notification (mastodon/email/confirmation)
     // notifier.notifyEvent(event.id)
diff --git a/server/federation/follows.js b/server/federation/follows.js
index e569c7d5..f0290170 100644
--- a/server/federation/follows.js
+++ b/server/federation/follows.js
@@ -1,6 +1,7 @@
 const config = require('config')
 const Helpers = require('./helpers')
 const { user: User } = require('../api/models')
+const crypto = require('crypto')
 
 module.exports = {
   // follow request from fediverse
@@ -18,7 +19,15 @@ module.exports = {
       console.error('ok this is a new follower: ', body.actor)
       await user.update({ followers: [...user.followers, body.actor] })
     }
-    return Helpers.sendAcceptMessage(body, user, domain, req, res, targetOrigin)
+    const guid = crypto.randomBytes(16).toString('hex')
+    let message = {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      'id': `${config.baseurl}/federation/${guid}`,
+      'type': 'Accept',
+      'actor': `${config.baseurl}/federation/u/${user.username}`,
+      'object': body,
+    }    
+    return Helpers.signAndSend(message, user, body.actor)
 
   },
   // unfollow request from fediverse
diff --git a/server/federation/helpers.js b/server/federation/helpers.js
index 6f8be70b..ca257eee 100644
--- a/server/federation/helpers.js
+++ b/server/federation/helpers.js
@@ -1,6 +1,5 @@
 const fetch = require('fetch')
 const request = require('request')
-const crypto = require('crypto')
 const config = require('config')
 
 const Helpers = {
@@ -41,18 +40,6 @@ const Helpers = {
         console.log('Response:', response.body, response.statusCode, response.status, response.statusMessage)
       }
     })
-    return res.status(200)
-  },
-  async sendAcceptMessage (body, user, domain, req, res, targetOrigin) {
-    const guid = crypto.randomBytes(16).toString('hex')
-    let message = {
-      '@context': 'https://www.w3.org/ns/activitystreams',
-      'id': `${config.baseurl}/federation/${guid}`,
-      'type': 'Accept',
-      'actor': `${config.baseurl}/federation/u/${user.username}`,
-      'object': body,
-    }
-    // Helpers.signAndSend(message, user, domain, req, res, targetOrigin)
   },
   async sendEvent(event, user) {
     console.error('devo inviare un evento ai followers')