diff --git a/src/activitypub/index.js b/src/activitypub/index.js index 068264794c..d08d1e6015 100644 --- a/src/activitypub/index.js +++ b/src/activitypub/index.js @@ -2,7 +2,6 @@ const nconf = require('nconf'); const { createHash, createSign, createVerify } = require('crypto'); -const validator = require('validator'); const request = require('../request'); const db = require('../database'); diff --git a/src/user/follow.js b/src/user/follow.js index 592bbee12b..a15ecb121f 100644 --- a/src/user/follow.js +++ b/src/user/follow.js @@ -73,14 +73,10 @@ module.exports = function (User) { if (parseInt(uid, 10) <= 0) { return []; } - const uids = await db.getSortedSetRevUnion({ - sets: [ - `${type}:${uid}`, - `${type}Remote:${uid}`, - ], - start, - stop, - }); + const uids = await db.getSortedSetRevRange([ + `${type}:${uid}`, + `${type}Remote:${uid}`, + ], start, stop); const data = await plugins.hooks.fire(`filter:user.${type}`, { uids: uids,