Merge branch 'release/3.2.0' into prosody_room_list

This commit is contained in:
John Livingston
2021-07-14 19:11:09 +02:00
7 changed files with 71 additions and 1 deletions

View File

@ -114,7 +114,14 @@ function register ({ registerHook, registerSettingsScript, peertubeHelpers }: Re
case 'prosody-peertube-uri':
case 'chat-type-help-builtin-prosody':
case 'prosody-list-rooms':
case 'prosody-advanced':
case 'prosody-c2s':
return options.formValues['chat-type'] !== ('builtin-prosody' as ChatType)
case 'prosody-c2s-port':
return !(
options.formValues['chat-type'] === ('builtin-prosody' as ChatType) &&
options.formValues['prosody-c2s'] === true
)
case 'chat-server':
case 'chat-room':
case 'chat-bosh-uri':