UpdatedAt
} from 'sequelize-typescript'
import { FollowState } from '../../../shared/models/actors'
-import { AccountFollow } from '../../../shared/models/actors/follow.model'
+import { ActorFollow } from '../../../shared/models/actors/follow.model'
import { logger } from '../../helpers/logger'
import { getServerActor } from '../../helpers/utils'
-import { ACTOR_FOLLOW_SCORE } from '../../initializers'
+import { ACTOR_FOLLOW_SCORE } from '../../initializers/constants'
import { FOLLOW_STATES } from '../../initializers/constants'
import { ServerModel } from '../server/server'
import { getSort } from '../utils'
-import { ActorModel } from './actor'
+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'
@Table({
tableName: 'actorFollow',
if (numberOfActorFollowsRemoved) logger.info('Removed bad %d actor follows.', numberOfActorFollowsRemoved)
}
- static updateActorFollowsScore (goodInboxes: string[], badInboxes: string[], t: Sequelize.Transaction | undefined) {
- if (goodInboxes.length === 0 && badInboxes.length === 0) return
-
- logger.info('Updating %d good actor follows and %d bad actor follows scores.', goodInboxes.length, badInboxes.length)
-
- if (goodInboxes.length !== 0) {
- ActorFollowModel.incrementScores(goodInboxes, ACTOR_FOLLOW_SCORE.BONUS, t)
- .catch(err => logger.error('Cannot increment scores of good actor follows.', { err }))
- }
-
- if (badInboxes.length !== 0) {
- ActorFollowModel.incrementScores(badInboxes, ACTOR_FOLLOW_SCORE.PENALTY, t)
- .catch(err => logger.error('Cannot decrement scores of bad actor follows.', { err }))
- }
- }
-
static loadByActorAndTarget (actorId: number, targetActorId: number, t?: Sequelize.Transaction) {
const query = {
where: {
return ActorFollowModel.findOne(query)
}
- static loadByActorAndTargetNameAndHost (actorId: number, targetName: string, targetHost: string, t?: Sequelize.Transaction) {
- const actorFollowingPartInclude = {
+ static loadByActorAndTargetNameAndHostForAPI (actorId: number, targetName: string, targetHost: string, t?: Sequelize.Transaction) {
+ const actorFollowingPartInclude: IIncludeOptions = {
model: ActorModel,
required: true,
as: 'ActorFollowing',
where: {
preferredUsername: targetName
- }
+ },
+ include: [
+ {
+ model: VideoChannelModel.unscoped(),
+ required: false
+ }
+ ]
}
if (targetHost === null) {
actorFollowingPartInclude.where['serverId'] = null
} else {
- Object.assign(actorFollowingPartInclude, {
- include: [
- {
- model: ServerModel,
- required: true,
- where: {
- host: targetHost
- }
- }
- ]
+ actorFollowingPartInclude.include.push({
+ model: ServerModel,
+ required: true,
+ where: {
+ host: targetHost
+ }
})
}
actorId
},
include: [
+ actorFollowingPartInclude,
{
model: ActorModel,
required: true,
as: 'ActorFollower'
- },
- actorFollowingPartInclude
+ }
],
transaction: t
}
return ActorFollowModel.findOne(query)
+ .then(result => {
+ if (result && result.ActorFollowing.VideoChannel) {
+ result.ActorFollowing.VideoChannel.Actor = result.ActorFollowing
+ }
+
+ return result
+ })
}
- static listFollowingForApi (id: number, start: number, count: number, sort: string) {
+ static listSubscribedIn (actorId: number, targets: { name: string, host?: string }[]) {
+ const whereTab = targets
+ .map(t => {
+ if (t.host) {
+ return {
+ [ Sequelize.Op.and ]: [
+ {
+ '$preferredUsername$': t.name
+ },
+ {
+ '$host$': t.host
+ }
+ ]
+ }
+ }
+
+ return {
+ [ Sequelize.Op.and ]: [
+ {
+ '$preferredUsername$': t.name
+ },
+ {
+ '$serverId$': null
+ }
+ ]
+ }
+ })
+
+ const query = {
+ attributes: [],
+ where: {
+ [ Sequelize.Op.and ]: [
+ {
+ [ Sequelize.Op.or ]: whereTab
+ },
+ {
+ actorId
+ }
+ ]
+ },
+ include: [
+ {
+ attributes: [ 'preferredUsername' ],
+ model: ActorModel.unscoped(),
+ required: true,
+ as: 'ActorFollowing',
+ include: [
+ {
+ attributes: [ 'host' ],
+ model: ServerModel.unscoped(),
+ required: false
+ }
+ ]
+ }
+ ]
+ }
+
+ return ActorFollowModel.findAll(query)
+ }
+
+ static listFollowingForApi (id: number, start: number, count: number, sort: string, search?: string) {
const query = {
distinct: true,
offset: start,
model: ActorModel,
as: 'ActorFollowing',
required: true,
- include: [ ServerModel ]
+ include: [
+ {
+ model: ServerModel,
+ required: true,
+ where: search ? {
+ host: {
+ [Sequelize.Op.iLike]: '%' + search + '%'
+ }
+ } : undefined
+ }
+ ]
}
]
}
})
}
- static listSubscriptionsForApi (id: number, start: number, count: number, sort: string) {
+ static listFollowersForApi (actorId: number, start: number, count: number, sort: string, search?: string) {
const query = {
distinct: true,
offset: start,
limit: count,
order: getSort(sort),
- where: {
- actorId: id
- },
include: [
{
model: ActorModel,
- as: 'ActorFollowing',
required: true,
+ as: 'ActorFollower',
include: [
{
- model: VideoChannelModel,
- required: true
+ model: ServerModel,
+ required: true,
+ where: search ? {
+ host: {
+ [ Sequelize.Op.iLike ]: '%' + search + '%'
+ }
+ } : undefined
}
]
+ },
+ {
+ model: ActorModel,
+ as: 'ActorFollowing',
+ required: true,
+ where: {
+ id: actorId
+ }
}
]
}
return ActorFollowModel.findAndCountAll(query)
.then(({ rows, count }) => {
return {
- data: rows.map(r => r.ActorFollowing.VideoChannel),
+ data: rows,
total: count
}
})
}
- static listFollowersForApi (id: number, start: number, count: number, sort: string) {
+ static listSubscriptionsForApi (actorId: number, start: number, count: number, sort: string) {
const query = {
+ attributes: [],
distinct: true,
offset: start,
limit: count,
order: getSort(sort),
+ where: {
+ actorId: actorId
+ },
include: [
{
- model: ActorModel,
- required: true,
- as: 'ActorFollower',
- include: [ ServerModel ]
- },
- {
- model: ActorModel,
+ attributes: [ 'id' ],
+ model: ActorModel.unscoped(),
as: 'ActorFollowing',
required: true,
- where: {
- id
- }
+ include: [
+ {
+ model: VideoChannelModel.unscoped(),
+ required: true,
+ include: [
+ {
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
+ model: ActorModel,
+ required: true
+ },
+ {
+ model: AccountModel.unscoped(),
+ required: true,
+ include: [
+ {
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
+ model: ActorModel,
+ required: true
+ }
+ ]
+ }
+ ]
+ }
+ ]
}
]
}
return ActorFollowModel.findAndCountAll(query)
- .then(({ rows, count }) => {
- return {
- data: rows,
- total: count
- }
- })
+ .then(({ rows, count }) => {
+ return {
+ data: rows.map(r => r.ActorFollowing.VideoChannel),
+ total: count
+ }
+ })
}
- static listAcceptedFollowerUrlsForApi (actorIds: number[], t: Sequelize.Transaction, start?: number, count?: number) {
+ static listAcceptedFollowerUrlsForAP (actorIds: number[], t: Sequelize.Transaction, start?: number, count?: number) {
return ActorFollowModel.createListAcceptedFollowForApiQuery('followers', actorIds, t, start, count)
}
}
}
+ static updateFollowScore (inboxUrl: string, value: number, t?: Sequelize.Transaction) {
+ 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"."actorId" ' +
+ `WHERE "actor"."inboxUrl" = '${inboxUrl}' OR "actor"."sharedInboxUrl" = '${inboxUrl}'` +
+ ')'
+
+ const options = {
+ type: Sequelize.QueryTypes.BULKUPDATE,
+ transaction: t
+ }
+
+ return ActorFollowModel.sequelize.query(query, options)
+ }
+
private static async createListAcceptedFollowForApiQuery (
type: 'followers' | 'following',
actorIds: number[],
tasks.push(ActorFollowModel.sequelize.query(query, options))
}
- const [ followers, [ { total } ] ] = await Promise.all(tasks)
+ const [ followers, [ dataTotal ] ] = await Promise.all(tasks)
const urls: string[] = followers.map(f => f.url)
return {
data: urls,
- total: parseInt(total, 10)
+ total: dataTotal ? parseInt(dataTotal.total, 10) : 0
}
}
- private static incrementScores (inboxUrls: string[], value: number, t: Sequelize.Transaction | undefined) {
- const inboxUrlsString = inboxUrls.map(url => `'${url}'`).join(',')
-
- 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"."actorId" ' +
- 'WHERE "actor"."inboxUrl" IN (' + inboxUrlsString + ') OR "actor"."sharedInboxUrl" IN (' + inboxUrlsString + ')' +
- ')'
-
- const options = t ? {
- type: Sequelize.QueryTypes.BULKUPDATE,
- transaction: t
- } : undefined
-
- return ActorFollowModel.sequelize.query(query, options)
- }
-
private static listBadActorFollows () {
const query = {
where: {
return ActorFollowModel.findAll(query)
}
- toFormattedJSON (): AccountFollow {
+ toFormattedJSON (): ActorFollow {
const follower = this.ActorFollower.toFormattedJSON()
const following = this.ActorFollowing.toFormattedJSON()
projects / github / Chocobozzz / PeerTube.git / blobdiff