elexis
4c454f3eee
The commit introduced support for arbitrary lobby CreateGUIMessage JS::Value arguments but didn't transfer wstring_from_utf8 appropriately. Instead of enlengthening the code by reintroducing utf8_from_wstring everyhwere, shorten the code and specialize ToJSVal for glooxwrapper::string and gloox enums. Avoid string copies for XmppClient getters, refs D1668: Change GetPresence() and GetRole() to return the pointer to the string literal instead of copy constructing a std::string each call. Don't reintroduce the unneeded utf8_from_wstring conversions for the untranslatable ASCII identifiers returned by GetPresence() and GetRole(). Change GetSubject() to return a const ref to the member instead of copy assigning the std::string to an output value. Change m_Subject to std::wstring to avoid constructing a copy using wstring_from_utf8 each GetSubject() call. Change gloox enum to translatable string functions to be static, so as to use them in the new ToJSVal functions (enabled by not calling CertificateErrorToString from ConnectionErrorToString anyymore in 92fc34c87c/D2274). Avoid per-player string copies in m_PlayerMap: Change m_PlayerMap value type from std::vector<std::string> to a new PlayerMap struct with named members for readability. Use gloox enums as PlayerMap values to avoid constructing (performance) and storing (memory footprint) std::strings. The JS String is created from the pointer to the ASCII string literal without intermediaries. Use glooxwrapper::string for nickname and m_Rating since it's the data source type received in relevant places, but that might be improved for performance with std::wstring. Construct map values in place where possible and post error instead of silently inserting if an existing value is to be modified. Avoid repeated std::map lookups on string keys by caching the PlayerMap::iterator where available. Remove some glooxwrapper::string to_string() calls redundant with its operator<< and improve DbgXMPP gloox enum output. Transfer rating too upon nickchange. Differential Revision: https://code.wildfiregames.com/D2271 Tested on: clang 8.0.1, Jenkins This was SVN commit r22891.
70 lines
3.1 KiB
C++
70 lines
3.1 KiB
C++
/* Copyright (C) 2019 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. 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.
|
|
*
|
|
* 0 A.D. 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 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef IXMPPCLIENT_H
|
|
#define IXMPPCLIENT_H
|
|
|
|
#include "scriptinterface/ScriptTypes.h"
|
|
|
|
class ScriptInterface;
|
|
namespace StunClient {
|
|
struct StunEndpoint;
|
|
}
|
|
|
|
class IXmppClient
|
|
{
|
|
public:
|
|
static IXmppClient* create(const ScriptInterface* scriptInterface, const std::string& sUsername, const std::string& sPassword, const std::string& sRoom, const std::string& sNick, const int historyRequestSize = 0, bool regOpt = false);
|
|
virtual ~IXmppClient() {}
|
|
|
|
virtual void connect() = 0;
|
|
virtual void disconnect() = 0;
|
|
virtual bool isConnected() = 0;
|
|
virtual void recv() = 0;
|
|
virtual void SendIqGetBoardList() = 0;
|
|
virtual void SendIqGetProfile(const std::string& player) = 0;
|
|
virtual void SendIqGameReport(const ScriptInterface& scriptInterface, JS::HandleValue data) = 0;
|
|
virtual void SendIqRegisterGame(const ScriptInterface& scriptInterface, JS::HandleValue data) = 0;
|
|
virtual void SendIqUnregisterGame() = 0;
|
|
virtual void SendIqChangeStateGame(const std::string& nbp, const std::string& players) = 0;
|
|
virtual void SendIqLobbyAuth(const std::string& to, const std::string& token) = 0;
|
|
virtual void SetNick(const std::string& nick) = 0;
|
|
virtual void GetNick(std::string& nick) = 0;
|
|
virtual void kick(const std::string& nick, const std::string& reason) = 0;
|
|
virtual void ban(const std::string& nick, const std::string& reason) = 0;
|
|
virtual void SetPresence(const std::string& presence) = 0;
|
|
virtual const char* GetPresence(const std::string& nickname) = 0;
|
|
virtual const char* GetRole(const std::string& nickname) = 0;
|
|
virtual const std::wstring& GetSubject() = 0;
|
|
virtual void GUIGetPlayerList(const ScriptInterface& scriptInterface, JS::MutableHandleValue ret) = 0;
|
|
virtual void GUIGetGameList(const ScriptInterface& scriptInterface, JS::MutableHandleValue ret) = 0;
|
|
virtual void GUIGetBoardList(const ScriptInterface& scriptInterface, JS::MutableHandleValue ret) = 0;
|
|
virtual void GUIGetProfile(const ScriptInterface& scriptInterface, JS::MutableHandleValue ret) = 0;
|
|
|
|
virtual JS::Value GuiPollNewMessage(const ScriptInterface& scriptInterface) = 0;
|
|
virtual JS::Value GuiPollHistoricMessages(const ScriptInterface& scriptInterface) = 0;
|
|
virtual bool GuiPollHasPlayerListUpdate() = 0;
|
|
|
|
virtual void SendMUCMessage(const std::string& message) = 0;
|
|
virtual void SendStunEndpointToHost(const StunClient::StunEndpoint& stunEndpoint, const std::string& hostJID) = 0;
|
|
};
|
|
|
|
extern IXmppClient *g_XmppClient;
|
|
extern bool g_rankedGame;
|
|
|
|
#endif // XMPPCLIENT_H
|