From 95c452eed68c4d95932cdc19c84a384da7a2ca85 Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Tue, 29 Nov 2022 18:50:17 +0100 Subject: [PATCH] stuff --- Library/_res/0BDFDB.data.json | 21 +++++-- Plugins/EditChannels/EditChannels.plugin.js | 62 ++++++++----------- Plugins/EditUsers/EditUsers.plugin.js | 4 +- .../RemoveBlockedUsers.plugin.js | 7 ++- 4 files changed, 48 insertions(+), 46 deletions(-) diff --git a/Library/_res/0BDFDB.data.json b/Library/_res/0BDFDB.data.json index 17f8c9e105..15261e2e03 100644 --- a/Library/_res/0BDFDB.data.json +++ b/Library/_res/0BDFDB.data.json @@ -359,7 +359,6 @@ }, "PatchModules": { "Account": {"protos": ["renderAvatarWithPopout", "renderCopiableNameTag", "renderCopiedSuccess"]}, - "ActiveThread": {"strings": [".threadId", ".gotoThread", ".showChannelName"]}, "AnalyticsContext": {"props": ["ObjectTypes", "Objects", "Pages", "Sections"]}, "AuditLogEntry": {"protos": ["renderRoleUpdate", "renderChangeDetails", "getActionTypeColor", "renderPermissionUpdate"]}, "AuditLogs": {"strings": ["Messages.SEARCH_MEMBERS", "._lastExpandedRef", ".handleActionFilterQueryClear"]}, @@ -373,8 +372,10 @@ "BlobMask": {"protos": ["getBadgePositionInterpolation", "getUpperBadgeStyles"]}, "BlockedMessageGroup": {"strings": ["collapsed-message-item", "isBeforeGroup", "collapsedReason"]}, "ChannelCall": {"strings": ["maybeLeaveFullScreen", "handleFullscreenParticipant", "CHANNEL_CALL_POPOUT"]}, + "ChannelCallHeader": {"strings": ["focusedApplication:", "focusedParticipant:", ".getSelectedParticipant", ".appContext"]}, "ChannelCallGrid": {"strings": [".totalNumberOfParticipants", "keyExtractor:", "channel_user_limit:"]}, "ChannelCallVideoParticipants": {"strings": [".tileSizer", ".participantTileWidth", ".COVER"]}, + "ChannelEmptyMessages": {"strings": [".Messages.BEGINNING_CHANNEL_WELCOME", ".Messages.BEGINNING_GROUP_DM_MANAGED", ".showingBanner"]}, "ChannelItem": {"strings": ["canHaveDot", "unreadRelevant", "UNREAD_HIGHLIGHT"]}, "ChannelItemIcon": {"strings": [".hasActiveThreads", ".locked", ".iconContainer"]}, "ChannelMembers": {"strings": ["MEMBER_LIST_VIEWED", "getDimensions", "member-"]}, @@ -463,6 +464,7 @@ "PeopleListItemPending": {"strings": ["PENDING_INCOMING", ".DENY", "addRelationship"]}, "PeopleListSectionedLazy": {"strings": [".statusSections", ".peopleList", "id:\"people-list\""]}, "PeopleListSectionedNonLazy": {"strings": [".statusSections", ".peopleList", "id:\"people\""]}, + "PictureInPictureVideo": {"strings": [".topControls", ".bottomControl", ".screenMessage", ".renderBottomLeftControls"]}, "PrivateChannel": {"strings": ["LEAVE_GROUP_DM_MANAGED_BODY", "handleCloseButtonMouseDown", "handleLeaveGroup"]}, "PrivateChannelRecipients": {"strings": [".membersWrap", "recipients"]}, "PrivateChannelsList": {"strings": ["privateChannelIds", "privateChannelRecipientsInviteButtonIcon"]}, @@ -479,8 +481,11 @@ "RichChannelMention": {"strings": ["iconType:", "Messages.DELETED_CHANNEL_PLACEHOLDER"]}, "RichRoleMention": {"strings": [".color?null", ".guildId", ".roles[", "\"@\""]}, "RichUserMention": {"strings": ["hidePersonalInformation", "getUser", "userTooltip"]}, + "RTCConnection": {"strings": [".NOISE_CANCELLATION_POPOUT", ".voicePanelIntroductionButton"]}, + "RTCConnectionVoiceUsers": {"strings": [".Messages.VOICE_PANEL_SHOW_EXTRAS", ".Messages.VOICE_PANEL_USERS", ".voiceStates"]}, "SearchBar": {"strings": [").inputRef", ".containerRef", ".handleOnChange"]}, "SearchPopout": {"strings": [".handleHintClick", ".selectedIndex", "token.start"]}, + "SearchPopoutOption": {"strings": [".plusIcon", ".option,", ".filter"]}, "SearchResult": {"strings": [".onJump", "message:", "handleMessageClick"]}, "SearchResults": {"strings": ["SEARCH_ERROR", "emptyResultsText", "isSearching"]}, "SearchResultsInner": {"strings": ["SEARCH_HIDE_BLOCKED_MESSAGES", "totalResults", "\"search-result-\""]}, @@ -494,12 +499,16 @@ "SystemMessageWrapper": {"strings": ["unknown message type", "\"SystemMessage\""]}, "TabBar": {"props": ["Types", "Looks", "Item", "Panel"]}, "TextChannelEmptyMessage": {"strings": ["MANAGE_CHANNELS", ".BEGINNING_CHANNEL_DESCRIPTION", "topicHook:"]}, + "ThreadCard": {"strings": [".threadId", ".gotoThread", ".container", ".threadName"]}, + "ThreadCardDescription": {"strings": [".Messages.THREAD_BROWSER_STARTED_BY", ".bullet", ".lastMessageId"]}, + "ThreadEmptyMessage": {"strings": [",{channel:", ".name", "{channelId:", ".iconWrapper", ".icon}"]}, + "ThreadEmptyMessageAuthor": {"strings": [".threadCreatorName", ".unknownCreatorName", ".getUser"]}, + "ThreadMessageAccessories": {"strings": ["threadMetadata", "NO_RECENT_THREAD_MESSAGES", ".Messages.THREAD"]}, + "ThreadMessageAccessoryMessage": {"strings": [".threadMessageAccessoryPlaceholder", ".threadMessageAccessoryContent", "formatInline:"]}, + "ThreadSidebar": {"strings": [".baseChannelId", ".SIDEBAR", ".THREAD_HEADER_BAR"]}, "Tooltip": {"protos": ["renderTooltip", "setDomElement", "shouldShowTooltip", "toggleShow"]}, "TransitionGroup": {"protos": ["performAppear", "performEnter", "performLeave"]}, - "ThreadCard": {"strings": [".threadId", ".gotoThread", ".container", ".threadName"]}, - "ThreadEmptyMessage": {"strings": [",{channel:", ".name)", "{channelId:", ".iconWrapper", ".icon}"]}, - "ThreadMessageAccessories": {"strings": ["threadMetadata", "NO_RECENT_THREAD_MESSAGES", ".Messages.THREAD"]}, - "ThreadSidebar": {"strings": [".baseChannelId", ".SIDEBAR", ".THREAD_HEADER_BAR"]}, + "TypingUsers": {"strings": ["Easing.quad", ".emphasizeSlowmodeCooldown", ".sequence("]}, "UnavailableGuildsButton": {"strings": [".errorInner", ".guildsError", "Messages.PARTIAL_OUTAGE"]}, "UnreadDMs": {"strings": ["getMutablePrivateChannels", "selectedVoiceGuildId", ".selectedVoiceChannelId"]}, "UseCopyIdItem": {"strings": ["\"devmode-copy-id\""]}, @@ -524,6 +533,7 @@ "UserRolesSection": {"strings": [".rolePillBorder", "numRoles", "roleClassName"]}, "UserSummaryItem": {"protos": ["renderMoreUsers", "renderUsers", "renderIcon"]}, "UserSettingsAppearance": {"protos": ["renderTheme", "renderDisplayMode", "renderMessageGroupSpacingSlider"]}, + "VideoBackground": {"strings": [".backgroundSrc", ".pulseSpeakingIndicator", ".avatarWrapper"]}, "VoiceUser": {"protos": ["renderPrioritySpeaker", "renderIcons", "renderAvatar"]}, "VoiceUsers": {"strings": ["hidePreview", "previewIsOpen", "previewUserIdAfterDelay"]} }, @@ -3202,6 +3212,7 @@ "threadcardauthor": ["ThreadCard", "authorName"], "threadcardavatar": ["ThreadCard", "avatar"], "threadcardname": ["ThreadCard", "threadName"], + "threadcardstartedby": ["ThreadCard", "startedByName"], "tip": ["Tip", "tip"], "tipblock": ["Tip", "block"], "tippro": ["Tip", "pro"], diff --git a/Plugins/EditChannels/EditChannels.plugin.js b/Plugins/EditChannels/EditChannels.plugin.js index bd89da4fcb..deed54880c 100644 --- a/Plugins/EditChannels/EditChannels.plugin.js +++ b/Plugins/EditChannels/EditChannels.plugin.js @@ -2,7 +2,7 @@ * @name EditChannels * @author DevilBro * @authorId 278543574059057154 - * @version 4.4.8 + * @version 4.4.9 * @description Allows you to locally edit Channels * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -88,6 +88,7 @@ module.exports = (_ => { before: [ "AuditLogEntry", "AutocompleteChannelResult", + "ChannelEmptyMessages", "ChannelsList", "ChannelTextAreaEditor", "ChannelThreadItem", @@ -97,8 +98,6 @@ module.exports = (_ => { "RecentsChannelHeader", "SearchPopout", "SystemMessageWrapper", - "TextChannelEmptyMessage", - "ThreadEmptyMessage", "ThreadMessageAccessories" ], after: [ @@ -265,12 +264,9 @@ module.exports = (_ => { if (changedChannels[e.instance.props.channel.id].name) e.instance.props.placeholder = BDFDB.LanguageUtils.LanguageStringsFormat("TEXTAREA_PLACEHOLDER", `#${changedChannels[e.instance.props.channel.id].name}`); } - processTextChannelEmptyMessage (e) { - if (this.settings.places.chatWindow && e.instance.props.channel && changedChannels[e.instance.props.channel.id]) e.instance.props.channel = this.getChannelData(e.instance.props.channel.id); - } - - processThreadEmptyMessage (e) { - if (this.settings.places.chatWindow && e.instance.props.channel && changedChannels[e.instance.props.channel.id]) e.instance.props.channel = this.getChannelData(e.instance.props.channel.id); + processChannelEmptyMessages (e) { + if (!this.settings.places.chatWindow || !e.instance.props.channel || !changedChannels[e.instance.props.channel.id]) return; + e.instance.props.channel = this.getChannelData(e.instance.props.channel.id); } processSystemMessageWrapper (e) { @@ -872,9 +868,7 @@ module.exports = (_ => { } else { iconInput.props.disabled = false; - this.checkUrl(iconInput.props.value, iconInput).then(returnValue => { - newData.url = returnValue; - }); + this.checkUrl(iconInput.props.value, iconInput).then(returnValue => newData.url = returnValue); } } }) @@ -888,9 +882,7 @@ module.exports = (_ => { disabled: data.removeIcon, ref: instance => {if (instance) iconInput = instance;}, onChange: (value, instance) => { - this.checkUrl(value, instance).then(returnValue => { - newData.url = returnValue; - }); + this.checkUrl(value, instance).then(returnValue => newData.url = returnValue); } }) ] @@ -931,27 +923,25 @@ module.exports = (_ => { callback(""); BDFDB.ReactUtils.forceUpdate(instance); } - else instance.checkTimeout = BDFDB.TimeUtils.timeout(_ => { - BDFDB.LibraryRequires.request(url, {agentOptions: {rejectUnauthorized: false}}, (error, response, result) => { - delete instance.checkTimeout; - if (instance.props.disabled) { - delete instance.props.success; - delete instance.props.errorMessage; - callback(""); - } - else if (response && response.headers["content-type"] && response.headers["content-type"].indexOf("image") != -1) { - instance.props.success = true; - delete instance.props.errorMessage; - callback(url); - } - else { - delete instance.props.success; - instance.props.errorMessage = this.labels.modal_invalidurl; - callback(""); - } - BDFDB.ReactUtils.forceUpdate(instance); - }); - }, 1000); + else instance.checkTimeout = BDFDB.TimeUtils.timeout(_ => BDFDB.LibraryRequires.request(url, {agentOptions: {rejectUnauthorized: false}}, (error, response, result) => { + delete instance.checkTimeout; + if (instance.props.disabled) { + delete instance.props.success; + delete instance.props.errorMessage; + callback(""); + } + else if (response && response.headers["content-type"] && response.headers["content-type"].indexOf("image") != -1) { + instance.props.success = true; + delete instance.props.errorMessage; + callback(url); + } + else { + delete instance.props.success; + instance.props.errorMessage = this.labels.modal_invalidurl; + callback(""); + } + BDFDB.ReactUtils.forceUpdate(instance); + }), 1000); }); } diff --git a/Plugins/EditUsers/EditUsers.plugin.js b/Plugins/EditUsers/EditUsers.plugin.js index 3db613451d..9cd277147c 100644 --- a/Plugins/EditUsers/EditUsers.plugin.js +++ b/Plugins/EditUsers/EditUsers.plugin.js @@ -130,7 +130,7 @@ module.exports = (_ => { PrivateChannelRecipientsInvitePopout: "render", QuickSwitchUserResult: "render", SearchPopoutComponent: "render", - PrivateChannelCallParticipants: "render", + VoiceCallParticipants: "render", ChannelCall: "render", ChannelCallGrid: "default", HorizontalVideoParticipants: "default", @@ -1255,7 +1255,7 @@ module.exports = (_ => { } } - processPrivateChannelCallParticipants (e) { + processVoiceCallParticipants (e) { if (BDFDB.ArrayUtils.is(e.instance.props.participants) && this.settings.places.dmCalls) { e.instance.props.participants = [].concat(e.instance.props.participants); for (let i in e.instance.props.participants) if (e.instance.props.participants[i] && e.instance.props.participants[i].user) e.instance.props.participants[i] = Object.assign({}, e.instance.props.participants[i], {user: this.getUserData(e.instance.props.participants[i].user.id)}); diff --git a/Plugins/RemoveBlockedUsers/RemoveBlockedUsers.plugin.js b/Plugins/RemoveBlockedUsers/RemoveBlockedUsers.plugin.js index 7b13a95584..27de4d06ca 100644 --- a/Plugins/RemoveBlockedUsers/RemoveBlockedUsers.plugin.js +++ b/Plugins/RemoveBlockedUsers/RemoveBlockedUsers.plugin.js @@ -2,7 +2,7 @@ * @name RemoveBlockedUsers * @author DevilBro * @authorId 278543574059057154 - * @version 1.5.8 + * @version 1.5.9 * @description Removes blocked Messages/Users * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -99,7 +99,7 @@ module.exports = (_ => { "VoiceUsers" ], after: [ - "ActiveThread", + "ThreadCard", "BlockedMessageGroup", "ChannelPins", "DirectMessage", @@ -354,7 +354,7 @@ module.exports = (_ => { if (this.settings.places.reactions && BDFDB.ArrayUtils.is(e.instance.props.reactors)) e.instance.props.reactors = e.instance.props.reactors.filter(n => !n || !BDFDB.LibraryStores.RelationshipStore.isBlocked(n.id)); } - processActiveThread (e) { + processThreadCard (e) { if (!this.settings.places.threads) return; let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {filter: n => n && n.type && n.type.toString().indexOf(".getMostRecentMessage") > -1}); if (index > -1 && children[index].props && children[index].props.channel) { @@ -419,6 +419,7 @@ module.exports = (_ => { if (!this.settings.places.activity) return; let [children, index] = BDFDB.ReactUtils.findParent(e.instance, {name: "NowPlayingHeader"}); if (index > -1) for (let child of children) if (child && child.props && child.props.party) { + child.props.party = Object.assign({}, child.props.party); if (child.props.party.priorityMembers) { child.props.party.priorityMembers = child.props.party.priorityMembers.filter(n => !n || !n.user || !BDFDB.LibraryStores.RelationshipStore.isBlocked(n.user.id)); if (!child.props.party.priorityMembers.length) child.props.party.priorityMembers.push({user: new BDFDB.DiscordObjects.User({id: 0, username: ""})});