mirror of
https://github.com/misskey-dev/misskey.git
synced 2024-12-13 19:00:51 +01:00
Merge remote-tracking branch 'tamaina/fix-emj' into io
This commit is contained in:
commit
1ed9e440c7
2 changed files with 6 additions and 3 deletions
|
@ -44,7 +44,10 @@ export class CustomEmojiService {
|
|||
memoryCacheLifetime: 1000 * 60 * 3, // 3m
|
||||
fetcher: () => this.emojisRepository.find({ where: { host: IsNull() } }).then(emojis => new Map(emojis.map(emoji => [emoji.name, emoji]))),
|
||||
toRedisConverter: (value) => JSON.stringify(value.values()),
|
||||
fromRedisConverter: (value) => new Map(JSON.parse(value).map((x: Emoji) => [x.name, x])), // TODO: Date型の変換
|
||||
fromRedisConverter: (value) => {
|
||||
if (!Array.isArray(value)) return undefined;
|
||||
return new Map(JSON.parse(value).map((x: Emoji) => [x.name, x]));
|
||||
}, // TODO: Date型の変換
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ export class RedisKVCache<T> {
|
|||
private memoryCache: MemoryKVCache<T>;
|
||||
private fetcher: (key: string) => Promise<T>;
|
||||
private toRedisConverter: (value: T) => string;
|
||||
private fromRedisConverter: (value: string) => T;
|
||||
private fromRedisConverter: (value: string) => T | undefined; // undefined means no cache
|
||||
|
||||
constructor(redisClient: RedisKVCache<T>['redisClient'], name: RedisKVCache<T>['name'], opts: {
|
||||
lifetime: RedisKVCache<T>['lifetime'];
|
||||
|
@ -92,7 +92,7 @@ export class RedisSingleCache<T> {
|
|||
private memoryCache: MemorySingleCache<T>;
|
||||
private fetcher: () => Promise<T>;
|
||||
private toRedisConverter: (value: T) => string;
|
||||
private fromRedisConverter: (value: string) => T;
|
||||
private fromRedisConverter: (value: string) => T | undefined; // undefined means no cache
|
||||
|
||||
constructor(redisClient: RedisSingleCache<T>['redisClient'], name: RedisSingleCache<T>['name'], opts: {
|
||||
lifetime: RedisSingleCache<T>['lifetime'];
|
||||
|
|
Loading…
Reference in a new issue