strictNullChecks (#4666)
* wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip
This commit is contained in:
@@ -2,6 +2,7 @@ import { EntityRepository, Repository } from 'typeorm';
|
||||
import { Users, Notes } from '..';
|
||||
import rap from '@prezzemolo/rap';
|
||||
import { Notification } from '../entities/notification';
|
||||
import { ensure } from '../../prelude/ensure';
|
||||
|
||||
@EntityRepository(Notification)
|
||||
export class NotificationRepository extends Repository<Notification> {
|
||||
@@ -14,7 +15,7 @@ export class NotificationRepository extends Repository<Notification> {
|
||||
public async pack(
|
||||
src: Notification['id'] | Notification,
|
||||
) {
|
||||
const notification = typeof src === 'object' ? src : await this.findOne(src);
|
||||
const notification = typeof src === 'object' ? src : await this.findOne(src).then(ensure);
|
||||
|
||||
return await rap({
|
||||
id: notification.id,
|
||||
@@ -23,23 +24,23 @@ export class NotificationRepository extends Repository<Notification> {
|
||||
userId: notification.notifierId,
|
||||
user: Users.pack(notification.notifier || notification.notifierId),
|
||||
...(notification.type === 'mention' ? {
|
||||
note: Notes.pack(notification.note || notification.noteId),
|
||||
note: Notes.pack(notification.note || notification.noteId!),
|
||||
} : {}),
|
||||
...(notification.type === 'reply' ? {
|
||||
note: Notes.pack(notification.note || notification.noteId),
|
||||
note: Notes.pack(notification.note || notification.noteId!),
|
||||
} : {}),
|
||||
...(notification.type === 'renote' ? {
|
||||
note: Notes.pack(notification.note || notification.noteId),
|
||||
note: Notes.pack(notification.note || notification.noteId!),
|
||||
} : {}),
|
||||
...(notification.type === 'quote' ? {
|
||||
note: Notes.pack(notification.note || notification.noteId),
|
||||
note: Notes.pack(notification.note || notification.noteId!),
|
||||
} : {}),
|
||||
...(notification.type === 'reaction' ? {
|
||||
note: Notes.pack(notification.note || notification.noteId),
|
||||
note: Notes.pack(notification.note || notification.noteId!),
|
||||
reaction: notification.reaction
|
||||
} : {}),
|
||||
...(notification.type === 'pollVote' ? {
|
||||
note: Notes.pack(notification.note || notification.noteId),
|
||||
note: Notes.pack(notification.note || notification.noteId!),
|
||||
choice: notification.choice
|
||||
} : {})
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user