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

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

Browse source
This commit is contained in:
thororen1234 2025-10-06 18:16:44 -04:00
commit 13d39e7fd9
No known key found for this signature in database
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/plugins/revealAllSpoilers/index.ts
View file

@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { Devs } from "@utils/constants";
import { Devs, IS_MAC } from "@utils/constants";
import definePlugin from "@utils/types";
import { findByPropsLazy } from "@webpack";
@ -39,9 +39,9 @@ export default definePlugin({
],
reveal(event: MouseEvent) {
const { ctrlKey, shiftKey, target } = event;
const { ctrlKey, metaKey, shiftKey, target } = event;
if (!ctrlKey) { return; }
if (!(IS_MAC ? metaKey : ctrlKey)) { return; }
const { spoilerContent, hidden } = SpoilerClasses;
const { messagesWrapper } = MessagesClasses;

10
src/plugins/showTimeoutDuration/index.tsx
View file

@ -14,8 +14,8 @@ import { canonicalizeMatch } from "@utils/patches";
import definePlugin, { OptionType } from "@utils/types";
import { Message } from "@vencord/discord-types";
import { findComponentLazy } from "@webpack";
import { ChannelStore, GuildMemberStore, Text, Tooltip } from "@webpack/common";
import { FunctionComponent, ReactNode } from "react";
import { ChannelStore, GuildMemberStore, Text, TooltipContainer } from "@webpack/common";
import { ReactNode } from "react";
const countDownFilter = canonicalizeMatch("#{intl::MAX_AGE_NEVER}");
const CountDown = findComponentLazy(m => m.prototype?.render?.toString().includes(countDownFilter));
@ -83,13 +83,13 @@ export default definePlugin({
}
],
TooltipWrapper: ErrorBoundary.wrap(({ message, children, text }: { message: Message; children: FunctionComponent<any>; text: ReactNode; }) => {
TooltipWrapper: ErrorBoundary.wrap(({ message, children, text }: { message: Message; children: ReactNode; text: ReactNode; }) => {
if (settings.store.displayStyle === DisplayStyle.Tooltip)
return <Tooltip text={renderTimeout(message, false)}>{children}</Tooltip>;
return <TooltipContainer text={renderTimeout(message, false)}>{children}</TooltipContainer>;
return (
<div className="vc-std-wrapper">
<Tooltip text={text}>{children}</Tooltip>
<TooltipContainer text={text}>{children}</TooltipContainer>
<Text variant="text-md/normal" color="status-danger">
{renderTimeout(message, true)} timeout remaining
</Text>