update public copy of PPFI TeleIRC

irc/piraatit/telepirateirc/chatids.json

@@ -1 +1 @@
-{"Antikupla":-1001235442861,"Global Pirates":"-1001057453853","Helsinki":-1001116081415,"Mediaseuranta":-1001106763853,"Mikaela - supergroup":"-1001149130394","PPFI - Aaltopiraatit":"-1001090737719","PPFI - Grafiikka":"-1001133635073","PPFI - Helsingin Hallituskokoukset":"-1001122135183","PPFI - Helsinki":"-1001116081415","PIR - Keski-Suomi":"-1001121256763","PPFI - Mediaseuranta":"-1001106763853","PPFI - Messi":"-1001137586553","PPFI - Sivusto":"-1001379936008","PPFI - Toiminta":"-1001103875498","PPFI - Uusimaa":"-1001096588605","PPFI - Varsinais-Suomi":-1001139315365,"PPFI - Verkkopalvelut":"-1001115432082","PPFI - Yleiskeskustelu (EI EDUSTA PUOLUEEN LINJAA!)":-1001128288801,"PiNu hallitus":"-1001142160911","Piraatit":"-1001102075786","Piraattinuoret":"-1001117962134","Pirate Party Finland":"-1001136883228","Sateenkaaripiraatit":"-1001125413651","Syötteet":-1001116457229,"TEST":"-1001228320159","Toiminta":-1001103875498,"Uusimaa":-1001096588605,"Likakaivo":"-1001128288801","PPFI - Häme":"-1001374071099","Akateemiset Piraatit":"-1001185661848","PPFI - Helsinki":"-1001116081415"}
+{"Antikupla":"-1001235442861","Global Pirates":"-1001057453853","Helsinki":-1001116081415,"Mediaseuranta":-1001106763853,"Mikaela - supergroup":"-1001149130394","PPFI - Aaltopiraatit":"-1001090737719","PPFI - Grafiikka":"-1001133635073","PPFI - Helsingin Hallituskokoukset":"-1001122135183","PPFI - Helsinki":"-1001116081415","PPFI - Keski-Suomi":"-1001121256763","PPFI - Mediaseuranta":"-1001106763853","PPFI - Messi":"-1001137586553","PPFI - Sivusto":"-1001379936008","PPFI - Toiminta":"-1001103875498","PPFI - Uusimaa":"-1001096588605","PPFI - Varsinais-Suomi":"-1001139315365","PPFI - Verkkopalvelut":"-1001115432082","PPFI - Yleiskeskustelu (EI EDUSTA PUOLUEEN LINJAA!)":-1001128288801,"PiNu hallitus":"-1001142160911","Piraatit":"-1001102075786","Piraattinuoret":"-1001117962134","Pirate Party Finland":"-1001136883228","Sateenkaaripiraatit":"-1001125413651","Syötteet":"-1001116457229","TEST":"-1001228320159","Toiminta":-1001103875498,"Uusimaa":-1001096588605,"Likakaivo":"-1001128288801","PPFI - Häme":"-1001374071099","Akateemiset Piraatit":"-1001185661848","PIR - Hallituksen kokoukset":"-1001172132698","PPFI - Puoluetoimisto":"-1001193123558","silta.piraatit.fi":"-1001198260672","SPAM-TELEIRC-PRIVAT":"-1001249769430","PPFI - Suomiareena":"-1001184954189","[READ-ONLY] PirateIRC #opers":"-1001173866260","PirateIRC Telegram Opers":"-1001176463928","PIR - Satakunta":"-1001159836952","##Mikaela":"-1001149130394","PPFI - Viestintä ja Markkinointi":"-1001298673578","Tech Pirates":"-1001166389528","PirateIRC Telegram Opers/Staff":"-1001176463928"}

irc/piraatit/telepirateirc/config.js

@@ -21,7 +21,7 @@ config.showMedia = true;
 config.httpPort = 61825;
 
 // HTTP server location, URLs are generated from this
