Merge branch 'master' of https://github.com/TsundereKermit/bubble

Author: TsundereKermit

public/js/DirectMessageListChatKit.js

@@ -71,17 +71,9 @@ chatManager
             var li = document.createElement("li");
             var div = document.createElement("div");
 
-            //Get msg from element for inputting into the log div
+            //Get msg from element for inputting into the dm div
             var dmMsg = element.parts[0].payload.content;
 
-            //Check for quoting
-            if (dmMsg.indexOf("QMsg") === 0) {
-              //Get quoted message and actual message
-              var dmLenEnd = dmMsg.indexOf("QEnd");
-              var dmMessageLength = parseInt(dmMsg.substring(4, dmLenEnd));
-              dmMsg = dmMsg.substr(dmLenEnd + dmMessageLength + 4);
-            }
-
             //Set div text
             //Puts the name of the sender of the message in front of their message
             if(element.senderId === logId){
@@ -135,13 +127,6 @@ chatManager
           var div = document.createElement("div");
 
           var DMInnerHTML = message.parts[0].payload.content;
-          //Check for quoting
-          if (DMInnerHTML.indexOf("QMsg") === 0) {
-            //Get quoted message and actual message
-            var newDMLenEnd = DMInnerHTML.indexOf("QEnd");
-            var newDMMessageLength = parseInt(DMInnerHTML.substring(4, newDMLenEnd));
-            DMInnerHTML = DMInnerHTML.substr(newDMLenEnd + newDMMessageLength + 4);
-          }
 
           //Puts the name of the user who sent the message in front of the message
           if(message.senderId === logId){

public/js/DirectMessageListQuery.js

@@ -4,8 +4,7 @@ $(document).ready(() => {
     //Initializing the quoted string 
     var msgVal = "";
 
-    //Context menus
-    var dmUsername;
+    //Context menu
     var dmText;
 
     //DM text right click
@@ -15,8 +14,7 @@ $(document).ready(() => {
       var top = e.pageY;
       var left = e.pageX;
       dmText = e.target.innerHTML;
-      dmUsername = document.getElementById("titId").innerHTML;
-  
+
       //Set up delete/quoting mechanisms
       $("#dmRClickDelete").val(dmText);
       $("#dmRClickQuote").val(dmText);
@@ -43,7 +41,7 @@ $(document).ready(() => {
       var target = e.target.id;
       switch (target) {
         case "dmRClickQuote":
-          msgVal = "'Quote: " + dmText + "' ";
+          msgVal = "'Quote: " + dmText + "' -> ";
           $("#message-text").val(msgVal);
           break;
         case "dmRClickDelete":

routes/index.js

@@ -422,14 +422,16 @@ router.post("/deleteMsg", (req, res) => {
 router.post("/dmDeleteMsg", (req, res) => {
     //Form data
     const { roomId, userId, message } = req.body;
+    var viewedMsg;
 
     chatkit.fetchMultipartMessages({
         roomId: roomId,
         limit: 100,
     })
     .then(messages => {
         for (let m of messages) {
-            if (m.parts[0].content === message) {
+            viewedMsg = userId + ": " + m.parts[0].content;
+            if (viewedMsg === message) {
                 chatkit.deleteMessage({
                     roomId: roomId,
                     messageId: m.id