import { UserModel } from './user'
import { AvatarModel } from '../avatar/avatar'
import { VideoPlaylistModel } from '../video/video-playlist'
-import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants'
+import { CONSTRAINTS_FIELDS, SERVER_ACTOR_NAME, WEBSERVER } from '../../initializers/constants'
import { FindOptions, IncludeOptions, Op, Transaction, WhereOptions } from 'sequelize'
import { AccountBlocklistModel } from './account-blocklist'
import { ServerBlocklistModel } from '../server/server-blocklist'
import { ActorFollowModel } from '../activitypub/actor-follow'
-import { MAccountActor, MAccountDefault, MAccountSummaryFormattable, MAccountFormattable, MAccountAP } from '../../typings/models'
+import { MAccountActor, MAccountAP, MAccountDefault, MAccountFormattable, MAccountSummaryFormattable, MAccount } from '../../types/models'
import * as Bluebird from 'bluebird'
+import { ModelCache } from '@server/models/model-cache'
+import { VideoModel } from '../video/video'
export enum ScopeNames {
SUMMARY = 'SUMMARY'
}
export type SummaryOptions = {
+ actorRequired?: boolean // Default: true
whereActor?: WhereOptions
withAccountBlockerIds?: number[]
}
]
}))
@Scopes(() => ({
- [ ScopeNames.SUMMARY ]: (options: SummaryOptions = {}) => {
+ [ScopeNames.SUMMARY]: (options: SummaryOptions = {}) => {
const whereActor = options.whereActor || undefined
const serverInclude: IncludeOptions = {
}
const query: FindOptions = {
- attributes: [ 'id', 'name' ],
+ attributes: [ 'id', 'name', 'actorId' ],
include: [
{
attributes: [ 'id', 'preferredUsername', 'url', 'serverId', 'avatarId' ],
model: ActorModel.unscoped(),
- required: true,
+ required: options.actorRequired ?? true,
where: whereActor,
include: [
serverInclude,
@HasMany(() => VideoCommentModel, {
foreignKey: {
- allowNull: false
+ allowNull: true
},
onDelete: 'cascade',
hooks: true
@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)
}
static loadLocalByName (name: string): Bluebird<MAccountDefault> {
- const query = {
- where: {
- [ Op.or ]: [
- {
- userId: {
- [ Op.ne ]: null
+ 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): Bluebird<MAccountDefault> {
})
}
+ static loadAccountIdFromVideo (videoId: number): Bluebird<MAccount> {
+ 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): Bluebird<MAccountActor[]> {
const query = {
attributes: [ ],
.findAll(query)
}
+ getClientUrl () {
+ return WEBSERVER.URL + '/accounts/' + this.Actor.getIdentifier()
+ }
+
toFormattedJSON (this: MAccountFormattable): Account {
const actor = this.Actor.toFormattedJSON()
const account = {
}
toActivityPubObject (this: MAccountAP) {
- const obj = this.Actor.toActivityPubObject(this.name, 'Account')
+ const obj = this.Actor.toActivityPubObject(this.name)
return Object.assign(obj, {
summary: this.description