diff options
| author | rinsuki <428rinsuki+git@gmail.com> | 2020-03-04 11:45:33 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 11:45:33 +0900 |
| commit | c18f6fde80c4672df2d2b98d4ecd45bb2958a97d (patch) | |
| tree | 847bfbfebf117b7a6d01345307cc8dcbfcf20f32 /src/models | |
| parent | Merge pull request #6121 from syuilo/patch/autogen/v11 (diff) | |
| download | sharkey-c18f6fde80c4672df2d2b98d4ecd45bb2958a97d.tar.gz sharkey-c18f6fde80c4672df2d2b98d4ecd45bb2958a97d.tar.bz2 sharkey-c18f6fde80c4672df2d2b98d4ecd45bb2958a97d.zip | |
lintをGitHub Actions でするように (#6101)
* package.json の lint スクリプトを修正
* lint アクションを追加
* yarn lint --fix
* 手動修正
Diffstat (limited to 'src/models')
| -rw-r--r-- | src/models/entities/clip-note.ts | 2 | ||||
| -rw-r--r-- | src/models/repositories/user.ts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/models/entities/clip-note.ts b/src/models/entities/clip-note.ts index 19e4750fc6..7d96b2ef7a 100644 --- a/src/models/entities/clip-note.ts +++ b/src/models/entities/clip-note.ts @@ -8,7 +8,7 @@ import { id } from '../id'; export class ClipNote { @PrimaryColumn(id()) public id: string; - + @Index() @Column({ ...id(), diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts index 1d669feb5e..c6bc35030c 100644 --- a/src/models/repositories/user.ts +++ b/src/models/repositories/user.ts @@ -98,7 +98,7 @@ export class UserRepository extends Repository<User> { public async getHasUnreadAntenna(userId: User['id']): Promise<boolean> { const antennas = await Antennas.find({ userId }); - + const unread = antennas.length > 0 ? await AntennaNotes.findOne({ antennaId: In(antennas.map(x => x.id)), read: false @@ -112,7 +112,7 @@ export class UserRepository extends Repository<User> { muterId: userId }); const mutedUserIds = mute.map(m => m.muteeId); - + const count = await Notifications.count({ where: { notifieeId: userId, |