mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-07 12:36:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: Make muted post placeholders look clickable (resolves #502) (!1019)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1019

Closes #502

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Hazelnoot 2025-05-12 10:37:09 +00:00
commit cace4153e4
6 changed files with 40 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,23 +173,17 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-else-if="!hardMuted" :class="$style.muted" @click="muted = false"> <div v-else-if="!hardMuted" :class="$style.muted" @click="muted = false">
<I18n v-if="muted === 'sensitiveMute'" :src="i18n.ts.userSaysSomethingSensitive" tag="small"> <I18n v-if="muted === 'sensitiveMute'" :src="i18n.ts.userSaysSomethingSensitive" tag="small">
<template #name> <template #name>
<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)"> <MkUserName :user="appearNote.user"/>
<MkUserName :user="appearNote.user"/>
</MkA>
</template> </template>
</I18n> </I18n>
<I18n v-else-if="showSoftWordMutedWord !== true" :src="i18n.ts.userSaysSomething" tag="small"> <I18n v-else-if="showSoftWordMutedWord !== true" :src="i18n.ts.userSaysSomething" tag="small">
<template #name> <template #name>
<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)"> <MkUserName :user="appearNote.user"/>
<MkUserName :user="appearNote.user"/>
</MkA>
</template> </template>
</I18n> </I18n>
<I18n v-else :src="i18n.ts.userSaysSomethingAbout" tag="small"> <I18n v-else :src="i18n.ts.userSaysSomethingAbout" tag="small">
<template #name> <template #name>
<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)"> <MkUserName :user="appearNote.user"/>
<MkUserName :user="appearNote.user"/>
</MkA>
</template> </template>
<template #word> <template #word>
{{ Array.isArray(muted) ? muted.map(words => Array.isArray(words) ? words.join() : words).slice(0, 3).join(' ') : muted }} {{ Array.isArray(muted) ? muted.map(words => Array.isArray(words) ? words.join() : words).slice(0, 3).join(' ') : muted }}
@ -1388,6 +1382,11 @@ function emitUpdReaction(emoji: string, delta: number) {
padding: 8px; padding: 8px;
text-align: center; text-align: center;
opacity: 0.7; opacity: 0.7;
cursor: pointer;
}
.muted:hover {
background: var(--MI_THEME-buttonBg);
} }
.reactionOmitted { .reactionOmitted {

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

@ -232,9 +232,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-else class="_panel" :class="$style.muted" @click="muted = false"> <div v-else class="_panel" :class="$style.muted" @click="muted = false">
<I18n :src="i18n.ts.userSaysSomething" tag="small"> <I18n :src="i18n.ts.userSaysSomething" tag="small">
<template #name> <template #name>
<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)"> <MkUserName :user="appearNote.user"/>
<MkUserName :user="appearNote.user"/>
</MkA>
</template> </template>
</I18n> </I18n>
</div> </div>
@ -1199,5 +1197,10 @@ function animatedMFM() {
padding: 8px; padding: 8px;
text-align: center; text-align: center;
opacity: 0.7; opacity: 0.7;
cursor: pointer;
}
.muted:hover {
background: var(--MI_THEME-buttonBg);
} }
</style> </style>

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

@ -75,9 +75,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-else :class="$style.muted" @click="muted = false"> <div v-else :class="$style.muted" @click="muted = false">
<I18n :src="i18n.ts.userSaysSomething" tag="small"> <I18n :src="i18n.ts.userSaysSomething" tag="small">
<template #name> <template #name>
<MkA v-user-preview="note.userId" :to="userPage(note.user)"> <MkUserName :user="appearNote.user"/>
<MkUserName :user="note.user"/>
</MkA>
</template> </template>
</I18n> </I18n>
</div> </div>
@ -518,5 +516,10 @@ if (props.detail) {
border: 1px solid var(--MI_THEME-divider); border: 1px solid var(--MI_THEME-divider);
margin: 8px 8px 0 8px; margin: 8px 8px 0 8px;
border-radius: var(--MI-radius-sm); border-radius: var(--MI-radius-sm);
cursor: pointer;
}
.muted:hover {
background: var(--MI_THEME-buttonBg);
} }
</style> </style>

