e2net/iceshrimp
3
0
Fork 0
forked from mirrors/iceshrimp
Code Pull requests Activity

Fix cw-only renotes

Browse source 
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
This commit is contained in:
Laura Hausmann 2023-07-22 15:32:54 +02:00
parent 9928ca72e2
commit 11e4ef045d
Signed by: zotan
GPG key ID: D044E84C5BE01605
5 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/backend/src/server/activitypub/outbox.ts
View file

@ -133,12 +133,13 @@ export async function packActivity(note: Note): Promise<any> {
if (
note.renoteId &&
note.text == null &&
note.cw == null &&
!note.hasPoll &&
(note.fileIds == null || note.fileIds.length === 0)
) {
const renote = await Notes.findOneByOrFail({ id: note.renoteId });
return renderAnnounce(
renote.uri ? renote.uri : `${config.url}/notes/${renote.id}`,
renote.uri ?? `${config.url}/notes/${renote.id}`,
note,
);
}

11
packages/backend/src/services/note/create.ts
View file

@ -596,7 +596,11 @@ export default async (
});
//#region AP deliver
if (Users.isLocalUser(user) && !dontFederateInitially) {
if (
Users.isLocalUser(user) &&
!data.localOnly &&
!dontFederateInitially
) {
(async () => {
const noteActivity = await renderNoteOrRenoteActivity(data, note);
const dm = new DeliverManager(user, noteActivity);
@ -661,12 +665,11 @@ async function renderNoteOrRenoteActivity(data: Option, note: Note) {
const content =
data.renote &&
data.text == null &&
data.cw == null &&
data.poll == null &&
(data.files == null || data.files.length === 0)
? renderAnnounce(
data.renote.uri
? data.renote.uri
: `${config.url}/notes/${data.renote.id}`,
data.renote.uri ?? `${config.url}/notes/${data.renote.id}`,
note,
)
: renderCreate(await renderNote(note, false), note);

1
packages/backend/src/services/note/delete.ts
View file

@ -61,6 +61,7 @@ export default async function (
if (
note.renoteId &&
note.text == null &&
note.cw == null &&
!note.hasPoll &&
(note.fileIds == null || note.fileIds.length === 0)
) {

1
packages/client/src/components/MkNote.vue
View file

@ -328,6 +328,7 @@ if (noteViewInterruptors.length > 0) {
const isRenote =
note.renote != null &&
note.text == null &&
note.cw == null &&
note.fileIds.length === 0 &&
note.poll == null;

1
packages/client/src/scripts/get-note-menu.ts
View file

@ -21,6 +21,7 @@ export function getNoteMenu(props: {
const isRenote =
props.note.renote != null &&
props.note.text == null &&
props.note.cw == null &&
props.note.fileIds.length === 0 &&
props.note.poll == null;