Browse Source

Fix SQL query

pull/5340/merge
Chocobozzz 2 weeks ago
parent
commit
65b2ec673d
No known key found for this signature in database GPG Key ID: 583A612D890159BE
3 changed files with 6 additions and 6 deletions
  1. +2
    -2
      server/models/actor/actor-follow.ts
  2. +2
    -2
      server/models/actor/actor.ts
  3. +2
    -2
      server/models/video/video-channel.ts

+ 2
- 2
server/models/actor/actor-follow.ts View File

@@ -311,7 +311,7 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo
if (t.host) {
return {
[Op.and]: [
ActorModel.wherePreferredUsername(t.name, '$preferredUsername$'),
ActorModel.wherePreferredUsername(t.name),
{ $host$: t.host }
]
}
@@ -319,7 +319,7 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo

return {
[Op.and]: [
ActorModel.wherePreferredUsername(t.name, '$preferredUsername$'),
ActorModel.wherePreferredUsername(t.name),
{ $serverId$: null }
]
}


+ 2
- 2
server/models/actor/actor.ts View File

@@ -381,7 +381,7 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
const query = {
where: {
[Op.and]: [
this.wherePreferredUsername(preferredUsername),
this.wherePreferredUsername(preferredUsername, '"ActorModel"."preferredUsername"'),
{
serverId: null
}
@@ -431,7 +431,7 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {

static loadByNameAndHost (preferredUsername: string, host: string): Promise<MActorFull> {
const query = {
where: this.wherePreferredUsername(preferredUsername),
where: this.wherePreferredUsername(preferredUsername, '"ActorModel"."preferredUsername"'),
include: [
{
model: ServerModel,


+ 2
- 2
server/models/video/video-channel.ts View File

@@ -702,7 +702,7 @@ export class VideoChannelModel extends Model<Partial<AttributesOnly<VideoChannel
required: true,
where: {
[Op.and]: [
ActorModel.wherePreferredUsername(name),
ActorModel.wherePreferredUsername(name, 'Actor.preferredUsername'),
{ serverId: null }
]
},
@@ -728,7 +728,7 @@ export class VideoChannelModel extends Model<Partial<AttributesOnly<VideoChannel
{
model: ActorModel,
required: true,
where: ActorModel.wherePreferredUsername(name),
where: ActorModel.wherePreferredUsername(name, 'Actor.preferredUsername'),
include: [
{
model: ServerModel,


Loading…
Cancel
Save