moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

excludeNsfwやCWのNSFW扱いなど (#5341)

Browse Source 
* NoteにisSensitive

* Revert "NoteにisSensitive"

This reverts commit 3d5bcfbaf0.

* query excludeNsfw

* AP deliverでCW付きはsensitiveにするように

* excludeNsfwでCW付きも除くように
This commit is contained in:
MeiMei 2019-08-27 17:33:07 +09:00 committed by Acid Chicken (硫酸鶏)
parent 6a0affcec1
commit 13f69e4291
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/remote/activitypub/renderer/note.ts
View File

@ -158,7 +158,7 @@ export default async function renderNote(note: Note, dive = true): Promise<any>
cc, cc,
inReplyTo, inReplyTo,
attachment: files.map(renderDocument), attachment: files.map(renderDocument),
sensitive: files.some(file => file.isSensitive), sensitive: note.cw != null || files.some(file => file.isSensitive),
tag, tag,
...asPoll ...asPoll
}; };

8
src/server/api/endpoints/notes/local-timeline.ts
View File

@ -112,12 +112,8 @@ export default define(meta, async (ps, user) => {
})); }));
if (ps.excludeNsfw) { if (ps.excludeNsfw) {
// v11 TODO query.andWhere('note.cw IS NULL');
/* query.andWhere('0 = (SELECT COUNT(*) FROM drive_file df WHERE df.id = ANY(note."fileIds") AND df."isSensitive" = TRUE)');
query['_files.isSensitive'] = {
$ne: true
};
*/
} }
} }
//#endregion //#endregion

6
src/server/api/endpoints/users/notes.ts
View File

@ -150,10 +150,8 @@ export default define(meta, async (ps, me) => {
})); }));
if (ps.excludeNsfw) { if (ps.excludeNsfw) {
// v11 TODO query.andWhere('note.cw IS NULL');
/*query['_files.isSensitive'] = { query.andWhere('0 = (SELECT COUNT(*) FROM drive_file df WHERE df.id = ANY(note."fileIds") AND df."isSensitive" = TRUE)');
$ne: true
};*/
} }
} }