SheWhoReignsSupreme/Equicord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
thororen 2026-09-19 10:42:14 -04:00
commit ddf6c563b4
No known key found for this signature in database
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/runInstaller.mjs
View file

@ -19,7 +19,7 @@
import "./checkNodeVersion.js"; import "./checkNodeVersion.js";
import { execFileSync, execSync } from "child_process"; import { execFileSync, execSync } from "child_process";
import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs"; import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync, cpSync, rmSync } from "fs";
import { dirname, join } from "path"; import { dirname, join } from "path";
import { Readable } from "stream"; import { Readable } from "stream";
import { finished } from "stream/promises"; import { finished } from "stream/promises";

2
src/plugins/gifPaste/index.ts
View file

@ -30,7 +30,7 @@ export default definePlugin({
patches: [{ patches: [{
find: "handleSelectGIF=", find: "handleSelectGIF=",
replacement: { replacement: {
match: /handleSelectGIF=(\i)=>\{/, match: /handleSelectGIF=\((\i),\i\)=>\{/,
replace: "$&if (!this?.props?.className) return $self.handleSelect($1);" replace: "$&if (!this?.props?.className) return $self.handleSelect($1);"
} }
}], }],

4
src/plugins/superReactionTweaks/index.ts
View file

@ -53,8 +53,8 @@ export default definePlugin({
{ {
find: ".EMOJI_PICKER_CONSTANTS_EMOJI_CONTAINER_PADDING_HORIZONTAL)", find: ".EMOJI_PICKER_CONSTANTS_EMOJI_CONTAINER_PADDING_HORIZONTAL)",
replacement: { replacement: {
match: /(openPopoutType:void 0(?=.+?isBurstReaction:(\i).+?;(\i===\i\.\i\.REACTION)&&\i\.push\().+?\[\2,\i\]=\i\.useState\()!1\)/, match: /(openPopoutType:void 0(?=.+?isBurstReaction:(\i).+?\.intention===(\i\.\i\.REACTION)).+?\[\2,\i\]=\i\.useState\()!1\)(?<=pickerIntention:(\i).+?)/,
replace: (_, rest, _isBurstReactionVariable, isReactionIntention) => `${rest}$self.shouldSuperReactByDefault&&${isReactionIntention})` replace: (_, rest, _isBurstReactionVariable, REACTION_INTENTION, pickerIntention) => `${rest}$self.shouldSuperReactByDefault&&${pickerIntention}===${REACTION_INTENTION})`
} }
} }
], ],

2
src/webpack/common/components.ts
View file

@ -112,7 +112,7 @@ export const ScrollerAuto = LazyComponent(() => createScroller?.(scrollerClasses
export const ListScrollerThin = LazyComponent(() => createListScroller(listScrollerClasses.thin, listScrollerClasses.fade, "", ResizeObserver)); export const ListScrollerThin = LazyComponent(() => createListScroller(listScrollerClasses.thin, listScrollerClasses.fade, "", ResizeObserver));
export const ListScrollerAuto = LazyComponent(() => createListScroller(listScrollerClasses.auto, listScrollerClasses.fade, "", ResizeObserver)); export const ListScrollerAuto = LazyComponent(() => createListScroller(listScrollerClasses.auto, listScrollerClasses.fade, "", ResizeObserver));
export const FocusLock = waitForComponent<t.FocusLock>("FocusLock", filters.componentByCode(".containerRef,{keyboardModeEnabled:")); export const FocusLock = waitForComponent<t.FocusLock>("FocusLock", filters.componentByCode(".containerRef,{disableReturn:"));
export let useToken: t.useToken; export let useToken: t.useToken;
waitFor(m => { waitFor(m => {