Including nick prefix into message objects

diff --git a/client/src/models/channel.js b/client/src/models/channel.js
index 0fe8d4310eb77784511df30ea2e5c3e0668bee8f..e407c6c4ad6a9ecff3cc1249d316bdb32f7b0e67 100644 (file)
--- a/client/src/models/channel.js
+++ b/client/src/models/channel.js
@@ -51,7 +51,7 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
 \r
 \r
     addMsg: function (nick, msg, type, opts) {\r
-        var message_obj, bs, d,\r
+        var message_obj, bs, d, members, member,\r
             scrollback = (parseInt(_kiwi.global.settings.get('scrollback'), 10) || 250);\r
 \r
         opts = opts || {};\r
@@ -68,11 +68,16 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
             opts.style = '';\r
         }\r
 \r
-        // Run through the plugins\r
+        // Create a message object\r
         message_obj = {"msg": msg, "date": opts.date, "time": opts.time, "nick": nick, "chan": this.get("name"), "type": type, "style": opts.style};\r
-        //tmp = _kiwi.plugs.run('addmsg', message_obj);\r
-        if (!message_obj) {\r
-            return;\r
+\r
+        // If this user has one, get its prefix\r
+        members = this.get('members');\r
+        if (members) {\r
+            member = members.getByNick(message_obj.nick);\r
+            if (member) {\r
+                message_obj.nick_prefix = member.get('prefix');\r
+            }\r
         }\r
 \r
         // The CSS class (action, topic, notice, etc)\r