summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/AntennaService.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-04-03 12:11:16 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-04-03 12:11:16 +0900
commitb53d6c7f8ca1a712eab44967e8d05a0cc7bcc034 (patch)
tree79ea4fe1f14c0d3c47a46705345be03a2fa2fc4b /packages/backend/src/core/AntennaService.ts
parentfix(frontend): tweak MkPagination behaviouyr (diff)
downloadsharkey-b53d6c7f8ca1a712eab44967e8d05a0cc7bcc034.tar.gz
sharkey-b53d6c7f8ca1a712eab44967e8d05a0cc7bcc034.tar.bz2
sharkey-b53d6c7f8ca1a712eab44967e8d05a0cc7bcc034.zip
perf(backend): store notes of an antenna to redis instead of postgresql
Resolve #10169
Diffstat (limited to 'packages/backend/src/core/AntennaService.ts')
-rw-r--r--packages/backend/src/core/AntennaService.ts61
1 files changed, 10 insertions, 51 deletions
diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts
index aaa26a8321..4bd3f39af2 100644
--- a/packages/backend/src/core/AntennaService.ts
+++ b/packages/backend/src/core/AntennaService.ts
@@ -12,7 +12,7 @@ import { PushNotificationService } from '@/core/PushNotificationService.js';
import * as Acct from '@/misc/acct.js';
import type { Packed } from '@/misc/json-schema.js';
import { DI } from '@/di-symbols.js';
-import type { MutingsRepository, NotesRepository, AntennaNotesRepository, AntennasRepository, UserListJoiningsRepository } from '@/models/index.js';
+import type { MutingsRepository, NotesRepository, AntennasRepository, UserListJoiningsRepository } from '@/models/index.js';
import { UtilityService } from '@/core/UtilityService.js';
import { bindThis } from '@/decorators.js';
import { StreamMessages } from '@/server/api/stream/types.js';
@@ -24,6 +24,9 @@ export class AntennaService implements OnApplicationShutdown {
private antennas: Antenna[];
constructor(
+ @Inject(DI.redis)
+ private redisClient: Redis.Redis,
+
@Inject(DI.redisSubscriber)
private redisSubscriber: Redis.Redis,
@@ -33,9 +36,6 @@ export class AntennaService implements OnApplicationShutdown {
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
- @Inject(DI.antennaNotesRepository)
- private antennaNotesRepository: AntennaNotesRepository,
-
@Inject(DI.antennasRepository)
private antennasRepository: AntennasRepository,
@@ -92,54 +92,13 @@ export class AntennaService implements OnApplicationShutdown {
@bindThis
public async addNoteToAntenna(antenna: Antenna, note: Note, noteUser: { id: User['id']; }): Promise<void> {
- // 通知しない設定になっているか、自分自身の投稿なら既読にする
- const read = !antenna.notify || (antenna.userId === noteUser.id);
-
- this.antennaNotesRepository.insert({
- id: this.idService.genId(),
- antennaId: antenna.id,
- noteId: note.id,
- read: read,
- });
-
+ this.redisClient.xadd(
+ `antennaTimeline:${antenna.id}`,
+ 'MAXLEN', '~', '200',
+ `${this.idService.parse(note.id).date.getTime()}-*`,
+ 'note', note.id);
+
this.globalEventService.publishAntennaStream(antenna.id, 'note', note);
-
- if (!read) {
- const mutings = await this.mutingsRepository.find({
- where: {
- muterId: antenna.userId,
- },
- select: ['muteeId'],
- });
-
- // Copy
- const _note: Note = {
- ...note,
- };
-
- if (note.replyId != null) {
- _note.reply = await this.notesRepository.findOneByOrFail({ id: note.replyId });
- }
- if (note.renoteId != null) {
- _note.renote = await this.notesRepository.findOneByOrFail({ id: note.renoteId });
- }
-
- if (isUserRelated(_note, new Set<string>(mutings.map(x => x.muteeId)))) {
- return;
- }
-
- // 2秒経っても既読にならなかったら通知
- setTimeout(async () => {
- const unread = await this.antennaNotesRepository.findOneBy({ antennaId: antenna.id, read: false });
- if (unread) {
- this.globalEventService.publishMainStream(antenna.userId, 'unreadAntenna', antenna);
- this.pushNotificationService.pushNotification(antenna.userId, 'unreadAntennaNote', {
- antenna: { id: antenna.id, name: antenna.name },
- note: await this.noteEntityService.pack(note),
- });
- }
- }, 2000);
- }
}
// NOTE: フォローしているユーザーのノート、リストのユーザーのノート、グループのユーザーのノート指定はパフォーマンス上の理由で無効になっている