mirror of
https://codeberg.org/yeentown/barkey.git
synced 2025-07-07 12:36:57 +00:00
replace upsert with insert+fetch and delete+insert
This commit is contained in:
parent
693cdde327
commit
3907355a48
1 changed files with 27 additions and 4 deletions
|
@ -10,7 +10,7 @@ import { IdentifiableError } from '@/misc/identifiable-error.js';
|
|||
import type { MiRemoteUser, MiUser } from '@/models/User.js';
|
||||
import type { MiNote } from '@/models/Note.js';
|
||||
import { IdService } from '@/core/IdService.js';
|
||||
import type { MiNoteReaction } from '@/models/NoteReaction.js';
|
||||
import { MiNoteReaction } from '@/models/NoteReaction.js';
|
||||
import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
|
||||
import { GlobalEventService } from '@/core/GlobalEventService.js';
|
||||
import { NotificationService } from '@/core/NotificationService.js';
|
||||
|
@ -31,6 +31,7 @@ import { isQuote, isRenote } from '@/misc/is-renote.js';
|
|||
import { ReactionsBufferingService } from '@/core/ReactionsBufferingService.js';
|
||||
import { PER_NOTE_REACTION_USER_PAIR_CACHE_MAX } from '@/const.js';
|
||||
import { CacheService } from '@/core/CacheService.js';
|
||||
import type { DataSource } from 'typeorm';
|
||||
|
||||
const FALLBACK = '\u2764';
|
||||
|
||||
|
@ -89,6 +90,9 @@ export class ReactionService {
|
|||
@Inject(DI.emojisRepository)
|
||||
private emojisRepository: EmojisRepository,
|
||||
|
||||
@Inject(DI.db)
|
||||
private readonly db: DataSource,
|
||||
|
||||
private utilityService: UtilityService,
|
||||
private customEmojiService: CustomEmojiService,
|
||||
private roleService: RoleService,
|
||||
|
@ -176,11 +180,30 @@ export class ReactionService {
|
|||
reaction,
|
||||
};
|
||||
|
||||
await this.noteReactionsRepository.upsert(record, {
|
||||
skipUpdateIfNoValuesChanged: true,
|
||||
conflictPaths: ['noteId', 'userId'],
|
||||
const result = await this.db.transaction(async tem => {
|
||||
await tem.createQueryBuilder(MiNoteReaction, 'noteReaction')
|
||||
.insert()
|
||||
.values(record)
|
||||
.orIgnore()
|
||||
.execute();
|
||||
|
||||
return await tem.createQueryBuilder(MiNoteReaction, 'noteReaction')
|
||||
.select()
|
||||
.where({ noteId: note.id, userId: user.id })
|
||||
.getOneOrFail();
|
||||
});
|
||||
|
||||
if (result.id !== record.id) {
|
||||
// Conflict with the same ID => nothing to do.
|
||||
if (result.reaction === record.reaction) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 別のリアクションがすでにされていたら置き換える
|
||||
await this.delete(user, note);
|
||||
await this.noteReactionsRepository.insert(record);
|
||||
}
|
||||
|
||||
// Increment reactions count
|
||||
if (this.meta.enableReactionsBuffering) {
|
||||
await this.reactionsBufferingService.create(note.id, user.id, reaction, note.reactionAndUserPairCache);
|
||||
|
|
Loading…
Add table
Reference in a new issue