forked from misskey-dev/misskey
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(announcement): 個別のお知らせにリンクで飛べるように (MisskeyIO#639)
- Loading branch information
Showing
12 changed files
with
316 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: syuilo and misskey-project | ||
| * SPDX-License-Identifier: AGPL-3.0-only | ||
| */ | ||
|
|
||
| import { Injectable } from '@nestjs/common'; | ||
| import { Endpoint } from '@/server/api/endpoint-base.js'; | ||
| import { AnnouncementService } from '@/core/AnnouncementService.js'; | ||
| import { EntityNotFoundError } from "typeorm"; | ||
| import { ApiError } from "../error.js"; | ||
|
|
||
| export const meta = { | ||
| tags: ['meta'], | ||
|
|
||
| requireCredential: false, | ||
|
|
||
| res: { | ||
| type: 'object', | ||
| optional: false, nullable: false, | ||
| ref: 'Announcement', | ||
| }, | ||
|
|
||
| errors: { | ||
| noSuchAnnouncement: { | ||
| message: 'No such announcement.', | ||
| code: 'NO_SUCH_ANNOUNCEMENT', | ||
| id: 'b57b5e1d-4f49-404a-9edb-46b00268f121', | ||
| }, | ||
| }, | ||
| } as const; | ||
|
|
||
| export const paramDef = { | ||
| type: 'object', | ||
| properties: { | ||
| announcementId: { type: 'string', format: 'misskey:id' }, | ||
| }, | ||
| required: ['announcementId'], | ||
| } as const; | ||
|
|
||
| @Injectable() | ||
| export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export | ||
| constructor( | ||
| private announcementService: AnnouncementService, | ||
| ) { | ||
| super(meta, paramDef, async (ps, me) => { | ||
| try { | ||
| return await this.announcementService.getAnnouncement(ps.announcementId, me); | ||
| } catch (err) { | ||
| if (err instanceof EntityNotFoundError) throw new ApiError(meta.errors.noSuchAnnouncement); | ||
| throw err; | ||
| } | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| <template> | ||
| <MkStickyContainer> | ||
| <template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template> | ||
| <MkSpacer :contentMax="800"> | ||
| <Transition | ||
| :enterActiveClass="defaultStore.state.animation ? $style.fadeEnterActive : ''" | ||
| :leaveActiveClass="defaultStore.state.animation ? $style.fadeLeaveActive : ''" | ||
| :enterFromClass="defaultStore.state.animation ? $style.fadeEnterFrom : ''" | ||
| :leaveToClass="defaultStore.state.animation ? $style.fadeLeaveTo : ''" | ||
| mode="out-in" | ||
| > | ||
| <div v-if="announcement" :key="announcement.id" class="_panel" :class="$style.announcement"> | ||
| <div v-if="announcement.forYou" :class="$style.forYou"><i class="ti ti-pin"></i> {{ i18n.ts.forYou }}</div> | ||
| <div :class="$style.header"> | ||
| <span v-if="$i && !announcement.silence && !announcement.isRead" style="margin-right: 0.5em;">🆕</span> | ||
| <span style="margin-right: 0.5em;"> | ||
| <i v-if="announcement.icon === 'info'" class="ti ti-info-circle"></i> | ||
| <i v-else-if="announcement.icon === 'warning'" class="ti ti-alert-triangle" style="color: var(--warn);"></i> | ||
| <i v-else-if="announcement.icon === 'error'" class="ti ti-circle-x" style="color: var(--error);"></i> | ||
| <i v-else-if="announcement.icon === 'success'" class="ti ti-check" style="color: var(--success);"></i> | ||
| </span> | ||
| <Mfm :text="announcement.title"/> | ||
| </div> | ||
| <div :class="$style.content"> | ||
| <Mfm :text="announcement.text"/> | ||
| <img v-if="announcement.imageUrl" :src="announcement.imageUrl"/> | ||
| <MkA :to="`/announcements/${announcement.id}`"> | ||
| <div style="margin-top: 8px; opacity: 0.7; font-size: 85%;"> | ||
| {{ i18n.ts.createdAt }}: <MkTime :time="announcement.createdAt" mode="detail"/> | ||
| </div> | ||
| <div v-if="announcement.updatedAt" style="opacity: 0.7; font-size: 85%;"> | ||
| {{ i18n.ts.updatedAt }}: <MkTime :time="announcement.updatedAt" mode="detail"/> | ||
| </div> | ||
| </MkA> | ||
| </div> | ||
| <div v-if="$i && !announcement.silence && !announcement.isRead" :class="$style.footer"> | ||
| <MkButton primary @click="read(announcement)"><i class="ti ti-check"></i> {{ i18n.ts.gotIt }}</MkButton> | ||
| </div> | ||
| </div> | ||
| <MkError v-else-if="error" @retry="fetch()"/> | ||
| <MkLoading v-else/> | ||
| </Transition> | ||
| </MkSpacer> | ||
| </MkStickyContainer> | ||
| </template> | ||
|
|
||
| <script lang="ts" setup> | ||
| import { ref, computed, watch } from 'vue'; | ||
| import * as Misskey from 'misskey-js'; | ||
| import MkButton from '@/components/MkButton.vue'; | ||
| import * as os from '@/os.js'; | ||
| import { misskeyApi } from '@/scripts/misskey-api.js'; | ||
| import { i18n } from '@/i18n.js'; | ||
| import { definePageMetadata } from '@/scripts/page-metadata.js'; | ||
| import { $i, updateAccount } from '@/account.js'; | ||
| import { defaultStore } from '@/store.js'; | ||
| const props = defineProps<{ | ||
| announcementId: string; | ||
| }>(); | ||
| const announcement = ref<Misskey.entities.Announcement | null>(null); | ||
| const error = ref<any>(null); | ||
| const path = computed(() => props.announcementId); | ||
| function fetch() { | ||
| announcement.value = null; | ||
| misskeyApi('announcement', { | ||
| announcementId: props.announcementId, | ||
| }).then(async _announcement => { | ||
| announcement.value = _announcement; | ||
| }).catch(err => { | ||
| error.value = err; | ||
| }); | ||
| } | ||
| async function read(announcement): Promise<void> { | ||
| if (announcement.needConfirmationToRead) { | ||
| const confirm = await os.confirm({ | ||
| type: 'question', | ||
| title: i18n.ts._announcement.readConfirmTitle, | ||
| text: i18n.tsx._announcement.readConfirmText({ title: announcement.title }), | ||
| }); | ||
| if (confirm.canceled) return; | ||
| } | ||
| announcement.isRead = true; | ||
| await misskeyApi('i/read-announcement', { announcementId: announcement.id }); | ||
| if ($i) { | ||
| updateAccount({ | ||
| unreadAnnouncements: $i.unreadAnnouncements.filter((a: { id: string; }) => a.id !== announcement.id), | ||
| }); | ||
| } | ||
| } | ||
| watch(() => path.value, fetch, { immediate: true }); | ||
| const headerActions = computed(() => []); | ||
| const headerTabs = computed(() => []); | ||
| definePageMetadata(() => ({ | ||
| title: announcement.value ? `${i18n.ts.announcements}: ${announcement.value.title}` : i18n.ts.announcements, | ||
| icon: 'ti ti-speakerphone', | ||
| })); | ||
| </script> | ||
|
|
||
| <style lang="scss" module> | ||
| .announcement { | ||
| padding: 16px; | ||
| } | ||
| .forYou { | ||
| display: flex; | ||
| align-items: center; | ||
| line-height: 24px; | ||
| font-size: 90%; | ||
| white-space: pre; | ||
| color: #d28a3f; | ||
| } | ||
| .header { | ||
| margin-bottom: 16px; | ||
| font-weight: bold; | ||
| font-size: 120%; | ||
| } | ||
| .content { | ||
| > img { | ||
| display: block; | ||
| max-height: 300px; | ||
| max-width: 100%; | ||
| } | ||
| } | ||
| .footer { | ||
| margin-top: 16px; | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.