summaryrefslogtreecommitdiff
path: root/src/models
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-03-23 15:06:56 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-03-23 15:06:56 +0900
commit7e4a800352dd1de91a7a6c457b39f297d76fd9bf (patch)
tree174117f77dcc50defb3081b94a67c3de5c63c5cf /src/models
parentコミット忘れ (diff)
downloadsharkey-7e4a800352dd1de91a7a6c457b39f297d76fd9bf.tar.gz
sharkey-7e4a800352dd1de91a7a6c457b39f297d76fd9bf.tar.bz2
sharkey-7e4a800352dd1de91a7a6c457b39f297d76fd9bf.zip
noteのread処理
Diffstat (limited to 'src/models')
-rw-r--r--src/models/repositories/user.ts7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts
index 53c06f3f16..3d897e1663 100644
--- a/src/models/repositories/user.ts
+++ b/src/models/repositories/user.ts
@@ -6,6 +6,7 @@ import config from '../../config';
import { SchemaType } from '../../misc/schema';
import { awaitAll } from '../../prelude/await-all';
import { populateEmojis } from '../../misc/populate-emojis';
+import { getAntennas } from '../../misc/antenna-cache';
export type PackedUser = SchemaType<typeof packedUserSchema>;
@@ -97,10 +98,10 @@ export class UserRepository extends Repository<User> {
}
public async getHasUnreadAntenna(userId: User['id']): Promise<boolean> {
- const antennas = await Antennas.find({ userId });
+ const myAntennas = (await getAntennas()).filter(a => a.userId === userId);
- const unread = antennas.length > 0 ? await AntennaNotes.findOne({
- antennaId: In(antennas.map(x => x.id)),
+ const unread = myAntennas.length > 0 ? await AntennaNotes.findOne({
+ antennaId: In(myAntennas.map(x => x.id)),
read: false
}) : null;