forked from misskey-dev/misskey
-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix: チャンネルのフォロー・アンフォローの反映速度を改善 (misskey-dev#12149)
* チャンネルのフォロー・アンフォローの反映速度を改善 * fix lint * userFollowingChannelsCacheの場所をCacheServiceからChannelFollowingServiceに移動 --------- Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
- Loading branch information
1 parent
d15ce4a
commit 17ca35a
Showing
7 changed files
with
126 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| import { Inject, Injectable, OnModuleInit } from '@nestjs/common'; | ||
| import Redis from 'ioredis'; | ||
| import { DI } from '@/di-symbols.js'; | ||
| import type { ChannelFollowingsRepository } from '@/models/_.js'; | ||
| import { MiChannel } from '@/models/_.js'; | ||
| import { IdService } from '@/core/IdService.js'; | ||
| import { GlobalEvents, GlobalEventService } from '@/core/GlobalEventService.js'; | ||
| import { bindThis } from '@/decorators.js'; | ||
| import type { MiLocalUser } from '@/models/User.js'; | ||
| import { RedisKVCache } from '@/misc/cache.js'; | ||
|
|
||
| @Injectable() | ||
| export class ChannelFollowingService implements OnModuleInit { | ||
| public userFollowingChannelsCache: RedisKVCache<Set<string>>; | ||
|
|
||
| constructor( | ||
| @Inject(DI.redis) | ||
| private redisClient: Redis.Redis, | ||
| @Inject(DI.redisForSub) | ||
| private redisForSub: Redis.Redis, | ||
| @Inject(DI.channelFollowingsRepository) | ||
| private channelFollowingsRepository: ChannelFollowingsRepository, | ||
| private idService: IdService, | ||
| private globalEventService: GlobalEventService, | ||
| ) { | ||
| this.userFollowingChannelsCache = new RedisKVCache<Set<string>>(this.redisClient, 'userFollowingChannels', { | ||
| lifetime: 1000 * 60 * 30, // 30m | ||
| memoryCacheLifetime: 1000 * 60, // 1m | ||
| fetcher: (key) => this.channelFollowingsRepository.find({ | ||
| where: { followerId: key }, | ||
| select: ['followeeId'], | ||
| }).then(xs => new Set(xs.map(x => x.followeeId))), | ||
| toRedisConverter: (value) => JSON.stringify(Array.from(value)), | ||
| fromRedisConverter: (value) => new Set(JSON.parse(value)), | ||
| }); | ||
|
|
||
| this.redisForSub.on('message', this.onMessage); | ||
| } | ||
|
|
||
| onModuleInit() { | ||
| } | ||
|
|
||
| @bindThis | ||
| public async follow( | ||
| requestUser: MiLocalUser, | ||
| targetChannel: MiChannel, | ||
| ): Promise<void> { | ||
| await this.channelFollowingsRepository.insert({ | ||
| id: this.idService.gen(), | ||
| followerId: requestUser.id, | ||
| followeeId: targetChannel.id, | ||
| }); | ||
|
|
||
| this.globalEventService.publishInternalEvent('followChannel', { | ||
| userId: requestUser.id, | ||
| channelId: targetChannel.id, | ||
| }); | ||
| } | ||
|
|
||
| @bindThis | ||
| public async unfollow( | ||
| requestUser: MiLocalUser, | ||
| targetChannel: MiChannel, | ||
| ): Promise<void> { | ||
| await this.channelFollowingsRepository.delete({ | ||
| followerId: requestUser.id, | ||
| followeeId: targetChannel.id, | ||
| }); | ||
|
|
||
| this.globalEventService.publishInternalEvent('unfollowChannel', { | ||
| userId: requestUser.id, | ||
| channelId: targetChannel.id, | ||
| }); | ||
| } | ||
|
|
||
| @bindThis | ||
| private async onMessage(_: string, data: string): Promise<void> { | ||
| const obj = JSON.parse(data); | ||
|
|
||
| if (obj.channel === 'internal') { | ||
| const { type, body } = obj.message as GlobalEvents['internal']['payload']; | ||
| switch (type) { | ||
| case 'followChannel': { | ||
| this.userFollowingChannelsCache.refresh(body.userId); | ||
| break; | ||
| } | ||
| case 'unfollowChannel': { | ||
| this.userFollowingChannelsCache.delete(body.userId); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @bindThis | ||
| public dispose(): void { | ||
| this.userFollowingChannelsCache.dispose(); | ||
| } | ||
|
|
||
| @bindThis | ||
| public onApplicationShutdown(signal?: string | undefined): void { | ||
| this.dispose(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters