From e1063a1c895820879b80d4e4e42902ed67960f50 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Sat, 3 Feb 2018 12:57:27 +0200
Subject: [PATCH] IRC: update discord-irc & TeleIRC configs

---
 irc/piraatit/discord-irc/config.json | 8 ++++----
 irc/piraatit/telepirateirc/config.js | 8 ++++++--
 irc/telefreenode/chatids.json        | 1 +
 irc/telefreenode/config.js           | 2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 irc/telefreenode/chatids.json

diff --git a/irc/piraatit/discord-irc/config.json b/irc/piraatit/discord-irc/config.json
index c020cbf..eaf7259 100644
--- a/irc/piraatit/discord-irc/config.json
+++ b/irc/piraatit/discord-irc/config.json
@@ -12,11 +12,12 @@
 			"374659905983873025": "#piraattinuoret",
 			"374867585868496897": "#pinu_hallitus",
 			"375207988459470849": "#test",
-			"381011785962225664": "#aaltopiraatit"
+			"381011785962225664": "#aaltopiraatit",
+			"389413571831791626": "#hepihalko"
 			},
 		"ircOptions": {
 			"userName": "D6",
-			"realName": "Admin: Mikaela#6940",
+			"realName": "Discord.gg Relay ~ Mikaela#6940",
 			"password": "CENSORED",
 			"port": "6697",
 			"secure": "true",
@@ -27,7 +28,6 @@
 			"ircText": "<{$displayUsername}> {$text}",
 			"discord": "<`{$author}`> {$withMentions}"
 			},
-		"ircNickColor": false,
-		"commandCharacters": ["!", "_"]
+		"ircNickColor": false
 	}
 ]
diff --git a/irc/piraatit/telepirateirc/config.js b/irc/piraatit/telepirateirc/config.js
index 3036427..fe384df 100644
--- a/irc/piraatit/telepirateirc/config.js
+++ b/irc/piraatit/telepirateirc/config.js
@@ -40,14 +40,13 @@ config.nameFormat = '%username%';
 config.usernameFallbackFormat = '%firstName% %lastName%';
 
 config.ircNick = 'T4';
-config.ircServer = 'au.pirateirc.net';
+config.ircServer = 'fi.pirateirc.net';
 
 // array of commands to send to IRC server as soon as we're connected,
 // example: config.ircPerformCmds = [
 //     'PRIVMSG Q@CServe.quakenet.org :AUTH <username> <password>'
 // ]
 
-// config.ircPerformCmds = ['NICKSERV identify Euforia CENSORED']
 config.ircPerformCmds = ['NICKSERV identify T4 CENSORED', 'NICKSERV regain T4', 'mode T4 -i+gRQ', 'CHANSERV invite #messi', 'JOIN #messi'];
 //config.ircPerformCmds = [];
 
@@ -165,6 +164,11 @@ config.channels = [
     {
         ircChan: '#globalPirates',
         tgGroup: 'Global Pirates'
+    },
+
+    {
+        ircChan: '#antikupla',
+        tgGroup: 'Antikupla'
     }
 
     //{
diff --git a/irc/telefreenode/chatids.json b/irc/telefreenode/chatids.json
new file mode 100644
index 0000000..6c2218a
--- /dev/null
+++ b/irc/telefreenode/chatids.json
@@ -0,0 +1 @@
+{"#sailfishos-porters":"-156634556","Mer-meeting":-1001100500036,"Mikaela - group":-1001149130394,"Mikaela - supergroup":"-1001149130394","NemoMobile":-1001100341174,"Sailfish Hackclub Helsinki":-146527899,"Sailfish OS Fan Club":"-1001094603738","akunapu":"-1001067264661"}
\ No newline at end of file
diff --git a/irc/telefreenode/config.js b/irc/telefreenode/config.js
index ec4c1b4..9cc53f2 100644
--- a/irc/telefreenode/config.js
+++ b/irc/telefreenode/config.js
@@ -31,7 +31,7 @@ config.mediaConversions = {
 
 // Add some randomness to url when relaying media
 // Use 0 to disable
-config.mediaRandomLength = 0;
+config.mediaRandomLength = 10;
 
 // Age in seconds after which a Telegram message is not relayed, this prevents
 // spamming the IRC channel if your bot was offline for a long time