modules: Remove partyline

Fixes #1632
znc · Apr 12, 2019 · d94605c · d94605c
1 parent 8d309bb
commit d94605c
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 1,054 deletions.
diff --git a/modules/partyline.cpp b/modules/partyline.cpp
diff --git a/modules/po/partyline.de_DE.po b/modules/po/partyline.de_DE.po
diff --git a/modules/po/partyline.es_ES.po b/modules/po/partyline.es_ES.po
diff --git a/modules/po/partyline.fr_FR.po b/modules/po/partyline.fr_FR.po
diff --git a/modules/po/partyline.id_ID.po b/modules/po/partyline.id_ID.po
diff --git a/modules/po/partyline.nl_NL.po b/modules/po/partyline.nl_NL.po
diff --git a/modules/po/partyline.pot b/modules/po/partyline.pot
diff --git a/modules/po/partyline.pt_BR.po b/modules/po/partyline.pt_BR.po
diff --git a/modules/po/partyline.ru_RU.po b/modules/po/partyline.ru_RU.po
diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp
@@ -424,6 +424,18 @@ bool CIRCNetwork::ParseConfig(CConfig* pConfig, CString& sError,
         for (const CString& sValue : vsList) {
             CString sModName = sValue.Token(0);
             CString sNotice = "Loading network module [" + sModName + "]";
+            CString sModRet;
+            CString sArgs = sValue.Token(1, true);
+
+            // We removed partyline on 2019-04-12, znc 1.8
+            if (sModName == "partyline") {
+                bool bModRet = LoadModule(sModName, sArgs, sNotice, sModRet);
+
+                if (!bModRet) {
+                    CUtils::PrintError("NOTICE: [partyline] was removed, cannot load.");
+                }
+                continue;
+            }
 
             // XXX Legacy crap, added in ZNC 0.203, modified in 0.207
             // Note that 0.203 == 0.207
@@ -450,9 +462,6 @@ bool CIRCNetwork::ParseConfig(CConfig* pConfig, CString& sError,
                 sModName = "modules_online";
             }
 
-            CString sModRet;
-            CString sArgs = sValue.Token(1, true);
-
             bool bModRet = LoadModule(sModName, sArgs, sNotice, sModRet);
 
             if (!bModRet) {