channel announcements and leave / enter messages, chat code refactoring

4 files changed, 274 insertions, 118 deletions

diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index 824d6e8c..aa090d64 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.cpp
@@ -33,6 +33,8 @@
 #include "../being.h"
 #include "../beingmanager.h"
 #include "../game.h"
+#include "../channel.h"
+#include "../channelmanager.h"
 
 #include "../gui/chat.h"
 #include "../gui/guildwindow.h"
@@ -53,6 +55,7 @@ ChatHandler::ChatHandler()
         CPMSG_PRIVMSG,
         CPMSG_QUIT_CHANNEL_RESPONSE,
         CPMSG_LIST_CHANNELUSERS_RESPONSE,
+        CPMSG_CHANNEL_EVENT,
         0
     };
     handledMessages = _messages;
@@ -60,146 +63,224 @@ ChatHandler::ChatHandler()
 
 void ChatHandler::handleMessage(MessageIn &msg)
 {
-    Being *being;
-    std::string chatMsg;
-    short channelId;
-    short id;
-    std::string userNick;
-    std::string channelName;
-    short error = -1;
-
     switch (msg.getId())
     {
         case GPMSG_SAY:
-            id = msg.readInt16();
-            chatMsg = msg.readString();
-            if (id == 0)
-            {
-                chatWindow->chatLog(chatMsg, BY_SERVER);
-                break;
-            }
-            being = beingManager->findBeing(id);
-            if (being)
-            {
-                chatWindow->chatLog(being->getName() + " : " + chatMsg, being == player_node ? BY_PLAYER : BY_OTHER);
-                being->setSpeech(chatMsg, SPEECH_TIME);
-            }
-            else
-            {
-                chatWindow->chatLog("Unknown : " + chatMsg, BY_OTHER);
-            }
+            handleGameChatMessage(msg);
             break;
+            
         case CPMSG_REGISTER_CHANNEL_RESPONSE:
-            error = msg.readInt8();
-            if(error == ERRMSG_OK)
-            {
-                channelId = msg.readInt16();
-                std::string channelName = msg.readString();
-                chatWindow->chatLog("Registered Channel " + channelName, BY_SERVER);
-                chatWindow->addChannel(channelId, channelName);
-                chatWindow->createNewChannelTab(channelName);
-            }
-            else
-            {
-                if (error == ERRMSG_INVALID_ARGUMENT)
-                {
-                    chatWindow->chatLog("Error registering channel - Invalid Channel Name given", BY_SERVER);
-                }
-                else
-                {
-                    chatWindow->chatLog("Error registering channel", BY_SERVER);
-                }
-            }
+            handleRegisterChannelResponse(msg);
             break;
+            
         case CPMSG_ENTER_CHANNEL_RESPONSE:
-            if(msg.readInt8() == ERRMSG_OK)
-            {
-                channelId = msg.readInt16();
-                channelName = msg.readString();
-                std::string announcement = msg.readString();
-                std::vector<std::string> userList;
-                std::string user;
-                while(msg.getUnreadLength())
-                {
-                    user = msg.readString();
-                    if (user == "")
-                        break;
-                    userList.push_back(user);
-                }
-                chatWindow->addChannel(channelId, channelName);
-                chatWindow->createNewChannelTab(channelName);
-                chatWindow->chatLog(announcement, BY_SERVER, channelName);
-            }
-            else
-            {
-                chatWindow->chatLog("Error joining channel", BY_SERVER);
-            }
+            handleEnterChannelResponse(msg);
             break;
 
         case CPMSG_LIST_CHANNELS_RESPONSE:
-            chatWindow->chatLog("Listing Channels", BY_SERVER);
-            while(msg.getUnreadLength())
-            {
-                channelName = msg.readString();
-                if (channelName == "")
-                    break;
-                std::ostringstream numUsers;
-                numUsers << msg.readInt16();
-                if(channelName != "")
-                {
-                    channelName += " - ";
-                    channelName += numUsers.str();
-                    chatWindow->chatLog(channelName, BY_SERVER);
-                }
-            }
-            chatWindow->chatLog("End of channel list", BY_SERVER);
+            handleListChannelsResponse(msg);
             break;
 
         case CPMSG_PRIVMSG:
-            userNick = msg.readString();
-            chatMsg = msg.readString();
-
-            if (!chatWindow->tabExists(userNick))
-            {
-                chatWindow->createNewChannelTab(userNick);
-                
-            }
-            chatWindow->chatLog(userNick + ": " + chatMsg, BY_OTHER, userNick);
+            handlePrivateMessage(msg);
             break;
 
         case CPMSG_ANNOUNCEMENT:
-            chatMsg = msg.readString();
-            chatWindow->chatLog(chatMsg, BY_GM);
+            handleAnnouncement(msg);
             break;
 
         case CPMSG_PUBMSG:
-            channelId = msg.readInt16();
-            userNick = msg.readString();
-            chatMsg = msg.readString();
-
-            chatWindow->sendToChannel(channelId, userNick, chatMsg);
+            handleChatMessage(msg);
             break;
 
         case CPMSG_QUIT_CHANNEL_RESPONSE:
-            if(msg.readInt8() == ERRMSG_OK)
-            {
-                channelId = msg.readInt16();
-                // remove the chat tab
-                chatWindow->removeChannel(channelId);
-            }
+            handleQuitChannelResponse(msg);
             break;
 
         case CPMSG_LIST_CHANNELUSERS_RESPONSE:
-            channelName = msg.readString();
-            while(msg.getUnreadLength())
-            {
-                userNick = msg.readString();
-                if (userNick == "")
-                {
-                    break;
-                }
-                guildWindow->setOnline(channelName, userNick, true);
-            }
+            handleListChannelUsersResponse(msg);
+            break;
+        
+        case CPMSG_CHANNEL_EVENT:
+            handleChannelEvent(msg);
+    }
+}
+
+void ChatHandler::handleGameChatMessage(MessageIn &msg)
+{
+    short id = msg.readInt16();
+    std::string chatMsg = msg.readString();
+    
+    if (id == 0)
+    {
+        chatWindow->chatLog(chatMsg, BY_SERVER);
+        return;
+    }
+    
+    Being *being = beingManager->findBeing(id);
+    
+    if (being)
+    {
+        chatWindow->chatLog(being->getName() + " : " + chatMsg,
+                            being == player_node ? BY_PLAYER : BY_OTHER);
+        being->setSpeech(chatMsg, SPEECH_TIME);
+    }
+    else
+    {
+        chatWindow->chatLog("Unknown : " + chatMsg, BY_OTHER);
+    }
+}
+
+void ChatHandler::handleRegisterChannelResponse(MessageIn &msg)
+{
+    char error = msg.readInt8();
+    if(error == ERRMSG_OK)
+    {
+        short channelId = msg.readInt16();
+        std::string channelName = msg.readString();
+        std::string channelAnnouncement = msg.readString();
+        chatWindow->chatLog("Registered Channel " + channelName, BY_SERVER);
+        channelManager->addChannel(new Channel(channelId, 
+                                               channelName, 
+                                               channelAnnouncement));
+        chatWindow->createNewChannelTab(channelName);
+    }
+    else
+    {
+        if (error == ERRMSG_INVALID_ARGUMENT)
+        {
+            chatWindow->chatLog("Error registering channel - Invalid Channel Name given", BY_SERVER);
+        }
+        else
+        {
+            chatWindow->chatLog("Error registering channel", BY_SERVER);
+        }
+    }
+}
+
+void ChatHandler::handleEnterChannelResponse(MessageIn &msg)
+{
+    if(msg.readInt8() == ERRMSG_OK)
+    {
+        short channelId = msg.readInt16();
+        std::string channelName = msg.readString();
+        std::string announcement = msg.readString();
+        Channel *channel = new Channel(channelId, channelName, announcement);
+        std::string user;
+        while(msg.getUnreadLength())
+        {
+            user = msg.readString();
+            if (user == "")
+                return;
+            channel->addUser(user);
+        }
+        channelManager->addChannel(channel);
+        chatWindow->createNewChannelTab(channelName);
+        chatWindow->chatLog(announcement, BY_SERVER, channelName);
+    }
+    else
+    {
+        chatWindow->chatLog("Error joining channel", BY_SERVER);
+    }
+}
+
+void ChatHandler::handleListChannelsResponse(MessageIn &msg)
+{
+    chatWindow->chatLog("Listing Channels", BY_SERVER);
+    while(msg.getUnreadLength())
+    {
+        std::string channelName = msg.readString();
+        if (channelName == "")
+            return;
+        std::ostringstream numUsers;
+        numUsers << msg.readInt16();
+        if(channelName != "")
+        {
+            channelName += " - ";
+            channelName += numUsers.str();
+            chatWindow->chatLog(channelName, BY_SERVER);
+        }
+    }
+    chatWindow->chatLog("End of channel list", BY_SERVER);
+}
+
+void ChatHandler::handlePrivateMessage(MessageIn &msg)
+{
+    std::string userNick = msg.readString();
+    std::string chatMsg = msg.readString();
+
+    if (!chatWindow->tabExists(userNick))
+    {
+        chatWindow->createNewChannelTab(userNick);
+                
+    }
+    chatWindow->chatLog(userNick + ": " + chatMsg, BY_OTHER, userNick);
+}
+
+void ChatHandler::handleAnnouncement(MessageIn &msg)
+{
+    std::string chatMsg = msg.readString();
+    chatWindow->chatLog(chatMsg, BY_GM);
+}
+
+void ChatHandler::handleChatMessage(MessageIn &msg)
+{
+    short channelId = msg.readInt16();
+    std::string userNick = msg.readString();
+    std::string chatMsg = msg.readString();
+
+    chatWindow->sendToChannel(channelId, userNick, chatMsg);
+}
+
+void ChatHandler::handleQuitChannelResponse(MessageIn &msg)
+{
+    if(msg.readInt8() == ERRMSG_OK)
+    {
+        short channelId = msg.readInt16();
+        // remove the chat tab
+        chatWindow->removeChannel(channelId);
+    }
+}
+
+void ChatHandler::handleListChannelUsersResponse(MessageIn &msg)
+{
+    std::string channelName = msg.readString();
+    std::string userNick;
+    while(msg.getUnreadLength())
+    {
+        userNick = msg.readString();
+        if (userNick == "")
+        {
             break;
+        }
+        guildWindow->setOnline(channelName, userNick, true);
     }
 }
