Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(tms): インスタンス情報の表示位置 #198

Merged
merged 1 commit into from
Apr 25, 2024
Merged

feat(tms): インスタンス情報の表示位置 #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions locales/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9992,6 +9992,32 @@ export interface Locale extends ILocale {
* これらの機能はtaiymeで独自実装したものです。
*/
readonly "description": string;
readonly "_tickerPosition": {
/**
* インスタンス情報の表示位置
*/
readonly "label": string;
/**
* デフォルト
*/
readonly "default": string;
/**
* 縦 (左端)
*/
readonly "leftVerticalBar": string;
/**
* 縦 (右端)
*/
readonly "rightVerticalBar": string;
/**
* 透かし (左下)
*/
readonly "leftWatermark": string;
/**
* 透かし (右下)
*/
readonly "rightWatermark": string;
};
readonly "_superMenuDisplayMode": {
/**
* 設定メニューの表示モード
Expand Down
7 changes: 7 additions & 0 deletions locales/ja-JP.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2663,6 +2663,13 @@ _tms:
_settings:
title: "taiyme拡張機能"
description: "これらの機能はtaiymeで独自実装したものです。"
_tickerPosition:
label: "インスタンス情報の表示位置"
default: "デフォルト"
leftVerticalBar: "縦 (左端)"
rightVerticalBar: "縦 (右端)"
leftWatermark: "透かし (左下)"
rightWatermark: "透かし (右下)"
_superMenuDisplayMode:
label: "設定メニューの表示モード"
caption: "主にスマートフォン・タブレットデバイス向けの設定です。"
Expand Down
86 changes: 0 additions & 86 deletions packages/frontend/src/components/MkInstanceTicker.vue
View file
Open in desktop

This file was deleted.

29 changes: 3 additions & 26 deletions packages/frontend/src/components/MkNote.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<!--<div v-if="appearNote._prId_" class="tip"><i class="ti ti-speakerphone"></i> {{ i18n.ts.promotion }}<button class="_textButton hide" @click="readPromo()">{{ i18n.ts.hideThisNote }} <i class="ti ti-x"></i></button></div>-->
<!--<div v-if="appearNote._featuredId_" class="tip"><i class="ti ti-bolt"></i> {{ i18n.ts.featured }}</div>-->
<div v-if="isRenoted" :class="$style.renote">
<div v-if="note.channel" :class="$style.colorBar" :style="{ background: note.channel.color }"></div>
<MkAvatar :class="$style.renoteAvatar" :user="note.user" link preview/>
<i class="ti ti-repeat" style="margin-right: 4px;"></i>
<I18n :src="i18n.ts.renotedBy" tag="span" :class="$style.renoteText">
Expand Down Expand Up @@ -48,11 +47,10 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</div>
<article v-else :class="$style.article" @contextmenu.stop="onContextmenu">
<div v-if="appearNote.channel" :class="$style.colorBar" :style="{ background: appearNote.channel.color }"></div>
<MkAvatar :class="$style.avatar" :user="appearNote.user" :link="!mock" :preview="!mock"/>
<div :class="$style.main">
<MkNoteHeader :note="appearNote" :mini="true"/>
<MkInstanceTicker v-if="showTicker" :instance="appearNote.user.instance"/>
<TmsInstanceTicker v-if="showTicker" :instance="appearNote.user.instance" :channel="appearNote.channel" :position="tmsStore.state.tickerPosition"/>
<div style="container-type: inline-size;">
<p v-if="appearNote.cw != null" :class="$style.cw">
<Mfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :author="appearNote.user" :nyaize="'respect'"/>
Expand Down Expand Up @@ -175,7 +173,7 @@ import MkCwButton from '@/components/MkCwButton.vue';
import MkPoll from '@/components/MkPoll.vue';
import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
import MkUrlPreview from '@/components/MkUrlPreview.vue';
import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
import TmsInstanceTicker from '@/components/TmsInstanceTicker.vue';
import { pleaseLogin } from '@/scripts/please-login.js';
import { focusPrev, focusNext } from '@/scripts/focus.js';
import { checkWordMute } from '@/scripts/check-word-mute.js';
Expand Down Expand Up @@ -265,7 +263,7 @@ const muted = ref(checkMute(appearNote.value, $i?.mutedWords));
const hardMuted = ref(props.withHardMute && checkMute(appearNote.value, $i?.hardMutedWords, true));
const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
const translating = ref(false);
const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.value.user.instance);
const showTicker = computed(() => (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.value.user.instance != null) || (appearNote.value.channel != null));
const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i?.id));
const canPakuru = computed(() => tmsStore.reactiveState.enablePakuru.value || tmsStore.reactiveState.enableNumberquote.value);
const renoteCollapsed = ref(
Expand Down Expand Up @@ -681,10 +679,6 @@ function emitUpdReaction(emoji: string, delta: number) {
& + .article {
padding-top: 8px;
}

> .colorBar {
height: calc(100% - 6px);
}
}

.renoteAvatar {
Expand Down Expand Up @@ -760,16 +754,6 @@ function emitUpdReaction(emoji: string, delta: number) {
padding: 28px 32px;
}

.colorBar {
position: absolute;
top: 8px;
left: 8px;
width: 5px;
height: calc(100% - 16px);
border-radius: 999px;
pointer-events: none;
}

.avatar {
flex-shrink: 0;
display: block !important;
Expand Down Expand Up @@ -999,13 +983,6 @@ function emitUpdReaction(emoji: string, delta: number) {
}
}
}

.colorBar {
top: 6px;
left: 6px;
width: 4px;
height: calc(100% - 12px);
}
}

@container (max-width: 300px) {
Expand Down
7 changes: 4 additions & 3 deletions packages/frontend/src/components/MkNoteDetailed.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,11 @@ SPDX-License-Identifier: AGPL-3.0-only
<i v-else-if="appearNote.visibility === 'specified'" ref="specified" class="ti ti-mail"></i>
</span>
<span v-if="appearNote.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-rocket-off"></i></span>
<span v-if="appearNote.channel" style="margin-left: 0.5em;" :title="appearNote.channel.name"><i class="ti ti-device-tv"></i></span>
</div>
</div>
<div :class="$style.noteHeaderUsername"><MkAcct :user="appearNote.user"/></div>
<MkInstanceTicker v-if="showTicker" :instance="appearNote.user.instance"/>
<TmsInstanceTicker v-if="showTicker" :instance="appearNote.user.instance" :channel="appearNote.channel" position="default"/>
</div>
</header>
<div :class="$style.noteContent">
Expand Down Expand Up @@ -206,7 +207,7 @@ import MkCwButton from '@/components/MkCwButton.vue';
import MkPoll from '@/components/MkPoll.vue';
import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
import MkUrlPreview from '@/components/MkUrlPreview.vue';
import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
import TmsInstanceTicker from '@/components/TmsInstanceTicker.vue';
import { pleaseLogin } from '@/scripts/please-login.js';
import { checkWordMute } from '@/scripts/check-word-mute.js';
import { userPage } from '@/filters/user.js';
Expand Down Expand Up @@ -283,7 +284,7 @@ const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
const translating = ref(false);
const parsed = appearNote.value.text ? mfm.parse(appearNote.value.text) : null;
const urls = parsed ? extractUrlFromMfm(parsed).filter((url) => appearNote.value.renote?.url !== url && appearNote.value.renote?.uri !== url) : null;
const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.value.user.instance);
const showTicker = computed(() => (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.value.user.instance != null) || (appearNote.value.channel != null));
const conversation = ref<Misskey.entities.Note[]>([]);
const replies = ref<Misskey.entities.Note[]>([]);
const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || appearNote.value.userId === $i?.id);
Expand Down
Loading