forked from misskey-dev/misskey
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #75 from anatawa12/pick-redis-push-tl
- Loading branch information
Showing
7 changed files
with
232 additions
and
4 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: syuilo and other misskey contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-only | ||
| */ | ||
|
|
||
| import { Inject, Injectable } from '@nestjs/common'; | ||
| import * as Redis from 'ioredis'; | ||
| import { DI } from '@/di-symbols.js'; | ||
| import { bindThis } from '@/decorators.js'; | ||
| import { IdService } from '@/core/IdService.js'; | ||
|
|
||
| @Injectable() | ||
| export class RedisTimelineService { | ||
| constructor( | ||
| @Inject(DI.redis) | ||
| private redisClient: Redis.Redis, | ||
|
|
||
| private idService: IdService, | ||
| ) { | ||
| } | ||
|
|
||
| @bindThis | ||
| public push(tl: string, id: string, maxlen: number, pipeline: Redis.ChainableCommander) { | ||
| // リモートから遅れて届いた(もしくは後から追加された)投稿日時が古い投稿が追加されるとページネーション時に問題を引き起こすため、 | ||
| // 3分以内に投稿されたものでない場合、Redisにある最古のIDより新しい場合のみ追加する | ||
| if (this.idService.parse(id).date.getTime() > Date.now() - 1000 * 60 * 3) { | ||
| pipeline.lpush('list:' + tl, id); | ||
| if (Math.random() < 0.1) { // 10%の確率でトリム | ||
| pipeline.ltrim('list:' + tl, 0, maxlen - 1); | ||
| } | ||
| } else { | ||
| // 末尾のIDを取得 | ||
| this.redisClient.lindex('list:' + tl, -1).then(lastId => { | ||
| if (lastId == null || (this.idService.parse(id).date.getTime() > this.idService.parse(lastId).date.getTime())) { | ||
| this.redisClient.lpush('list:' + tl, id); | ||
| } else { | ||
| Promise.resolve(); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| @bindThis | ||
| public get(name: string, untilId?: string | null, sinceId?: string | null) { | ||
| if (untilId && sinceId) { | ||
| return this.redisClient.lrange('list:' + name, 0, -1) | ||
| .then(ids => ids.filter(id => id < untilId && id > sinceId).sort((a, b) => a > b ? -1 : 1)); | ||
| } else if (untilId) { | ||
| return this.redisClient.lrange('list:' + name, 0, -1) | ||
| .then(ids => ids.filter(id => id < untilId).sort((a, b) => a > b ? -1 : 1)); | ||
| } else if (sinceId) { | ||
| return this.redisClient.lrange('list:' + name, 0, -1) | ||
| .then(ids => ids.filter(id => id > sinceId).sort((a, b) => a < b ? -1 : 1)); | ||
| } else { | ||
| return this.redisClient.lrange('list:' + name, 0, -1) | ||
| .then(ids => ids.sort((a, b) => a > b ? -1 : 1)); | ||
| } | ||
| } | ||
|
|
||
| @bindThis | ||
| public getMulti(name: string[], untilId?: string | null, sinceId?: string | null): Promise<string[][]> { | ||
| const pipeline = this.redisClient.pipeline(); | ||
| for (const n of name) { | ||
| pipeline.lrange('list:' + n, 0, -1); | ||
| } | ||
| return pipeline.exec().then(res => { | ||
| if (res == null) return []; | ||
| const tls = res.map(r => r[1] as string[]); | ||
| return tls.map(ids => | ||
| (untilId && sinceId) | ||
| ? ids.filter(id => id < untilId && id > sinceId).sort((a, b) => a > b ? -1 : 1) | ||
| : untilId | ||
| ? ids.filter(id => id < untilId).sort((a, b) => a > b ? -1 : 1) | ||
| : sinceId | ||
| ? ids.filter(id => id > sinceId).sort((a, b) => a < b ? -1 : 1) | ||
| : ids.sort((a, b) => a > b ? -1 : 1), | ||
| ); | ||
| }); | ||
| } | ||
| } |
Oops, something went wrong.