diff options
author | Chocobozzz <me@florianbigard.com> | 2018-12-26 10:36:24 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-01-09 11:15:15 +0100 |
commit | cef534ed53e4518fe0acf581bfe880788d42fc36 (patch) | |
tree | 115b51ea5136849a2336d44915c7780649f25dc2 /server/models/activitypub/actor-follow.ts | |
parent | 1de1d05f4c61fe059fa5e24e79c92582f0e7e4b3 (diff) | |
download | PeerTube-cef534ed53e4518fe0acf581bfe880788d42fc36.tar.gz PeerTube-cef534ed53e4518fe0acf581bfe880788d42fc36.tar.zst PeerTube-cef534ed53e4518fe0acf581bfe880788d42fc36.zip |
Add user notification base code
Diffstat (limited to 'server/models/activitypub/actor-follow.ts')
-rw-r--r-- | server/models/activitypub/actor-follow.ts | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts index 994f791de..796e07a42 100644 --- a/server/models/activitypub/actor-follow.ts +++ b/server/models/activitypub/actor-follow.ts | |||
@@ -307,7 +307,7 @@ export class ActorFollowModel extends Model<ActorFollowModel> { | |||
307 | }) | 307 | }) |
308 | } | 308 | } |
309 | 309 | ||
310 | static listFollowersForApi (id: number, start: number, count: number, sort: string, search?: string) { | 310 | static listFollowersForApi (actorId: number, start: number, count: number, sort: string, search?: string) { |
311 | const query = { | 311 | const query = { |
312 | distinct: true, | 312 | distinct: true, |
313 | offset: start, | 313 | offset: start, |
@@ -335,7 +335,7 @@ export class ActorFollowModel extends Model<ActorFollowModel> { | |||
335 | as: 'ActorFollowing', | 335 | as: 'ActorFollowing', |
336 | required: true, | 336 | required: true, |
337 | where: { | 337 | where: { |
338 | id | 338 | id: actorId |
339 | } | 339 | } |
340 | } | 340 | } |
341 | ] | 341 | ] |
@@ -350,7 +350,7 @@ export class ActorFollowModel extends Model<ActorFollowModel> { | |||
350 | }) | 350 | }) |
351 | } | 351 | } |
352 | 352 | ||
353 | static listSubscriptionsForApi (id: number, start: number, count: number, sort: string) { | 353 | static listSubscriptionsForApi (actorId: number, start: number, count: number, sort: string) { |
354 | const query = { | 354 | const query = { |
355 | attributes: [], | 355 | attributes: [], |
356 | distinct: true, | 356 | distinct: true, |
@@ -358,7 +358,7 @@ export class ActorFollowModel extends Model<ActorFollowModel> { | |||
358 | limit: count, | 358 | limit: count, |
359 | order: getSort(sort), | 359 | order: getSort(sort), |
360 | where: { | 360 | where: { |
361 | actorId: id | 361 | actorId: actorId |
362 | }, | 362 | }, |
363 | include: [ | 363 | include: [ |
364 | { | 364 | { |
@@ -451,9 +451,9 @@ export class ActorFollowModel extends Model<ActorFollowModel> { | |||
451 | static updateFollowScore (inboxUrl: string, value: number, t?: Sequelize.Transaction) { | 451 | static updateFollowScore (inboxUrl: string, value: number, t?: Sequelize.Transaction) { |
452 | const query = `UPDATE "actorFollow" SET "score" = LEAST("score" + ${value}, ${ACTOR_FOLLOW_SCORE.MAX}) ` + | 452 | const query = `UPDATE "actorFollow" SET "score" = LEAST("score" + ${value}, ${ACTOR_FOLLOW_SCORE.MAX}) ` + |
453 | 'WHERE id IN (' + | 453 | 'WHERE id IN (' + |
454 | 'SELECT "actorFollow"."id" FROM "actorFollow" ' + | 454 | 'SELECT "actorFollow"."id" FROM "actorFollow" ' + |
455 | 'INNER JOIN "actor" ON "actor"."id" = "actorFollow"."actorId" ' + | 455 | 'INNER JOIN "actor" ON "actor"."id" = "actorFollow"."actorId" ' + |
456 | `WHERE "actor"."inboxUrl" = '${inboxUrl}' OR "actor"."sharedInboxUrl" = '${inboxUrl}'` + | 456 | `WHERE "actor"."inboxUrl" = '${inboxUrl}' OR "actor"."sharedInboxUrl" = '${inboxUrl}'` + |
457 | ')' | 457 | ')' |
458 | 458 | ||
459 | const options = { | 459 | const options = { |