Merge Add MUMBLE_DOES_CHANNEL_EXIST native (pr-2682)

7fcb6b7 - fix(voip/mumble): Add correct return types to MUMBLE_DOES_CHANNEL_EXIST b1d2a85 - feat(voip/mumble): Add MUMBLE_DOES_CHANNEL_EXIST native
citizenfx · Aug 20, 2024 · 9cb2e86 · 9cb2e86
2 parents 918265a + 7fcb6b7
commit 9cb2e86
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 3 deletions.
diff --git a/code/components/gta-net-five/src/MumbleVoice.cpp b/code/components/gta-net-five/src/MumbleVoice.cpp
@@ -1151,6 +1151,20 @@ static HookFunction hookFunction([]()
 			}
 		});
 
+		fx::ScriptEngine::RegisterNativeHandler("MUMBLE_DOES_CHANNEL_EXIST", [](fx::ScriptContext& context) {
+			auto channel = context.GetArgument<int>(0);
+
+			if (g_mumble.connected)
+			{
+				auto channelName = fmt::sprintf("Game Channel %d", channel);
+				context.SetResult<bool>(g_mumbleClient->DoesChannelExist(channelName));
+			}
+			else
+			{
+				context.SetResult<bool>(false);
+			}
+		});
+
 		fx::ScriptEngine::RegisterNativeHandler("MUMBLE_ADD_VOICE_TARGET_PLAYER", [](fx::ScriptContext& context)
 		{
 			auto id = context.GetArgument<int>(0);

diff --git a/code/components/voip-mumble/include/MumbleClient.h b/code/components/voip-mumble/include/MumbleClient.h
@@ -121,6 +121,8 @@ class IMumbleClient : public fwRefCountable
 
 	virtual void RemoveListenChannel(const std::string& channelName) = 0;
 
+	virtual bool DoesChannelExist(const std::string& channelName) = 0;
+
 	virtual std::shared_ptr<lab::AudioContext> GetAudioContext(const std::string& name) = 0;
 
 	// settings

diff --git a/code/components/voip-mumble/include/MumbleClientImpl.h b/code/components/voip-mumble/include/MumbleClientImpl.h
@@ -104,6 +104,8 @@ class MumbleClient : public IMumbleClient, public Botan::TLS::Callbacks
 
 	virtual void RemoveListenChannel(const std::string& channelName) override;
 
+	virtual bool DoesChannelExist(const std::string& channelName) override;
+
 	virtual std::shared_ptr<lab::AudioContext> GetAudioContext(const std::string& name) override;
 
 	virtual void SetClientVolumeOverride(const std::wstring& clientName, float volume) override;

diff --git a/code/components/voip-mumble/src/MumbleClient.cpp b/code/components/voip-mumble/src/MumbleClient.cpp
@@ -349,9 +349,10 @@ void MumbleClient::Initialize()
 
 							if (!t.channel.empty())
 							{
+								std::wstring wname = ToWide(t.channel);
 								for (auto& channelPair : m_state.GetChannels())
 								{
-									if (channelPair.second.GetName() == ToWide(t.channel))
+									if (channelPair.second.GetName() == wname)
 									{
 										vt->set_channel_id(channelPair.first);
 									}
@@ -690,6 +691,21 @@ std::string MumbleClient::GetVoiceChannelFromServerId(uint32_t serverId)
 	return retString;
 }
 
+bool MumbleClient::DoesChannelExist(const std::string& channelName)
+{
+	std::wstring wname = ToWide(channelName);
+
+	for (const auto& channel : m_state.GetChannels())
+	{
+		if (channel.second.GetName() == wname)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
 void MumbleClient::GetTalkers(std::vector<std::string>* referenceIds)
 {
 	referenceIds->clear();

diff --git a/code/components/voip-mumble/src/MumbleClientState_Channel.cpp b/code/components/voip-mumble/src/MumbleClientState_Channel.cpp
@@ -62,8 +62,7 @@ void MumbleClientState::ProcessChannelState(MumbleProto::ChannelState& channelSt
 		if (channelIt == m_channels.end())
 		{
 			auto channel = MumbleChannel(m_client, channelState);
-
-			m_channels.insert(std::make_pair(id, channel));
+			m_channels.emplace(id, channel);
 
 			auto name = channel.GetName();
 

diff --git a/ext/native-decls/MumbleDoesChannelExist.md b/ext/native-decls/MumbleDoesChannelExist.md
@@ -0,0 +1,17 @@
+---
+ns: CFX
+apiset: client
+---
+## MUMBLE_DOES_CHANNEL_EXIST
+
+```c
+BOOL MUMBLE_DOES_CHANNEL_EXIST(int channel);
+```
+
+Check whether specified channel exists on the Mumble server.
+
+## Parameters
+* **channel**: A game voice channel ID.
+
+## Return value
+True if the specific channel exists. False otherwise.