oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

Revert "feat: お知らせの優先順位機能 (#118)"

Browse source 
This reverts commit fe0f7a91a3.
This commit is contained in:
まっちゃとーにゅ 2023-08-15 16:44:54 +09:00
parent eeef3965b7
commit 04fefb2056
No known key found for this signature in database
GPG key ID: 6AFBBF529601C1DB
12 changed files with 69 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

18
packages/frontend/src/pages/announcements.vue
View file

@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkStickyContainer>
<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
<MkSpacer :contentMax="800">
<MkPagination v-slot="{items, reload}" :pagination="pagination" class="ruryvtyk _gaps_m">
<MkPagination v-slot="{items}" :pagination="pagination" class="ruryvtyk _gaps_m">
<section v-for="(announcement, i) in items" :key="announcement.id" :class="{ announcement: true, _panel: true, private: announcement.isPrivate }">
<div class="header"><span v-if="$i && !announcement.isRead"><span class="ti ti-speakerphone"></span></span><Mfm :text="announcement.title"/></div>
<div class="content">
@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<img v-if="announcement.imageUrl" :src="announcement.imageUrl"/>
</div>
<div v-if="$i && !announcement.isRead" class="footer">
<MkButton primary @click="read(items, reload, announcement, i)"><i class="ti ti-check"></i> {{ i18n.ts.gotIt }}</MkButton>
<MkButton primary @click="read(items, announcement, i)"><i class="ti ti-check"></i> {{ i18n.ts.gotIt }}</MkButton>
</div>
</section>
</MkPagination>
@ -24,6 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
import { } from 'vue';
import MkPagination from '@/components/MkPagination.vue';
import MkButton from '@/components/MkButton.vue';
import * as os from '@/os';
@ -33,15 +34,16 @@ import { $i } from '@/account';
const pagination = {
endpoint: 'announcements' as const,
offsetMode: true,
limit: 10,
};
function read(items, reload, announcement, i) {
items[i].isRead = true;
os.api('i/read-announcement', {
announcementId: announcement.id,
}).then(reload);
// TODO: これは実質的に親コンポーネントから子コンポーネントのプロパティを変更してるのでなんとかしたい
function read(items, announcement, i) {
items[i] = {
...announcement,
isRead: true,
};
os.api('i/read-announcement', { announcementId: announcement.id });
}
const headerActions = $computed(() => []);