summaryrefslogtreecommitdiff
path: root/src/chat-server
diff options
context:
space:
mode:
Diffstat (limited to 'src/chat-server')
-rw-r--r--src/chat-server/chatchannel.cpp8
-rw-r--r--src/chat-server/chatchannel.hpp8
-rw-r--r--src/chat-server/chatchannelmanager.cpp19
-rw-r--r--src/chat-server/chatchannelmanager.hpp9
-rw-r--r--src/chat-server/chathandler.cpp56
-rw-r--r--src/chat-server/chathandler.hpp2
-rw-r--r--src/chat-server/party.hpp4
-rw-r--r--src/chat-server/partyhandler.cpp2
8 files changed, 46 insertions, 62 deletions
diff --git a/src/chat-server/chatchannel.cpp b/src/chat-server/chatchannel.cpp
index 5dd2b667..43ca1e92 100644
--- a/src/chat-server/chatchannel.cpp
+++ b/src/chat-server/chatchannel.cpp
@@ -112,13 +112,13 @@ void ChatChannel::setUserMode(ChatClient *user, unsigned char mode)
}
}
-std::string ChatChannel::getUserMode(ChatClient *user)
+std::string ChatChannel::getUserMode(ChatClient *user) const
{
- std::map<ChatChannel*, std::string>::iterator itr = user->userModes.find(this);
+ std::map<ChatChannel*, std::string>::const_iterator itr =
+ user->userModes.find(const_cast<ChatChannel*>(this));
+
if (itr != user->userModes.end())
- {
return itr->second;
- }
return 0;
}
diff --git a/src/chat-server/chatchannel.hpp b/src/chat-server/chatchannel.hpp
index 8a462ddf..66ffb5b2 100644
--- a/src/chat-server/chatchannel.hpp
+++ b/src/chat-server/chatchannel.hpp
@@ -65,13 +65,13 @@ class ChatChannel
/**
* Get the name of the channel.
*/
- const std::string& getName() const
+ const std::string &getName() const
{ return mName; }
/**
* Get the announcement string of the channel.
*/
- const std::string& getAnnouncement() const
+ const std::string &getAnnouncement() const
{ return mAnnouncement; }
/**
@@ -101,7 +101,7 @@ class ChatChannel
/**
* Gets the list of the users registered in the channel.
*/
- const ChannelUsers& getUserList() const
+ const ChannelUsers &getUserList() const
{ return mRegisteredUsers; }
/**
@@ -136,7 +136,7 @@ class ChatChannel
/**
* Get user mode
*/
- std::string getUserMode(ChatClient *);
+ std::string getUserMode(ChatClient *) const;
private:
unsigned short mId; /**< The ID of the channel. */
diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp
index bb9d3a73..f2c52e8e 100644
--- a/src/chat-server/chatchannelmanager.cpp
+++ b/src/chat-server/chatchannelmanager.cpp
@@ -120,7 +120,8 @@ int ChatChannelManager::getChannelId(const std::string &channelName) const
i_end = mChatChannels.end();
i != i_end; ++i)
{
- if (i->second.getName() == channelName) return i->first;
+ if (i->second.getName() == channelName)
+ return i->first;
}
return 0;
}
@@ -130,7 +131,7 @@ ChatChannel *ChatChannelManager::getChannel(int channelId)
ChatChannels::iterator i = mChatChannels.find(channelId);
if (i != mChatChannels.end())
return &i->second;
- return NULL;
+ return 0;
}
ChatChannel *ChatChannelManager::getChannel(const std::string &name)
@@ -139,12 +140,10 @@ ChatChannel *ChatChannelManager::getChannel(const std::string &name)
i != mChatChannels.end(); ++i)
{
if (i->second.getName() == name)
- {
return &(i->second);
- }
}
- return NULL;
+ return 0;
}
void ChatChannelManager::setChannelTopic(int channelId, const std::string &topic)
@@ -179,9 +178,15 @@ bool ChatChannelManager::channelExists(int channelId) const
return mChatChannels.find(channelId) != mChatChannels.end();
}
-bool ChatChannelManager::channelExists(const std::string &channelName)
+bool ChatChannelManager::channelExists(const std::string &channelName) const
{
- return getChannel(channelName) != NULL;
+ for (ChatChannels::const_iterator i = mChatChannels.begin();
+ i != mChatChannels.end(); ++i)
+ {
+ if (i->second.getName() == channelName)
+ return true;
+ }
+ return false;
}
int ChatChannelManager::nextUsable()
diff --git a/src/chat-server/chatchannelmanager.hpp b/src/chat-server/chatchannelmanager.hpp
index 096323b0..739b4285 100644
--- a/src/chat-server/chatchannelmanager.hpp
+++ b/src/chat-server/chatchannelmanager.hpp
@@ -34,14 +34,7 @@
class ChatChannelManager
{
public:
- /**
- * Constructor.
- */
ChatChannelManager();
-
- /**
- * Destructor.
- */
~ChatChannelManager();
/**
@@ -114,7 +107,7 @@ class ChatChannelManager
* @param channelId a channel ID
*/
bool channelExists(int channelId) const;
- bool channelExists(const std::string &channelName);
+ bool channelExists(const std::string &channelName) const;
/**
* Get next usable channel ID
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index 95d2ed73..410c5b0b 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -252,8 +252,7 @@ void ChatHandler::processMessage(NetComputer *comp, MessageIn &message)
computer.send(result);
}
-void
-ChatHandler::handleCommand(ChatClient &computer, const std::string &command)
+void ChatHandler::handleCommand(ChatClient &computer, const std::string &command)
{
LOG_INFO("Chat: Received unhandled command: " << command);
MessageOut result;
@@ -262,8 +261,7 @@ ChatHandler::handleCommand(ChatClient &computer, const std::string &command)
computer.send(result);
}
-void
-ChatHandler::warnPlayerAboutBadWords(ChatClient &computer)
+void ChatHandler::warnPlayerAboutBadWords(ChatClient &computer)
{
// We could later count if the player is really often unpolite.
MessageOut result;
@@ -274,8 +272,7 @@ ChatHandler::warnPlayerAboutBadWords(ChatClient &computer)
LOG_INFO(computer.characterName << " says bad words.");
}
-void
-ChatHandler::handleChatMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleChatMessage(ChatClient &client, MessageIn &msg)
{
std::string text = msg.readString();
@@ -309,8 +306,7 @@ ChatHandler::handleChatMessage(ChatClient &client, MessageIn &msg)
storage->addTransaction(trans);
}
-void
-ChatHandler::handleAnnounceMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleAnnounceMessage(ChatClient &client, MessageIn &msg)
{
std::string text = msg.readString();
@@ -349,8 +345,7 @@ ChatHandler::handleAnnounceMessage(ChatClient &client, MessageIn &msg)
}
-void
-ChatHandler::handlePrivMsgMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handlePrivMsgMessage(ChatClient &client, MessageIn &msg)
{
std::string user = msg.readString();
std::string text = msg.readString();
@@ -458,8 +453,7 @@ void ChatHandler::handleEnterChannelMessage(ChatClient &client, MessageIn &msg)
client.send(reply);
}
-void
-ChatHandler::handleModeChangeMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleModeChangeMessage(ChatClient &client, MessageIn &msg)
{
short channelId = msg.readShort();
ChatChannel *channel = chatChannelManager->getChannel(channelId);
@@ -500,8 +494,7 @@ ChatHandler::handleModeChangeMessage(ChatClient &client, MessageIn &msg)
storage->addTransaction(trans);
}
-void
-ChatHandler::handleKickUserMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleKickUserMessage(ChatClient &client, MessageIn &msg)
{
short channelId = msg.readShort();
ChatChannel *channel = chatChannelManager->getChannel(channelId);
@@ -538,8 +531,7 @@ ChatHandler::handleKickUserMessage(ChatClient &client, MessageIn &msg)
storage->addTransaction(trans);
}
-void
-ChatHandler::handleQuitChannelMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleQuitChannelMessage(ChatClient &client, MessageIn &msg)
{
MessageOut reply(CPMSG_QUIT_CHANNEL_RESPONSE);
@@ -581,8 +573,7 @@ ChatHandler::handleQuitChannelMessage(ChatClient &client, MessageIn &msg)
client.send(reply);
}
-void
-ChatHandler::handleListChannelsMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleListChannelsMessage(ChatClient &client, MessageIn &msg)
{
MessageOut reply(CPMSG_LIST_CHANNELS_RESPONSE);
@@ -607,8 +598,8 @@ ChatHandler::handleListChannelsMessage(ChatClient &client, MessageIn &msg)
storage->addTransaction(trans);
}
-void
-ChatHandler::handleListChannelUsersMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleListChannelUsersMessage(ChatClient &client,
+ MessageIn &msg)
{
MessageOut reply(CPMSG_LIST_CHANNELUSERS_RESPONSE);
@@ -639,8 +630,7 @@ ChatHandler::handleListChannelUsersMessage(ChatClient &client, MessageIn &msg)
storage->addTransaction(trans);
}
-void
-ChatHandler::handleTopicChange(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleTopicChange(ChatClient &client, MessageIn &msg)
{
short channelId = msg.readShort();
std::string topic = msg.readString();
@@ -664,8 +654,7 @@ ChatHandler::handleTopicChange(ChatClient &client, MessageIn &msg)
storage->addTransaction(trans);
}
-void
-ChatHandler::handleDisconnectMessage(ChatClient &client, MessageIn &msg)
+void ChatHandler::handleDisconnectMessage(ChatClient &client, MessageIn &msg)
{
MessageOut reply(CPMSG_DISCONNECT_RESPONSE);
reply.writeByte(ERRMSG_OK);
@@ -674,9 +663,9 @@ ChatHandler::handleDisconnectMessage(ChatClient &client, MessageIn &msg)
client.send(reply);
}
-void
-ChatHandler::sayToPlayer(ChatClient &computer, const std::string &playerName,
- const std::string &text)
+void ChatHandler::sayToPlayer(ChatClient &computer,
+ const std::string &playerName,
+ const std::string &text)
{
MessageOut result;
LOG_DEBUG(computer.characterName << " says to " << playerName << ": "
@@ -717,16 +706,13 @@ void ChatHandler::sendInChannel(ChatChannel *channel, MessageOut &msg)
}
}
-ChatClient* ChatHandler::getClient(const std::string &name)
+ChatClient *ChatHandler::getClient(const std::string &name) const
{
- std::map<std::string, ChatClient*>::iterator itr;
- itr = mPlayerMap.find(name);
+ std::map<std::string, ChatClient*>::const_iterator itr
+ = mPlayerMap.find(name);
+
if (itr != mPlayerMap.end())
- {
return itr->second;
- }
else
- {
- return NULL;
- }
+ return 0;
}
diff --git a/src/chat-server/chathandler.hpp b/src/chat-server/chathandler.hpp
index fe14271f..1cd4306b 100644
--- a/src/chat-server/chathandler.hpp
+++ b/src/chat-server/chathandler.hpp
@@ -318,7 +318,7 @@ class ChatHandler : public ConnectionHandler
* @param The name of the character
* @return The Chat Client
*/
- ChatClient *getClient(const std::string &name);
+ ChatClient *getClient(const std::string &name) const;
/**
* Set the topic of a guild channel
diff --git a/src/chat-server/party.hpp b/src/chat-server/party.hpp
index d09e53ea..29bb7f21 100644
--- a/src/chat-server/party.hpp
+++ b/src/chat-server/party.hpp
@@ -48,12 +48,12 @@ public:
/**
* Return number of users in party
*/
- unsigned int numUsers() { return mUsers.size(); }
+ unsigned int userCount() const { return mUsers.size(); }
/**
* Return the party id
*/
- unsigned int getId() { return mId; }
+ unsigned int getId() const { return mId; }
private:
PartyUsers mUsers;
diff --git a/src/chat-server/partyhandler.cpp b/src/chat-server/partyhandler.cpp
index 04fb8fb1..e9e4222f 100644
--- a/src/chat-server/partyhandler.cpp
+++ b/src/chat-server/partyhandler.cpp
@@ -219,7 +219,7 @@ void ChatHandler::removeUserFromParty(ChatClient &client)
informPartyMemberQuit(client);
// if theres less than 1 member left, remove the party
- if (client.party->numUsers() < 1)
+ if (client.party->userCount() < 1)
{
delete client.party;
client.party = 0;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-08-03 23:49:36 +0000