161sh/trashposs
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/trashposs synced 2024-11-22 08:53:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'always expand CWs' option not applying on timeline views, resolves #179

Browse Source
This commit is contained in:
Laura Hausmann 2023-09-02 23:02:54 +02:00
parent 206e81da10
commit de3c75689e
No known key found for this signature in database
GPG Key ID: D044E84C5BE01605
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/components/MkNote.vue
View File

@ -346,7 +346,7 @@ let appearNote = $computed(() =>
isRenote ? (note.renote as misskey.entities.Note) : note,
);
const isMyRenote = $i && $i.id === note.userId;
const showContent = ref(false);
const showContent = ref(defaultStore.state.alwaysExpandCws);
const isDeleted = ref(false);
const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
const translation = ref(null);

2
packages/client/src/components/MkNoteDetailed.vue
View File

@ -224,7 +224,7 @@ const noteEl = $ref();
const menuButton = ref<HTMLElement>();
const renoteButton = ref<InstanceType<typeof XRenoteButton>>();
const reactButton = ref<HTMLElement>();
const showContent = ref(false);
const showContent = ref(defaultStore.state.alwaysExpandCws);
const isDeleted = ref(false);
const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
const translation = ref(null);

6
packages/client/src/components/MkSubNoteContent.vue
View File

@ -249,16 +249,16 @@ const urls = props.note.text
: null;
const cwStyle = computed (() => `_cw_style_${defaultStore.state.cwStyle}`);
let _showContent = $ref(null);
let _showContent = $ref(defaultStore.state.alwaysExpandCws);
let showContent = $computed({
set(val) { _showContent = val },
get() {
if (props.forceExpandCw != null) {
if (props.forceExpandCw != null && props.detailedView) {
_showContent = props.forceExpandCw;
props.forceExpandCw = null;
}
return _showContent || false;
return _showContent;
},
})

3
packages/client/src/pages/settings/general.vue
View File

@ -414,7 +414,8 @@ watch(
advancedMfm,
autoplayMfm,
expandOnNoteClick,
cwStyle
cwStyle,
alwaysExpandCws
],
async () => {
await reloadAsk();