ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

fix sort conflict of ImplicitRelationships & SortFriendRequests (#2408)

Browse source
This commit is contained in:
dolfies 2024-05-03 09:09:54 -04:00 committed by GitHub
parent 84c53b4a27
commit 03d7e0fb93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/plugins/implicitRelationships/index.ts
View file

@ -81,8 +81,8 @@ export default definePlugin({
find: "getRelationshipCounts(){", find: "getRelationshipCounts(){",
replacement: { replacement: {
predicate: () => Settings.plugins.ImplicitRelationships.sortByAffinity, predicate: () => Settings.plugins.ImplicitRelationships.sortByAffinity,
match: /\.sortBy\(\i=>\i\.comparator\)/, match: /\}\)\.sortBy\((.+?)\)\.value\(\)/,
replace: "$&.sortBy((row) => $self.sortList(row))" replace: "}).sortBy(row => $self.wrapSort(($1), row)).value()"
} }
}, },
@ -120,10 +120,10 @@ export default definePlugin({
} }
), ),
sortList(row: any) { wrapSort(comparator: Function, row: any) {
return row.type === 5 return row.type === 5
? -UserAffinitiesStore.getUserAffinity(row.user.id)?.affinity ?? 0 ? -UserAffinitiesStore.getUserAffinity(row.user.id)?.affinity ?? 0
: row.comparator; : comparator(row);
}, },
async fetchImplicitRelationships() { async fetchImplicitRelationships() {

8
src/plugins/sortFriendRequests/index.tsx
View file

@ -41,8 +41,8 @@ export default definePlugin({
patches: [{ patches: [{
find: "getRelationshipCounts(){", find: "getRelationshipCounts(){",
replacement: { replacement: {
match: /\.sortBy\(\i=>\i\.comparator\)/, match: /\}\)\.sortBy\((.+?)\)\.value\(\)/,
replace: "$&.sortBy((row) => $self.sortList(row))" replace: "}).sortBy(row => $self.wrapSort(($1), row)).value()"
} }
}, { }, {
find: ".Messages.FRIEND_REQUEST_CANCEL", find: ".Messages.FRIEND_REQUEST_CANCEL",
@ -53,10 +53,10 @@ export default definePlugin({
} }
}], }],
sortList(row: any) { wrapSort(comparator: Function, row: any) {
return row.type === 3 || row.type === 4 return row.type === 3 || row.type === 4
? -this.getSince(row.user) ? -this.getSince(row.user)
: row.comparator; : comparator(row);
}, },
getSince(user: User) { getSince(user: User) {