diff options
author | Chocobozzz <me@florianbigard.com> | 2018-10-05 16:56:14 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-10-05 17:02:10 +0200 |
commit | 79bd2632d62f2f600d663815fcc00a01ca981aa1 (patch) | |
tree | 2a6b5df65fdd6025dda16cf7cd743c4530c63bf6 /server/models | |
parent | e724fa93c71d76d709e819a05e5e2904a3c4205b (diff) | |
download | PeerTube-79bd2632d62f2f600d663815fcc00a01ca981aa1.tar.gz PeerTube-79bd2632d62f2f600d663815fcc00a01ca981aa1.tar.zst PeerTube-79bd2632d62f2f600d663815fcc00a01ca981aa1.zip |
Add user moderation in the account page
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/account/account.ts | 3 | ||||
-rw-r--r-- | server/models/video/video-format-utils.ts | 2 | ||||
-rw-r--r-- | server/models/video/video.ts | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/server/models/account/account.ts b/server/models/account/account.ts index 27c75d886..5a237d733 100644 --- a/server/models/account/account.ts +++ b/server/models/account/account.ts | |||
@@ -248,7 +248,8 @@ export class AccountModel extends Model<AccountModel> { | |||
248 | displayName: this.getDisplayName(), | 248 | displayName: this.getDisplayName(), |
249 | description: this.description, | 249 | description: this.description, |
250 | createdAt: this.createdAt, | 250 | createdAt: this.createdAt, |
251 | updatedAt: this.updatedAt | 251 | updatedAt: this.updatedAt, |
252 | userId: this.userId ? this.userId : undefined | ||
252 | } | 253 | } |
253 | 254 | ||
254 | return Object.assign(actor, account) | 255 | return Object.assign(actor, account) |
diff --git a/server/models/video/video-format-utils.ts b/server/models/video/video-format-utils.ts index 78972b199..905e84449 100644 --- a/server/models/video/video-format-utils.ts +++ b/server/models/video/video-format-utils.ts | |||
@@ -10,7 +10,7 @@ import { | |||
10 | getVideoLikesActivityPubUrl, | 10 | getVideoLikesActivityPubUrl, |
11 | getVideoSharesActivityPubUrl | 11 | getVideoSharesActivityPubUrl |
12 | } from '../../lib/activitypub' | 12 | } from '../../lib/activitypub' |
13 | import { isArray } from 'util' | 13 | import { isArray } from '../../helpers/custom-validators/misc' |
14 | 14 | ||
15 | export type VideoFormattingJSONOptions = { | 15 | export type VideoFormattingJSONOptions = { |
16 | completeDescription?: boolean | 16 | completeDescription?: boolean |
diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 0a2d7e6de..46d823240 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts | |||
@@ -94,7 +94,6 @@ import { | |||
94 | import * as validator from 'validator' | 94 | import * as validator from 'validator' |
95 | import { UserVideoHistoryModel } from '../account/user-video-history' | 95 | import { UserVideoHistoryModel } from '../account/user-video-history' |
96 | 96 | ||
97 | |||
98 | // FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation | 97 | // FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation |
99 | const indexes: Sequelize.DefineIndexesOptions[] = [ | 98 | const indexes: Sequelize.DefineIndexesOptions[] = [ |
100 | buildTrigramSearchIndex('video_name_trigram', 'name'), | 99 | buildTrigramSearchIndex('video_name_trigram', 'name'), |