mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-28 23:09:10 +09:00
Code

fix(backend): fix of 1671575d5d

Browse Source
This commit is contained in:
syuilo 2023-10-19 11:17:59 +09:00
parent 1671575d5d
commit f9549e1f1b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/core/ReactionService.ts
View File

@ -188,7 +188,7 @@ export class ReactionService {
.set({ .set({
reactions: () => sql, reactions: () => sql,
...(note.reactionAndUserPairCache.length < 10 ? { ...(note.reactionAndUserPairCache.length < 10 ? {
reactionAndUserPairCache: () => `array_append("reactionAndUserPairCache", '${user.id}:${reaction}')`, reactionAndUserPairCache: () => `array_append("reactionAndUserPairCache", '${user.id}/${reaction}')`,
} : {}), } : {}),
}) })
.where('id = :id', { id: note.id }) .where('id = :id', { id: note.id })
@ -296,7 +296,7 @@ export class ReactionService {
await this.notesRepository.createQueryBuilder().update() await this.notesRepository.createQueryBuilder().update()
.set({ .set({
reactions: () => sql, reactions: () => sql,
reactionAndUserPairCache: () => `array_remove("reactionAndUserPairCache", '${user.id}:${exist.reaction}')`, reactionAndUserPairCache: () => `array_remove("reactionAndUserPairCache", '${user.id}/${exist.reaction}')`,
}) })
.where('id = :id', { id: note.id }) .where('id = :id', { id: note.id })
.execute(); .execute();

6
packages/backend/src/core/entities/NoteEntityService.ts
View File

@ -187,7 +187,7 @@ export class NoteEntityService implements OnModuleInit {
if (note.reactionAndUserPairCache && reactionsCount <= note.reactionAndUserPairCache.length) { if (note.reactionAndUserPairCache && reactionsCount <= note.reactionAndUserPairCache.length) {
const pair = note.reactionAndUserPairCache.find(p => p.startsWith(meId)); const pair = note.reactionAndUserPairCache.find(p => p.startsWith(meId));
if (pair) { if (pair) {
return this.reactionService.convertLegacyReaction(pair.split(':')[1]); return this.reactionService.convertLegacyReaction(pair.split('/')[1]);
} else { } else {
return undefined; return undefined;
} }
@ -411,7 +411,7 @@ export class NoteEntityService implements OnModuleInit {
myReactionsMap.set(note.renote.id, null); myReactionsMap.set(note.renote.id, null);
} else if (reactionsCount <= note.renote.reactionAndUserPairCache.length) { } else if (reactionsCount <= note.renote.reactionAndUserPairCache.length) {
const pair = note.renote.reactionAndUserPairCache.find(p => p.startsWith(meId)); const pair = note.renote.reactionAndUserPairCache.find(p => p.startsWith(meId));
myReactionsMap.set(note.renote.id, pair ? pair.split(':')[1] : null); myReactionsMap.set(note.renote.id, pair ? pair.split('/')[1] : null);
} else { } else {
idsNeedFetchMyReaction.add(note.renote.id); idsNeedFetchMyReaction.add(note.renote.id);
} }
@ -422,7 +422,7 @@ export class NoteEntityService implements OnModuleInit {
myReactionsMap.set(note.id, null); myReactionsMap.set(note.id, null);
} else if (reactionsCount <= note.reactionAndUserPairCache.length) { } else if (reactionsCount <= note.reactionAndUserPairCache.length) {
const pair = note.reactionAndUserPairCache.find(p => p.startsWith(meId)); const pair = note.reactionAndUserPairCache.find(p => p.startsWith(meId));
myReactionsMap.set(note.id, pair ? pair.split(':')[1] : null); myReactionsMap.set(note.id, pair ? pair.split('/')[1] : null);
} else { } else {
idsNeedFetchMyReaction.add(note.id); idsNeedFetchMyReaction.add(note.id);
} }