OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Warn user when they want to delete a channel 

Because they will not be able to create another channel with the same
actor name
pull/1567/head
Chocobozzz 2019-01-14 10:24:49 +01:00
parent 7b95f31385
commit b4593cd7ff
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts
View File

@ -35,10 +35,14 @@ export class MyAccountVideoChannelsComponent implements OnInit {
async deleteVideoChannel (videoChannel: VideoChannel) { async deleteVideoChannel (videoChannel: VideoChannel) {
const res = await this.confirmService.confirmWithInput( const res = await this.confirmService.confirmWithInput(
this.i18n( this.i18n(
'Do you really want to delete {{videoChannelName}}? It will delete all videos uploaded in this channel too.', 'Do you really want to delete {{channelDisplayName}}? It will delete all videos uploaded in this channel, ' +
{ videoChannelName: videoChannel.displayName } 'and you will not be able to create another channel with the same name ({{channelName}})!',
{ channelDisplayName: videoChannel.displayName, channelName: videoChannel.name }
),
this.i18n(
'Please type the display name of the video channel ({{displayName}}) to confirm',
{ displayName: videoChannel.displayName }
), ),
this.i18n('Please type the name of the video channel to confirm'),
videoChannel.displayName, videoChannel.displayName,
this.i18n('Delete') this.i18n('Delete')
) )

2
server/lib/activitypub/actor.ts
View File

@ -296,7 +296,7 @@ async function fetchRemoteActor (actorUrl: string): Promise<{ statusCode?: numbe
const actorJSON: ActivityPubActor = requestResult.body const actorJSON: ActivityPubActor = requestResult.body
if (isActorObjectValid(actorJSON) === false) { if (isActorObjectValid(actorJSON) === false) {
logger.debug('Remote actor JSON is not valid.', { actorJSON: actorJSON }) logger.debug('Remote actor JSON is not valid.', { actorJSON })
return { result: undefined, statusCode: requestResult.response.statusCode } return { result: undefined, statusCode: requestResult.response.statusCode }
} }

2
server/lib/activitypub/process/process.ts
View File

@ -35,7 +35,7 @@ async function processActivities (
const actorsCache: { [ url: string ]: ActorModel } = {} const actorsCache: { [ url: string ]: ActorModel } = {}
for (const activity of activities) { for (const activity of activities) {
if (!options.signatureActor && [ 'Create', 'Announce', 'Like' ].indexOf(activity.type) === -1) { if (!options.signatureActor && [ 'Create', 'Announce', 'Like' ].includes(activity.type) === false) {
logger.error('Cannot process activity %s (type: %s) without the actor signature.', activity.id, activity.type) logger.error('Cannot process activity %s (type: %s) without the actor signature.', activity.id, activity.type)
continue continue
} }