yume/paricafe
1
0
Fork 0
mirror of https://github.com/paricafe/misskey.git synced 2025-04-15 10:19:40 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix missing conflict

Browse source
This commit is contained in:
FLY_MC 2025-03-11 04:53:37 +08:00
parent 574756b292
commit 885c606679
1 changed files with 4 additions and 7 deletions

11
packages/frontend/src/components/MkNoteHeader.vue
View file

@ -29,7 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkA v-else :to="notePage(note)" :style="{ textDecoration: 'none', userSelect: 'none' }" @mouseenter="setDetail(true)" @mouseleave="setDetail(false)">
<MkTime
:time="note.createdAt"
:mode="(defaultStore.state.showDetailTimeWhenHover && isDetail) ? 'detail' : undefined"
:mode="(store.s.showDetailTimeWhenHover && isDetail) ? 'detail' : undefined"
colored
/>
</MkA>
@ -41,7 +41,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<span v-if="note.localOnly" style="margin-left: 0.5em;" :title="i18n.ts._visibility['disableFederation']"><i class="ti ti-rocket-off"></i></span>
<span v-if="note.channel" style="margin-left: 0.5em;" :title="note.channel.name"><i class="ti ti-device-tv"></i></span>
</div>
<div :class="$style.info"><MkInstanceTicker v-if="showTicker" :style="{ cursor: defaultStore.state.clickToShowInstanceTickerWindow ? 'pointer' : 'default' }" :instance="note.user.instance" :host="note.user.host"/></div>
<div :class="$style.info"><MkInstanceTicker v-if="showTicker" :style="{ cursor: store.s.clickToShowInstanceTickerWindow ? 'pointer' : 'default' }" :instance="note.user.instance" :host="note.user.host"/></div>
</div>
</header>
</template>
@ -52,11 +52,8 @@ import * as Misskey from 'misskey-js';
import { i18n } from '@/i18n.js';
import { notePage } from '@/filters/note.js';
import { userPage } from '@/filters/user.js';
<<<<<<< HEAD
import { defaultStore } from '@/store.js';
import { store } from '@/store.js';
import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
=======
>>>>>>> develop
const isDetail = ref(false);
const setDetail = (value) => {
@ -67,7 +64,7 @@ const props = defineProps<{
note: Misskey.entities.Note;
}>();
const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && props.note.user.instance);
const showTicker = (store.s.instanceTicker === 'always') || (store.s.instanceTicker === 'remote' && props.note.user.instance);
const mock = inject<boolean>('mock', false);
</script>