Merge branch 'release/3.2.0' into prosody_room_list

2021-06-22 13:47:39 +02:00
parent e6d4b0f663 25e41338c8
commit 47bf53bafb
12 changed files with 208 additions and 10 deletions
--- a/server/lib/prosody/config/content.ts
+++ b/server/lib/prosody/config/content.ts
@ -241,6 +241,12 @@ class ProsodyConfigContent {
    this.muc.set('peertubelivechat_list_rooms_apikey', apikey)
  }

+  useTestModule (prosodyApikey: string, apiurl: string): void {
+    this.global.add('modules_enabled', 'http_peertubelivechat_test')
+    this.global.set('peertubelivechat_test_apikey', prosodyApikey)
+    this.global.set('peertubelivechat_test_peertube_api_url', apiurl)
+  }
+
  setLog (level: ProsodyLogLevel, syslog?: ProsodyLogLevel[]): void {
    let log = ''
    log += 'log = {\n'