X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fmodels%2Factor%2Factor.ts;h=c12dcf63408baade6dc126da947f62b06d6f1d3f;hb=5cad2ca9db9b9d138f8a33058d10b94a9fd50c69;hp=0cd30f5451ad693ea8d65746c5db0b5cee4d22ab;hpb=ea54cd04c1ff0e55651cd5fb1a83672acde68604;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/actor/actor.ts b/server/models/actor/actor.ts index 0cd30f545..c12dcf634 100644 --- a/server/models/actor/actor.ts +++ b/server/models/actor/actor.ts @@ -16,9 +16,9 @@ import { Table, UpdatedAt } from 'sequelize-typescript' -import { getLowercaseExtension } from '@server/helpers/core-utils' import { ModelCache } from '@server/models/model-cache' -import { AttributesOnly } from '@shared/core-utils' +import { getLowercaseExtension } from '@shared/core-utils' +import { AttributesOnly } from '@shared/typescript-utils' import { ActivityIconObject, ActivityPubActorType } from '../../../shared/models/activitypub' import { ActorImage } from '../../../shared/models/actors/actor-image.model' import { activityPubContextify } from '../../helpers/activitypub' @@ -496,7 +496,7 @@ export class ActorModel extends Model>> { }, { where, transaction }) } - static loadAccountActorByVideoId (videoId: number): Promise { + static loadAccountActorByVideoId (videoId: number, transaction: Transaction): Promise { const query = { include: [ { @@ -520,7 +520,8 @@ export class ActorModel extends Model>> { } ] } - ] + ], + transaction } return ActorModel.unscoped().findOne(query)