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

stuff

This commit is contained in:
Mirco Wittrien 2022-10-02 17:12:02 +02:00
parent 41b324fd03
commit b60eace0a5
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/_res/0BDFDB.data.json
View File

@ -59,7 +59,6 @@
"ReadStateTypes": ["GUILD_EVENT", "NOTIFICATION_CENTER", "CHANNEL"],
"RelationshipTypes": ["FRIEND", "PENDING_INCOMING", "PENDING_OUTGOING"],
"Routes": ["CHANNEL_THREAD_VIEW", "MESSAGE_REQUESTS"],
"StatusTypes": ["STREAMING", "UNKNOWN", "DND"],
"UserFlags": ["HYPESQUAD", "BUG_HUNTER_LEVEL_1", "STAFF"],
"UserNotificationSettings": ["NULL", "NO_MESSAGES", "ALL_MESSAGES"],
"UserSettingsActionTypes": ["SLOW_USER_ACTION", "DAILY"],
@ -475,7 +474,11 @@
"Types": ["WANDERING_CUBES", "CHASING_DOTS"],
"Spinner": ["LOADING"]
}},
"Status": {"name": "Status"},
"StatusComponents": {"strings": ["{mask", ".mask,", "UNKNOWN"], "exported": false, "value": "exports", "map": {
"AnimatedStatus": ["useSpring"],
"Status": [".mask,"],
"Types": ["UNKNOWN", "INVISIBLE"]
}},
"StatusPickerPopout": {"strings": ["\"StatusPickerPopout\""], "value": "default"},
"TextElement": {"strings": [".strong,", ".STANDARD"]},
"Timeout": {"protos": ["start", "stop", "isStarted"]},

2
Plugins/BetterFriendList/BetterFriendList.plugin.js
View File

@ -246,7 +246,7 @@ module.exports = (_ => {
newChildren.push(this.createBadge(favorizedFriends.filter(id => relationships[id] == BDFDB.DiscordConstants.RelationshipTypes.FRIEND).length));
break;
case BDFDB.DiscordConstants.FriendsSections.ONLINE:
newChildren.push(this.createBadge(Object.entries(relationships).filter(n => n[1] == BDFDB.DiscordConstants.RelationshipTypes.FRIEND && !(this.settings.general.addHiddenCategory && hiddenFriends.indexOf(n[0]) > -1) && BDFDB.LibraryStores.PresenceStore.getStatus(n[0]) != BDFDB.DiscordConstants.StatusTypes.OFFLINE).length));
newChildren.push(this.createBadge(Object.entries(relationships).filter(n => n[1] == BDFDB.DiscordConstants.RelationshipTypes.FRIEND && !(this.settings.general.addHiddenCategory && hiddenFriends.indexOf(n[0]) > -1) && BDFDB.LibraryStores.PresenceStore.getStatus(n[0]) != BDFDB.LibraryComponents.StatusComponents.Types.OFFLINE).length));
break;
case BDFDB.DiscordConstants.FriendsSections.PENDING:
newChildren.push(this.createBadge(relationshipCount[BDFDB.DiscordConstants.RelationshipTypes.PENDING_INCOMING], this.labels.incoming, relationshipCount[BDFDB.DiscordConstants.RelationshipTypes.PENDING_INCOMING] > 0));

4
Plugins/CustomStatusPresets/CustomStatusPresets.plugin.js
View File

@ -372,9 +372,9 @@ module.exports = (_ => {
})
})
}),
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Status, {
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.StatusComponents.Status, {
className: BDFDB.disCN._customstatuspresetsstatus,
status: presets[id].status || BDFDB.DiscordConstants.StatusTypes.ONLINE
status: presets[id].status || BDFDB.LibraryComponents.StatusComponents.Types.ONLINE
}),
BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextScroller, {
children: presets[id].text

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

@ -796,7 +796,7 @@ module.exports = (_ => {
}
getOnlineCount () {
return Object.entries(BDFDB.LibraryStores.RelationshipStore.getRelationships()).filter(n => n[1] == BDFDB.DiscordConstants.RelationshipTypes.FRIEND && BDFDB.LibraryStores.PresenceStore.getStatus(n[0]) != BDFDB.DiscordConstants.StatusTypes.OFFLINE).length;
return Object.entries(BDFDB.LibraryStores.RelationshipStore.getRelationships()).filter(n => n[1] == BDFDB.DiscordConstants.RelationshipTypes.FRIEND && BDFDB.LibraryStores.PresenceStore.getStatus(n[0]) != BDFDB.LibraryComponents.StatusComponents.Types.OFFLINE).length;
}
startInterval () {
@ -821,7 +821,7 @@ module.exports = (_ => {
let status = this.getStatusWithMobileAndActivity(id, observedUsers[id], clientStatuses);
let transitionChannelId = null;
let customChanged = false, loginNotice = false, screensharingNotice = false;
if (user && (!observedUsers[id][status.name] && observedUsers[id].login && status.name != BDFDB.DiscordConstants.StatusTypes.OFFLINE && userStatusStore[id].name == BDFDB.DiscordConstants.StatusTypes.OFFLINE && (loginNotice = true) || observedUsers[id][status.name] && (
if (user && (!observedUsers[id][status.name] && observedUsers[id].login && status.name != BDFDB.LibraryComponents.StatusComponents.Types.OFFLINE && userStatusStore[id].name == BDFDB.LibraryComponents.StatusComponents.Types.OFFLINE && (loginNotice = true) || observedUsers[id][status.name] && (
observedUsers[id].custom && (
userStatusStore[id].custom != status.custom && ((customChanged = status.custom) || true) ||
(customChanged = status.custom && !this.activityIsSame(id, status))
@ -854,7 +854,7 @@ module.exports = (_ => {
timestamp: timestamp
});
if (!(this.settings.general.muteOnDND && BDFDB.UserUtils.getStatus() == BDFDB.DiscordConstants.StatusTypes.DND) && (!lastTimes[user.id] || lastTimes[user.id] != timestamp)) {
if (!(this.settings.general.muteOnDND && BDFDB.UserUtils.getStatus() == BDFDB.LibraryComponents.StatusComponents.Types.DND) && (!lastTimes[user.id] || lastTimes[user.id] != timestamp)) {
lastTimes[user.id] = timestamp;
let openChannel = _ => {
@ -921,12 +921,12 @@ module.exports = (_ => {
}
createStatusDot (status, isMobile, style = {}) {
return BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Status, {
return BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.StatusComponents.Status, {
style: Object.assign({}, style),
size: 12,
color: isMobile ? BDFDB.UserUtils.getStatusColor(status, true) : null,
isMobile: isMobile,
status: isMobile ? BDFDB.DiscordConstants.StatusTypes.ONLINE : status
status: isMobile ? BDFDB.LibraryComponents.StatusComponents.Types.ONLINE : status
});
}

4
Plugins/NotificationSounds/NotificationSounds.plugin.js
View File

@ -489,10 +489,10 @@ module.exports = (_ => {
mini: true,
grow: 0,
label: "Mute in",
labelChildren: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Status, {
labelChildren: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.StatusComponents.Status, {
style: {marginLeft: 6},
size: 12,
status: BDFDB.DiscordConstants.StatusTypes.DND
status: BDFDB.LibraryComponents.StatusComponents.Types.DND
}),
value: choices[type].mute,
onChange: value => {