Fix broken patches

This commit is contained in:
Nuckyz 2023-11-24 16:49:19 -03:00
parent fdddfdb05b
commit 3e8e106be7
No known key found for this signature in database
GPG key ID: 440BF8296E1C4AD9
3 changed files with 22 additions and 35 deletions

View file

@ -1,20 +1,8 @@
/*
* Vencord, a modification for Discord's desktop app
* Copyright (c) 2022 Vendicated and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
* Vencord, a Discord client mod
* Copyright (c) 2023 Vendicated and contributors
* SPDX-License-Identifier: GPL-3.0-or-later
*/
import { Devs } from "@utils/constants";
import definePlugin from "@utils/types";

View file

@ -16,17 +16,27 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { definePluginSettings } from "@api/Settings";
import { Flex } from "@components/Flex";
import { Devs } from "@utils/constants";
import definePlugin, { OptionType } from "@utils/types";
import { RelationshipStore } from "@webpack/common";
import { User } from "discord-types/general";
import { Settings } from "Vencord";
const settings = definePluginSettings({
showDates: {
type: OptionType.BOOLEAN,
description: "Show dates on friend requests",
default: false,
restartNeeded: true
}
});
export default definePlugin({
name: "SortFriendRequests",
authors: [Devs.Megu],
description: "Sorts friend requests by date of receipt",
settings,
patches: [{
find: "getRelationshipCounts(){",
@ -35,13 +45,11 @@ export default definePlugin({
replace: ".sortBy((row) => $self.sortList(row))"
}
}, {
find: "RelationshipTypes.PENDING_INCOMING?",
find: ".Messages.FRIEND_REQUEST_CANCEL",
replacement: {
predicate: () => Settings.plugins.SortFriendRequests.showDates,
match: /(user:(\i),.{10,50}),subText:(\i),(className:\i\.userInfo}\))/,
replace: (_, pre, user, subtext, post) => `${pre},
subText: $self.makeSubtext(${subtext}, ${user}),
${post}`
predicate: () => settings.store.showDates,
match: /subText:(\i)(?=,className:\i\.userInfo}\))(?<=user:(\i).+?)/,
replace: (_, subtext, user) => `subText:$self.makeSubtext(${subtext},${user})`
}
}],
@ -63,14 +71,5 @@ export default definePlugin({
{!isNaN(since.getTime()) && <span>Received &mdash; {since.toDateString()}</span>}
</Flex>
);
},
options: {
showDates: {
type: OptionType.BOOLEAN,
description: "Show dates on friend requests",
default: false,
restartNeeded: true
}
}
});

View file

@ -120,9 +120,9 @@ export default definePlugin({
find: 'navId:"image-context"',
predicate: () => settings.store.addBack,
replacement: {
// return IS_DESKTOP ? React.createElement(Menu, ...)
match: /return \i\.\i\?/,
replace: "return true?"
// return IS_DESKTOP && null != ... ? React.createElement(Menu, ...)
match: /return \i\.\i(?=&&null)/,
replace: "return true"
}
},