1 files changed, 34 insertions, 20 deletions

diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index a452281f..705795f4 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -21,20 +21,21 @@
 
 #include "net/manaserv/chathandler.h"
 
+#include "actorspritemanager.h"
 #include "being.h"
-#include "beingmanager.h"
 #include "client.h"
 #include "channel.h"
 #include "channelmanager.h"
-
-#include "gui/chat.h"
+#include "event.h"
+#include "log.h"
+#include "playerrelations.h"
 
 #include "gui/widgets/channeltab.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/protocol.h"
+#include "net/manaserv/manaserv_protocol.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
@@ -149,22 +150,30 @@ void ChatHandler::handleGameChatMessage(Net::MessageIn &msg)
 
     if (id == 0)
     {
-        localChatTab->chatLog(chatMsg, BY_SERVER);
+        SERVER_NOTICE(chatMsg)
         return;
     }
 
-    Being *being = beingManager->findBeing(id);
+    Being *being = actorSpriteManager->findBeing(id);
 
-    std::string mes;
-    if (being)
+    if (!being)
     {
-        mes = being->getName() + " : " + chatMsg;
-        being->setSpeech(chatMsg, SPEECH_TIME);
+        logger->log("Warning: Received GPMSG_SAY for unknown being with id %i."
+                    " (Message is: %s)", id, chatMsg.c_str());
+        return;
     }
-    else
-        mes = "Unknown : " + chatMsg;
 
-    localChatTab->chatLog(mes, being == player_node ? BY_PLAYER : BY_OTHER);
+    std::string mes = being->getName() + " : " + chatMsg;
+
+    Mana::Event event(being == player_node ? EVENT_PLAYER : EVENT_BEING);
+    event.setString("message", mes);
+    event.setString("text", chatMsg);
+    event.setString("nick", being->getName());
+    event.setInt("beingId", id);
+    event.setInt("permissions", player_relations
+                 .checkPermissionSilently(being->getName(),
+                 PlayerRelation::SPEECH_LOG | PlayerRelation::SPEECH_FLOAT));
+    event.trigger(CHANNEL_CHAT);
 }
 
 void ChatHandler::handleEnterChannelResponse(Net::MessageIn &msg)
@@ -198,13 +207,13 @@ void ChatHandler::handleEnterChannelResponse(Net::MessageIn &msg)
     }
     else
     {
-        localChatTab->chatLog(_("Error joining channel."), BY_SERVER);
+        SERVER_NOTICE(_("Error joining channel."))
     }
 }
 
 void ChatHandler::handleListChannelsResponse(Net::MessageIn &msg)
 {
-    localChatTab->chatLog(_("Listing channels."), BY_SERVER);
+    SERVER_NOTICE(_("Listing channels."))
     while (msg.getUnreadLength())
     {
         std::string channelName = msg.readString();
@@ -214,9 +223,9 @@ void ChatHandler::handleListChannelsResponse(Net::MessageIn &msg)
         numUsers << msg.readInt16();
         channelName += " - ";
         channelName += numUsers.str();
-        localChatTab->chatLog(channelName, BY_SERVER);
+        SERVER_NOTICE(channelName)
     }
-    localChatTab->chatLog(_("End of channel list."), BY_SERVER);
+    SERVER_NOTICE(_("End of channel list."))
 }
 
 void ChatHandler::handlePrivateMessage(Net::MessageIn &msg)
@@ -224,13 +233,18 @@ void ChatHandler::handlePrivateMessage(Net::MessageIn &msg)
     std::string userNick = msg.readString();
     std::string chatMsg = msg.readString();
 
-    chatWindow->whisper(userNick, chatMsg);
+    Mana::Event event(EVENT_WHISPER);
+    event.setString("nick", userNick);
+    event.setString("message", chatMsg);
+    event.trigger(CHANNEL_CHAT);
 }
 
 void ChatHandler::handleAnnouncement(Net::MessageIn &msg)
 {
     std::string chatMsg = msg.readString();
-    localChatTab->chatLog(chatMsg, BY_GM);
+    Mana::Event event(EVENT_ANNOUNCEMENT);
+    event.setString("message", chatMsg);
+    event.trigger(CHANNEL_CHAT);
 }
 
 void ChatHandler::handleChatMessage(Net::MessageIn &msg)
@@ -341,7 +355,7 @@ void ChatHandler::handleWhoResponse(Net::MessageIn &msg)
         {
             break;
         }
-        localChatTab->chatLog(userNick, BY_SERVER);
+        SERVER_NOTICE(userNick)
     }
 }