diff options
Diffstat (limited to 'server/models/video/video-channel.ts')
-rw-r--r-- | server/models/video/video-channel.ts | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts index 93a611fa0..183ff3436 100644 --- a/server/models/video/video-channel.ts +++ b/server/models/video/video-channel.ts | |||
@@ -1,7 +1,6 @@ | |||
1 | import * as Sequelize from 'sequelize' | 1 | import * as Sequelize from 'sequelize' |
2 | 2 | ||
3 | import { isVideoChannelNameValid, isVideoChannelDescriptionValid } from '../../helpers' | 3 | import { isVideoChannelNameValid, isVideoChannelDescriptionValid } from '../../helpers' |
4 | import { removeVideoChannelToFriends } from '../../lib' | ||
5 | 4 | ||
6 | import { addMethodsToModel, getSort } from '../utils' | 5 | import { addMethodsToModel, getSort } from '../utils' |
7 | import { | 6 | import { |
@@ -143,12 +142,13 @@ toFormattedJSON = function (this: VideoChannelInstance) { | |||
143 | 142 | ||
144 | toActivityPubObject = function (this: VideoChannelInstance) { | 143 | toActivityPubObject = function (this: VideoChannelInstance) { |
145 | const json = { | 144 | const json = { |
145 | type: 'VideoChannel' as 'VideoChannel', | ||
146 | id: this.url, | ||
146 | uuid: this.uuid, | 147 | uuid: this.uuid, |
148 | content: this.description, | ||
147 | name: this.name, | 149 | name: this.name, |
148 | description: this.description, | 150 | published: this.createdAt, |
149 | createdAt: this.createdAt, | 151 | updated: this.updatedAt |
150 | updatedAt: this.updatedAt, | ||
151 | ownerUUID: this.Account.uuid | ||
152 | } | 152 | } |
153 | 153 | ||
154 | return json | 154 | return json |
@@ -180,7 +180,7 @@ function afterDestroy (videoChannel: VideoChannelInstance) { | |||
180 | uuid: videoChannel.uuid | 180 | uuid: videoChannel.uuid |
181 | } | 181 | } |
182 | 182 | ||
183 | return removeVideoChannelToFriends(removeVideoChannelToFriendsParams) | 183 | // FIXME: send remove event to followers |
184 | } | 184 | } |
185 | 185 | ||
186 | return undefined | 186 | return undefined |
@@ -277,7 +277,7 @@ loadByUUIDOrUrl = function (uuid: string, url: string, t?: Sequelize.Transaction | |||
277 | { uuid }, | 277 | { uuid }, |
278 | { url } | 278 | { url } |
279 | ] | 279 | ] |
280 | }, | 280 | } |
281 | } | 281 | } |
282 | 282 | ||
283 | if (t !== undefined) query.transaction = t | 283 | if (t !== undefined) query.transaction = t |