Merge pull request #440 from cpiber/discord-clean

Discord plugin: Clean Up Export (follow-up #380)
th-ch · Oct 24, 2021 · 58c6a12 · 58c6a12
2 parents 005c930 + 4d4dacb
commit 58c6a12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/plugins/discord/back.js b/plugins/discord/back.js
@@ -145,7 +145,4 @@ module.exports.clear = () => {
 };
 module.exports.connect = connect;
 module.exports.registerRefresh = (cb) => refreshCallbacks.push(cb);
-/**
- * @type {Info}
- */
-module.exports.info = Object.defineProperties({}, Object.keys(info).reduce((o, k) => ({ ...o, [k]: { enumerable: true, get: () => info[k] } }), {}));
+module.exports.isConnected = () => info.rpc !== null;
diff --git a/plugins/discord/menu.js b/plugins/discord/menu.js
@@ -1,6 +1,6 @@
 const { setOptions } = require("../../config/plugins");
 const { edit } = require("../../config");
-const { clear, info, connect, registerRefresh } = require("./back");
+const { clear, connect, registerRefresh, isConnected } = require("./back");
 
 let hasRegisterred = false;
 
@@ -12,8 +12,8 @@ module.exports = (win, options, refreshMenu) => {
 
 	return [
 		{
-			label: info.rpc !== null ? "Connected" : "Reconnect",
-			enabled: info.rpc === null,
+			label: isConnected() ? "Connected" : "Reconnect",
+			enabled: !isConnected(),
 			click: connect,
 		},
 		{