From cbe0f8ac7d514e3c8c424fb64d8d4c40c98996f5 Mon Sep 17 00:00:00 2001
From: supertiger1234 <saawalkhn123@googlemail.com>
Date: Sat, 27 Jul 2019 10:51:01 +0100
Subject: [PATCH] fixed bugs

---
 src/components/app/MessagePanel.vue |  7 +++++--
 src/utils/emojiParser.js            |  2 +-
 src/utils/messageFormatter.js       | 18 ++++++++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/components/app/MessagePanel.vue b/src/components/app/MessagePanel.vue
index 08d7e91..cf09b11 100644
--- a/src/components/app/MessagePanel.vue
+++ b/src/components/app/MessagePanel.vue
@@ -247,7 +247,6 @@ export default {
         }
       }, 2000)
     },
-
     resize(event) {
       let input = this.$refs["input-box"];
 
@@ -371,19 +370,23 @@ export default {
           }
         }
       }
+
       if (event.keyCode === 38){ //38 = up arrow
         if (this.message !== "") return;
         if (this.editMessage) return;
         const messagesFiltered = this.selectedChannelMessages.filter(m => m.creator.uniqueID === this.user.uniqueID);
+
         if (!messagesFiltered.length) return;
         event.preventDefault();
         const lastMessage = messagesFiltered[messagesFiltered.length - 1];
         this.$store.dispatch("setEditMessage", {
           messageID: lastMessage.messageID,
-          channelID: lastMessage.channelID
+          channelID: lastMessage.channelID,
+          message: lastMessage.message
         });
 
       }
+
     },
     invertScroll(event) {
       if (event.deltaY) {
diff --git a/src/utils/emojiParser.js b/src/utils/emojiParser.js
index a032a7f..e62b37d 100644
--- a/src/utils/emojiParser.js
+++ b/src/utils/emojiParser.js
@@ -22,7 +22,7 @@ export default {
 			if (emoji) return emoji.unicode
 
 			const customEmoji = customEmojis.find(e => e.name === x.substr(1).slice(0, -1))
-			if (customEmoji) return `:${customEmoji.name}&${customEmoji.emojiID}:`
+			if (customEmoji) return `<:${customEmoji.name}:${customEmoji.emojiID}>`
 			return x
 		});
 	},
diff --git a/src/utils/messageFormatter.js b/src/utils/messageFormatter.js
index c733114..61b873b 100644
--- a/src/utils/messageFormatter.js
+++ b/src/utils/messageFormatter.js
@@ -26,12 +26,18 @@ const markdown = new MarkdownIt({
 }).use(chatPlugin)
 	.use(customEmoji);
 
-function owo (text) {
-	const split = text.split('&');
-	if (!split || split.length <= 1) return `:${text}:`;
-	const url = split[split.length - 1].slice(4);
-	return `<img class="emoji" draggable="false" alt=":${split[0]}:" src="${config.domain + "/files/" + url}">`
-}
+
+//add attributes to link tag
+const defaultRender = markdown.renderer.rules.link_open || function(tokens, idx, options, env, self) {
+  return self.renderToken(tokens, idx, options);
+};
+
+markdown.renderer.rules.link_open = function (tokens, idx, options, env, self) {
+  tokens[idx].attrPush(['target', '_blank']); // add new attribute
+  tokens[idx].attrPush(['class', 'msg-link']);
+  // pass token to default renderer.
+  return defaultRender(tokens, idx, options, env, self);
+};
 
 
 export default (message) => {