Master to Beta changes

Merge master changes to beta
joe27g · Feb 5, 2021 · e2ac95c · e2ac95c
2 parents fa388d3 + c7b2c35
commit e2ac95c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/plugins/avatar_links.js b/plugins/avatar_links.js
@@ -27,7 +27,8 @@ module.exports = new Plugin({
  // Make sure it's already in the DOM
  await new Promise(r => {setTimeout(r, 5)});
  const theMenu = document.querySelector('.'+cm.menu);
- const reactData = theMenu.__reactInternalInstance$;
+
+ const reactData = theMenu[Object.keys(theMenu).find(key => key.startsWith("__reactInternalInstance") || key.startsWith("__reactFiber"))];
 
  let label = "";
  let url = "";

diff --git a/plugins/direct_download.js b/plugins/direct_download.js
@@ -76,20 +76,21 @@ module.exports = new Plugin({
  this._contClass = EDApi.findModule('embedWrapper').container;
  ttM = EDApi.findModule('tooltipPointer');
  iteM = EDApi.findModule('hideInteraction');
- document.addEventListener('contextmenu', this.listener);
+ Dispatcher = EDApi.findModule("dispatch");
+ Dispatcher.subscribe("CONTEXT_MENU_OPEN", this.listener);
  },
  listener(e) {
  if (document.getElementsByClassName(this._cmClass).length == 0) setTimeout(() => module.exports.onContextMenu(e), 0);
  else this.onContextMenu(e);
  },
  onContextMenu(e) {
+ e = e.contextMenu;
  const messageGroup = e.target.closest('.'+this._contClass);
  const parentElem = e.target.parentElement;
  const guildWrapper = EDApi.findModule('childWrapper').wrapper;
  const memberAvatar = EDApi.findModule('nameAndDecorators').avatar;
-
+ 
  if (e.target.localName != 'a' && e.target.localName != 'img' && e.target.localName != 'video' && !messageGroup && !e.target.className.includes(guildWrapper) && !parentElem.className.includes(memberAvatar) && !e.target.className.includes('avatar-')) return;
-
  let saveLabel = 'Download',
  url = e.target.poster || e.target.style.backgroundImage.substring(e.target.style.backgroundImage.indexOf(`'`) + 1, e.target.style.backgroundImage.lastIndexOf(`'`)) || e.target.href || e.target.src;
 
@@ -127,6 +128,6 @@ module.exports = new Plugin({
  setTimeout(() => addMenuItem(url, saveLabel, fileName, fileExtension), 5);
  },
  unload: function() {
- document.removeEventListener('contextmenu', this.listener);
+ Dispatcher.unsubscribe("CONTEXT_MENU_OPEN", this.listener);
  }
 });
diff --git a/plugins/ed_settings.js b/plugins/ed_settings.js
@@ -354,7 +354,7 @@ module.exports = new Plugin({
 
  return e(Button, {size: Button.Sizes.SMALL, color: Button.Colors.GREEN, style: {margin: '0 5px', display: 'inline-block'}, onClick: e => {
  setString("Opening...");
- const sucess = require("electron").shell.openItem(
+ const sucess = require("electron").shell.openPath(
  e.shiftKey ?
  process.env.injDir :
  require("path").join(process.env.injDir, "plugins")

diff --git a/plugins/hidden_channels.js b/plugins/hidden_channels.js
@@ -16,7 +16,7 @@ module.exports = new Plugin({
  ai = EDApi.findModule('actionIcon');
 
  const getUser = EDApi.findModule('getCurrentUser').getCurrentUser;
- const getAllChannels = EDApi.findModule('getChannels').getChannels;
+ const getAllChannels = EDApi.findModule('getGuildChannels').getGuildChannels;
  const can = EDApi.findModule('computePermissions').can;
 
  g_dc = EDApi.findModule('getDefaultChannel');