[fix] fedi followers

server/api/controller/ap_user.js

@@ -1,10 +1,10 @@
-const { ap_users: APUsers } = require('../models')
+const { ap_user: APUser } = require('../models')
 
 const apUserController = {
   async toggleBlock (req, res) {
     const user_id = req.body.user_id
-    const user = await APUsers.findByPk(user_id)
-    user.update({ blocked: !user.blocked })
+    const user = await APUser.findByPk(user_id)
+    await user.update({ blocked: !user.blocked })
     res.json(user)
   }
 }

server/api/controller/instance.js

@@ -17,8 +17,8 @@ const instancesController = {
    * get instance users
    */
   async get (req, res) {
-    const fedi_users = await APUser.findAll({ where: { instanceDomain: req.params.instance_domain }, include: [Resource] })
-    return res.json(fedi_users)
+    const ap_users = await APUser.findAll({ where: { instanceDomain: req.params.instance_domain }, include: [Resource] })
+    return res.json(ap_users)
   },
 
   async toggleBlock (req, res) {

server/federation/helpers.js

@@ -4,7 +4,7 @@ const crypto = require('crypto')
 const config = require('config')
 const httpSignature = require('http-signature')
 const debug = require('debug')('federation:helpers')
-const { APUser, Instance } = require('../api/models')
+const { ap_user: APUser, instance: Instance } = require('../api/models')
 const url = require('url')
 const settingsController = require('../api/controller/settings')
 
@@ -55,7 +55,7 @@ const Helpers = {
       return
     }
 
-    const followers = await APUser.findAll({ where: { follow: true } })
+    const followers = await APUser.findAll({ where: { follower: true } })
     const recipients = {}
     followers.forEach(follower => {
       const sharedInbox = follower.object.endpoints.sharedInbox

server/notifier.js

@@ -28,7 +28,7 @@ const notifier = {
   },
   async notifyEvent (action, eventId) {
     const event = await Event.findByPk(eventId, {
-      include: [ Tag, Place, Notification, { model: User, include: { model: APUser, as: 'followers' } } ]
+      include: [ Tag, Place, Notification, { model: User } ]
     })
 
     debug('%s -> %s', action, event.title)