mirrors/Equicord
1
1
Fork 0
mirror of https://github.com/Equicord/Equicord.git synced 2025-06-19 03:17:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'upstream/dev'

Browse source
This commit is contained in:
thororen1234 2024-06-01 13:14:59 -04:00
commit 268e053d68
16 changed files with 341 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/_core/supportHelper.tsx
View file

@ -69,7 +69,7 @@ export default definePlugin({
commands: [{
name: "equicord-debug",
description: "Send Equicord Debug info",
predicate: ctx => AllowedChannelIds.includes(ctx.channel.id),
predicate: ctx => isPluginDev(UserStore.getCurrentUser()?.id) || AllowedChannelIds.includes(ctx.channel.id),
async execute() {
const { RELEASE_CHANNEL } = window.GLOBAL_ENV;

2
src/plugins/friendsSince/index.tsx
View file

@ -36,7 +36,7 @@ export default definePlugin({
{
find: ".UserPopoutUpsellSource.PROFILE_PANEL,",
replacement: {
match: /\i.default,\{userId:(\i)}\)/,
match: /\i.default,\{userId:([^,]+?)}\)/,
replace: "$&,$self.friendsSince({ userId: $1 })"
}
},

5
src/plugins/secretRingTone/index.ts
View file

@ -16,9 +16,8 @@ export default definePlugin({
{
find: '"call_ringing_beat"',
replacement: {
// FIXME Remove === alternative when it hits stable
match: /500(!==|===)\i\(\)\.random\(1,1e3\)/,
replace: (_, predicate) => predicate === "!==" ? "false" : "true",
match: /500!==\i\(\)\.random\(1,1e3\)/,
replace: "false",
}
},
],

2
src/plugins/showConnections/index.tsx
View file

@ -182,7 +182,7 @@ export default definePlugin({
}
},
{
find: "\"Profile Panel: user cannot be undefined\"",
find: ".UserPopoutUpsellSource.PROFILE_PANEL,",
replacement: {
// createElement(Divider, {}), createElement(NoteComponent)
match: /\(0,\i\.jsx\)\(\i\.\i,\{\}\).{0,100}setNote:(?=.+?channelId:(\i).id)/,

3
src/plugins/showHiddenChannels/index.tsx
View file

@ -73,8 +73,9 @@ export default definePlugin({
find: '"placeholder-channel-id"',
replacement: [
// Remove the special logic for channels we don't have access to
// FIXME Remove variable matcher from threadsIds when it hits stable
{
match: /if\(!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL.+?{if\(this\.id===\i\).+?threadIds:\i}}/,
match: /if\(!\i\.\i\.can\(\i\.\i\.VIEW_CHANNEL.+?{if\(this\.id===\i\).+?threadIds:(?:\[\]|\i)}}/,
replace: ""
},
// Do not check for unreads when selecting the render level if the channel is hidden