From f37dc0dd14d9ce0b59c454c2c1b935fcbe9727e9 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 23 Aug 2018 17:58:39 +0200 Subject: Add ability to search video channels --- server/models/account/account.ts | 14 +-- server/models/activitypub/actor-follow.ts | 103 +++++++++++++++++-- server/models/activitypub/actor.ts | 10 ++ server/models/video/video-channel.ts | 163 +++++++++++++++++++++++++----- 4 files changed, 242 insertions(+), 48 deletions(-) (limited to 'server/models') diff --git a/server/models/account/account.ts b/server/models/account/account.ts index 07539a04e..6bbfc6f4e 100644 --- a/server/models/account/account.ts +++ b/server/models/account/account.ts @@ -29,18 +29,8 @@ import { UserModel } from './user' @DefaultScope({ include: [ { - model: () => ActorModel, - required: true, - include: [ - { - model: () => ServerModel, - required: false - }, - { - model: () => AvatarModel, - required: false - } - ] + model: () => ActorModel, // Default scope includes avatar and server + required: true } ] }) diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts index b2d7ace66..81fcf7001 100644 --- a/server/models/activitypub/actor-follow.ts +++ b/server/models/activitypub/actor-follow.ts @@ -26,7 +26,7 @@ import { ACTOR_FOLLOW_SCORE } from '../../initializers' 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' @@ -167,8 +167,11 @@ export class ActorFollowModel extends Model { return ActorFollowModel.findOne(query) } - static loadByActorAndTargetNameAndHost (actorId: number, targetName: string, targetHost: string, t?: Sequelize.Transaction) { + static loadByActorAndTargetNameAndHostForAPI (actorId: number, targetName: string, targetHost: string, t?: Sequelize.Transaction) { const actorFollowingPartInclude: IIncludeOptions = { + attributes: { + exclude: unusedActorAttributesForAPI + }, model: ActorModel, required: true, as: 'ActorFollowing', @@ -177,7 +180,7 @@ export class ActorFollowModel extends Model { }, include: [ { - model: VideoChannelModel, + model: VideoChannelModel.unscoped(), required: false } ] @@ -200,17 +203,79 @@ export class ActorFollowModel extends Model { actorId }, include: [ - { - 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 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) { @@ -248,6 +313,7 @@ export class ActorFollowModel extends Model { static listSubscriptionsForApi (id: number, start: number, count: number, sort: string) { const query = { + attributes: [], distinct: true, offset: start, limit: count, @@ -257,6 +323,9 @@ export class ActorFollowModel extends Model { }, include: [ { + attributes: { + exclude: unusedActorAttributesForAPI + }, model: ActorModel, as: 'ActorFollowing', required: true, @@ -266,8 +335,24 @@ export class ActorFollowModel extends Model { required: true, include: [ { - model: AccountModel, + attributes: { + exclude: unusedActorAttributesForAPI + }, + model: ActorModel, required: true + }, + { + model: AccountModel, + required: true, + include: [ + { + attributes: { + exclude: unusedActorAttributesForAPI + }, + model: ActorModel, + required: true + } + ] } ] } diff --git a/server/models/activitypub/actor.ts b/server/models/activitypub/actor.ts index 2abf40713..ec0b4b2d9 100644 --- a/server/models/activitypub/actor.ts +++ b/server/models/activitypub/actor.ts @@ -42,6 +42,16 @@ enum ScopeNames { FULL = 'FULL' } +export const unusedActorAttributesForAPI = [ + 'publicKey', + 'privateKey', + 'inboxUrl', + 'outboxUrl', + 'sharedInboxUrl', + 'followersUrl', + 'followingUrl' +] + @DefaultScope({ include: [ { diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts index 9f80e0b8d..7d717fc68 100644 --- a/server/models/video/video-channel.ts +++ b/server/models/video/video-channel.ts @@ -12,6 +12,7 @@ import { Is, Model, Scopes, + Sequelize, Table, UpdatedAt } from 'sequelize-typescript' @@ -24,19 +25,36 @@ import { } from '../../helpers/custom-validators/video-channels' import { sendDeleteActor } from '../../lib/activitypub/send' import { AccountModel } from '../account/account' -import { ActorModel } from '../activitypub/actor' -import { getSort, throwIfNotValid } from '../utils' +import { ActorModel, unusedActorAttributesForAPI } from '../activitypub/actor' +import { buildTrigramSearchIndex, createSimilarityAttribute, getSort, throwIfNotValid } from '../utils' import { VideoModel } from './video' import { CONSTRAINTS_FIELDS } from '../../initializers' -import { AvatarModel } from '../avatar/avatar' import { ServerModel } from '../server/server' +import { DefineIndexesOptions } from 'sequelize' + +// FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation +const indexes: DefineIndexesOptions[] = [ + buildTrigramSearchIndex('video_channel_name_trigram', 'name'), + + { + fields: [ 'accountId' ] + }, + { + fields: [ 'actorId' ] + } +] enum ScopeNames { + AVAILABLE_FOR_LIST = 'AVAILABLE_FOR_LIST', WITH_ACCOUNT = 'WITH_ACCOUNT', WITH_ACTOR = 'WITH_ACTOR', WITH_VIDEOS = 'WITH_VIDEOS' } +type AvailableForListOptions = { + actorId: number +} + @DefaultScope({ include: [ { @@ -46,23 +64,57 @@ enum ScopeNames { ] }) @Scopes({ - [ScopeNames.WITH_ACCOUNT]: { - include: [ - { - model: () => AccountModel.unscoped(), - required: true, - include: [ - { - model: () => ActorModel.unscoped(), - required: true, - include: [ + [ScopeNames.AVAILABLE_FOR_LIST]: (options: AvailableForListOptions) => { + const actorIdNumber = parseInt(options.actorId + '', 10) + + // Only list local channels OR channels that are on an instance followed by actorId + const inQueryInstanceFollow = '(' + + 'SELECT "actor"."serverId" FROM "actor" ' + + 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = actor.id ' + + 'WHERE "actorFollow"."actorId" = ' + actorIdNumber + + ')' + + return { + include: [ + { + attributes: { + exclude: unusedActorAttributesForAPI + }, + model: ActorModel, + where: { + [Sequelize.Op.or]: [ + { + serverId: null + }, { - model: () => AvatarModel.unscoped(), - required: false + serverId: { + [ Sequelize.Op.in ]: Sequelize.literal(inQueryInstanceFollow) + } } ] } - ] + }, + { + model: AccountModel, + required: true, + include: [ + { + attributes: { + exclude: unusedActorAttributesForAPI + }, + model: ActorModel, // Default scope includes avatar and server + required: true + } + ] + } + ] + } + }, + [ScopeNames.WITH_ACCOUNT]: { + include: [ + { + model: () => AccountModel, + required: true } ] }, @@ -79,14 +131,7 @@ enum ScopeNames { }) @Table({ tableName: 'videoChannel', - indexes: [ - { - fields: [ 'accountId' ] - }, - { - fields: [ 'actorId' ] - } - ] + indexes }) export class VideoChannelModel extends Model { @@ -170,15 +215,61 @@ export class VideoChannelModel extends Model { return VideoChannelModel.count(query) } - static listForApi (start: number, count: number, sort: string) { + static listForApi (actorId: number, start: number, count: number, sort: string) { const query = { offset: start, limit: count, order: getSort(sort) } + const scopes = { + method: [ ScopeNames.AVAILABLE_FOR_LIST, { actorId } as AvailableForListOptions ] + } return VideoChannelModel - .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ]) + .scope(scopes) + .findAndCountAll(query) + .then(({ rows, count }) => { + return { total: count, data: rows } + }) + } + + static searchForApi (options: { + actorId: number + search: string + start: number + count: number + sort: string + }) { + const attributesInclude = [] + const escapedSearch = VideoModel.sequelize.escape(options.search) + const escapedLikeSearch = VideoModel.sequelize.escape('%' + options.search + '%') + attributesInclude.push(createSimilarityAttribute('VideoChannelModel.name', options.search)) + + const query = { + attributes: { + include: attributesInclude + }, + offset: options.start, + limit: options.count, + order: getSort(options.sort), + where: { + id: { + [ Sequelize.Op.in ]: Sequelize.literal( + '(' + + 'SELECT id FROM "videoChannel" WHERE ' + + 'lower(immutable_unaccent("name")) % lower(immutable_unaccent(' + escapedSearch + ')) OR ' + + 'lower(immutable_unaccent("name")) LIKE lower(immutable_unaccent(' + escapedLikeSearch + '))' + + ')' + ) + } + } + } + + const scopes = { + method: [ ScopeNames.AVAILABLE_FOR_LIST, { actorId: options.actorId } as AvailableForListOptions ] + } + return VideoChannelModel + .scope(scopes) .findAndCountAll(query) .then(({ rows, count }) => { return { total: count, data: rows } @@ -239,7 +330,25 @@ export class VideoChannelModel extends Model { } return VideoChannelModel - .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ]) + .scope([ ScopeNames.WITH_ACCOUNT ]) + .findOne(query) + } + + static loadByUrlAndPopulateAccount (url: string) { + const query = { + include: [ + { + model: ActorModel, + required: true, + where: { + url + } + } + ] + } + + return VideoChannelModel + .scope([ ScopeNames.WITH_ACCOUNT ]) .findOne(query) } -- cgit v1.2.3