瀏覽代碼

made it so user who is getting @mentioned sees bacground color

Akira Laine 9 年之前
父節點
當前提交
a0f1688198
共有 2 個文件被更改,包括 9 次插入5 次删除
  1. 5 2
      app/client/templates/room.html
  2. 4 3
      app/server/server.js

+ 5 - 2
app/client/templates/room.html

@@ -139,8 +139,11 @@
                                     {{#emojione}}
                                         <li class="chat-message"><small class="rank-{{this.rawrank}}">{{this.rank}}</small> <a style="text-decoration: none" href="/u/{{this.username}}" target="_blank"><b class="bold">{{this.username}}</b></a> <span title="{{time}}" style="float: right;">{{rtime time}}</span> <br/>
                                             {{#if this.isMentioned}}
-                                                <!--Do stuff here-->
-                                                <span style="background-color: lightblue">{{this.message}}</span>
+                                                {{#if this.curUserMention}}
+                                                    <span style="background-color: lightblue">{{this.message}}</span>
+                                                {{else}}
+                                                    {{this.message}}
+                                                {{/if}}
                                             {{else}}
                                                 {{this.message}}
                                             {{/if}}

+ 4 - 3
app/server/server.js

@@ -664,6 +664,7 @@ Meteor.methods({
             var username = user.profile.username;
             var profanity = false;
             var mentionUsername;
+            var isCurUserMentioned;
             if(message.indexOf("@") !== -1) {
                 var messageArr = message.split(" ");
                 for (var i in messageArr) {
@@ -673,7 +674,8 @@ Meteor.methods({
                 }
                 Meteor.users.find().forEach(function(user){
                     if(mention.indexOf(user.profile.username) !== -1){
-                       mentionUsername = true;
+                        mentionUsername = true;
+                        isCurUserMentioned = Meteor.user().profile.username === user.profile.username;
                     };
                 })
             }
@@ -688,8 +690,7 @@ Meteor.methods({
                     if(res.content.indexOf("true") > -1){
                         return true;
                     } else{
-                        console.log("djkfs " + mentionUsername);
-                        Chat.insert({type: type, rawrank: rawrank, rank: "[A]", message: message, mention: mention, isMentioned: mentionUsername, time: time, username: username});
+                        Chat.insert({type: type, rawrank: rawrank, rank: "[A]", message: message, curUserMention: isCurUserMentioned, isMentioned: mentionUsername, time: time, username: username});
                     }
                 });
                 return true;