irc/hexchat/servlist.conf

@@ -1,5 +1,21 @@
 v=2.14.3
 
+N=Asak
+U=Mikaela@HEXCHAT
+L=10
+E=UTF-8 (Unicode)
+F=93
+D=0
+S=chat.actionsack.com/6697
+
+N=ErgoChat
+U=Mikaela@HEXCHAT
+L=10
+E=UTF-8 (Unicode)
+F=92
+D=0
+S=irc.ergo.chat/6697
+
 N=IRC@Etro
 U=Mikaela@HEXCHAT
 L=10
@@ -16,9 +32,16 @@ E=UTF-8 (Unicode)
 F=93
 D=0
 S=irc.liberta.casa/6697
-C=OPER %n %p
 
-N=PirateIRC-Production
+N=NixNet
+U=Mikaela@HEXCHAT
+L=10
+E=UTF-8 (Unicode)
+F=93
+D=0
+S=irc.nixnet.services/6697
+
+N=Old PirateIRC
 U=MikaelaSuomalainen
 L=10
 E=UTF-8 (Unicode)
@@ -27,7 +50,23 @@ D=0
 S=roubaix-fr.pirateirc.net/6697
 C=OPER %n %p
 
-N=PirateIRC-Testnet
+N=Oragono Testnet
+U=Mikaela@HEXCHAT
+L=10
+E=UTF-8 (Unicode)
+F=92
+D=0
+S=testnet.oragono.io/6697
+
+N=PartidoPirataAR
+U=Mikaela@HEXCHAT
+L=10
+E=UTF-8 (Unicode)
+F=92
+D=0
+S=partidopirata.com.ar/6697
+
+N=PirateIRC2
 U=MikaelaSuomalainen@HEXCHAT
 L=10
 E=UTF-8 (Unicode)

irc/hexchat/servlist.conf.old

@@ -1,76 +0,0 @@
-v=2.14.3
-
-N=Asak
-U=Mikaela@HEXCHAT
-L=10
-E=UTF-8 (Unicode)
-F=93
-D=0
-S=chat.actionsack.com/6697
-
-N=ErgoChat
-U=Mikaela@HEXCHAT
-L=10
-E=UTF-8 (Unicode)
-F=92
-D=0
-S=irc.ergo.chat/6697
-
-N=IRC@Etro
-U=Mikaela@HEXCHAT
-L=10
-E=UTF-8 (Unicode)
-F=93
-D=0
-S=etro.mikaela.info/6697
-C=OPER %n %p
-
-N=LibertaCasa
-U=Mikaela@HEXCHAT
-L=10
-E=UTF-8 (Unicode)
-F=93
-D=0
-S=irc.liberta.casa/6697
-
-N=NixNet
-U=Mikaela@HEXCHAT
-L=10
-E=UTF-8 (Unicode)
-F=93
-D=0
-S=irc.nixnet.services/6697
-
-N=Old PirateIRC
-U=MikaelaSuomalainen
-L=10
-E=UTF-8 (Unicode)
-F=93
-D=0
-S=roubaix-fr.pirateirc.net/6697
-C=OPER %n %p
-
-N=Ergo Testnet
-U=Mikaela@HEXCHAT
-L=10
-E=UTF-8 (Unicode)
-F=92
-D=0
-S=testnet.ergo.chat/6697
-
-N=PartidoPirataAR
-U=Mikaela@HEXCHAT
-L=10
-E=UTF-8 (Unicode)
-F=92
-D=0
-S=partidopirata.com.ar/6697
-
-N=PirateIRC2
-U=MikaelaSuomalainen@HEXCHAT
-L=10
-E=UTF-8 (Unicode)
-F=93
-D=0
-S=irc2.piraattipuolue.fi/6697
-C=OPER %n %p

irc/matterbridge/matterbridge-example.toml

@@ -57,8 +57,6 @@ Login="username"
 Password="password"
 # Otherwise collision risk with UseUserName=true
 NoHomeServerSuffix=false
-# The Matrix logo "[m]" easens hitting up Discord maximum length so it's
-# better to only have a single char label with the full MXID
 Label="m"
 # Use Matrix ID instead of display name to avoid messages getting lost due
 # to Ergo and Matterbridge disagreeing on invalid characters (e.g. LGBT* flag)