+
+void ChatHandler::handleChannelEvent(MessageIn &msg)
+{
+    short channelId = msg.readInt16();
+    char eventId = msg.readInt8();
+    std::string line = msg.readString();
+    Channel *channel = channelManager->findById(channelId);
+    
+    if(channel)
+    {
+        switch(eventId)
+        {
+            case CHAT_EVENT_NEW_PLAYER:
+                line += " entered the channel.";
+                break;
+        
+            case CHAT_EVENT_LEAVING_PLAYER:
+                line += " left the channel.";
+                break;
+        
+            default:
+                line = "Unknown channel event.";
+        }
+    
+        chatWindow->chatLog(line, BY_SERVER, channel->getName());
+    }
+}
+
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index e9db3575..874998d9 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -30,8 +30,62 @@ class ChatHandler : public MessageHandler
 {
     public:
         ChatHandler();
-
+        
+        /**
+         * Handle the given message appropriately.
+         */
         void handleMessage(MessageIn &msg);
+    
+    private:
+        /**
+         * Handle chat messages sent from the game server.
+         */
+        void handleGameChatMessage(MessageIn &msg);
+        
+        /**
+         * Handle channel registration responses.
+         */
+        void handleRegisterChannelResponse(MessageIn &msg);
+        
+        /**
+         * Handle channel entry responses.
+         */
+        void handleEnterChannelResponse(MessageIn &msg);
+        
+        /**
+         * Handle list channels responses.
+         */
+        void handleListChannelsResponse(MessageIn &msg);
+        
+        /**
+         * Handle private messages.
+         */
+        void handlePrivateMessage(MessageIn &msg);
+        
+        /**
+         * Handle announcements.
+         */
+        void handleAnnouncement(MessageIn &msg);
+        
+        /**
+         * Handle chat messages.
+         */
+        void handleChatMessage(MessageIn &msg);
+        
+        /**
+         * Handle quit channel responses.
+         */
+        void handleQuitChannelResponse(MessageIn &msg);
+        
+        /**
+         * Handle list channel users responses.
+         */
+        void handleListChannelUsersResponse(MessageIn &msg);
+        
+        /**
+         * Handle channel events.
+         */
+        void handleChannelEvent(MessageIn &msg);
 };
 
 #endif
