Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: handle Update(Note) when object has limited visibility, #12834

Browse Source
This commit is contained in:
Julian Lam
2024-10-15 11:27:54 -04:00
parent 1bf0990774
commit e5948464e7
4 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/activitypub/inbox.js
View File

@@ -10,6 +10,7 @@ const posts = require('../posts');
const topics = require('../topics');
const categories = require('../categories');
const notifications = require('../notifications');
const messaging = require('../messaging');
const flags = require('../flags');
const api = require('../api');
const activitypub = require('.');
@@ -63,7 +64,8 @@ inbox.create = async (req) => {
const { object } = req.body;
// Alternative logic for non-public objects
if (![...object.to, ...object.cc].includes(activitypub._constants.publicAddress)) {
const isPublic = [...object.to, ...object.cc].includes(activitypub._constants.publicAddress);
if (!isPublic) {
return await activitypub.notes.assertPrivate(object);
}
@@ -76,11 +78,7 @@ inbox.create = async (req) => {
inbox.update = async (req) => {
const { actor, object } = req.body;
// Temporary, reject non-public notes.
if (![...object.to, ...object.cc].includes(activitypub._constants.publicAddress)) {
throw new Error('[[error:activitypub.not-implemented]]');
}
const isPublic = [...object.to, ...object.cc].includes(activitypub._constants.publicAddress);
// Origin checking
const actorHostname = new URL(actor).hostname;
@@ -91,19 +89,39 @@ inbox.update = async (req) => {
switch (object.type) {
case 'Note': {
const exists = await posts.exists(object.id);
const [isNote, isMessage] = await Promise.all([
posts.exists(object.id),
messaging.messageExists(object.id),
]);
try {
if (exists) {
const postData = await activitypub.mocks.post(object);
await posts.edit(postData);
const isDeleted = await posts.getPostField(object.id, 'deleted');
if (isDeleted) {
await api.posts.restore({ uid: actor }, { pid: object.id });
switch (true) {
case isNote: {
const postData = await activitypub.mocks.post(object);
await posts.edit(postData);
const isDeleted = await posts.getPostField(object.id, 'deleted');
if (isDeleted) {
await api.posts.restore({ uid: actor }, { pid: object.id });
}
break;
}
} else {
const asserted = await activitypub.notes.assert(0, object.id);
if (asserted) {
announce(object.id, req.body);
case isMessage: {
const roomId = await messaging.getMessageField(object.id, 'roomId');
await messaging.editMessage(actor, object.id, roomId, object.content);
break;
}
default: {
if (!isPublic) {
return await activitypub.notes.assertPrivate(object);
}
const asserted = await activitypub.notes.assert(0, object.id);
if (asserted) {
announce(object.id, req.body);
}
break;
}
}
} catch (e) {