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

feat(announcement): 個別のお知らせにリンクで飛べるように (MisskeyIO#639)

Browse source
This commit is contained in:
まっちゃとーにゅ 2024-05-24 21:40:28 +09:00 • committed by GitHub
parent 9e4ff380ad
commit f6bf7f992a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 316 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
*/
import { Inject, Injectable } from '@nestjs/common';
import { Brackets, In } from 'typeorm';
import { Brackets, EntityNotFoundError, In } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { MiUser } from '@/models/User.js';
import type { AnnouncementReadsRepository, AnnouncementsRepository, MiAnnouncement, UsersRepository } from '@/models/_.js';
@ -254,6 +254,24 @@ export class AnnouncementService {
}
}
@bindThis
public async getAnnouncement(announcementId: MiAnnouncement['id'], me: MiUser | null): Promise<Packed<'Announcement'>> {
const announcement = await this.announcementsRepository.findOneByOrFail({ id: announcementId });
if (me) {
if (announcement.userId && announcement.userId !== me.id) {
throw new EntityNotFoundError(this.announcementsRepository.metadata.target, { id: announcementId });
}
const read = await this.announcementReadsRepository.findOneBy({
announcementId: announcement.id,
userId: me.id,
});
return this.announcementEntityService.pack({ ...announcement, isRead: read !== null }, me);
} else {
return this.announcementEntityService.pack(announcement, null);
}
}
@bindThis
public async getAnnouncements(
me: MiUser | null,