From 4cbea602dd66844a5ef04953a8b8cfcc67fa13cd Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 3 Nov 2022 11:50:34 +0200
Subject: [PATCH] Sync appservice-discord configuration with upstream

---
 .../templates/config.yaml.j2                  | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/roles/custom/matrix-bridge-appservice-discord/templates/config.yaml.j2 b/roles/custom/matrix-bridge-appservice-discord/templates/config.yaml.j2
index a530af2e5..2309be443 100644
--- a/roles/custom/matrix-bridge-appservice-discord/templates/config.yaml.j2
+++ b/roles/custom/matrix-bridge-appservice-discord/templates/config.yaml.j2
@@ -18,6 +18,9 @@ bridge:
   disableTypingNotifications: false
   # Disable deleting messages on Discord if a message is redacted on Matrix.
   disableDeletionForwarding: false
+  # Disable portal bridging, where Matrix users can search for unbridged Discord
+  # rooms on their Matrix server.
+  disablePortalBridging: {{ matrix_appservice_discord_bridge_disablePortalBridging|to_json }}
   # Enable users to bridge rooms using !discord commands. See
   # https://t2bot.io/discord for instructions.
   enableSelfServiceBridging: {{ matrix_appservice_discord_bridge_enableSelfServiceBridging|to_json }}
@@ -28,10 +31,14 @@ bridge:
   disableJoinLeaveNotifications: false
   # Disable Invite echos from matrix
   disableInviteNotifications: false
-  # Disable portal briding (automatic room creation)
-  disablePortalBridging: {{ matrix_appservice_discord_bridge_disablePortalBridging|to_json }}
+  # Disable Room Topic echos from matrix
+  disableRoomTopicNotifications: false
   # Auto-determine the language of code blocks (this can be CPU-intensive)
   determineCodeLanguage: false
+  # MXID of an admin user that will be PMd if the bridge experiences problems. Optional
+  adminMxid: {{ matrix_admin | to_json }}
+  # The message to send to the bridge admin if the Discord token is not valid
+  invalidTokenMessage: 'Your Discord bot token seems to be invalid, and the bridge cannot function. Please update it in your bridge settings and restart the bridge'
 # Authentication configuration for the discord bot.
 auth:
   clientID: {{ matrix_appservice_discord_client_id | string|to_json }}
@@ -75,20 +82,20 @@ channel:
     namePattern: "[Discord] :guild :name"
     # Changes made to rooms when a channel is deleted.
     deleteOptions:
-      # Prefix the room name with a string.
-      #namePrefix: "[Deleted]"
-      # Prefix the room topic with a string.
-      #topicPrefix: "This room has been deleted"
-      # Disable people from talking in the room by raising the event PL to 50
-      disableMessaging: false
-      # Remove the discord alias from the room.
-      unsetRoomAlias: true
-      # Remove the room from the directory.
-      unlistFromDirectory: true
-      # Set the room to be unavaliable for joining without an invite.
-      setInviteOnly: true
-      # Make all the discord users leave the room.
-      ghostsLeave: true
+       # Prefix the room name with a string.
+       #namePrefix: "[Deleted]"
+       # Prefix the room topic with a string.
+       #topicPrefix: "This room has been deleted"
+       # Disable people from talking in the room by raising the event PL to 50
+       disableMessaging: false
+       # Remove the discord alias from the room.
+       unsetRoomAlias: true
+       # Remove the room from the directory.
+       unlistFromDirectory: true
+       # Set the room to be unavailable for joining without an invite.
+       setInviteOnly: true
+       # Make all the discord users leave the room.
+       ghostsLeave: true
 limits:
     # Delay in milliseconds between discord users joining a room.
     roomGhostJoinDelay: 6000
@@ -98,8 +105,15 @@ limits:
     # echos = (Copies of a sent message may arrive from discord before we've
     # fininished handling it, causing us to echo it back to the room)
     discordSendDelay: 1500
+    # Set a maximum of rooms to be bridged.
+    # roomCount: 20
 ghosts:
     # Pattern for the ghosts nick, available is :nick, :username, :tag and :id
     nickPattern: ":nick"
     # Pattern for the ghosts username, available is :username, :tag and :id
     usernamePattern: ":username#:tag"
+# Prometheus-compatible metrics endpoint
+metrics:
+    enable: false
+    port: 9001
+    host: "127.0.0.1"