diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2021-01-13 09:12:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-13 09:12:55 +0100 |
commit | 1ea7da819e5bfae7b443ed722c18c4165d101439 (patch) | |
tree | 17cea3786dfb3a59a2ad5559de9ebf106a0440a2 /server/controllers/api/video-channel.ts | |
parent | 75dd1b641f987e1e09dbaa3329e08c6e98a858f3 (diff) | |
download | PeerTube-1ea7da819e5bfae7b443ed722c18c4165d101439.tar.gz PeerTube-1ea7da819e5bfae7b443ed722c18c4165d101439.tar.zst PeerTube-1ea7da819e5bfae7b443ed722c18c4165d101439.zip |
add ability to remove one's avatar for account and channels (#3467)
* add ability to remove one's avatar for account and channels
* add ability to remove one's avatar for account and channels
* only display avatar edition options after input change
Diffstat (limited to 'server/controllers/api/video-channel.ts')
-rw-r--r-- | server/controllers/api/video-channel.ts | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/server/controllers/api/video-channel.ts b/server/controllers/api/video-channel.ts index c48e00232..7ac01b0ef 100644 --- a/server/controllers/api/video-channel.ts +++ b/server/controllers/api/video-channel.ts | |||
@@ -13,7 +13,7 @@ import { MIMETYPES } from '../../initializers/constants' | |||
13 | import { sequelizeTypescript } from '../../initializers/database' | 13 | import { sequelizeTypescript } from '../../initializers/database' |
14 | import { setAsyncActorKeys } from '../../lib/activitypub/actor' | 14 | import { setAsyncActorKeys } from '../../lib/activitypub/actor' |
15 | import { sendUpdateActor } from '../../lib/activitypub/send' | 15 | import { sendUpdateActor } from '../../lib/activitypub/send' |
16 | import { updateActorAvatarFile } from '../../lib/avatar' | 16 | import { deleteActorAvatarFile, updateActorAvatarFile } from '../../lib/avatar' |
17 | import { JobQueue } from '../../lib/job-queue' | 17 | import { JobQueue } from '../../lib/job-queue' |
18 | import { createLocalVideoChannel, federateAllVideosOfChannel } from '../../lib/video-channel' | 18 | import { createLocalVideoChannel, federateAllVideosOfChannel } from '../../lib/video-channel' |
19 | import { | 19 | import { |
@@ -70,6 +70,13 @@ videoChannelRouter.post('/:nameWithHost/avatar/pick', | |||
70 | asyncMiddleware(updateVideoChannelAvatar) | 70 | asyncMiddleware(updateVideoChannelAvatar) |
71 | ) | 71 | ) |
72 | 72 | ||
73 | videoChannelRouter.delete('/:nameWithHost/avatar', | ||
74 | authenticate, | ||
75 | // Check the rights | ||
76 | asyncMiddleware(videoChannelsUpdateValidator), | ||
77 | asyncMiddleware(deleteVideoChannelAvatar) | ||
78 | ) | ||
79 | |||
73 | videoChannelRouter.put('/:nameWithHost', | 80 | videoChannelRouter.put('/:nameWithHost', |
74 | authenticate, | 81 | authenticate, |
75 | asyncMiddleware(videoChannelsUpdateValidator), | 82 | asyncMiddleware(videoChannelsUpdateValidator), |
@@ -133,7 +140,7 @@ async function updateVideoChannelAvatar (req: express.Request, res: express.Resp | |||
133 | const videoChannel = res.locals.videoChannel | 140 | const videoChannel = res.locals.videoChannel |
134 | const oldVideoChannelAuditKeys = new VideoChannelAuditView(videoChannel.toFormattedJSON()) | 141 | const oldVideoChannelAuditKeys = new VideoChannelAuditView(videoChannel.toFormattedJSON()) |
135 | 142 | ||
136 | const avatar = await updateActorAvatarFile(avatarPhysicalFile, videoChannel) | 143 | const avatar = await updateActorAvatarFile(videoChannel, avatarPhysicalFile) |
137 | 144 | ||
138 | auditLogger.update(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannel.toFormattedJSON()), oldVideoChannelAuditKeys) | 145 | auditLogger.update(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannel.toFormattedJSON()), oldVideoChannelAuditKeys) |
139 | 146 | ||
@@ -144,6 +151,14 @@ async function updateVideoChannelAvatar (req: express.Request, res: express.Resp | |||
144 | .end() | 151 | .end() |
145 | } | 152 | } |
146 | 153 | ||
154 | async function deleteVideoChannelAvatar (req: express.Request, res: express.Response) { | ||
155 | const videoChannel = res.locals.videoChannel | ||
156 | |||
157 | await deleteActorAvatarFile(videoChannel) | ||
158 | |||
159 | return res.sendStatus(HttpStatusCode.NO_CONTENT_204) | ||
160 | } | ||
161 | |||
147 | async function addVideoChannel (req: express.Request, res: express.Response) { | 162 | async function addVideoChannel (req: express.Request, res: express.Response) { |
148 | const videoChannelInfo: VideoChannelCreate = req.body | 163 | const videoChannelInfo: VideoChannelCreate = req.body |
149 | 164 | ||