etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-11-30 01:43:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix type in CustomEmojiService 2

Browse source
This commit is contained in:
tamaina 2023-04-12 12:32:27 +00:00
parent 6ea057f8f8
commit 3ff5a5ae29
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/backend/src/core/CustomEmojiService.ts
View file

@ -13,6 +13,7 @@ import { MemoryKVCache, RedisSingleCache } from '@/misc/cache.js';
import { UtilityService } from '@/core/UtilityService.js'; import { UtilityService } from '@/core/UtilityService.js';
import type { Config } from '@/config.js'; import type { Config } from '@/config.js';
import { query } from '@/misc/prelude/url.js'; import { query } from '@/misc/prelude/url.js';
import { Serialized } from '@/server/api/stream/types';
@Injectable() @Injectable()
export class CustomEmojiService { export class CustomEmojiService {
@ -46,7 +47,7 @@ export class CustomEmojiService {
toRedisConverter: (value) => JSON.stringify(Array.from(value.values())), toRedisConverter: (value) => JSON.stringify(Array.from(value.values())),
fromRedisConverter: (value) => { fromRedisConverter: (value) => {
if (!Array.isArray(JSON.parse(value))) return undefined; // 古いバージョンの壊れたキャッシュが残っていることがある(そのうち消す) if (!Array.isArray(JSON.parse(value))) return undefined; // 古いバージョンの壊れたキャッシュが残っていることがある(そのうち消す)
return new Map(JSON.parse(value).map((x: Emoji) => [x.name, { return new Map(JSON.parse(value).map((x: Serialized<Emoji>) => [x.name, {
...x, ...x,
updatedAt: x.updatedAt && new Date(x.updatedAt), updatedAt: x.updatedAt && new Date(x.updatedAt),
}])); }]));

2
packages/backend/src/server/api/stream/types.ts
View file

@ -172,7 +172,7 @@ type EventUnionFromDictionary<
> = U[keyof U]; > = U[keyof U];
// redis通すとDateのインスタンスはstringに変換されるので // redis通すとDateのインスタンスはstringに変換されるので
type Serialized<T> = { export type Serialized<T> = {
[K in keyof T]: [K in keyof T]:
T[K] extends Date T[K] extends Date
? string ? string