woem.men/forkey
4
2
Fork 3
Code Issues 34 Pull requests 16 Projects Releases Packages Wiki Activity Actions

[Frontend] Incoming media that isnt marked as sensitive but is from a cwed post is now sensitve #74

Open
leah wants to merge 3 commits from feature/mark-incoming-cwed-post-media-as-sensitive into main
pull from: feature/mark-incoming-cwed-post-media-as-sensitive
merge into: woem.men:main
Conversation 0 Commits 3 Files changed 12 +15 -12
6 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 38fda7790e - Show all commits

9
packages/frontend/src/components/MkMediaList.vue
View file

@ -39,7 +39,7 @@ import XVideo from '@/components/MkMediaVideo.vue';
import * as os from '@/os.js';
import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
import { defaultStore } from '@/store.js';
import {$i} from "@/account";
import { $i } from "@/account";
const props = defineProps<{
mediaList: Misskey.entities.DriveFile[];
@ -92,10 +92,11 @@ async function calcAspectRatio() {
}
onMounted(() => {
if (($i ? defaultStore.state.markIncomingMediaInCwedPostAsSensitive : true))
if (($i ? defaultStore.state.markIncomingMediaInCwedPostAsSensitive : true)) {
props.mediaList.forEach(media => {
media.isSensitive = props.isNoteSensitive
})
media.isSensitive = props.isNoteSensitive;
});
}
calcAspectRatio();

2
packages/frontend/src/components/MkNote.vue
View file

@ -79,7 +79,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</div>
<div v-if="appearNote.files && appearNote.files.length > 0">
<MkMediaList :mediaList="appearNote.files" :user="appearNote.user" :is-note-sensitive="note.cw"/>
<MkMediaList :mediaList="appearNote.files" :user="appearNote.user" :isNoteSensitive="note.cw"/>
</div>
<MkPoll v-if="appearNote.poll" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll"/>
<div v-if="isEnabledUrlPreview">

2
packages/frontend/src/components/MkNoteDetailed.vue
View file

@ -92,7 +92,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</div>
<div v-if="appearNote.files && appearNote.files.length > 0">
<MkMediaList :mediaList="appearNote.files" :user="appearNote.user" :is-note-sensitive="note.cw"/>
<MkMediaList :mediaList="appearNote.files" :user="appearNote.user" :isNoteSensitive="note.cw"/>
</div>
<MkPoll v-if="appearNote.poll" ref="pollViewer" :noteId="appearNote.id" :poll="appearNote.poll" :class="$style.poll"/>
<div v-if="isEnabledUrlPreview">

2
packages/frontend/src/components/MkSubNoteContent.vue
View file

@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<details v-if="note.files && note.files.length > 0">
<summary>({{ i18n.tsx.withNFiles({ n: note.files.length }) }})</summary>
<MkMediaList :mediaList="note.files" :user="note.user" :is-note-sensitive="note.cw"/>
<MkMediaList :mediaList="note.files" :user="note.user" :isNoteSensitive="note.cw"/>
</details>
<details v-if="note.poll">
<summary>{{ i18n.ts.poll }}</summary>

10
packages/frontend/src/pages/user/index.files.vue
View file

@ -33,8 +33,8 @@ import XVideo from '@/components/MkMediaVideo.vue';
import XImage from '@/components/MkMediaImage.vue';
import XBanner from '@/components/MkMediaBanner.vue';
import { i18n } from '@/i18n.js';
import {$i} from "@/account";
import {defaultStore} from "@/store";
import { $i } from "@/account";
import { defaultStore } from "@/store";
const props = defineProps<{
user: Misskey.entities.UserDetailed;
@ -54,8 +54,10 @@ onMounted(() => {
}).then(notes => {
for (const note of notes) {
for (let file of note.files) {
if (($i ? defaultStore.state.markIncomingMediaInCwedPostAsSensitive : true))
file.isSensitive = note.cw !== null
if (($i ? defaultStore.state.markIncomingMediaInCwedPostAsSensitive : true)) {
file.isSensitive = note.cw !== null;
}
medias.value.push({
note,
file,

2
packages/frontend/src/pages/welcome.timeline.vue
View file

@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">RN: ...</MkA>
</div>
<div v-if="note.files.length > 0" :class="$style.richcontent">
<MkMediaList :mediaList="note.files" :user="note.user" :is-note-sensitive="note.cw"/>
<MkMediaList :mediaList="note.files" :user="note.user" :isNoteSensitive="note.cw"/>
</div>
<div v-if="note.poll">
<MkPoll :noteId="note.id" :poll="note.poll" :readOnly="true"/>