summaryrefslogtreecommitdiff
path: root/src/remote/activitypub
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2021-02-17 21:34:51 +0900
committerGitHub <noreply@github.com>2021-02-17 21:34:51 +0900
commit9bc0110b86ff1fd2014e1958a8512422408594a3 (patch)
treef194338d951859b390c32f77dedfc0e7e87379eb /src/remote/activitypub
parentリファクタ等 (diff)
downloadsharkey-9bc0110b86ff1fd2014e1958a8512422408594a3.tar.gz
sharkey-9bc0110b86ff1fd2014e1958a8512422408594a3.tar.bz2
sharkey-9bc0110b86ff1fd2014e1958a8512422408594a3.zip
Fix #7212 (#7215)
Diffstat (limited to 'src/remote/activitypub')
-rw-r--r--src/remote/activitypub/models/person.ts29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index 5840d67020..93e95df0a4 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -12,7 +12,7 @@ import { extractApHashtags } from './tag';
import { apLogger } from '../logger';
import { Note } from '../../../models/entities/note';
import { updateUsertags } from '../../../services/update-hashtag';
-import { Users, UserNotePinings, Instances, DriveFiles, Followings, UserProfiles, UserPublickeys } from '../../../models';
+import { Users, Instances, DriveFiles, Followings, UserProfiles, UserPublickeys } from '../../../models';
import { User, IRemoteUser } from '../../../models/entities/user';
import { Emoji } from '../../../models/entities/emoji';
import { UserNotePining } from '../../../models/entities/user-note-pining';
@@ -479,18 +479,19 @@ export async function updateFeatured(userId: User['id']) {
.slice(0, 5)
.map(item => limit(() => resolveNote(item, resolver))));
- // delete
- await UserNotePinings.delete({ userId: user.id });
+ await getConnection().transaction(async transactionalEntityManager => {
+ await transactionalEntityManager.delete(UserNotePining, { userId: user.id });
- // とりあえずidを別の時間で生成して順番を維持
- let td = 0;
- for (const note of featuredNotes.filter(note => note != null)) {
- td -= 1000;
- UserNotePinings.save({
- id: genId(new Date(Date.now() + td)),
- createdAt: new Date(),
- userId: user.id,
- noteId: note!.id
- } as UserNotePining);
- }
+ // とりあえずidを別の時間で生成して順番を維持
+ let td = 0;
+ for (const note of featuredNotes.filter(note => note != null)) {
+ td -= 1000;
+ transactionalEntityManager.insert(UserNotePining, {
+ id: genId(new Date(Date.now() + td)),
+ createdAt: new Date(),
+ userId: user.id,
+ noteId: note!.id
+ });
+ }
+ });
}