Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-28 01:21:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2025-05-08 14:12:33 -04:00
parent 7a7a4f0ab7 26e6a22278
commit d5349b39f5
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/api/activitypub.js
View File

@@ -13,6 +13,7 @@ const winston = require('winston');
const db = require('../database');
const user = require('../user');
const categories = require('../categories');
const meta = require('../meta');
const privileges = require('../privileges');
const activitypub = require('../activitypub');
@@ -43,7 +44,14 @@ activitypubApi.follow = enabledCheck(async (caller, { type, id, actor } = {}) =>
throw new Error('[[error:activitypub.invalid-id]]');
}
actor = actor.includes('@') ? await user.getUidByUserslug(actor) : actor;
if (actor.includes('@')) {
const [uid, cid] = await Promise.all([
user.getUidByUserslug(actor),
categories.getCidByHandle(actor),
]);
actor = uid || cid;
}
const isFollowing = await db.isSortedSetMember(type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, actor);
if (isFollowing) { // already following
@@ -73,10 +81,21 @@ activitypubApi.unfollow = enabledCheck(async (caller, { type, id, actor }) => {
throw new Error('[[error:activitypub.invalid-id]]');
}
actor = actor.includes('@') ? await user.getUidByUserslug(actor) : actor;
if (actor.includes('@')) {
const [uid, cid] = await Promise.all([
user.getUidByUserslug(actor),
categories.getCidByHandle(actor),
]);
const isFollowing = await db.isSortedSetMember(type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, actor);
if (!isFollowing) { // already not following
actor = uid || cid;
}
const [isFollowing, isPending] = await Promise.all([
db.isSortedSetMember(type === 'uid' ? `followingRemote:${id}` : `cid:${id}:following`, actor),
db.isSortedSetMember(`followRequests:${type === 'uid' ? 'uid' : 'cid'}.${id}`, actor),
]);
if (!isFollowing && !isPending) { // already not following/pending
return;
}

8
src/categories/index.js
View File

@@ -85,7 +85,13 @@ Categories.getCategoryById = async function (data) {
};
Categories.getCidByHandle = async function (handle) {
return await db.sortedSetScore('categoryhandle:cid', handle);
let cid = await db.sortedSetScore('categoryhandle:cid', handle);
if (!cid) {
// remote cids
cid = await db.getObjectField('handle:cid', handle);
}
return cid;
};
Categories.getAllCidsFromSet = async function (key) {

12
src/upgrades/4.3.2/fix_category_sync_null_values.js Normal file
View File

@@ -0,0 +1,12 @@
'use strict';
const db = require('../../database');
module.exports = {
name: 'Fix null values in category synchronization list',
timestamp: Date.UTC(2025, 4, 8),
method: async () => {
const cids = await db.getSortedSetMembers('categories:cid');
await db.sortedSetsRemove(cids.map(cid => `followRequests:cid.${cid}`), 'null');
},
};