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

Update FriendNotifications.plugin.js

This commit is contained in:
Mirco Wittrien 2021-04-13 18:25:20 +02:00
parent 2b5e9bcd53
commit 312d477c44
1 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
* @name FriendNotifications * @name FriendNotifications
* @author DevilBro * @author DevilBro
* @authorId 278543574059057154 * @authorId 278543574059057154
* @version 1.6.5 * @version 1.6.6
* @description Shows a Notification when a Friend or a User, you choose to observe, changes their Status * @description Shows a Notification when a Friend or a User, you choose to observe, changes their Status
* @invite Jx3TjNS * @invite Jx3TjNS
* @donate https://www.paypal.me/MircoWittrien * @donate https://www.paypal.me/MircoWittrien
@ -17,15 +17,15 @@ module.exports = (_ => {
"info": { "info": {
"name": "FriendNotifications", "name": "FriendNotifications",
"author": "DevilBro", "author": "DevilBro",
"version": "1.6.5", "version": "1.6.6",
"description": "Shows a Notification when a Friend or a User, you choose to observe, changes their Status" "description": "Shows a Notification when a Friend or a User, you choose to observe, changes their Status"
}, },
"changeLog": { "changeLog": {
"fixed": { "added": {
"Add Stranger": "Works again" "Status Indicator": "Added the Status Indicator to the Notifications"
}, },
"improved": { "improved": {
"Time Log Timestamp Format": "Added Option to allow Users to customize the Timestamp Format in the Time Log" "Mobile": "Also shows Mobile for all status and not only online"
} }
} }
}; };
@ -174,16 +174,18 @@ module.exports = (_ => {
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.AvatarComponents.default, { BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.AvatarComponents.default, {
className: BDFDB.disCN._friendnotificationslogavatar, className: BDFDB.disCN._friendnotificationslogavatar,
src: log.avatar, src: log.avatar,
status: log.status,
size: BDFDB.LibraryComponents.AvatarComponents.Sizes.SIZE_40 size: BDFDB.LibraryComponents.AvatarComponents.Sizes.SIZE_40
}), }),
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextScroller, { BDFDB.ReactUtils.createElement("di", {
className: BDFDB.disCN._friendnotificationslogcontent, className: BDFDB.disCN._friendnotificationslogcontent,
speed: 1, children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextScroller, {
children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextElement, { speed: 1,
children: BDFDB.ReactUtils.elementToReact(BDFDB.DOMUtils.create(log.string)) children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextElement, {
children: BDFDB.ReactUtils.elementToReact(BDFDB.DOMUtils.create(log.string))
})
}) })
}) }),
_this.createStatusDot(log.status, log.mobile)
] ]
}) })
] ]
@ -247,6 +249,7 @@ module.exports = (_ => {
} }
${BDFDB.dotCN._friendnotificationslogcontent} { ${BDFDB.dotCN._friendnotificationslogcontent} {
max-width: 600px; max-width: 600px;
overflow: hidden;
} }
${BDFDB.dotCN._friendnotificationstypelabel} { ${BDFDB.dotCN._friendnotificationstypelabel} {
border-radius: 3px; border-radius: 3px;
@ -617,7 +620,7 @@ module.exports = (_ => {
BDFDB.PatchUtils.forceAllUpdates(this); BDFDB.PatchUtils.forceAllUpdates(this);
} }
} }
processGuilds (e) { processGuilds (e) {
if (settings.addOnlineCount) { if (settings.addOnlineCount) {
if (typeof e.returnvalue.props.children == "function") { if (typeof e.returnvalue.props.children == "function") {
@ -697,8 +700,8 @@ module.exports = (_ => {
}, BDFDB.ObjectUtils.map(statuses, init => notificationTypes[init ? "TOAST" : "DISABLED"].value)); }, BDFDB.ObjectUtils.map(statuses, init => notificationTypes[init ? "TOAST" : "DISABLED"].value));
} }
getStatusWithMobileAndActivity (id, config) { getStatusWithMobileAndActivity (id, config, clientStatuses) {
let status = {name: BDFDB.UserUtils.getStatus(id), activity: null, custom: false, mobile: BDFDB.LibraryModules.StatusMetaUtils.isMobileOnline(id)}; let status = {name: BDFDB.UserUtils.getStatus(id), activity: null, custom: false, mobile: clientStatuses && clientStatuses[id] && !!clientStatuses[id].mobile};
let activity = BDFDB.UserUtils.getActivity(id) || BDFDB.UserUtils.getCustomStatus(id); let activity = BDFDB.UserUtils.getActivity(id) || BDFDB.UserUtils.getCustomStatus(id);
if (activity && BDFDB.DiscordConstants.ActivityTypes[activity.type]) { if (activity && BDFDB.DiscordConstants.ActivityTypes[activity.type]) {
let isCustom = activity.type == BDFDB.DiscordConstants.ActivityTypes.CUSTOM_STATUS; let isCustom = activity.type == BDFDB.DiscordConstants.ActivityTypes.CUSTOM_STATUS;
@ -718,7 +721,6 @@ module.exports = (_ => {
getStatusName (id, status) { getStatusName (id, status) {
if (!status) return ""; if (!status) return "";
let statusName = (BDFDB.LanguageUtils.LanguageStringsCheck[statuses[status.name].name] && BDFDB.LanguageUtils.LanguageStrings[statuses[status.name].name] || this.labels["status_" + status.name] || statuses[status.name].name || "").toLowerCase(); let statusName = (BDFDB.LanguageUtils.LanguageStringsCheck[statuses[status.name].name] && BDFDB.LanguageUtils.LanguageStrings[statuses[status.name].name] || this.labels["status_" + status.name] || statuses[status.name].name || "").toLowerCase();
if (status.mobile && observedUsers[id].mobile) statusName += ` (${BDFDB.LanguageUtils.LanguageStrings.ACTIVE_ON_MOBILE})`;
return statusName; return statusName;
} }
@ -739,7 +741,8 @@ module.exports = (_ => {
observedUsers = Object.assign({}, data.nonFriends, data.friends); observedUsers = Object.assign({}, data.nonFriends, data.friends);
delete observedUsers[BDFDB.UserUtils.me.id]; delete observedUsers[BDFDB.UserUtils.me.id];
for (let id in observedUsers) userStatusStore[id] = this.getStatusWithMobileAndActivity(id, observedUsers[id]); let clientStatuses = BDFDB.LibraryModules.StatusMetaUtils.getState().clientStatuses;
for (let id in observedUsers) userStatusStore[id] = this.getStatusWithMobileAndActivity(id, observedUsers[id], clientStatuses);
checkInterval = BDFDB.TimeUtils.interval(_ => { checkInterval = BDFDB.TimeUtils.interval(_ => {
let amount = BDFDB.LibraryModules.StatusMetaUtils.getOnlineFriendCount(); let amount = BDFDB.LibraryModules.StatusMetaUtils.getOnlineFriendCount();
@ -747,9 +750,10 @@ module.exports = (_ => {
friendCounter.props.amount = amount; friendCounter.props.amount = amount;
BDFDB.ReactUtils.forceUpdate(friendCounter); BDFDB.ReactUtils.forceUpdate(friendCounter);
} }
clientStatuses = BDFDB.LibraryModules.StatusMetaUtils.getState().clientStatuses;
for (let id in observedUsers) if (!observedUsers[id].disabled) { for (let id in observedUsers) if (!observedUsers[id].disabled) {
let user = BDFDB.LibraryModules.UserStore.getUser(id); let user = BDFDB.LibraryModules.UserStore.getUser(id);
let status = this.getStatusWithMobileAndActivity(id, observedUsers[id]); let status = this.getStatusWithMobileAndActivity(id, observedUsers[id], clientStatuses);
let customChanged = false; let customChanged = false;
if (user && observedUsers[id][status.name] && ( if (user && observedUsers[id][status.name] && (
userStatusStore[id].name != status.name || userStatusStore[id].name != status.name ||
@ -772,11 +776,13 @@ module.exports = (_ => {
let toastString = BDFDB.StringUtils.htmlEscape(string).replace(/'{0,1}\$user'{0,1}/g, `<strong>${BDFDB.StringUtils.htmlEscape(name)}</strong>${settings.showDiscriminator ? ("#" + user.discriminator) : ""}`).replace(/'{0,1}\$statusOld'{0,1}/g, `<strong>${oldStatusName}</strong>`).replace(/'{0,1}\$status'{0,1}/g, `<strong>${statusName}</strong>`); let toastString = BDFDB.StringUtils.htmlEscape(string).replace(/'{0,1}\$user'{0,1}/g, `<strong>${BDFDB.StringUtils.htmlEscape(name)}</strong>${settings.showDiscriminator ? ("#" + user.discriminator) : ""}`).replace(/'{0,1}\$statusOld'{0,1}/g, `<strong>${oldStatusName}</strong>`).replace(/'{0,1}\$status'{0,1}/g, `<strong>${statusName}</strong>`);
if (status.activity) toastString = toastString.replace(/'{0,1}\$song'{0,1}|'{0,1}\$game'{0,1}/g, `<strong>${status.activity.name || status.activity.details || ""}</strong>`).replace(/'{0,1}\$artist'{0,1}|'{0,1}\$custom'{0,1}/g, `<strong>${[status.activity.emoji && status.activity.emoji.name, status.activity.state].filter(n => n).join(" ") || ""}</strong>`); if (status.activity) toastString = toastString.replace(/'{0,1}\$song'{0,1}|'{0,1}\$game'{0,1}/g, `<strong>${status.activity.name || status.activity.details || ""}</strong>`).replace(/'{0,1}\$artist'{0,1}|'{0,1}\$custom'{0,1}/g, `<strong>${[status.activity.emoji && status.activity.emoji.name, status.activity.state].filter(n => n).join(" ") || ""}</strong>`);
let statusType = BDFDB.UserUtils.getStatus(user.id);
timeLog.unshift({ timeLog.unshift({
string: toastString, string: toastString,
avatar: avatar, avatar: avatar,
name: name, name: name,
status: BDFDB.UserUtils.getStatus(user.id), status: statusType,
mobile: status.mobile,
timestamp: timestamp timestamp: timestamp
}); });
@ -794,6 +800,7 @@ module.exports = (_ => {
if (observedUsers[id][status.name] == notificationTypes.DESKTOP.value) { if (observedUsers[id][status.name] == notificationTypes.DESKTOP.value) {
let desktopString = string.replace(/\$user/g, `${name}${settings.showDiscriminator ? ("#" + user.discriminator) : ""}`).replace(/\$status/g, statusName).replace(/\$statusOld/g, oldStatusName); let desktopString = string.replace(/\$user/g, `${name}${settings.showDiscriminator ? ("#" + user.discriminator) : ""}`).replace(/\$status/g, statusName).replace(/\$statusOld/g, oldStatusName);
if (status.activity) desktopString = desktopString.replace(/\$song|\$game/g, status.activity.name || status.activity.details || "").replace(/\$artist|\$custom/g, [status.activity.emoji && status.activity.emoji.name, status.activity.state].filter(n => n).join(" ") || ""); if (status.activity) desktopString = desktopString.replace(/\$song|\$game/g, status.activity.name || status.activity.details || "").replace(/\$artist|\$custom/g, [status.activity.emoji && status.activity.emoji.name, status.activity.state].filter(n => n).join(" ") || "");
if (status.mobile) desktopString += " (mobile)";
let notificationSound = notificationSounds["desktop" + status.name] || {}; let notificationSound = notificationSounds["desktop" + status.name] || {};
BDFDB.NotificationUtils.desktop(desktopString, { BDFDB.NotificationUtils.desktop(desktopString, {
icon: avatar, icon: avatar,
@ -802,7 +809,13 @@ module.exports = (_ => {
onClick: openChannel onClick: openChannel
}); });
} }
else BDFDB.NotificationUtils.toast(BDFDB.ReactUtils.elementToReact(BDFDB.DOMUtils.create(toastString)), { else BDFDB.NotificationUtils.toast(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Flex, {
align: BDFDB.LibraryComponents.Flex.Align.CENTER,
children: [
BDFDB.ReactUtils.elementToReact(BDFDB.DOMUtils.create(toastString)),
this.createStatusDot(statusType, status.mobile)
]
}), {
timeout: amounts.toastTime * 1000, timeout: amounts.toastTime * 1000,
avatar: avatar, avatar: avatar,
barColor: BDFDB.UserUtils.getStatusColor(status.name, true), barColor: BDFDB.UserUtils.getStatusColor(status.name, true),
@ -821,7 +834,17 @@ module.exports = (_ => {
userStatusStore[id] = status; userStatusStore[id] = status;
} }
}, amounts.checkInterval * 1000); }, amounts.checkInterval * 1000);
} }
createStatusDot (status, isMobile) {
return BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Status, {
style: {marginLeft: 6},
size: 12,
color: isMobile ? BDFDB.UserUtils.getStatusColor(status, true) : null,
isMobile: isMobile,
status: isMobile ? BDFDB.DiscordConstants.StatusTypes.ONLINE : status
});
}
showTimeLog () { showTimeLog () {
let searchTimeout; let searchTimeout;