From 4e74e8032be8293ffe3cb3c30528d4ef7c11a798 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 5 Dec 2018 14:36:05 +0100 Subject: [PATCH] Remove inferred type --- .../user-moderation-dropdown.component.ts | 44 +++++++++---------- server/controllers/api/accounts.ts | 4 +- server/controllers/api/users/me.ts | 2 +- server/controllers/api/video-channel.ts | 4 +- server/models/video/video.ts | 20 ++++----- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts index d391246e0..e3c9db923 100644 --- a/client/src/app/shared/moderation/user-moderation-dropdown.component.ts +++ b/client/src/app/shared/moderation/user-moderation-dropdown.component.ts @@ -277,18 +277,18 @@ export class UserModerationDropdownComponent implements OnChanges { }, { label: this.i18n('Ban'), - handler: ({ user }: { user: User }) => this.openBanUserModal(user), - isDisplayed: ({ user }: { user: User }) => !user.blocked + handler: ({ user }) => this.openBanUserModal(user), + isDisplayed: ({ user }) => !user.blocked }, { label: this.i18n('Unban'), - handler: ({ user }: { user: User }) => this.unbanUser(user), - isDisplayed: ({ user }: { user: User }) => user.blocked + handler: ({ user }) => this.unbanUser(user), + isDisplayed: ({ user }) => user.blocked }, { label: this.i18n('Set Email as Verified'), - handler: ({ user }: { user: User }) => this.setEmailAsVerified(user), - isDisplayed: ({ user }: { user: User }) => this.requiresEmailVerification && !user.blocked && user.emailVerified === false + handler: ({ user }) => this.setEmailAsVerified(user), + isDisplayed: ({ user }) => this.requiresEmailVerification && !user.blocked && user.emailVerified === false } ]) } @@ -299,23 +299,23 @@ export class UserModerationDropdownComponent implements OnChanges { this.userActions.push([ { label: this.i18n('Mute this account'), - isDisplayed: ({ account }: { account: Account }) => account.mutedByUser === false, - handler: ({ account }: { account: Account }) => this.blockAccountByUser(account) + isDisplayed: ({ account }) => account.mutedByUser === false, + handler: ({ account }) => this.blockAccountByUser(account) }, { label: this.i18n('Unmute this account'), - isDisplayed: ({ account }: { account: Account }) => account.mutedByUser === true, - handler: ({ account }: { account: Account }) => this.unblockAccountByUser(account) + isDisplayed: ({ account }) => account.mutedByUser === true, + handler: ({ account }) => this.unblockAccountByUser(account) }, { label: this.i18n('Mute the instance'), - isDisplayed: ({ account }: { account: Account }) => !account.userId && account.mutedServerByInstance === false, - handler: ({ account }: { account: Account }) => this.blockServerByUser(account.host) + isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false, + handler: ({ account }) => this.blockServerByUser(account.host) }, { label: this.i18n('Unmute the instance'), - isDisplayed: ({ account }: { account: Account }) => !account.userId && account.mutedServerByInstance === true, - handler: ({ account }: { account: Account }) => this.unblockServerByUser(account.host) + isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === true, + handler: ({ account }) => this.unblockServerByUser(account.host) } ]) @@ -326,13 +326,13 @@ export class UserModerationDropdownComponent implements OnChanges { instanceActions = instanceActions.concat([ { label: this.i18n('Mute this account by your instance'), - isDisplayed: ({ account }: { account: Account }) => account.mutedByInstance === false, - handler: ({ account }: { account: Account }) => this.blockAccountByInstance(account) + isDisplayed: ({ account }) => account.mutedByInstance === false, + handler: ({ account }) => this.blockAccountByInstance(account) }, { label: this.i18n('Unmute this account by your instance'), - isDisplayed: ({ account }: { account: Account }) => account.mutedByInstance === true, - handler: ({ account }: { account: Account }) => this.unblockAccountByInstance(account) + isDisplayed: ({ account }) => account.mutedByInstance === true, + handler: ({ account }) => this.unblockAccountByInstance(account) } ]) } @@ -342,13 +342,13 @@ export class UserModerationDropdownComponent implements OnChanges { instanceActions = instanceActions.concat([ { label: this.i18n('Mute the instance by your instance'), - isDisplayed: ({ account }: { account: Account }) => !account.userId && account.mutedServerByInstance === false, - handler: ({ account }: { account: Account }) => this.blockServerByInstance(account.host) + isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === false, + handler: ({ account }) => this.blockServerByInstance(account.host) }, { label: this.i18n('Unmute the instance by your instance'), - isDisplayed: ({ account }: { account: Account }) => !account.userId && account.mutedServerByInstance === true, - handler: ({ account }: { account: Account }) => this.unblockServerByInstance(account.host) + isDisplayed: ({ account }) => !account.userId && account.mutedServerByInstance === true, + handler: ({ account }) => this.unblockServerByInstance(account.host) } ]) } diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts index 86ef2aed1..a69a83acf 100644 --- a/server/controllers/api/accounts.ts +++ b/server/controllers/api/accounts.ts @@ -74,10 +74,10 @@ async function listVideoAccountChannels (req: express.Request, res: express.Resp async function listAccountVideos (req: express.Request, res: express.Response, next: express.NextFunction) { const account: AccountModel = res.locals.account - const actorId = isUserAbleToSearchRemoteURI(res) ? null : undefined + const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined const resultList = await VideoModel.listForApi({ - actorId, + followerActorId, start: req.query.start, count: req.query.count, sort: req.query.sort, diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts index 47f2c9ec7..d2456346b 100644 --- a/server/controllers/api/users/me.ts +++ b/server/controllers/api/users/me.ts @@ -238,7 +238,7 @@ async function getUserSubscriptionVideos (req: express.Request, res: express.Res nsfw: buildNSFWFilter(res, req.query.nsfw), filter: req.query.filter as VideoFilter, withFiles: false, - actorId: user.Account.Actor.id, + followerActorId: user.Account.Actor.id, user }) diff --git a/server/controllers/api/video-channel.ts b/server/controllers/api/video-channel.ts index 63240dfa1..fd143a139 100644 --- a/server/controllers/api/video-channel.ts +++ b/server/controllers/api/video-channel.ts @@ -202,10 +202,10 @@ async function getVideoChannel (req: express.Request, res: express.Response, nex async function listVideoChannelVideos (req: express.Request, res: express.Response, next: express.NextFunction) { const videoChannelInstance: VideoChannelModel = res.locals.videoChannel - const actorId = isUserAbleToSearchRemoteURI(res) ? null : undefined + const followerActorId = isUserAbleToSearchRemoteURI(res) ? null : undefined const resultList = await VideoModel.listForApi({ - actorId, + followerActorId, start: req.query.start, count: req.query.count, sort: req.query.sort, diff --git a/server/models/video/video.ts b/server/models/video/video.ts index e8cb5aa88..adef37937 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -140,7 +140,7 @@ type ForAPIOptions = { type AvailableForListIDsOptions = { serverAccountId: number - actorId: number + followerActorId: number includeLocalVideos: boolean filter?: VideoFilter categoryOneOf?: number[] @@ -315,7 +315,7 @@ type AvailableForListIDsOptions = { query.include.push(videoChannelInclude) } - if (options.actorId) { + if (options.followerActorId) { let localVideosReq = '' if (options.includeLocalVideos === true) { localVideosReq = ' UNION ALL ' + @@ -327,7 +327,7 @@ type AvailableForListIDsOptions = { } // Force actorId to be a number to avoid SQL injections - const actorIdNumber = parseInt(options.actorId.toString(), 10) + const actorIdNumber = parseInt(options.followerActorId.toString(), 10) query.where[ 'id' ][ Sequelize.Op.and ].push({ [ Sequelize.Op.in ]: Sequelize.literal( '(' + @@ -985,7 +985,7 @@ export class VideoModel extends Model { filter?: VideoFilter, accountId?: number, videoChannelId?: number, - actorId?: number + followerActorId?: number trendingDays?: number, user?: UserModel }, countVideos = true) { @@ -1008,11 +1008,11 @@ export class VideoModel extends Model { const serverActor = await getServerActor() - // actorId === null has a meaning, so just check undefined - const actorId = options.actorId !== undefined ? options.actorId : serverActor.id + // followerActorId === null has a meaning, so just check undefined + const followerActorId = options.followerActorId !== undefined ? options.followerActorId : serverActor.id const queryOptions = { - actorId, + followerActorId, serverAccountId: serverActor.Account.id, nsfw: options.nsfw, categoryOneOf: options.categoryOneOf, @@ -1118,7 +1118,7 @@ export class VideoModel extends Model { const serverActor = await getServerActor() const queryOptions = { - actorId: serverActor.id, + followerActorId: serverActor.id, serverAccountId: serverActor.Account.id, includeLocalVideos: options.includeLocalVideos, nsfw: options.nsfw, @@ -1273,11 +1273,11 @@ export class VideoModel extends Model { // threshold corresponds to how many video the field should have to be returned static async getRandomFieldSamples (field: 'category' | 'channelId', threshold: number, count: number) { const serverActor = await getServerActor() - const actorId = serverActor.id + const followerActorId = serverActor.id const scopeOptions: AvailableForListIDsOptions = { serverAccountId: serverActor.Account.id, - actorId, + followerActorId, includeLocalVideos: true } -- 2.41.0