From 14cb5480bac936f332cdb964eb1f4d57befff83e Mon Sep 17 00:00:00 2001
From: supertiger1234 <saawalkhn123@googlemail.com>
Date: Sat, 17 Aug 2019 17:25:02 +0100
Subject: [PATCH] fixed issue with members list when removing  server

---
 package-lock.json                      | 5 +++++
 package.json                           | 1 +
 src/components/app/MessageTemplate.vue | 9 ++++++++-
 src/main.js                            | 3 +++
 src/store/modules/serversModule.js     | 2 +-
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 385c7f2..b562de0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11684,6 +11684,11 @@
       "resolved": "https://registry.npmjs.org/uws/-/uws-10.148.2.tgz",
       "integrity": "sha1-8BZSoLS7lByxi7emJI14D9AVAkU="
     },
+    "v-clipboard": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/v-clipboard/-/v-clipboard-2.2.2.tgz",
+      "integrity": "sha512-8Nch/q4j4e5BqHFuKUReKBvB7lzn9FQTEuPa54pmfX44VYhWnxAoSHuMwm2Qf9EnyCSEmczqj2VYPsU2BEe6Mw=="
+    },
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
diff --git a/package.json b/package.json
index 44e494a..fd7d830 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "socket.io-client": "^2.2.0",
     "twemoji": "^11.3.0",
     "uws": "^10.148.1",
+    "v-clipboard": "^2.2.2",
     "validator": "^11.1.0",
     "vue": "^2.5.17",
     "vue-headful": "^2.0.1",
diff --git a/src/components/app/MessageTemplate.vue b/src/components/app/MessageTemplate.vue
index 476ccd2..1feb4c8 100644
--- a/src/components/app/MessageTemplate.vue
+++ b/src/components/app/MessageTemplate.vue
@@ -59,6 +59,7 @@
       <div class="other-information">
         <div class="drop-down-button" ref="drop-down-button" @click="dropDownVisable = !dropDownVisable"><i class="material-icons">more_vert</i></div>
         <div class="drop-down-menu" v-click-outside="closeDropDown" v-if="dropDownVisable">
+          <div class="drop-item" @click="copyMessage" >Copy</div>
           <div class="drop-item" @click="editMessage" v-if="user.uniqueID === uniqueID">Edit</div>
           <div class="drop-item warn" @click="deleteMessage">Delete</div>
         </div>
@@ -195,6 +196,10 @@ export default {
     },
     onResize(dimentions) {
       this.imageSize();
+    },
+    copyMessage() {
+      this.dropDownVisable = false;
+      this.$clipboard(this.message);
     }
   },
   watch: {
@@ -263,10 +268,12 @@ export default {
 .drop-down-button{
   opacity: 0;
   transition: 0.2s;
+  position: relative;
+  z-index: 1;
 }
 .drop-down-menu {
   position: absolute;
-  z-index: 999;
+  z-index: 9999999;
   background: rgba(0, 0, 0, 0.918);
   border-radius: 10px;
   padding: 5px;
diff --git a/src/main.js b/src/main.js
index 5d820c8..1f05f56 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,7 +7,10 @@ import {store} from './store/index';
 import Axios from 'axios';
 import './utils/clickOutside';
 import vueHeadful from 'vue-headful';
+import Clipboard from 'v-clipboard';
+
 Vue.component('vue-headful', vueHeadful);
+Vue.use(Clipboard)
 
 Vue.config.productionTip = false
 
diff --git a/src/store/modules/serversModule.js b/src/store/modules/serversModule.js
index 018ea5d..1460085 100644
--- a/src/store/modules/serversModule.js
+++ b/src/store/modules/serversModule.js
@@ -114,7 +114,7 @@ const mutations = {
     state.serverMembers.push(serverMember);
   },
   REMOVE_SERVER_MEMBER(state, {uniqueID, server_id}) {
-    state.serverMembers = state.serverMembers.filter(m => m.uniqueID !== uniqueID && m.server_id === server_id);
+    state.serverMembers = state.serverMembers.filter(m => m.uniqueID !== uniqueID && m.server_id !== server_id);
   },
   SET_SELECTED_SERVER_ID(state, serverID){
     state.selectedServerID = serverID;