diff --git a/src/net/guildhandler.cpp b/src/net/guildhandler.cpp
index 459c5ac4..10da5075 100644
--- a/src/net/guildhandler.cpp
+++ b/src/net/guildhandler.cpp
@@ -35,6 +35,8 @@
 #include "../guild.h"
 #include "../log.h"
 #include "../localplayer.h"
+#include "../channel.h"
+#include "../channelmanager.h"
 
 GuildHandler::GuildHandler()
 {
@@ -181,6 +183,7 @@ void GuildHandler::joinedGuild(MessageIn &msg)
     short guildId = msg.readInt16();
     bool leader = msg.readInt8();
     short channelId = msg.readInt16();
+    std::string announcement = msg.readString();
 
     // Add guild to player and create new guild tab
     Guild *guild = player_node->addGuild(guildId, leader);
@@ -190,7 +193,8 @@ void GuildHandler::joinedGuild(MessageIn &msg)
 
     // Automatically create the guild channel
     // COMMENT: Should this go here??
-    chatWindow->addChannel(channelId, guildName);
+    Channel *channel = new Channel(channelId, guildName, announcement);
+    channelManager->addChannel(channel);
     chatWindow->createNewChannelTab(guildName);
-    chatWindow->chatLog("Guild Channel", BY_SERVER, guildName);
+    chatWindow->chatLog(announcement, BY_SERVER, guildName);
 }
diff --git a/src/net/protocol.h b/src/net/protocol.h
index d2d5937d..87577942 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -252,4 +252,21 @@ enum {
     MOVING_DESTINATION = 2
 };
 
+// Email change specific return values
+enum {
+    EMAILCHG_EXISTS_EMAIL = 0x40
+};
+
+// Chat errors return values
+enum {
+    CHAT_USING_BAD_WORDS = 0x40,
+    CHAT_UNHANDLED_COMMAND
+};
+
+// Chat channels event values
+enum {
+    CHAT_EVENT_NEW_PLAYER = 0,
+    CHAT_EVENT_LEAVING_PLAYER
+};
+
 #endif