X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Faccount%2Faccount.ts;h=619a598ddf15013d2d1eb34796c2280dedbb36d5;hb=6b5f72beda96d8b7e4d6329c4001827334de27dd;hp=2b04acd863743d3a6e8c69462165741d83350ece;hpb=241c3357d13ac2fb4c8ffca6469e575388c1fac5;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/account/account.ts b/server/models/account/account.ts index 2b04acd86..619a598dd 100644 --- a/server/models/account/account.ts +++ b/server/models/account/account.ts @@ -1,9 +1,11 @@ +import { FindOptions, Includeable, IncludeOptions, Op, Transaction, WhereOptions } from 'sequelize' import { AllowNull, BeforeDestroy, BelongsTo, Column, - CreatedAt, DataType, + CreatedAt, + DataType, Default, DefaultScope, ForeignKey, @@ -14,25 +16,46 @@ import { Table, UpdatedAt } from 'sequelize-typescript' +import { ModelCache } from '@server/models/model-cache' +import { AttributesOnly } from '@shared/typescript-utils' import { Account, AccountSummary } from '../../../shared/models/actors' import { isAccountDescriptionValid } from '../../helpers/custom-validators/accounts' -import { sendDeleteActor } from '../../lib/activitypub/send' -import { ActorModel } from '../activitypub/actor' +import { CONSTRAINTS_FIELDS, SERVER_ACTOR_NAME, WEBSERVER } from '../../initializers/constants' +import { sendDeleteActor } from '../../lib/activitypub/send/send-delete' +import { + MAccount, + MAccountActor, + MAccountAP, + MAccountDefault, + MAccountFormattable, + MAccountSummaryFormattable, + MChannelActor +} from '../../types/models' +import { ActorModel } from '../actor/actor' +import { ActorFollowModel } from '../actor/actor-follow' +import { ActorImageModel } from '../actor/actor-image' import { ApplicationModel } from '../application/application' import { ServerModel } from '../server/server' +import { ServerBlocklistModel } from '../server/server-blocklist' +import { UserModel } from '../user/user' import { getSort, throwIfNotValid } from '../utils' +import { VideoModel } from '../video/video' import { VideoChannelModel } from '../video/video-channel' import { VideoCommentModel } from '../video/video-comment' -import { UserModel } from './user' -import { AvatarModel } from '../avatar/avatar' import { VideoPlaylistModel } from '../video/video-playlist' -import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants' -import { Op, Transaction, WhereOptions } from 'sequelize' +import { AccountBlocklistModel } from './account-blocklist' export enum ScopeNames { SUMMARY = 'SUMMARY' } +export type SummaryOptions = { + actorRequired?: boolean // Default: true + whereActor?: WhereOptions + whereServer?: WhereOptions + withAccountBlockerIds?: number[] +} + @DefaultScope(() => ({ include: [ { @@ -42,29 +65,66 @@ export enum ScopeNames { ] })) @Scopes(() => ({ - [ ScopeNames.SUMMARY ]: (whereActor?: WhereOptions) => { - return { - attributes: [ 'id', 'name' ], - include: [ + [ScopeNames.SUMMARY]: (options: SummaryOptions = {}) => { + const serverInclude: IncludeOptions = { + attributes: [ 'host' ], + model: ServerModel.unscoped(), + required: !!options.whereServer, + where: options.whereServer + } + + const queryInclude: Includeable[] = [ + { + attributes: [ 'id', 'preferredUsername', 'url', 'serverId', 'avatarId' ], + model: ActorModel.unscoped(), + required: options.actorRequired ?? true, + where: options.whereActor, + include: [ + serverInclude, + + { + model: ActorImageModel.unscoped(), + as: 'Avatar', + required: false + } + ] + } + ] + + const query: FindOptions = { + attributes: [ 'id', 'name', 'actorId' ] + } + + if (options.withAccountBlockerIds) { + queryInclude.push({ + attributes: [ 'id' ], + model: AccountBlocklistModel.unscoped(), + as: 'BlockedBy', + required: false, + where: { + accountId: { + [Op.in]: options.withAccountBlockerIds + } + } + }) + + serverInclude.include = [ { - attributes: [ 'id', 'uuid', 'preferredUsername', 'url', 'serverId', 'avatarId' ], - model: ActorModel.unscoped(), - required: true, - where: whereActor, - include: [ - { - attributes: [ 'host' ], - model: ServerModel.unscoped(), - required: false - }, - { - model: AvatarModel.unscoped(), - required: false + attributes: [ 'id' ], + model: ServerBlocklistModel.unscoped(), + required: false, + where: { + accountId: { + [Op.in]: options.withAccountBlockerIds } - ] + } } ] } + + query.include = queryInclude + + return query } })) @Table({ @@ -82,7 +142,7 @@ export enum ScopeNames { } ] }) -export class AccountModel extends Model { +export class AccountModel extends Model>> { @AllowNull(false) @Column @@ -156,19 +216,31 @@ export class AccountModel extends Model { @HasMany(() => VideoCommentModel, { foreignKey: { - allowNull: false + allowNull: true }, onDelete: 'cascade', hooks: true }) VideoComments: VideoCommentModel[] + @HasMany(() => AccountBlocklistModel, { + foreignKey: { + name: 'targetAccountId', + allowNull: false + }, + as: 'BlockedBy', + onDelete: 'CASCADE' + }) + BlockedBy: AccountBlocklistModel[] + @BeforeDestroy static async sendDeleteIfOwned (instance: AccountModel, options) { if (!instance.Actor) { - instance.Actor = await instance.$get('Actor', { transaction: options.transaction }) as ActorModel + instance.Actor = await instance.$get('Actor', { transaction: options.transaction }) } + await ActorFollowModel.removeFollowsOf(instance.Actor.id, options.transaction) + if (instance.isOwned()) { return sendDeleteActor(instance.Actor, options.transaction) } @@ -176,27 +248,11 @@ export class AccountModel extends Model { return undefined } - static load (id: number, transaction?: Transaction) { + static load (id: number, transaction?: Transaction): Promise { return AccountModel.findByPk(id, { transaction }) } - static loadByUUID (uuid: string) { - const query = { - include: [ - { - model: ActorModel, - required: true, - where: { - uuid - } - } - ] - } - - return AccountModel.findOne(query) - } - - static loadByNameWithHost (nameWithHost: string) { + static loadByNameWithHost (nameWithHost: string): Promise { const [ accountName, host ] = nameWithHost.split('@') if (!host || host === WEBSERVER.HOST) return AccountModel.loadLocalByName(accountName) @@ -204,37 +260,47 @@ export class AccountModel extends Model { return AccountModel.loadByNameAndHost(accountName, host) } - static loadLocalByName (name: string) { - const query = { - where: { - [ Op.or ]: [ - { - userId: { - [ Op.ne ]: null + static loadLocalByName (name: string): Promise { + const fun = () => { + const query = { + where: { + [Op.or]: [ + { + userId: { + [Op.ne]: null + } + }, + { + applicationId: { + [Op.ne]: null + } } - }, + ] + }, + include: [ { - applicationId: { - [ Op.ne ]: null + model: ActorModel, + required: true, + where: { + preferredUsername: name } } ] - }, - include: [ - { - model: ActorModel, - required: true, - where: { - preferredUsername: name - } - } - ] + } + + return AccountModel.findOne(query) } - return AccountModel.findOne(query) + return ModelCache.Instance.doCache({ + cacheType: 'local-account-name', + key: name, + fun, + // The server actor never change, so we can easily cache it + whitelist: () => name === SERVER_ACTOR_NAME + }) } - static loadByNameAndHost (name: string, host: string) { + static loadByNameAndHost (name: string, host: string): Promise { const query = { include: [ { @@ -259,7 +325,7 @@ export class AccountModel extends Model { return AccountModel.findOne(query) } - static loadByUrl (url: string, transaction?: Transaction) { + static loadByUrl (url: string, transaction?: Transaction): Promise { const query = { include: [ { @@ -292,7 +358,30 @@ export class AccountModel extends Model { }) } - static listLocalsForSitemap (sort: string) { + static loadAccountIdFromVideo (videoId: number): Promise { + const query = { + include: [ + { + attributes: [ 'id', 'accountId' ], + model: VideoChannelModel.unscoped(), + required: true, + include: [ + { + attributes: [ 'id', 'channelId' ], + model: VideoModel.unscoped(), + where: { + id: videoId + } + } + ] + } + ] + } + + return AccountModel.findOne(query) + } + + static listLocalsForSitemap (sort: string): Promise { const query = { attributes: [ ], offset: 0, @@ -313,13 +402,16 @@ export class AccountModel extends Model { .findAll(query) } - toFormattedJSON (): Account { + getClientUrl () { + return WEBSERVER.URL + '/accounts/' + this.Actor.getIdentifier() + } + + toFormattedJSON (this: MAccountFormattable): Account { const actor = this.Actor.toFormattedJSON() const account = { id: this.id, displayName: this.getDisplayName(), description: this.description, - createdAt: this.createdAt, updatedAt: this.updatedAt, userId: this.userId ? this.userId : undefined } @@ -327,12 +419,11 @@ export class AccountModel extends Model { return Object.assign(actor, account) } - toFormattedSummaryJSON (): AccountSummary { - const actor = this.Actor.toFormattedJSON() + toFormattedSummaryJSON (this: MAccountSummaryFormattable): AccountSummary { + const actor = this.Actor.toFormattedSummaryJSON() return { id: this.id, - uuid: actor.uuid, name: actor.name, displayName: this.getDisplayName(), url: actor.url, @@ -341,8 +432,8 @@ export class AccountModel extends Model { } } - toActivityPubObject () { - const obj = this.Actor.toActivityPubObject(this.name, 'Account') + toActivityPubObject (this: MAccountAP) { + const obj = this.Actor.toActivityPubObject(this.name) return Object.assign(obj, { summary: this.description @@ -360,4 +451,12 @@ export class AccountModel extends Model { getDisplayName () { return this.name } + + getLocalUrl (this: MAccountActor | MChannelActor) { + return WEBSERVER.URL + `/accounts/` + this.Actor.preferredUsername + } + + isBlocked () { + return this.BlockedBy && this.BlockedBy.length !== 0 + } }