X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fmodels%2Factivitypub%2Factor-follow.ts;h=c65b975d23b8abce46c1663d7059e620b37940c0;hb=cb5ce4cb13095dbea6e5f05b96eaa42ffccf0716;hp=1b272e1c82014bb11c1d952ff23b6e2626c5b158;hpb=74dc3bca2b14f5fd3fe80c394dfc34177a46db77;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts index 1b272e1c8..c65b975d2 100644 --- a/server/models/activitypub/actor-follow.ts +++ b/server/models/activitypub/actor-follow.ts @@ -1,6 +1,5 @@ import * as Bluebird from 'bluebird' -import { values } from 'lodash' -import * as Sequelize from 'sequelize' +import { values, difference } from 'lodash' import { AfterCreate, AfterDestroy, @@ -22,14 +21,21 @@ import { FollowState } from '../../../shared/models/actors' import { ActorFollow } from '../../../shared/models/actors/follow.model' import { logger } from '../../helpers/logger' import { getServerActor } from '../../helpers/utils' -import { ACTOR_FOLLOW_SCORE } from '../../initializers/constants' -import { FOLLOW_STATES } from '../../initializers/constants' +import { ACTOR_FOLLOW_SCORE, FOLLOW_STATES, SERVER_ACTOR_NAME } from '../../initializers/constants' import { ServerModel } from '../server/server' -import { getSort } from '../utils' +import { createSafeIn, getSort, getFollowsSort } from '../utils' import { ActorModel, unusedActorAttributesForAPI } from './actor' import { VideoChannelModel } from '../video/video-channel' -import { IIncludeOptions } from '../../../node_modules/sequelize-typescript/lib/interfaces/IIncludeOptions' import { AccountModel } from '../account/account' +import { IncludeOptions, Op, QueryTypes, Transaction, WhereOptions } from 'sequelize' +import { + MActorFollowActorsDefault, + MActorFollowActorsDefaultSubscription, + MActorFollowFollowingHost, + MActorFollowFormattable, + MActorFollowSubscriptions +} from '@server/typings/models' +import { ActivityPubActorType } from '@shared/models' @Table({ tableName: 'actorFollow', @@ -52,7 +58,7 @@ import { AccountModel } from '../account/account' export class ActorFollowModel extends Model { @AllowNull(false) - @Column(DataType.ENUM(values(FOLLOW_STATES))) + @Column(DataType.ENUM(...values(FOLLOW_STATES))) state: FollowState @AllowNull(false) @@ -115,6 +121,24 @@ export class ActorFollowModel extends Model { ]) } + static removeFollowsOf (actorId: number, t?: Transaction) { + const query = { + where: { + [Op.or]: [ + { + actorId + }, + { + targetActorId: actorId + } + ] + }, + transaction: t + } + + return ActorFollowModel.destroy(query) + } + // Remove actor follows with a score of 0 (too many requests where they were unreachable) static async removeBadActorFollows () { const actorFollows = await ActorFollowModel.listBadActorFollows() @@ -127,7 +151,7 @@ export class ActorFollowModel extends Model { if (numberOfActorFollowsRemoved) logger.info('Removed bad %d actor follows.', numberOfActorFollowsRemoved) } - static loadByActorAndTarget (actorId: number, targetActorId: number, t?: Sequelize.Transaction) { + static loadByActorAndTarget (actorId: number, targetActorId: number, t?: Transaction): Bluebird { const query = { where: { actorId, @@ -151,8 +175,13 @@ export class ActorFollowModel extends Model { return ActorFollowModel.findOne(query) } - static loadByActorAndTargetNameAndHostForAPI (actorId: number, targetName: string, targetHost: string, t?: Sequelize.Transaction) { - const actorFollowingPartInclude: IIncludeOptions = { + static loadByActorAndTargetNameAndHostForAPI ( + actorId: number, + targetName: string, + targetHost: string, + t?: Transaction + ): Bluebird { + const actorFollowingPartInclude: IncludeOptions = { model: ActorModel, required: true, as: 'ActorFollowing', @@ -204,12 +233,12 @@ export class ActorFollowModel extends Model { }) } - static listSubscribedIn (actorId: number, targets: { name: string, host?: string }[]) { + static listSubscribedIn (actorId: number, targets: { name: string, host?: string }[]): Bluebird { const whereTab = targets .map(t => { if (t.host) { return { - [ Sequelize.Op.and ]: [ + [ Op.and ]: [ { '$preferredUsername$': t.name }, @@ -221,7 +250,7 @@ export class ActorFollowModel extends Model { } return { - [ Sequelize.Op.and ]: [ + [ Op.and ]: [ { '$preferredUsername$': t.name }, @@ -235,9 +264,9 @@ export class ActorFollowModel extends Model { const query = { attributes: [], where: { - [ Sequelize.Op.and ]: [ + [ Op.and ]: [ { - [ Sequelize.Op.or ]: whereTab + [ Op.or ]: whereTab }, { actorId @@ -264,12 +293,39 @@ export class ActorFollowModel extends Model { return ActorFollowModel.findAll(query) } - static listFollowingForApi (id: number, start: number, count: number, sort: string, search?: string) { + static listFollowingForApi (options: { + id: number, + start: number, + count: number, + sort: string, + state?: FollowState, + actorType?: ActivityPubActorType, + search?: string + }) { + const { id, start, count, sort, search, state, actorType } = options + + const followWhere = state ? { state } : {} + const followingWhere: WhereOptions = {} + const followingServerWhere: WhereOptions = {} + + if (search) { + Object.assign(followingServerWhere, { + host: { + [ Op.iLike ]: '%' + search + '%' + } + }) + } + + if (actorType) { + Object.assign(followingWhere, { type: actorType }) + } + const query = { distinct: true, offset: start, limit: count, - order: getSort(sort), + order: getFollowsSort(sort), + where: followWhere, include: [ { model: ActorModel, @@ -283,22 +339,19 @@ export class ActorFollowModel extends Model { model: ActorModel, as: 'ActorFollowing', required: true, + where: followingWhere, include: [ { model: ServerModel, required: true, - where: search ? { - host: { - [Sequelize.Op.iLike]: '%' + search + '%' - } - } : undefined + where: followingServerWhere } ] } ] } - return ActorFollowModel.findAndCountAll(query) + return ActorFollowModel.findAndCountAll(query) .then(({ rows, count }) => { return { data: rows, @@ -307,26 +360,50 @@ export class ActorFollowModel extends Model { }) } - static listFollowersForApi (actorId: number, start: number, count: number, sort: string, search?: string) { + static listFollowersForApi (options: { + actorId: number, + start: number, + count: number, + sort: string, + state?: FollowState, + actorType?: ActivityPubActorType, + search?: string + }) { + const { actorId, start, count, sort, search, state, actorType } = options + + const followWhere = state ? { state } : {} + const followerWhere: WhereOptions = {} + const followerServerWhere: WhereOptions = {} + + if (search) { + Object.assign(followerServerWhere, { + host: { + [ Op.iLike ]: '%' + search + '%' + } + }) + } + + if (actorType) { + Object.assign(followerWhere, { type: actorType }) + } + const query = { distinct: true, offset: start, limit: count, - order: getSort(sort), + order: getFollowsSort(sort), + where: followWhere, include: [ { model: ActorModel, required: true, as: 'ActorFollower', + where: followerWhere, include: [ { model: ServerModel, required: true, - where: search ? { - host: { - [ Sequelize.Op.iLike ]: '%' + search + '%' - } - } : undefined + where: followerServerWhere } ] }, @@ -341,7 +418,7 @@ export class ActorFollowModel extends Model { ] } - return ActorFollowModel.findAndCountAll(query) + return ActorFollowModel.findAndCountAll(query) .then(({ rows, count }) => { return { data: rows, @@ -398,7 +475,7 @@ export class ActorFollowModel extends Model { ] } - return ActorFollowModel.findAndCountAll(query) + return ActorFollowModel.findAndCountAll(query) .then(({ rows, count }) => { return { data: rows.map(r => r.ActorFollowing.VideoChannel), @@ -407,11 +484,50 @@ export class ActorFollowModel extends Model { }) } - static listAcceptedFollowerUrlsForAP (actorIds: number[], t: Sequelize.Transaction, start?: number, count?: number) { + static async keepUnfollowedInstance (hosts: string[]) { + const followerId = (await getServerActor()).id + + const query = { + attributes: [ 'id' ], + where: { + actorId: followerId + }, + include: [ + { + attributes: [ 'id' ], + model: ActorModel.unscoped(), + required: true, + as: 'ActorFollowing', + where: { + preferredUsername: SERVER_ACTOR_NAME + }, + include: [ + { + attributes: [ 'host' ], + model: ServerModel.unscoped(), + required: true, + where: { + host: { + [Op.in]: hosts + } + } + } + ] + } + ] + } + + const res = await ActorFollowModel.findAll(query) + const followedHosts = res.map(row => row.ActorFollowing.Server.host) + + return difference(hosts, followedHosts) + } + + static listAcceptedFollowerUrlsForAP (actorIds: number[], t: Transaction, start?: number, count?: number) { return ActorFollowModel.createListAcceptedFollowForApiQuery('followers', actorIds, t, start, count) } - static listAcceptedFollowerSharedInboxUrls (actorIds: number[], t: Sequelize.Transaction) { + static listAcceptedFollowerSharedInboxUrls (actorIds: number[], t: Transaction) { return ActorFollowModel.createListAcceptedFollowForApiQuery( 'followers', actorIds, @@ -423,7 +539,7 @@ export class ActorFollowModel extends Model { ) } - static listAcceptedFollowingUrlsForApi (actorIds: number[], t: Sequelize.Transaction, start?: number, count?: number) { + static listAcceptedFollowingUrlsForApi (actorIds: number[], t: Transaction, start?: number, count?: number) { return ActorFollowModel.createListAcceptedFollowForApiQuery('following', actorIds, t, start, count) } @@ -448,7 +564,7 @@ export class ActorFollowModel extends Model { } } - static updateFollowScore (inboxUrl: string, value: number, t?: Sequelize.Transaction) { + static updateScore (inboxUrl: string, value: number, t?: Transaction) { const query = `UPDATE "actorFollow" SET "score" = LEAST("score" + ${value}, ${ACTOR_FOLLOW_SCORE.MAX}) ` + 'WHERE id IN (' + 'SELECT "actorFollow"."id" FROM "actorFollow" ' + @@ -457,7 +573,29 @@ export class ActorFollowModel extends Model { ')' const options = { - type: Sequelize.QueryTypes.BULKUPDATE, + type: QueryTypes.BULKUPDATE, + transaction: t + } + + return ActorFollowModel.sequelize.query(query, options) + } + + static async updateScoreByFollowingServers (serverIds: number[], value: number, t?: Transaction) { + if (serverIds.length === 0) return + + const me = await getServerActor() + const serverIdsString = createSafeIn(ActorFollowModel, serverIds) + + const query = `UPDATE "actorFollow" SET "score" = LEAST("score" + ${value}, ${ACTOR_FOLLOW_SCORE.MAX}) ` + + 'WHERE id IN (' + + 'SELECT "actorFollow"."id" FROM "actorFollow" ' + + 'INNER JOIN "actor" ON "actor"."id" = "actorFollow"."targetActorId" ' + + `WHERE "actorFollow"."actorId" = ${me.Account.actorId} ` + // I'm the follower + `AND "actor"."serverId" IN (${serverIdsString})` + // Criteria on followings + ')' + + const options = { + type: QueryTypes.BULKUPDATE, transaction: t } @@ -467,7 +605,7 @@ export class ActorFollowModel extends Model { private static async createListAcceptedFollowForApiQuery ( type: 'followers' | 'following', actorIds: number[], - t: Sequelize.Transaction, + t: Transaction, start?: number, count?: number, columnUrl = 'url', @@ -485,8 +623,8 @@ export class ActorFollowModel extends Model { } const selections: string[] = [] - if (distinct === true) selections.push('DISTINCT("Follows"."' + columnUrl + '") AS "url"') - else selections.push('"Follows"."' + columnUrl + '" AS "url"') + if (distinct === true) selections.push(`DISTINCT("Follows"."${columnUrl}") AS "selectionUrl"`) + else selections.push(`"Follows"."${columnUrl}" AS "selectionUrl"`) selections.push('COUNT(*) AS "total"') @@ -496,21 +634,21 @@ export class ActorFollowModel extends Model { let query = 'SELECT ' + selection + ' FROM "actor" ' + 'INNER JOIN "actorFollow" ON "actorFollow"."' + firstJoin + '" = "actor"."id" ' + 'INNER JOIN "actor" AS "Follows" ON "actorFollow"."' + secondJoin + '" = "Follows"."id" ' + - 'WHERE "actor"."id" = ANY ($actorIds) AND "actorFollow"."state" = \'accepted\' ' + `WHERE "actor"."id" = ANY ($actorIds) AND "actorFollow"."state" = 'accepted' AND "Follows"."${columnUrl}" IS NOT NULL ` if (count !== undefined) query += 'LIMIT ' + count if (start !== undefined) query += ' OFFSET ' + start const options = { bind: { actorIds }, - type: Sequelize.QueryTypes.SELECT, + type: QueryTypes.SELECT, transaction: t } tasks.push(ActorFollowModel.sequelize.query(query, options)) } const [ followers, [ dataTotal ] ] = await Promise.all(tasks) - const urls: string[] = followers.map(f => f.url) + const urls: string[] = followers.map(f => f.selectionUrl) return { data: urls, @@ -522,7 +660,7 @@ export class ActorFollowModel extends Model { const query = { where: { score: { - [Sequelize.Op.lte]: 0 + [Op.lte]: 0 } }, logging: false @@ -531,7 +669,7 @@ export class ActorFollowModel extends Model { return ActorFollowModel.findAll(query) } - toFormattedJSON (): ActorFollow { + toFormattedJSON (this: MActorFollowFormattable): ActorFollow { const follower = this.ActorFollower.toFormattedJSON() const following = this.ActorFollowing.toFormattedJSON()