-config.httpLocation = 'http://hilla.kapsi.fi' + ':' + config.httpPort;
+config.httpLocation = 'http://silta.piraatit.fi' + ':' + config.httpPort;
 //config.httpLocation = 'https://t4.mikaela.info';
 
 //////////////////
@@ -37,17 +37,19 @@ config.httpLocation = 'http://hilla.kapsi.fi' + ':' + config.httpPort;
 config.nameFormat = '%username%';
 
 // fallback format string for %username% if sender lacks username
-config.usernameFallbackFormat = '%firstName% %lastName%';
+config.usernameFallbackFormat = '%firstName% (MISSING @USERNAME! telegram.org/faq#usernames-and-t-me)';
 
 config.ircNick = 'T4';
-config.ircServer = 'fi.pirateirc.net';
+//config.ircServer = 'fi.pirateirc.net';
+// Yggdrasil
+config.ircServer = '201:677d:1809:c5eb:202a:d39:e598:305';
 
 // 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 T4 CENSORED', 'NICKSERV regain T4', 'mode T4 -i+gRQ', 'CHANSERV invite #messi', 'JOIN #messi'];
+config.ircPerformCmds = ['NICKSERV identify T4 CENSORED', 'NICKSERV regain T4', 'mode T4 -i+RQ', 'CHANSERV invite #messi', 'JOIN #messi'];
 //config.ircPerformCmds = [];
 
 config.channels = [
@@ -64,27 +66,32 @@ config.channels = [
 
     {
         ircChan: '#mediaseuranta',
-        tgGroup: 'PIR - Mediaseuranta'
+        tgGroup: 'PPFI - Mediaseuranta'
     },
 
     {
         ircChan: '#helsinki',
-        tgGroup: 'PIR - Helsinki'
+        tgGroup: 'PPFI - Helsinki'
     },
 
     {
         ircChan: '#uusimaa',
-        tgGroup: 'PIR - Uusimaa'
+        tgGroup: 'PPFI - Uusimaa'
     },
 
     {
         ircChan: '#toiminta',
-        tgGroup: 'PIR - Toiminta'
+        tgGroup: 'PPFI - Toiminta'
+    },
+
+    {
+        ircChan: '#puoluetoimisto',
+        tgGroup: 'PPFI - Puoluetoimisto'
     },
 
     {
         ircChan: '#verkkopalvelut',
-        tgGroup: 'PIR - Verkkopalvelut'
+        tgGroup: 'PPFI - Verkkopalvelut'
     },
 
     {
@@ -92,14 +99,9 @@ config.channels = [
         tgGroup: 'PiNu hallitus'
     },
 
-    {
-        ircChan: '#piraattipuolue',
-        tgGroup: 'PIR - Yleiskeskustelu (EI EDUSTA PUOLUEEN LINJAA!)'
-    },
-
     {
         ircChan: '#keski-suomi',
-        tgGroup: 'PIR - Keski-Suomi'
+        tgGroup: 'PPFI - Keski-Suomi'
     },
 
     {
@@ -108,22 +110,22 @@ config.channels = [
     },
 
     {
-        ircChan: '#test',
+        ircChan: '#suomiareena',
-        tgGroup: 'TEST'
+        tgGroup: 'PPFI - Suomiareena'
     },
 
     {
         ircChan: '#Mikaela',
         ircChanReadOnly: true,
         ircChanOverrideReadOnly: true,
-        tgGroup: 'Mikaela - supergroup',
+        tgGroup: '##Mikaela',
         tgGroupReadOnly: true,
         tgGroupOverrideReadOnly: true,
     },
 
     {
         ircChan: '#aaltopiraatit',
-        tgGroup: 'PIR - Aaltopiraatit'
+        tgGroup: 'PPFI - Aaltopiraatit'
     },
 
     {
@@ -133,22 +135,17 @@ config.channels = [
 
     {
         ircChan: '#grafiikka',
-        tgGroup: 'PIR - Grafiikka'
+        tgGroup: 'PPFI - Grafiikka'
     },
 
     {
         ircChan: '#messi',
-        tgGroup: 'PIR - Messi'
+        tgGroup: 'PPFI - Messi'
     },
 
     {
         ircChan: '#varsinais-suomi',
-        tgGroup: 'PIR - Varsinais-Suomi'
+        tgGroup: 'PPFI - Varsinais-Suomi'
-    },
-
-    {
-        ircChan: '#hepihalko',
-        tgGroup: 'PIR - Helsingin Hallituskokoukset'
     },
 
     {
@@ -158,7 +155,7 @@ config.channels = [
 
     {
         ircChan: '#sivusto',
-        tgGroup: 'PIR - Sivusto'
+        tgGroup: 'PPFI - Sivusto'
     },
 
     {
@@ -169,6 +166,56 @@ config.channels = [
     {
         ircChan: '#antikupla',
         tgGroup: 'Antikupla'
+    },
+
+    {
+        ircChan: '#hame',
+	tgGroup: 'PPFI - Häme'
+    },
+
+    {
+        ircChan: '#akateemisetpiraatit',
+        tgGroup: 'Akateemiset Piraatit'
+    },
+
+    {
+	ircChan: '#hallituskokous',
+	tgGroup: 'PIR - Hallituksen kokoukset'
+    },
+
+    {
+	ircChan: 'T4',
+	tgGroup: 'SPAM-TELEIRC-PRIVAT',
+        tgGroupReadOnly: true
+    },
+
+    {
+        ircChan: '*',
+        tgGroup: 'SPAM-TELEIRC-PRIVAT',
+        tgGroupReadOnly: true
+    },
+
+    {
+	ircChan: '#opers',
+	tgGroup: 'PirateIRC Telegram Opers/Staff',
+	tgGroupReadOnly: true,
+        tgGroupOverrideReadOnly: true
+    },
+
+    {
+        ircChan: '#satakunta',
+        tgGroup: 'PIR - Satakunta'
+    },
+
+    {
+        ircChan: '#viestinta_markkinointi',
+	chanPwd: 'CENSORED',
+	tgGroup: 'PPFI - Viestintä ja Markkinointi'
+    },
+
+    {
+	ircChan: '#TechPirates',
+	tgGroup: 'Tech Pirates'
     }
 
     //{
@@ -195,8 +242,8 @@ config.channels = [
 // see https://node-irc.readthedocs.org/en/latest/API.html#client for
 // documentation
 config.ircOptions = {
-    userName: 'Euforia',
+    userName: 'Telegram',
-    realName: 'Telegram.org Relay ~ @M1kaela',
+    realName: 'mailto:pikaviestimet+PircTGRelay@piraattipuolue.fi',
     port: 6697,
     localAddress: null,
     debug: false,
@@ -206,8 +253,11 @@ config.ircOptions = {
     channels: [], // auto generated, do not touch
     secure: true,
     // TRUE JOS EPÄKELPO!
-    selfSigned: false,
+    // Yggdrasil
-    certExpired: false,
+    //selfSigned: false,
+    //certExpired: false,
+    selfSigned: true,
+    certExpired: true,
     floodProtection: true,
     floodProtectionDelay: 1000,
     sasl: true,
@@ -230,8 +280,8 @@ var regex = '^ *(?:' + config.ircNick + '[:,]?|!) +(.*\\S.*)$';
 config.hlRegexp = new RegExp(regex, 'i');
 
 // automatically added by config upgrade:
-config.logLevel = "info";
+config.logLevel = "error";
-config.mediaRandomLength = 0;
+config.mediaRandomLength = 10;
 config.maxMsgAge = 60;
 config.allowCommands = true;
 config.nickcolor = false;
@@ -251,3 +301,4 @@ config.mediaConversions = {
     'webp': 'png'
 };
 config.emphasizeAction = true;
+config.relayEdited = true;