diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2020-02-15 01:03:59 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2020-02-15 01:03:59 +0900 |
| commit | 65c0b6c7da1a16c2c81d19800d9aea7b7dfae4b9 (patch) | |
| tree | 7e16caf5d7e09b0a6486be2e6e961f6d0bd4b456 /src/models/repositories | |
| parent | Improve doc page (diff) | |
| download | misskey-65c0b6c7da1a16c2c81d19800d9aea7b7dfae4b9.tar.gz misskey-65c0b6c7da1a16c2c81d19800d9aea7b7dfae4b9.tar.bz2 misskey-65c0b6c7da1a16c2c81d19800d9aea7b7dfae4b9.zip | |
Resolve #5939
Diffstat (limited to 'src/models/repositories')
| -rw-r--r-- | src/models/repositories/antenna.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/models/repositories/antenna.ts b/src/models/repositories/antenna.ts index c47a7ea35c..9f8aa11347 100644 --- a/src/models/repositories/antenna.ts +++ b/src/models/repositories/antenna.ts @@ -2,7 +2,7 @@ import { EntityRepository, Repository } from 'typeorm'; import { Antenna } from '../entities/antenna'; import { ensure } from '../../prelude/ensure'; import { SchemaType } from '../../misc/schema'; -import { AntennaNotes } from '..'; +import { AntennaNotes, UserGroupJoinings } from '..'; export type PackedAntenna = SchemaType<typeof packedAntennaSchema>; @@ -14,6 +14,7 @@ export class AntennaRepository extends Repository<Antenna> { const antenna = typeof src === 'object' ? src : await this.findOne(src).then(ensure); const hasUnreadNote = (await AntennaNotes.findOne({ antennaId: antenna.id, read: false })) != null; + const userGroupJoining = antenna.userGroupJoiningId ? await UserGroupJoinings.findOne(antenna.userGroupJoiningId) : null; return { id: antenna.id, @@ -22,6 +23,7 @@ export class AntennaRepository extends Repository<Antenna> { keywords: antenna.keywords, src: antenna.src, userListId: antenna.userListId, + userGroupId: userGroupJoining ? userGroupJoining.userGroupId : null, users: antenna.users, caseSensitive: antenna.caseSensitive, notify: antenna.notify, |