OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix sharedInboxUrl list

pull/200/head
Chocobozzz 2018-01-09 18:13:00 +01:00
parent ca309a9f64
commit 759f8a29e9
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/models/activitypub/actor-follow.ts
View File

@ -191,12 +191,13 @@ export class ActorFollowModel extends Model<ActorFollowModel> {
static listAcceptedFollowerSharedInboxUrls (actorIds: number[], t: Sequelize.Transaction) {
return ActorFollowModel.createListAcceptedFollowForApiQuery(
'DISTINCT(followers)',
'followers',
actorIds,
t,
undefined,
undefined,
'sharedInboxUrl'
'sharedInboxUrl',
true
)
}
@ -204,12 +205,15 @@ export class ActorFollowModel extends Model<ActorFollowModel> {
return ActorFollowModel.createListAcceptedFollowForApiQuery('following', actorIds, t, start, count)
}
private static async createListAcceptedFollowForApiQuery (type: 'followers' | 'following' | 'DISTINCT(followers)',
actorIds: number[],
t: Sequelize.Transaction,
start?: number,
count?: number,
columnUrl = 'url') {
private static async createListAcceptedFollowForApiQuery (
type: 'followers' | 'following',
actorIds: number[],
t: Sequelize.Transaction,
start?: number,
count?: number,
columnUrl = 'url',
distinct = false
) {
let firstJoin: string
let secondJoin: string
@ -221,10 +225,15 @@ export class ActorFollowModel extends Model<ActorFollowModel> {
secondJoin = 'targetActorId'
}
const selections = [ '"Follows"."' + columnUrl + '" AS "url"', 'COUNT(*) AS "total"' ]
const selections: string[] = []
if (distinct === true) selections.push('DISTINCT("Follows"."' + columnUrl + '") AS "url"')
else selections.push('"Follows"."' + columnUrl + '" AS "url"')
selections.push('COUNT(*) AS "total"')
const tasks: Bluebird<any>[] = []
for (const selection of selections) {
for (let selection of selections) {
let query = 'SELECT ' + selection + ' FROM "actor" ' +
'INNER JOIN "actorFollow" ON "actorFollow"."' + firstJoin + '" = "actor"."id" ' +
'INNER JOIN "actor" AS "Follows" ON "actorFollow"."' + secondJoin + '" = "Follows"."id" ' +