From 1ab52cb174e2e7e741e8df4030b58695d29b08d3 Mon Sep 17 00:00:00 2001
From: Jiiks <jiiks@windowslive.com>
Date: Wed, 22 Aug 2018 16:55:25 +0300
Subject: [PATCH] Correct targeting

---
 client/src/builtin/EmoteModule.js               | 4 ++--
 client/src/ui/components/contextmenu/Group.vue  | 6 ++++--
 client/src/ui/components/contextmenu/Toggle.vue | 6 +++---
 client/src/ui/contextmenus.js                   | 3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/client/src/builtin/EmoteModule.js b/client/src/builtin/EmoteModule.js
index 5b26bcba..71a4031b 100644
--- a/client/src/builtin/EmoteModule.js
+++ b/client/src/builtin/EmoteModule.js
@@ -60,8 +60,8 @@ export default new class EmoteModule extends BuiltinModule {
             {
                 text: 'Favourite',
                 type: 'toggle',
-                checked: false,
-                onChange: (checked, target) => { console.log(target); return checked; }
+                checked: (target) => { console.log(target); if (target.alt && target.alt === ';cirThree;') { console.log('yes'); return true; } else return false; },
+                onChange: (checked, target) => { if (target.alt && target.alt === ';cirThree;') { console.log('yes'); return true; } else return false; }
             }
         ], filter => filter.closest('.bd-emote'));
 
diff --git a/client/src/ui/components/contextmenu/Group.vue b/client/src/ui/components/contextmenu/Group.vue
index 79777f74..df2a4cef 100644
--- a/client/src/ui/components/contextmenu/Group.vue
+++ b/client/src/ui/components/contextmenu/Group.vue
@@ -12,14 +12,14 @@
     <div class="bd-cmGroup" ref="test">
         <template v-for="(item, index) in items">
             <CMButton v-if="!item.type || item.type === 'button'" :item="item" :onClick="() => { item.onClick(); closeMenu(); }" />
-            <CMToggle v-else-if="item.type === 'toggle'" :item="item" :onClick="() => { item.checked = item.onChange(!item.checked, target) }"/>
+            <CMToggle v-else-if="item.type === 'toggle'" :item="item" :checked="typeof item.checked === 'function' ? item.checked(target) : item.checked" :onClick="() => { }" />
             <div v-else-if="item.type === 'sub'" class="bd-cmItem bd-cmSub" @mouseenter="e => subMenuMouseEnter(e, index, item)" @mouseleave="e => subMenuMouseLeave(e, index, item)">
                 {{item.text}}
                 <MiChevronDown />
                 <div ref="test2" class="bd-cm" v-if="index === visibleSub" :style="subStyle">
                     <template v-for="(item, index) in item.items">
                         <CMButton v-if="!item.type || item.type === 'button'" :item="item" :onClick="() => { item.onClick(); closeMenu(); }" />
-                        <CMToggle v-else-if="item.type === 'toggle'" :item="item" :onClick="() => { item.checked = item.onChange(!item.checked) }" />
+                        <CMToggle v-else-if="item.type === 'toggle'" :item="item" :checked="typeof item.checked === 'function' ? item.checked(target) : item.checked" :onClick="() => { }" />
                     </template>
                 </div>
             </div>
@@ -57,3 +57,5 @@
         }
     }
 </script>
+
+// return typeof this.item.checked === 'function' ? this.item.checked(target) : this.item.checked;
diff --git a/client/src/ui/components/contextmenu/Toggle.vue b/client/src/ui/components/contextmenu/Toggle.vue
index 25e4f7ae..e80fa629 100644
--- a/client/src/ui/components/contextmenu/Toggle.vue
+++ b/client/src/ui/components/contextmenu/Toggle.vue
@@ -11,9 +11,9 @@
 <template>
     <div class="bd-cmItem bd-cmToggle" @click="onClick">
         <div class="bd-cmLabel">{{item.text}}</div>
-        <div class="bd-cmCheckbox">
+        <div class="bd-cmCheckbox" :checked="checked">
             <div class="bd-cmCheckboxInner">
-                <input type="checkbox" :checked="item.checked || item.enabled"/>
+                <input type="checkbox" :checked="checked"/>
                 <span></span>
             </div>
         </div>
@@ -22,6 +22,6 @@
 
 <script>
     export default {
-        props: ['item', 'onClick']
+        props: ['item', 'onClick', 'checked']
     }
 </script>
diff --git a/client/src/ui/contextmenus.js b/client/src/ui/contextmenus.js
index cd3ce2a0..1f6aede7 100644
--- a/client/src/ui/contextmenus.js
+++ b/client/src/ui/contextmenus.js
@@ -66,11 +66,12 @@ export class DiscordContextMenu {
 
     static renderCm(component, args, retVal, res) {
         if (!retVal.props || !res.props) return;
-        const { target } = res.props;
+        const { target } = component.props;
         const { top, left } = retVal.props.style;
         if (!target || !top || !left) return;
         if (!retVal.props.children) return;
         if (!(retVal.props.children instanceof Array)) retVal.props.children = [retVal.props.children];
+
         for (const menu of this.menus.filter(menu => { if (!menu.filter) return true; return menu.filter(target)})) {
             retVal.props.children.push(VueInjector.createReactElement(CMGroup, {
                 target,