17
packages/frontend/src/components/SkNote.vue
View file

@ -174,23 +174,17 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-else-if="!hardMuted" :class="$style.muted" @click="muted = false"> <div v-else-if="!hardMuted" :class="$style.muted" @click="muted = false">
<I18n v-if="muted === 'sensitiveMute'" :src="i18n.ts.userSaysSomethingSensitive" tag="small"> <I18n v-if="muted === 'sensitiveMute'" :src="i18n.ts.userSaysSomethingSensitive" tag="small">
<template #name> <template #name>
<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)"> <MkUserName :user="appearNote.user"/>
<MkUserName :user="appearNote.user"/>
</MkA>
</template> </template>
</I18n> </I18n>
<I18n v-else-if="showSoftWordMutedWord !== true" :src="i18n.ts.userSaysSomething" tag="small"> <I18n v-else-if="showSoftWordMutedWord !== true" :src="i18n.ts.userSaysSomething" tag="small">
<template #name> <template #name>
<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)"> <MkUserName :user="appearNote.user"/>
<MkUserName :user="appearNote.user"/>
</MkA>
</template> </template>
</I18n> </I18n>
<I18n v-else :src="i18n.ts.userSaysSomethingAbout" tag="small"> <I18n v-else :src="i18n.ts.userSaysSomethingAbout" tag="small">
<template #name> <template #name>
<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)"> <MkUserName :user="appearNote.user"/>
<MkUserName :user="appearNote.user"/>
</MkA>
</template> </template>
<template #word> <template #word>
{{ Array.isArray(muted) ? muted.map(words => Array.isArray(words) ? words.join() : words).slice(0, 3).join(' ') : muted }} {{ Array.isArray(muted) ? muted.map(words => Array.isArray(words) ? words.join() : words).slice(0, 3).join(' ') : muted }}
@ -1451,6 +1445,11 @@ function emitUpdReaction(emoji: string, delta: number) {
padding: 8px; padding: 8px;
text-align: center; text-align: center;
opacity: 0.7; opacity: 0.7;
cursor: pointer;
}
.muted:hover {
background: var(--MI_THEME-buttonBg);
} }
.reactionOmitted { .reactionOmitted {

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

@ -237,9 +237,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-else class="_panel" :class="$style.muted" @click="muted = false"> <div v-else class="_panel" :class="$style.muted" @click="muted = false">
<I18n :src="i18n.ts.userSaysSomething" tag="small"> <I18n :src="i18n.ts.userSaysSomething" tag="small">
<template #name> <template #name>
<MkA v-user-preview="appearNote.userId" :to="userPage(appearNote.user)"> <MkUserName :user="appearNote.user"/>
<MkUserName :user="appearNote.user"/>
</MkA>
</template> </template>
</I18n> </I18n>
</div> </div>
@ -1273,6 +1271,11 @@ onUnmounted(() => {
padding: 8px; padding: 8px;
text-align: center; text-align: center;
opacity: 0.7; opacity: 0.7;
cursor: pointer;
}
.muted:hover {
background: var(--MI_THEME-buttonBg);
} }
.badgeRoles { .badgeRoles {

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

@ -83,9 +83,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-else :class="$style.muted" @click="muted = false"> <div v-else :class="$style.muted" @click="muted = false">
<I18n :src="i18n.ts.userSaysSomething" tag="small"> <I18n :src="i18n.ts.userSaysSomething" tag="small">
<template #name> <template #name>
<MkA v-user-preview="note.userId" :to="userPage(note.user)"> <MkUserName :user="appearNote.user"/>
<MkUserName :user="note.user"/>
</MkA>
</template> </template>
</I18n> </I18n>
</div> </div>
@ -606,6 +604,11 @@ if (props.detail) {
border: 1px solid var(--MI_THEME-divider); border: 1px solid var(--MI_THEME-divider);
margin: 8px 8px 0 8px; margin: 8px 8px 0 8px;
border-radius: var(--MI-radius-sm); border-radius: var(--MI-radius-sm);
cursor: pointer;
}
.muted:hover {
background: var(--MI_THEME-buttonBg);
} }
// avatar container with line // avatar container with line