Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into hazelnoot/following-timeline

Browse source
This commit is contained in:
Hazel K 2024-10-03 14:00:06 -04:00
commit 97a16c2ebc
22 changed files with 174 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/core/NoteEditService.ts
View file

@ -247,6 +247,11 @@ export class NoteEditService implements OnApplicationShutdown {
data.reply = undefined;
}
// changing visibility on an edit is ill-defined, let's try to
// keep the same visibility as the original note
data.visibility = oldnote.visibility;
data.localOnly = oldnote.localOnly;
// チャンネル外にリプライしたら対象のスコープに合わせる
// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
if (data.reply && data.channel && data.reply.channelId !== data.channel.id) {
@ -429,9 +434,6 @@ export class NoteEditService implements OnApplicationShutdown {
if (data.cw !== oldnote.cw) {
update.cw = data.cw;
}
if (data.localOnly !== oldnote.localOnly) {
update.localOnly = data.localOnly;
}
if (oldnote.hasPoll !== !!data.poll) {
update.hasPoll = !!data.poll;
}