Revert "feat: log all post edits to the event log, return eid when logging events, plumb eid into Update(Note) to federate out as a unique id"

This reverts commit 83392f3ca2.
This commit is contained in:
Opliko
2024-04-06 01:18:46 +02:00
parent cbfc8d252d
commit 8003b00acd
3 changed files with 6 additions and 11 deletions

View File

@@ -144,7 +144,7 @@ activitypubApi.update.profile = enabledCheck(async (caller, { uid }) => {
});
});
activitypubApi.update.note = enabledCheck(async (caller, { post, eid }) => {
activitypubApi.update.note = enabledCheck(async (caller, { post }) => {
const object = await activitypub.mocks.note(post);
const { targets } = await buildRecipients(object, post.user.uid);
@@ -155,7 +155,6 @@ activitypubApi.update.note = enabledCheck(async (caller, { post, eid }) => {
}
const payload = {
id: `${nconf.get('url')}/api/v3/events/${eid}`,
type: 'Update',
to: object.to,
cc: object.cc,

View File

@@ -112,16 +112,16 @@ postsAPI.edit = async function (caller, data) {
if (editResult.topic.isMainPost) {
await topics.thumbs.migrate(data.uuid, editResult.topic.tid);
}
let eid;
if (editResult.post.changed) {
({ eid } = await events.log({
const selfPost = parseInt(caller.uid, 10) === parseInt(editResult.post.uid, 10);
if (!selfPost && editResult.post.changed) {
await events.log({
type: `post-edit`,
uid: caller.uid,
ip: caller.ip,
pid: editResult.post.pid,
oldContent: editResult.post.oldContent,
newContent: editResult.post.newContent,
}));
});
}
if (editResult.topic.renamed) {
@@ -140,9 +140,7 @@ postsAPI.edit = async function (caller, data) {
if (!editResult.post.deleted) {
websockets.in(`topic_${editResult.topic.tid}`).emit('event:post_edited', editResult);
if (eid) {
await require('.').activitypub.update.note(caller, { post: postObj[0], eid });
}
await require('.').activitypub.update.note(caller, { post: postObj[0] });
return returnData;
}

View File

@@ -99,8 +99,6 @@ events.log = async function (data) {
db.setObject(`event:${eid}`, data),
]);
plugins.hooks.fire('action:events.log', { data: data });
return { eid };
};
// filter, start, stop, from(optional), to(optional), uids(optional)