lightcordwarez
/
BetterDiscordAddons
mirror of https://github.com/mwittrien/BetterDiscordAddons.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

fixed DM opening in Friend and StalkerNotifications

This commit is contained in:
Mirco Wittrien 2018-11-09 19:36:19 +01:00
parent 0f47a48a81
commit 3f95f8c636
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Plugins/FriendNotifications/FriendNotifications.plugin.js
View File

@ -115,7 +115,7 @@ class FriendNotifications {
getDescription () {return "Notifies you when a friend either logs in or out. Click the Online Friend-Counter to display a timelog of the current session.";} getDescription () {return "Notifies you when a friend either logs in or out. Click the Online Friend-Counter to display a timelog of the current session.";}
getVersion () {return "1.1.1";} getVersion () {return "1.1.2";}
getAuthor () {return "DevilBro";} getAuthor () {return "DevilBro";}
@ -224,6 +224,7 @@ class FriendNotifications {
this.FriendUtils = BDFDB.WebModules.findByProperties(["getFriendIDs", "getRelationships"]); this.FriendUtils = BDFDB.WebModules.findByProperties(["getFriendIDs", "getRelationships"]);
this.ChannelUtils = BDFDB.WebModules.findByProperties(["getDMFromUserId"]); this.ChannelUtils = BDFDB.WebModules.findByProperties(["getDMFromUserId"]);
this.ChannelSwitchUtils = BDFDB.WebModules.findByProperties(["selectPrivateChannel"]); this.ChannelSwitchUtils = BDFDB.WebModules.findByProperties(["selectPrivateChannel"]);
this.PrivateChannelUtils = BDFDB.WebModules.findByProperties(["openPrivateChannel"]);
this.UserMetaStore = BDFDB.WebModules.findByProperties(["getStatus", "getOnlineFriendCount"]); this.UserMetaStore = BDFDB.WebModules.findByProperties(["getStatus", "getOnlineFriendCount"]);
this.UserUtils = BDFDB.WebModules.findByProperties(["getUsers"]); this.UserUtils = BDFDB.WebModules.findByProperties(["getUsers"]);
@ -244,12 +245,11 @@ class FriendNotifications {
let string = `${BDFDB.encodeToHTML(data.name ? data.name : user.username)} is ${online ? "online" : "offline"}.`; let string = `${BDFDB.encodeToHTML(data.name ? data.name : user.username)} is ${online ? "online" : "offline"}.`;
let avatar = data.removeIcon ? "" : (data.url ? data.url : BDFDB.getUserAvatar(user.id)); let avatar = data.removeIcon ? "" : (data.url ? data.url : BDFDB.getUserAvatar(user.id));
let openChannel = () => { let openChannel = () => {
if (settings.openOnClick){ if (settings.openOnClick) {
let DMid = this.ChannelUtils.getDMFromUserId(user.id); let DMid = this.ChannelStore.getDMFromUserId(user.id)
if (DMid) { if (DMid) this.ChannelSwitchUtils.selectPrivateChannel(DMid);
require("electron").remote.getCurrentWindow().maximize(); else this.PrivateChannelUtils.openPrivateChannel(BDFDB.myData.id, user.id);
this.ChannelSwitchUtils.selectPrivateChannel(DMid); require("electron").remote.getCurrentWindow().maximize();
}
} }
}; };
if (!BDFDB.loadData(id, this, "desktop")) { if (!BDFDB.loadData(id, this, "desktop")) {

14
Plugins/StalkerNotifications/StalkerNotifications.plugin.js
View File

@ -127,7 +127,7 @@ class StalkerNotifications {
getDescription () {return "Lets you observe the status of people that aren't your friends.";} getDescription () {return "Lets you observe the status of people that aren't your friends.";}
getVersion () {return "1.0.5";} getVersion () {return "1.0.6";}
getAuthor () {return "DevilBro";} getAuthor () {return "DevilBro";}
@ -275,6 +275,7 @@ class StalkerNotifications {
this.ChannelUtils = BDFDB.WebModules.findByProperties(["getDMFromUserId"]); this.ChannelUtils = BDFDB.WebModules.findByProperties(["getDMFromUserId"]);
this.ChannelSwitchUtils = BDFDB.WebModules.findByProperties(["selectPrivateChannel"]); this.ChannelSwitchUtils = BDFDB.WebModules.findByProperties(["selectPrivateChannel"]);
this.PrivateChannelUtils = BDFDB.WebModules.findByProperties(["openPrivateChannel"]);
this.UserMetaStore = BDFDB.WebModules.findByProperties(["getStatus", "getOnlineFriendCount"]); this.UserMetaStore = BDFDB.WebModules.findByProperties(["getStatus", "getOnlineFriendCount"]);
this.UserUtils = BDFDB.WebModules.findByProperties(["getUsers"]); this.UserUtils = BDFDB.WebModules.findByProperties(["getUsers"]);
@ -328,12 +329,11 @@ class StalkerNotifications {
let string = `${BDFDB.encodeToHTML(data.name ? data.name : user.username)} is ${online ? "online" : "offline"}.`; let string = `${BDFDB.encodeToHTML(data.name ? data.name : user.username)} is ${online ? "online" : "offline"}.`;
let avatar = data.removeIcon ? "" : (data.url ? data.url : BDFDB.getUserAvatar(user.id)); let avatar = data.removeIcon ? "" : (data.url ? data.url : BDFDB.getUserAvatar(user.id));
let openChannel = () => { let openChannel = () => {
if (settings.openOnClick){ if (settings.openOnClick) {
let DMid = this.ChannelUtils.getDMFromUserId(user.id); let DMid = this.ChannelStore.getDMFromUserId(user.id)
if (DMid) { if (DMid) this.ChannelSwitchUtils.selectPrivateChannel(DMid);
require("electron").remote.getCurrentWindow().maximize(); else this.PrivateChannelUtils.openPrivateChannel(BDFDB.myData.id, user.id);
this.ChannelSwitchUtils.selectPrivateChannel(DMid); require("electron").remote.getCurrentWindow().maximize();
}
} }
}; };
if (!users[id].desktop) { if (!users[id].desktop) {