Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

enhance: ダイアログのお知らせをアーカイブした時イベントが発生しないように・アーカイブされたお知らせをわかりやすく (MisskeyIO#153)

Browse source
This commit is contained in:
まっちゃとーにゅ 2023-08-20 05:47:09 +09:00 committed by GitHub
parent 755d8419c9
commit eaae8e6bea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
packages/backend/src/core/AnnouncementService.ts
View file

@ -98,6 +98,7 @@ export class AnnouncementService {
} }
query.orderBy({ query.orderBy({
'announcement."isActive"': 'DESC',
'announcement."displayOrder"': 'DESC', 'announcement."displayOrder"': 'DESC',
'announcement."createdAt"': 'DESC', 'announcement."createdAt"': 'DESC',
}); });
@ -166,21 +167,26 @@ export class AnnouncementService {
const packed = await this.announcementEntityService.pack( const packed = await this.announcementEntityService.pack(
announcement, announcement,
values.userId ? { id: values.userId } : null, announcement.userId ? { id: announcement.userId } : null,
); );
if (values.userId) { if (announcement.isActive) {
if (announcement.userId) {
this.globalEventService.publishMainStream( this.globalEventService.publishMainStream(
values.userId, announcement.userId,
'announcementCreated', 'announcementCreated',
{ {
announcement: packed, announcement: packed,
}, },
); );
} else { } else {
this.globalEventService.publishBroadcastStream('announcementCreated', { this.globalEventService.publishBroadcastStream(
'announcementCreated',
{
announcement: packed, announcement: packed,
}); },
);
}
} }
return { return {

1
packages/frontend/src/pages/admin/announcements.vue
View file

@ -28,6 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkFolder v-for="announcement in announcements" :key="announcement.id ?? announcement._id" :defaultOpen="announcement.id == null"> <MkFolder v-for="announcement in announcements" :key="announcement.id ?? announcement._id" :defaultOpen="announcement.id == null">
<template #label>{{ announcement.title }}</template> <template #label>{{ announcement.title }}</template>
<template #icon> <template #icon>
<i v-if="announcement.id && !announcement.isActive" class="ti ti-archive"></i>
<i v-if="announcement.icon === 'info'" class="ti ti-info-circle"></i> <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 === '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 === 'error'" class="ti ti-circle-x" style="color: var(--error);"></i>