From 9b9c547e8cf29759ac3e8b0427cec9eb62ba57e4 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <xPaw@users.noreply.github.com>
Date: Sat, 23 Nov 2019 19:16:29 +0200
Subject: [PATCH] Remove UsernameFiltered and fix colored mentions

---
 client/components/ChatUserList.vue     |  7 +++--
 client/components/Username.vue         |  2 +-
 client/components/UsernameFiltered.vue | 37 --------------------------
 3 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 client/components/UsernameFiltered.vue

diff --git a/client/components/ChatUserList.vue b/client/components/ChatUserList.vue
index 45728426..769139ba 100644
--- a/client/components/ChatUserList.vue
+++ b/client/components/ChatUserList.vue
@@ -26,12 +26,13 @@
 				:class="['user-mode', getModeClass(mode)]"
 			>
 				<template v-if="userSearchInput.length > 0">
-					<UsernameFiltered
+					<Username
 						v-for="user in users"
 						:key="user.original.nick"
 						:on-hover="hoverUser"
 						:active="user.original === activeUser"
-						:user="user"
+						:user="user.original"
+						v-html="user.original.mode + user.string"
 					/>
 				</template>
 				<template v-else>
@@ -51,7 +52,6 @@
 <script>
 import {filter as fuzzyFilter} from "fuzzy";
 import Username from "./Username.vue";
-import UsernameFiltered from "./UsernameFiltered.vue";
 
 const modes = {
 	"~": "owner",
@@ -67,7 +67,6 @@ export default {
 	name: "ChatUserList",
 	components: {
 		Username,
-		UsernameFiltered,
 	},
 	props: {
 		channel: Object,
diff --git a/client/components/Username.vue b/client/components/Username.vue
index 8e3a255a..80f6023f 100644
--- a/client/components/Username.vue
+++ b/client/components/Username.vue
@@ -6,7 +6,7 @@
 		v-on="onHover ? {mouseover: hover} : {}"
 		@click.prevent="openContextMenu"
 		@contextmenu.prevent="openContextMenu"
-		>{{ user.mode }}{{ user.nick }}</span
+		><slot>{{ user.mode }}{{ user.nick }}</slot></span
 	>
 </template>
 
diff --git a/client/components/UsernameFiltered.vue b/client/components/UsernameFiltered.vue
deleted file mode 100644
index d8e68380..00000000
--- a/client/components/UsernameFiltered.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-	<span
-		:class="['user', nickColor, {active: active}]"
-		:data-name="user.original.nick"
-		role="button"
-		@mouseover="onHover(user.original)"
-		@click.prevent="openContextMenu"
-		@contextmenu.prevent="openContextMenu"
-		v-html="user.original.mode + user.string"
-	/>
-</template>
-
-<script>
-import colorClass from "../js/helpers/colorClass";
-
-export default {
-	name: "UsernameFiltered",
-	props: {
-		user: Object,
-		active: Boolean,
-		onHover: Function,
-	},
-	computed: {
-		nickColor() {
-			return colorClass(this.user.original.nick);
-		},
-	},
-	methods: {
-		openContextMenu(event) {
-			this.$root.$emit("contextmenu:user", {
-				event: event,
-				user: this.user.original,
-			});
-		},
-	},
-};
-</script>