Discord to be packed with libsodium

8 files changed, 42 insertions, 8 deletions

diff --git a/protocols/Discord/discord.vcxproj b/protocols/Discord/discord.vcxproj
index dc4a3679bc..edf662c623 100644
--- a/protocols/Discord/discord.vcxproj
+++ b/protocols/Discord/discord.vcxproj
@@ -44,6 +44,7 @@
     </ClCompile>

     <ClCompile Include="src\utils.cpp" />

     <ClCompile Include="src\voice.cpp" />

+    <ClCompile Include="src\voice_client.cpp" />

     <ClInclude Include="src\proto.h" />

     <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\stdafx.h" />

@@ -53,6 +54,9 @@
     <ProjectReference Include="..\..\libs\libjson\libjson.vcxproj">

       <Project>{f6a9340e-b8d9-4c75-be30-47dc66d0abc7}</Project>

     </ProjectReference>

+    <ProjectReference Include="..\..\libs\libsodium\libsodium.vcxproj">

+      <Project>{a185b162-6cb6-4502-b03f-b56f7699a8d9}</Project>

+    </ProjectReference>

     <ProjectReference Include="..\..\libs\zlib\zlib.vcxproj">

       <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>

     </ProjectReference>

diff --git a/protocols/Discord/discord.vcxproj.filters b/protocols/Discord/discord.vcxproj.filters
index 61ee857295..7316208d56 100644
--- a/protocols/Discord/discord.vcxproj.filters
+++ b/protocols/Discord/discord.vcxproj.filters
@@ -50,6 +50,9 @@
     <ClCompile Include="src\mfa.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\voice_client.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\proto.h">

diff --git a/protocols/Discord/src/main.cpp b/protocols/Discord/src/main.cpp
index 17a10bf78e..023a7b7925 100644
--- a/protocols/Discord/src/main.cpp
+++ b/protocols/Discord/src/main.cpp
@@ -72,6 +72,11 @@ static int OnModulesLoaded(WPARAM, LPARAM)
 

 int CMPlugin::Load()

 {

+	if (sodium_init() < 0) {

+		Netlib_Log(0, "libsodium cannot be initialized");

+		bVoiceEnabled = false;

+	}

+

 	HookEvent(ME_SYSTEM_MODULESLOADED, &OnModulesLoaded);

 

 	g_plugin.registerIcon("Protocols/Discord", g_iconList);

diff --git a/protocols/Discord/src/proto.h b/protocols/Discord/src/proto.h
index 98a3b1343b..32dce00906 100644
--- a/protocols/Discord/src/proto.h
+++ b/protocols/Discord/src/proto.h
@@ -608,7 +608,7 @@ struct CMPlugin : public ACCPROTOPLUGIN<CDiscordProto>
 {

 	CMPlugin();

 

-	bool bVoiceService = false;

+	bool bVoiceService = false, bVoiceEnabled = true;

 

 	int Load() override;

 };

diff --git a/protocols/Discord/src/stdafx.h b/protocols/Discord/src/stdafx.h
index 9987d6a256..95990b7dd2 100644
--- a/protocols/Discord/src/stdafx.h
+++ b/protocols/Discord/src/stdafx.h
@@ -51,6 +51,7 @@
 #include <m_voiceservice.h>

 

 #include "../../libs/zlib/src/zlib.h"

+#include "../../libs/libsodium/src/include/sodium.h"

 

 extern IconItem g_iconList[];

 

diff --git a/protocols/Discord/src/voice.cpp b/protocols/Discord/src/voice.cpp
index b30d7b166a..fad1728896 100644
--- a/protocols/Discord/src/voice.cpp
+++ b/protocols/Discord/src/voice.cpp
@@ -89,12 +89,6 @@ void CDiscordProto::TryVoiceStart(CDiscordGuild *pGuild)
 	}

 }

 

-void CDiscordProto::VoiceClientThread(void *param)

-{

-	auto *pCall = (CDiscordVoiceCall *)param;

-	pCall->startTime = time(0);

-}

-

 /////////////////////////////////////////////////////////////////////////////////////////

 // call operations (voice & video)

 

diff --git a/protocols/Discord/src/voice_client.cpp b/protocols/Discord/src/voice_client.cpp
new file mode 100644
index 0000000000..e20f6c95a9
--- /dev/null
+++ b/protocols/Discord/src/voice_client.cpp
@@ -0,0 +1,27 @@
+/*
+Copyright © 2016-22 Miranda NG team
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "stdafx.h"
+
+void CDiscordProto::VoiceClientThread(void *param)
+{
+	auto *pCall = (CDiscordVoiceCall *)param;
+	pCall->startTime = time(0);
+
+	int nLoops = 0;
+	time_t lastLoopTime = time(0);
+}
diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat
index 460c65d0d4..517cf1c939 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.bat
+++ b/tools/build_scripts/z2_PackPluginUpdater.bat
@@ -47,7 +47,7 @@ for /f %%a in ('dir plugins\*.dll /B /L') do (
 	if /I "%%a"=="CmdLine.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "MimCmd.exe")

 	if /I "%%a"=="CurrencyRates.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_CurrencyRates.dll" "Plugins\CurrencyRates\*.xml" "Plugins\CurrencyRates\CurrencyRatesChart.exe")

 	if /I "%%a"=="Dbx_mdbx.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "mdbx_chk.exe" "mdbx_dump.exe" "mdbx_load.exe" "Libs\libmdbx.mir")

-	if /I "%%a"=="Discord.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Discord.dll")

+	if /I "%%a"=="Discord.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Discord.dll" "Libs\libsodium.mir")

 	if /I "%%a"=="Dummy.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Dummy.dll")

 	if /I "%%a"=="Facebook.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Facebook.dll")

 	if /I "%%a"=="FavContacts.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Gadgets\favcontacts.gadget")