forgot bracket

This commit is contained in:
DarthArgus
2016-09-30 14:44:57 -05:00
parent 39e705c3d3
commit cc22c1948d
@@ -111,271 +111,272 @@ void GameServerConnection::onReceive(const Archive::ByteStream & message)
const uint32 messageType = gameNetworkMessage.getType();
switch(messageType) {
case constcrc("ChatDeleteAllPersistentMessages") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatDeleteAllPersistentMessages");
ChatDeleteAllPersistentMessages chatDeleteAllPersistentMessages(ri);
ChatServer::deleteAllPersistentMessages(chatDeleteAllPersistentMessages.getSourceNetworkId(), chatDeleteAllPersistentMessages.getTargetNetworkId());
break;
}
case constcrc("ChatCreateRoom") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatCreateRoom");
//printf("GameServerConnection -- ChatCreateRoom\n");
ChatCreateRoom chat(ri);
unsigned int sequence = chat.getSequence();
ChatServer::addGameServerConnection(sequence, this);
ChatServer::createRoom(NetworkId::cms_invalid, sequence, chat.getRoomName(), chat.getIsModerated(), chat.getIsPublic(), chat.getRoomTitle());
break;
}
case constcrc("ChatRequestLog") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatRequestLog");
ChatRequestLog chatRequestLog(ri);
std::vector<ChatLogEntry> chatLog;
ChatServer::getChatLog(chatRequestLog.getPlayer(), chatLog);
ChatOnRequestLog chatOnRequestLog(chatRequestLog.getSequence(), chatLog);
static Archive::ByteStream a;
a.clear();
chatOnRequestLog.pack(a);
(static_cast<Connection *>(this))->send(a, true);
break;
}
case constcrc("ChatDestroyRoomByName") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatDestroyRoomByName");
//printf("GameServerConnection -- ChatDestroyRoomByName\n");
ChatDestroyRoomByName chat(ri);
ChatServer::destroyRoom(chat.getRoomPath());
break;
}
case constcrc("ChatPutAvatarInRoom") :
{
//printf("GameServerConnection -- ChatPutAvatarInRoom\n");
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatPutAvatarInRoom");
ChatPutAvatarInRoom chat(ri);
ChatAvatarId id;
id.cluster = ConfigChatServer::getClusterName();
id.gameCode = m_gameCode;
id.name = chat.getAvatarName();
size_t pos = id.name.find(" ");
if(pos != std::string::npos)
id.name = id.name.substr(0, pos);
ChatServer::enterRoom(id, chat.getRoomName(), chat.getForceCreate(), chat.getCreatePrivate());
break;
}
case constcrc("ChatInviteAvatarToRoom") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatInviteAvatarToRoom");
//printf("GameServerConnection -- ChatInviteAvatarToRoom\n");
ChatInviteAvatarToRoom chat(ri);
ChatAvatarId characterName = chat.getAvatarId();
if(characterName.gameCode.empty())
characterName.gameCode = "SWG";
if(characterName.cluster.empty())
characterName.cluster = ConfigChatServer::getClusterName();
ChatServer::invite(NetworkId::cms_invalid, characterName, chat.getRoomName());
break;
}
case constcrc("ChatInviteGroupMembersToRoom") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatInviteGroupMembersToRoom");
//printf("GameServerConnection -- ChatInviteGroupMembersToRoom\n");
ChatInviteGroupMembersToRoom chat(ri);
ChatServer::inviteGroupMembers(chat.getInvitorNetworkId(), chat.getGroupLeaderId(), chat.getRoomName(), chat.getInvitedMembers());
break;
}
case constcrc("ChatUninviteFromRoom") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatUninviteAvatarToRoom");
//printf("GameServerConnection -- ChatUninviteAvatarFromRoom\n");
ChatUninviteFromRoom chat(ri);
ChatAvatarId characterName = chat.getAvatar();
if(characterName.gameCode.empty())
characterName.gameCode = "SWG";
if(characterName.cluster.empty())
characterName.cluster = ConfigChatServer::getClusterName();
ChatServer::uninvite(ChatServer::getNetworkIdByAvatarId(characterName), chat.getSequence(), characterName, chat.getRoomName());
break;
}
case constcrc("ChatChangeFriendStatus") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatChangeFriendStatus");
//printf("GameServerConnection -- ChatChangeFriendStatus\n");
ChatChangeFriendStatus chat(ri);
if (chat.getAdd())
case constcrc("ChatDeleteAllPersistentMessages") :
{
ChatServer::addFriend(
ChatServer::getNetworkIdByAvatarId(chat.getCharacterName()),
chat.getSequence(), chat.getFriendName());
}
else
{
ChatServer::removeFriend(
ChatServer::getNetworkIdByAvatarId(chat.getCharacterName()),
chat.getSequence(), chat.getFriendName());
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatDeleteAllPersistentMessages");
ChatDeleteAllPersistentMessages chatDeleteAllPersistentMessages(ri);
ChatServer::deleteAllPersistentMessages(chatDeleteAllPersistentMessages.getSourceNetworkId(), chatDeleteAllPersistentMessages.getTargetNetworkId());
break;
}
break;
}
case constcrc("ChatGetFriendsList") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatGetFriendsList");
//printf("GameServerConnection -- ChatGetFriendsList\n");
ChatGetFriendsList chat(ri);
ChatServer::getFriendsList(chat.getCharacterName());
break;
}
case constcrc("ChatChangeIgnoreStatus") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatChangeIgnoreStatus");
//printf("GameServerConnection -- ChatChangeIgnoreStatus\n");
ChatChangeIgnoreStatus chat(ri);
if (chat.getIgnore())
case constcrc("ChatCreateRoom") :
{
ChatServer::addIgnore(
ChatServer::getNetworkIdByAvatarId(chat.getCharacterName()),
chat.getSequence(), chat.getIgnoreName());
}
else
{
ChatServer::removeIgnore(
ChatServer::getNetworkIdByAvatarId(chat.getCharacterName()),
chat.getSequence(), chat.getIgnoreName());
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatCreateRoom");
//printf("GameServerConnection -- ChatCreateRoom\n");
ChatCreateRoom chat(ri);
unsigned int sequence = chat.getSequence();
ChatServer::addGameServerConnection(sequence, this);
ChatServer::createRoom(NetworkId::cms_invalid, sequence, chat.getRoomName(), chat.getIsModerated(), chat.getIsPublic(), chat.getRoomTitle());
break;
}
break;
}
case constcrc("ChatGetIgnoreList") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatGetIgnoreList");
//printf("GameServerConnection -- ChatGetIgnoreList\n");
ChatGetIgnoreList chat(ri);
case constcrc("ChatRequestLog") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatRequestLog");
ChatRequestLog chatRequestLog(ri);
std::vector<ChatLogEntry> chatLog;
ChatServer::getChatLog(chatRequestLog.getPlayer(), chatLog);
ChatServer::getIgnoreList(chat.getCharacterName());
break;
}
case constcrc("ChatRemoveAvatarFromRoom") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatRemoveAvatarFromRoom");
//printf("GameServerConnection -- ChatRemoveAvatarFromRoom\n");
ChatRemoveAvatarFromRoom chat(ri);
ChatAvatarId id = chat.getAvatarId();
size_t pos = id.name.find(" ");
if(pos != std::string::npos)
id.name = id.name.substr(0, pos);
ChatServer::removeAvatarFromRoom(id, chat.getRoomName());
break;
}
case constcrc("ChatMessageFromGame") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatMessageFromGame");
//printf("GameServerConnection -- ChatMessageFromGame\n");
ChatMessageFromGame chat(ri);
std::string recipient = chat.getTo();
size_t pos = recipient.find(" ");
if (pos != std::string::npos)
{
recipient = recipient.substr(0, pos);
ChatOnRequestLog chatOnRequestLog(chatRequestLog.getSequence(), chatLog);
static Archive::ByteStream a;
a.clear();
chatOnRequestLog.pack(a);
(static_cast<Connection *>(this))->send(a, true);
break;
}
switch(chat.getMessageType())
case constcrc("ChatDestroyRoomByName") :
{
case ChatMessageFromGame::INSTANT:
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatDestroyRoomByName");
//printf("GameServerConnection -- ChatDestroyRoomByName\n");
ChatDestroyRoomByName chat(ri);
ChatServer::destroyRoom(chat.getRoomPath());
break;
}
case constcrc("ChatPutAvatarInRoom") :
{
//printf("GameServerConnection -- ChatPutAvatarInRoom\n");
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatPutAvatarInRoom");
ChatPutAvatarInRoom chat(ri);
ChatAvatarId id;
id.cluster = ConfigChatServer::getClusterName();
id.gameCode = m_gameCode;
id.name = chat.getAvatarName();
size_t pos = id.name.find(" ");
if(pos != std::string::npos)
id.name = id.name.substr(0, pos);
ChatServer::enterRoom(id, chat.getRoomName(), chat.getForceCreate(), chat.getCreatePrivate());
break;
}
case constcrc("ChatInviteAvatarToRoom") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatInviteAvatarToRoom");
//printf("GameServerConnection -- ChatInviteAvatarToRoom\n");
ChatInviteAvatarToRoom chat(ri);
ChatAvatarId characterName = chat.getAvatarId();
if(characterName.gameCode.empty())
characterName.gameCode = "SWG";
if(characterName.cluster.empty())
characterName.cluster = ConfigChatServer::getClusterName();
ChatServer::invite(NetworkId::cms_invalid, characterName, chat.getRoomName());
break;
}
case constcrc("ChatInviteGroupMembersToRoom") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatInviteGroupMembersToRoom");
//printf("GameServerConnection -- ChatInviteGroupMembersToRoom\n");
ChatInviteGroupMembersToRoom chat(ri);
ChatServer::inviteGroupMembers(chat.getInvitorNetworkId(), chat.getGroupLeaderId(), chat.getRoomName(), chat.getInvitedMembers());
break;
}
case constcrc("ChatUninviteFromRoom") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatUninviteAvatarToRoom");
//printf("GameServerConnection -- ChatUninviteAvatarFromRoom\n");
ChatUninviteFromRoom chat(ri);
ChatAvatarId characterName = chat.getAvatar();
if(characterName.gameCode.empty())
characterName.gameCode = "SWG";
if(characterName.cluster.empty())
characterName.cluster = ConfigChatServer::getClusterName();
ChatServer::uninvite(ChatServer::getNetworkIdByAvatarId(characterName), chat.getSequence(), characterName, chat.getRoomName());
break;
}
case constcrc("ChatChangeFriendStatus") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatChangeFriendStatus");
//printf("GameServerConnection -- ChatChangeFriendStatus\n");
ChatChangeFriendStatus chat(ri);
if (chat.getAdd())
{
ChatAvatarId from(chat.getFrom());
if (from.cluster.empty())
from.cluster = ConfigChatServer::getClusterName();
if (from.gameCode.empty())
from.gameCode = m_gameCode;
ChatServer::addFriend(
ChatServer::getNetworkIdByAvatarId(chat.getCharacterName()),
chat.getSequence(), chat.getFriendName());
}
else
{
ChatServer::removeFriend(
ChatServer::getNetworkIdByAvatarId(chat.getCharacterName()),
chat.getSequence(), chat.getFriendName());
}
break;
}
case constcrc("ChatGetFriendsList") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatGetFriendsList");
//printf("GameServerConnection -- ChatGetFriendsList\n");
ChatGetFriendsList chat(ri);
ChatAvatarId to(recipient);
if (to.cluster.empty())
to.cluster = ConfigChatServer::getClusterName();
if (to.gameCode.empty())
to.gameCode = m_gameCode;
ChatServer::getFriendsList(chat.getCharacterName());
break;
}
case constcrc("ChatChangeIgnoreStatus") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatChangeIgnoreStatus");
//printf("GameServerConnection -- ChatChangeIgnoreStatus\n");
ChatChangeIgnoreStatus chat(ri);
ChatServer::sendInstantMessage(from, to, chat.getMessage(), chat.getOutOfBand());
if (chat.getIgnore())
{
ChatServer::addIgnore(
ChatServer::getNetworkIdByAvatarId(chat.getCharacterName()),
chat.getSequence(), chat.getIgnoreName());
}
else
{
ChatServer::removeIgnore(
ChatServer::getNetworkIdByAvatarId(chat.getCharacterName()),
chat.getSequence(), chat.getIgnoreName());
}
break;
case ChatMessageFromGame::PERSISTENT:
{
ChatAvatarId from(chat.getFrom());
if (from.cluster.empty())
from.cluster = ConfigChatServer::getClusterName();
if (from.gameCode.empty())
from.gameCode = m_gameCode;
ChatAvatarId to(recipient);
if (to.cluster.empty())
to.cluster = ConfigChatServer::getClusterName();
if (to.gameCode.empty())
to.gameCode = m_gameCode;
ChatServer::sendPersistentMessage(from, to, chat.getSubject(), chat.getMessage(), chat.getOutOfBand());
}
break;
case ChatMessageFromGame::ROOM:
{
ChatAvatarId from(chat.getFrom());
if (from.cluster.empty())
from.cluster = ConfigChatServer::getClusterName();
if (from.gameCode.empty())
from.gameCode = m_gameCode;
}
case constcrc("ChatGetIgnoreList") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatGetIgnoreList");
//printf("GameServerConnection -- ChatGetIgnoreList\n");
ChatGetIgnoreList chat(ri);
ChatServer::sendStandardRoomMessage(from, chat.getRoom(), chat.getMessage(), chat.getOutOfBand());
}
break;
default:
REPORT_LOG(true, ("Unkown Game Chat Message type\n"));
ChatServer::getIgnoreList(chat.getCharacterName());
break;
}
break;
}
case constcrc("SetUnsquelchTime") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - SetUnsquelchTime");
//printf("GameServerConnection -- SetUnsquelchTime\n");
GenericValueTypeMessage<std::pair<NetworkId, int> > setUnsquelchTime(ri);
case constcrc("ChatRemoveAvatarFromRoom") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatRemoveAvatarFromRoom");
//printf("GameServerConnection -- ChatRemoveAvatarFromRoom\n");
ChatRemoveAvatarFromRoom chat(ri);
ChatAvatarId id = chat.getAvatarId();
size_t pos = id.name.find(" ");
if(pos != std::string::npos)
id.name = id.name.substr(0, pos);
ChatServer::removeAvatarFromRoom(id, chat.getRoomName());
break;
}
case constcrc("ChatMessageFromGame") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatMessageFromGame");
//printf("GameServerConnection -- ChatMessageFromGame\n");
ChatMessageFromGame chat(ri);
std::string recipient = chat.getTo();
size_t pos = recipient.find(" ");
if (pos != std::string::npos)
{
recipient = recipient.substr(0, pos);
}
switch(chat.getMessageType())
{
case ChatMessageFromGame::INSTANT:
{
ChatAvatarId from(chat.getFrom());
if (from.cluster.empty())
from.cluster = ConfigChatServer::getClusterName();
if (from.gameCode.empty())
from.gameCode = m_gameCode;
ChatServer::setUnsquelchTime(setUnsquelchTime.getValue().first, static_cast<time_t>(setUnsquelchTime.getValue().second));
break;
}
case constcrc("ChatStatisticsGS") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatStatisticsGS");
//printf("GameServerConnection -- ChatStatisticsGS\n");
GenericValueTypeMessage<std::pair<std::pair<std::pair<NetworkId, int>, int>, std::pair<int, int> > > chatStatistics(ri);
ChatAvatarId to(recipient);
if (to.cluster.empty())
to.cluster = ConfigChatServer::getClusterName();
if (to.gameCode.empty())
to.gameCode = m_gameCode;
ChatServer::handleChatStatisticsFromGameServer(chatStatistics.getValue().first.first.first, static_cast<time_t>(chatStatistics.getValue().first.first.second), static_cast<time_t>(chatStatistics.getValue().first.second), chatStatistics.getValue().second.first, chatStatistics.getValue().second.second);
break;
}
case constcrc("BroadcastGlobalChannel") :
{
Archive::ReadIterator ri = message.begin();
ChatServer::sendInstantMessage(from, to, chat.getMessage(), chat.getOutOfBand());
}
break;
case ChatMessageFromGame::PERSISTENT:
{
ChatAvatarId from(chat.getFrom());
if (from.cluster.empty())
from.cluster = ConfigChatServer::getClusterName();
if (from.gameCode.empty())
from.gameCode = m_gameCode;
ChatAvatarId to(recipient);
if (to.cluster.empty())
to.cluster = ConfigChatServer::getClusterName();
if (to.gameCode.empty())
to.gameCode = m_gameCode;
ChatServer::sendPersistentMessage(from, to, chat.getSubject(), chat.getMessage(), chat.getOutOfBand());
}
break;
case ChatMessageFromGame::ROOM:
{
ChatAvatarId from(chat.getFrom());
if (from.cluster.empty())
from.cluster = ConfigChatServer::getClusterName();
if (from.gameCode.empty())
from.gameCode = m_gameCode;
typedef std::pair<std::pair<std::string,std::string>, bool> PayloadType;
GenericValueTypeMessage<PayloadType> msg(ri);
ChatServer::sendStandardRoomMessage(from, chat.getRoom(), chat.getMessage(), chat.getOutOfBand());
}
break;
default:
REPORT_LOG(true, ("Unkown Game Chat Message type\n"));
break;
}
break;
}
case constcrc("SetUnsquelchTime") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - SetUnsquelchTime");
//printf("GameServerConnection -- SetUnsquelchTime\n");
GenericValueTypeMessage<std::pair<NetworkId, int> > setUnsquelchTime(ri);
PayloadType const & payload = msg.getValue();
std::string const & channelName = payload.first.first;
std::string const & messageText = payload.first.second;
bool const & isRemove = payload.second;
ChatServer::setUnsquelchTime(setUnsquelchTime.getValue().first, static_cast<time_t>(setUnsquelchTime.getValue().second));
break;
}
case constcrc("ChatStatisticsGS") :
{
PROFILER_AUTO_BLOCK_DEFINE("GameServerConnection - ChatStatisticsGS");
//printf("GameServerConnection -- ChatStatisticsGS\n");
GenericValueTypeMessage<std::pair<std::pair<std::pair<NetworkId, int>, int>, std::pair<int, int> > > chatStatistics(ri);
LOG("CustomerService", ("ChatServer got BroadcastGlobalChannel on GameServerConnection chan(%s) text(%s) remove(%d)",
channelName.c_str(), messageText.c_str(), (isRemove?1:0)));
ChatServer::requestBroadcastChannelMessage(channelName, messageText, isRemove);
break;
}
case constcrc("ChatDestroyAvatar") :
{
GenericValueTypeMessage<std::string> const msg(ri);
ChatServer::getChatInterface()->DestroyAvatar(msg.getValue());
break;
ChatServer::handleChatStatisticsFromGameServer(chatStatistics.getValue().first.first.first, static_cast<time_t>(chatStatistics.getValue().first.first.second), static_cast<time_t>(chatStatistics.getValue().first.second), chatStatistics.getValue().second.first, chatStatistics.getValue().second.second);
break;
}
case constcrc("BroadcastGlobalChannel") :
{
Archive::ReadIterator ri = message.begin();
typedef std::pair<std::pair<std::string,std::string>, bool> PayloadType;
GenericValueTypeMessage<PayloadType> msg(ri);
PayloadType const & payload = msg.getValue();
std::string const & channelName = payload.first.first;
std::string const & messageText = payload.first.second;
bool const & isRemove = payload.second;
LOG("CustomerService", ("ChatServer got BroadcastGlobalChannel on GameServerConnection chan(%s) text(%s) remove(%d)",
channelName.c_str(), messageText.c_str(), (isRemove?1:0)));
ChatServer::requestBroadcastChannelMessage(channelName, messageText, isRemove);
break;
}
case constcrc("ChatDestroyAvatar") :
{
GenericValueTypeMessage<std::string> const msg(ri);
ChatServer::getChatInterface()->DestroyAvatar(msg.getValue());
break;
}
}
}