From b1c617726dccf90712f91b4811f8d6cf46884158 Mon Sep 17 00:00:00 2001
From: southerntofu <southerntofu@thunix.net>
Date: Sat, 24 Jul 2021 23:14:56 +0000
Subject: [PATCH] Shorter config, better defaults for IRC

---
 config.yml | 53 ++++++++++++++---------------------------------------
 roles      |  2 +-
 2 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/config.yml b/config.yml
index 87ddd1d..0885b8e 100644
--- a/config.yml
+++ b/config.yml
@@ -18,53 +18,28 @@ irc_announce:
 mucbridge:
   chans:
     # List of JIDs to bridge together, carefully following cheogram-muc-bridge settings
-    - [ { jid: "#joinjabber-fr%irc.tilde.chat@irc.localhost", tag: "~chat", nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"", nickLength: "Some 32" }, { jid: "fr@joinjabber.org", tag: "jabberFR", nickChars: "None Text", nickLength: "None Natural" } ]
+    - [ { jid: "#joinjabber-fr%irc.tilde.chat@irc.localhost", tag: "~", nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"", nickLength: "Some 32" }, { jid: "fr@joinjabber.org", tag: "jabberFR", nickChars: "None Text", nickLength: "None Natural" } ]
+    #- [ { jid: "#whereiseveryone%irc.libera.chat@irc.localhost", tag: "libera", nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"", nickLength: "Some 32" }, { jid: "guix@rooms.dismail.de", tag: "dismail", nickChars: "None Text", nickLength: "None Natural" } ]
     # Mappings of server to channel name
     - { tildechat: "#foo", jj: "foo" }
-  disroot:
-    - "anarchism"
-    - "federation"
-  jfr:
-    - "anarchisme"
-    - "fédération"
-  jjworkinggroups: # mappings defined in settings.profiles.jjworkinggroups
-    - "privacy"
-    - "bridging"
-    - "abuse"
-    - "translations"
-    - "sysadmin"
-    - "website"
+  # mappings defined in settings.profiles.jjworkinggroups
+  disroot: [ "anarchism", "federation" ]
+  jfr: [ "anarchisme", "fédération" ]
+  jjworkinggroups: [ "privacy", "bridging", "abuse", "translations", "sysadmin", "website" ]
   settings:
     host: "bridge.fr.tild3.org"
     nick: "fr-bridge2"
     gateway_irc: "irc.localhost" # Optional (defaults to irc.localhost + biboumi setup
     accounts:
-      tildechat:
-        host: "irc.tilde.chat"
-        type: "irc" # Optional (default to "xmpp")
-        nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"" # Optional (default to that, when type="irc", "None Text" otherwise)
-        nickLength: 32 # Optional (default to 32)
-        tag: "~chat"
-      jj:
-        host: "joinjabber.org"
-        tag: "jj"
-      disroot:
-        host: "chat.disroot.org"
-        tag: "disroot"
-      jfr:
-        host: "chat.jabberfr.org"
-        tag: "jfr"
+      tildechat: { host: "irc.tilde.chat", type: "irc", tag: "~chat" }
+      jj: { host: "joinjabber.org", tag: "jj" }
+      disroot: { host: "chat.disroot.org", tag: "disroot" }
+      jfr: { host: "chat.jabberfr.org", tag: "jfr" }
     profiles:
-      jjworkinggroups:
-        tildechat: "#joinjabber-$room"
-        jj: "$room"
-      jfr:
-        tildechat: "#$room"
-        jfr: "$room"
-      disroot:
-        tildechat: "#$room"
-        disroot: "$room"
-#    - [ { jid: "#whereiseveryone%irc.libera.chat@irc.hmm.st", tag: "libera", nickChars: "Some \"a-zA-Z0-9`|^_{}[]\\\\-\"", nickLength: "Some 32" }, { jid: "guix@rooms.dismail.de", tag: "dismail", nickChars: "None Text", nickLength: "None Natural" } ]
+      # Profiles are mapping of profile name to a mapping of server name to chatroom name format
+      jjworkinggroups: { tildechat: "#joinjabber-$room", jj: "$room" }
+      jfr: { tildechat: "#$room", jfr: "$room" }
+      disroot: { tildechat: "#$room", disroot: "$room" }
 #chatbridge:
 #  jabberfr:
 #    - anarchisme
diff --git a/roles b/roles
index 3ddabb0..6ff785c 160000
--- a/roles
+++ b/roles
@@ -1 +1 @@
-Subproject commit 3ddabb084cd171ec78f71016278a01cead5d654a
+Subproject commit 6ff785c87976bcc026b30772a472f9886812efc5