Cherrypicked mute, blocked, and boosts muted badges #50

Open
leah wants to merge 3 commits from feature/indicate-block-mute into main
4 changed files with 34 additions and 8 deletions

View file

@ -136,8 +136,10 @@ markAsSensitive: "Mark as sensitive"
unmarkAsSensitive: "Unmark as sensitive"
enterFileName: "Enter filename"
mute: "Mute"
muted: "Muted"
unmute: "Unmute"
renoteMute: "Mute Renotes"
renoteMuted: "Boosts muted"
renoteUnmute: "Unmute Renotes"
mutedReactions: "Mute reactions"
muteThisReaction: "Mute this reaction"

10
locales/index.d.ts vendored
View file

@ -568,6 +568,10 @@ export interface Locale extends ILocale {
*
*/
"mute": string;
/**
*
*/
"muted": string;
/**
*
*/
@ -576,6 +580,10 @@ export interface Locale extends ILocale {
*
*/
"renoteMute": string;
/**
*
*/
"renoteMuted": string;
/**
*
*/
@ -6843,7 +6851,7 @@ export interface Locale extends ILocale {
};
"_tutorialCompleted": {
/**
* Misskey初心者講座
* Forkey初心者講座
*/
"title": string;
/**

View file

@ -138,8 +138,10 @@ markAsSensitive: "センシティブとして設定"
unmarkAsSensitive: "センシティブを解除する"
enterFileName: "ファイル名を入力"
mute: "ミュート"
muted: "ミュート"
unmute: "ミュート解除"
renoteMute: "リノートをミュート"
renoteMuted: "ブースト・ミュート"
renoteUnmute: "リノートのミュートを解除"
mutedReactions: "リアクションのミュート"
muteThisReaction: "このリアクションをミュートする"

View file

@ -32,7 +32,12 @@ SPDX-License-Identifier: AGPL-3.0-only
</button>
</div>
</div>
<span v-if="$i && $i.id != user.id && user.isFollowed" class="followed">{{ i18n.ts.followsYou }}</span>
<div v-if="$i && $i.id != user.id" class="info-badges">
<span v-if="user.isFollowed">{{ i18n.ts.followsYou }}</span>
<span v-if="user.isMuted">{{ i18n.ts.muted }}</span>
<span v-if="user.isRenoteMuted">{{ i18n.ts.renoteMuted }}</span>
<span v-if="user.isBlocking">{{ i18n.ts.blocked }}</span>
</div>
<div v-if="$i" class="actions">
<button class="menu _button" @click="menu"><i class="ti ti-dots"></i></button>
<MkFollowButton v-if="$i.id != user.id" v-model:user="user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
@ -469,15 +474,24 @@ onUnmounted(() => {
background: linear-gradient(transparent, rgba(#000, 0.7));
}
> .followed {
> .info-badges {
position: absolute;
top: 12px;
left: 12px;
padding: 4px 8px;
color: #fff;
background: rgba(0, 0, 0, 0.7);
font-size: 0.7em;
border-radius: 6px;
display: flex;
flex-direction: row;
> * {
padding: 4px 8px;
color: #fff;
background: rgba(0, 0, 0, 0.7);
font-size: 0.7em;
border-radius: var(--radius);
}
> :not(:first-child) {
margin-left: 4px;
}
}
> .actions {