mirror of
https://github.com/Vendicated/Vencord.git
synced 2024-09-20 06:30:35 +00:00
Compare commits
17 commits
637956727d
...
66b0fe1370
Author | SHA1 | Date | |
---|---|---|---|
|
66b0fe1370 | ||
|
a015cf96f6 | ||
|
cecba0029f | ||
|
2e0977dd2b | ||
|
1b9ea1f413 | ||
|
cfb4972394 | ||
|
d0f048f81d | ||
|
a6058f8285 | ||
|
d17c0ea387 | ||
|
7ceaa5a6f0 | ||
|
2099d6ec94 | ||
|
2c33b5ac4d | ||
|
c27e01591e | ||
|
e5f743c922 | ||
|
8c0d54f13a | ||
|
ad64da0621 | ||
|
49c48393e0 |
12 changed files with 460 additions and 129 deletions
110
src/plugins/showTimeoutDetails/TimeoutReasonStore.ts
Normal file
110
src/plugins/showTimeoutDetails/TimeoutReasonStore.ts
Normal file
|
@ -0,0 +1,110 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a Discord client mod
|
||||||
|
* Copyright (c) 2024 Vendicated and contributors
|
||||||
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { proxyLazy } from "@utils/lazy";
|
||||||
|
import { findByPropsLazy } from "@webpack";
|
||||||
|
import { Constants, Flux, FluxDispatcher, GuildMemberStore, PermissionsBits, PermissionStore, RestAPI, useStateFromStores } from "@webpack/common";
|
||||||
|
|
||||||
|
|
||||||
|
const AuditLogReasons: {
|
||||||
|
MEMBER_UPDATE: number;
|
||||||
|
AUTO_MODERATION_USER_COMMUNICATION_DISABLED: number;
|
||||||
|
[reason: string]: number;
|
||||||
|
} = findByPropsLazy("ALL", "AUTO_MODERATION_USER_COMMUNICATION_DISABLED", "MEMBER_UPDATE");
|
||||||
|
|
||||||
|
export type TimeoutEntry = {
|
||||||
|
reason: string | undefined;
|
||||||
|
moderator: string | undefined; // User ID of moderator, undefined if automod did the timeout
|
||||||
|
automod: boolean | undefined;
|
||||||
|
automodRuleName: string | undefined;
|
||||||
|
automodChannelId: string | undefined;
|
||||||
|
expires: string | undefined; // used to compare if timeout reason is different
|
||||||
|
loading: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const NoTimeout: TimeoutEntry = {
|
||||||
|
reason: undefined,
|
||||||
|
moderator: undefined,
|
||||||
|
automod: undefined,
|
||||||
|
automodRuleName: undefined,
|
||||||
|
automodChannelId: undefined,
|
||||||
|
expires: undefined,
|
||||||
|
loading: false
|
||||||
|
};
|
||||||
|
|
||||||
|
export const TimeoutLoading: TimeoutEntry = {
|
||||||
|
reason: undefined,
|
||||||
|
moderator: undefined,
|
||||||
|
automod: undefined,
|
||||||
|
automodRuleName: undefined,
|
||||||
|
automodChannelId: undefined,
|
||||||
|
expires: undefined,
|
||||||
|
loading: true
|
||||||
|
};
|
||||||
|
|
||||||
|
export const TimeoutReasonStore = proxyLazy(() => {
|
||||||
|
class TimeoutReasonStore extends Flux.Store {
|
||||||
|
public reasonMap = new Map<string, TimeoutEntry>();
|
||||||
|
|
||||||
|
getReason(guildId: string, userId: string) {
|
||||||
|
const member = GuildMemberStore.getMember(guildId, userId);
|
||||||
|
|
||||||
|
if (!member?.communicationDisabledUntil) return NoTimeout;
|
||||||
|
if (new Date(member?.communicationDisabledUntil!) <= new Date()) return NoTimeout;
|
||||||
|
|
||||||
|
const reason = this.reasonMap.get(`${guildId}-${userId}`);
|
||||||
|
// Return if timeout reason entry is found and is up to date, or if it's still loading
|
||||||
|
if (reason && (reason.loading ? true : reason.expires === member?.communicationDisabledUntil)) return reason;
|
||||||
|
|
||||||
|
// The indicator being visible does not depend on any data here. This just returns that there's no extra information about the timeout.
|
||||||
|
if (!PermissionStore.canWithPartialContext(PermissionsBits.VIEW_AUDIT_LOG, { guildId })) return NoTimeout;
|
||||||
|
|
||||||
|
// Stop requesting data multiple times
|
||||||
|
this.reasonMap.set(`${guildId}-${userId}`, TimeoutLoading);
|
||||||
|
|
||||||
|
RestAPI.get({
|
||||||
|
url: Constants.Endpoints.GUILD_AUDIT_LOG(guildId),
|
||||||
|
query: {
|
||||||
|
// action_type is intentionally not specified here as we need multiple types of audit log actions.
|
||||||
|
target_id: userId,
|
||||||
|
limit: 100
|
||||||
|
}
|
||||||
|
}).then(logs => {
|
||||||
|
const entry = logs.body.audit_log_entries.find((entry: { action_type: number; changes: any[]; }) => {
|
||||||
|
if (entry.action_type === AuditLogReasons.AUTO_MODERATION_USER_COMMUNICATION_DISABLED) return true;
|
||||||
|
if (entry.action_type === AuditLogReasons.MEMBER_UPDATE && entry?.changes.some((change: { key: string; }) => change.key === "communication_disabled_until")) return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!entry) return this.reasonMap.set(`${guildId}-${userId}`, NoTimeout);
|
||||||
|
|
||||||
|
const isAutomod = entry.action_type === AuditLogReasons.AUTO_MODERATION_USER_COMMUNICATION_DISABLED;
|
||||||
|
|
||||||
|
this.reasonMap.set(`${guildId}-${userId}`, {
|
||||||
|
reason: entry.reason,
|
||||||
|
moderator: isAutomod ? undefined : entry.user_id,
|
||||||
|
automod: isAutomod,
|
||||||
|
automodRuleName: isAutomod ? entry?.options?.auto_moderation_rule_name : undefined,
|
||||||
|
automodChannelId: isAutomod ? entry?.options?.channel_id : undefined,
|
||||||
|
expires: member?.communicationDisabledUntil,
|
||||||
|
loading: false
|
||||||
|
});
|
||||||
|
|
||||||
|
// Re-render the timeout indicator components
|
||||||
|
this.emitChange();
|
||||||
|
});
|
||||||
|
|
||||||
|
return TimeoutLoading;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const store = new TimeoutReasonStore(FluxDispatcher, {});
|
||||||
|
|
||||||
|
return store;
|
||||||
|
});
|
||||||
|
|
||||||
|
export const useTimeoutReason = (guildId: string, userId: string) => useStateFromStores([TimeoutReasonStore], () => {
|
||||||
|
return TimeoutReasonStore.getReason(guildId, userId);
|
||||||
|
});
|
|
@ -0,0 +1,108 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a Discord client mod
|
||||||
|
* Copyright (c) 2024 Vendicated and contributors
|
||||||
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { SafetyIcon } from "@components/Icons";
|
||||||
|
import { classes, Margins } from "@utils/index";
|
||||||
|
import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
|
||||||
|
import { Button, Dialog, GuildMemberStore, GuildStore, i18n, Parser, PermissionsBits, PermissionStore, Text, UserStore, useState, useStateFromStores } from "@webpack/common";
|
||||||
|
import { Message } from "discord-types/general";
|
||||||
|
|
||||||
|
import { CountDown } from "..";
|
||||||
|
import { useTimeoutReason } from "../TimeoutReasonStore";
|
||||||
|
import TimeoutDetailsRow from "./TimeoutDetailsRow";
|
||||||
|
|
||||||
|
const PopoutClasses = findByPropsLazy("container", "scroller", "list");
|
||||||
|
|
||||||
|
const TimeoutIcon = findComponentByCodeLazy("M12 23c.08 0 .14-.08.11-.16a2.88 2.88 0 0 1 .29-2.31l2.2-3.85");
|
||||||
|
const ChannelIcon = findComponentByCodeLazy("h4.97l-.8 4.84a1 1 0 0 0 1.97.32l.86-5.16H20a1");
|
||||||
|
const CustomAutoModRuleIcon = findComponentByCodeLazy("a1 1 0 0 1 1-1h8a1 1 0 0 1 0 2H3a1 1 0 0 1-1-1ZM3 19a1 1 0 1 0 0 2h8a1 1 0 0 0 0-2H3Z");
|
||||||
|
const MessageIcon = findComponentByCodeLazy('"M12 22a10 10 0 1 0-8.45-4.64c.13.19.11.44-.04.61l-2.06 2.37A1 1 0 0 0 2.2 22H12Z"');
|
||||||
|
|
||||||
|
const { setCommunicationDisabledUntil } = findByPropsLazy("setCommunicationDisabledUntil");
|
||||||
|
|
||||||
|
export default function TimeoutDetailsPopout({ closePopout, guildId, userId, message }: { closePopout(): void; guildId: string; userId: string; message: Message; }) {
|
||||||
|
const user = UserStore.getUser(userId);
|
||||||
|
const member = GuildMemberStore.getMember(guildId, userId);
|
||||||
|
const reason = useTimeoutReason(guildId, userId);
|
||||||
|
const hasModerationPermission = useStateFromStores([PermissionStore], () => PermissionStore.canManageUser(PermissionsBits.MODERATE_MEMBERS, userId, GuildStore.getGuild(guildId)));
|
||||||
|
const parse = (text: string) => Parser.parse(text, true, {
|
||||||
|
channelId: message.channel_id,
|
||||||
|
messageId: message.id
|
||||||
|
});
|
||||||
|
|
||||||
|
const [cancelling, setCancelling] = useState(false);
|
||||||
|
|
||||||
|
return <Dialog
|
||||||
|
className={classes("vc-std-popout", PopoutClasses.container)}
|
||||||
|
>
|
||||||
|
<Text tag="h2" variant="eyebrow" style={{ color: "var(--header-primary)", display: "inline" }}>
|
||||||
|
Timeout details for {user.username}
|
||||||
|
</Text>
|
||||||
|
<div className={Margins.bottom8} />
|
||||||
|
|
||||||
|
<TimeoutDetailsRow
|
||||||
|
description="Remaining time in timeout"
|
||||||
|
icon={TimeoutIcon}
|
||||||
|
>
|
||||||
|
<CountDown
|
||||||
|
deadline={new Date(member.communicationDisabledUntil!)}
|
||||||
|
showUnits
|
||||||
|
stopAtOneSec
|
||||||
|
/>
|
||||||
|
</TimeoutDetailsRow>
|
||||||
|
|
||||||
|
<TimeoutDetailsRow
|
||||||
|
description="Moderator"
|
||||||
|
icon={SafetyIcon}
|
||||||
|
condition={!!(reason.moderator || reason.automod)}
|
||||||
|
>
|
||||||
|
{reason.automod ? i18n.Messages.GUILD_SETTINGS_AUTOMOD_TITLE : parse(`<@${reason.moderator}>`)}
|
||||||
|
</TimeoutDetailsRow>
|
||||||
|
|
||||||
|
<TimeoutDetailsRow
|
||||||
|
description="Channel where offending message was sent"
|
||||||
|
icon={ChannelIcon}
|
||||||
|
condition={!!reason.automodChannelId}
|
||||||
|
>
|
||||||
|
{parse(`<#${reason.automodChannelId}>`)}
|
||||||
|
</TimeoutDetailsRow>
|
||||||
|
|
||||||
|
<TimeoutDetailsRow
|
||||||
|
description="AutoMod Rule"
|
||||||
|
icon={CustomAutoModRuleIcon}
|
||||||
|
>
|
||||||
|
{reason.automodRuleName}
|
||||||
|
</TimeoutDetailsRow>
|
||||||
|
|
||||||
|
<TimeoutDetailsRow
|
||||||
|
description="Reason"
|
||||||
|
icon={MessageIcon}
|
||||||
|
>
|
||||||
|
{reason.reason}
|
||||||
|
</TimeoutDetailsRow>
|
||||||
|
|
||||||
|
{hasModerationPermission && <div className="vc-std-popout-button-wrapper"><Button
|
||||||
|
className="vc-std-popout-button"
|
||||||
|
size={Button.Sizes.SMALL}
|
||||||
|
color={Button.Colors.RED}
|
||||||
|
onClick={async () => {
|
||||||
|
setCancelling(true);
|
||||||
|
await setCommunicationDisabledUntil({
|
||||||
|
guildId,
|
||||||
|
userId,
|
||||||
|
communicationDisabledUntilTimestamp: null,
|
||||||
|
duratiion: null,
|
||||||
|
reason: null,
|
||||||
|
location: null
|
||||||
|
});
|
||||||
|
closePopout();
|
||||||
|
}}
|
||||||
|
submitting={cancelling}
|
||||||
|
>
|
||||||
|
{i18n.Messages.REMOVE_TIME_OUT}
|
||||||
|
</Button></div>}
|
||||||
|
</Dialog>;
|
||||||
|
}
|
|
@ -0,0 +1,26 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a Discord client mod
|
||||||
|
* Copyright (c) 2024 Vendicated and contributors
|
||||||
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { findByPropsLazy } from "@webpack";
|
||||||
|
import { Tooltip } from "@webpack/common";
|
||||||
|
import { JSXElementConstructor, ReactNode } from "react";
|
||||||
|
|
||||||
|
const rowClasses = findByPropsLazy("row", "rowIcon", "rowGuildName");
|
||||||
|
|
||||||
|
export default function TimeoutDetailsRow(props: {
|
||||||
|
description: ReactNode;
|
||||||
|
icon: JSXElementConstructor<any>;
|
||||||
|
children: ReactNode;
|
||||||
|
condition?: boolean | string;
|
||||||
|
}) {
|
||||||
|
if (props.condition === undefined ? !props.children : !props.condition) return null;
|
||||||
|
return <div className={rowClasses.row}>
|
||||||
|
<Tooltip text={props.description}>
|
||||||
|
{p => <props.icon {...p} className={rowClasses.rowIcon} height="24" width="24" />}
|
||||||
|
</Tooltip>
|
||||||
|
{props.children}
|
||||||
|
</div>;
|
||||||
|
}
|
92
src/plugins/showTimeoutDetails/components/TooltipWrapper.tsx
Normal file
92
src/plugins/showTimeoutDetails/components/TooltipWrapper.tsx
Normal file
|
@ -0,0 +1,92 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a Discord client mod
|
||||||
|
* Copyright (c) 2024 Vendicated and contributors
|
||||||
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { classes, Margins } from "@utils/index";
|
||||||
|
import { findByPropsLazy } from "@webpack";
|
||||||
|
import { ChannelStore, GuildMemberStore, i18n, Popout, Text, Tooltip } from "@webpack/common";
|
||||||
|
import { Message } from "discord-types/general";
|
||||||
|
import { FunctionComponent, ReactNode } from "react";
|
||||||
|
|
||||||
|
import { CountDown, DisplayStyle, settings } from "..";
|
||||||
|
import { useTimeoutReason } from "../TimeoutReasonStore";
|
||||||
|
import TimeoutDetailsPopout from "./TimeoutDetailsPopout";
|
||||||
|
|
||||||
|
const clickableClasses = findByPropsLazy("clickable", "avatar", "username");
|
||||||
|
|
||||||
|
export default function TooltipWrapper({ message, children, text }: { message: Message; children: FunctionComponent<any>; text: ReactNode; }) {
|
||||||
|
const guildId = ChannelStore.getChannel(message.channel_id)?.guild_id;
|
||||||
|
const timeoutReason = useTimeoutReason(guildId, message.author.id);
|
||||||
|
|
||||||
|
if (settings.store.displayStyle === DisplayStyle.Tooltip) return <Tooltip
|
||||||
|
tooltipClassName="vc-std-tooltip"
|
||||||
|
text={renderTimeout(message, false)}
|
||||||
|
children={(props: any) => (
|
||||||
|
<Popout
|
||||||
|
position="top"
|
||||||
|
align="left"
|
||||||
|
renderPopout={p => <TimeoutDetailsPopout {...p} guildId={guildId} userId={message.author.id} message={message} />}
|
||||||
|
>
|
||||||
|
{popoutProps => <span
|
||||||
|
{...popoutProps}
|
||||||
|
className={classes("vc-std-icon", clickableClasses.clickable, timeoutReason.automod && "vc-std-automod")}
|
||||||
|
onClick={e => { e.stopPropagation(); popoutProps.onClick(e); }} // stop double click to reply/edit
|
||||||
|
>
|
||||||
|
{children(props)}
|
||||||
|
</span>}
|
||||||
|
</Popout>
|
||||||
|
)}
|
||||||
|
/>;
|
||||||
|
return (
|
||||||
|
<Popout
|
||||||
|
position="top"
|
||||||
|
align="left"
|
||||||
|
renderPopout={p => <TimeoutDetailsPopout {...p} guildId={guildId} userId={message.author.id} message={message} />}
|
||||||
|
>
|
||||||
|
{popoutProps => <div
|
||||||
|
{...popoutProps}
|
||||||
|
className={classes("vc-std-wrapper", clickableClasses.clickable, timeoutReason.automod && "vc-std-automod")}
|
||||||
|
onClick={e => { e.stopPropagation(); popoutProps.onClick(e); }} // stop double click to reply/edit
|
||||||
|
>
|
||||||
|
<Tooltip text={text} children={children} />
|
||||||
|
<span className={Margins.right8} />
|
||||||
|
<Text variant="text-md/normal" className="vc-std-wrapper-text">
|
||||||
|
{renderTimeout(message, true)} timeout remaining
|
||||||
|
</Text>
|
||||||
|
</div>}
|
||||||
|
</Popout>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderTimeout(message: Message, inline: boolean) {
|
||||||
|
const guildId = ChannelStore.getChannel(message.channel_id)?.guild_id;
|
||||||
|
if (!guildId) return null;
|
||||||
|
|
||||||
|
const member = GuildMemberStore.getMember(guildId, message.author.id);
|
||||||
|
if (!member?.communicationDisabledUntil) return null;
|
||||||
|
|
||||||
|
const countdown = () => <>
|
||||||
|
<wbr />
|
||||||
|
<span style={{ whiteSpace: "nowrap" }}>
|
||||||
|
<CountDown
|
||||||
|
deadline={new Date(member.communicationDisabledUntil!)}
|
||||||
|
showUnits
|
||||||
|
stopAtOneSec
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
<wbr />
|
||||||
|
</>;
|
||||||
|
|
||||||
|
return inline
|
||||||
|
? countdown()
|
||||||
|
: <>
|
||||||
|
{i18n.Messages.GUILD_ENABLE_COMMUNICATION_TIME_REMAINING.format({
|
||||||
|
username: message.author.username,
|
||||||
|
countdown
|
||||||
|
})}
|
||||||
|
<br />
|
||||||
|
Click for more details.
|
||||||
|
</>;
|
||||||
|
}
|
61
src/plugins/showTimeoutDetails/index.tsx
Normal file
61
src/plugins/showTimeoutDetails/index.tsx
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a Discord client mod
|
||||||
|
* Copyright (c) 2024 Vendicated and contributors
|
||||||
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
*/
|
||||||
|
|
||||||
|
import "./styles.css";
|
||||||
|
|
||||||
|
import { definePluginSettings, migratePluginSettings } from "@api/Settings";
|
||||||
|
import ErrorBoundary from "@components/ErrorBoundary";
|
||||||
|
import { Devs } from "@utils/constants";
|
||||||
|
import definePlugin, { OptionType } from "@utils/types";
|
||||||
|
import { findComponentLazy } from "@webpack";
|
||||||
|
|
||||||
|
import TooltipWrapper from "./components/TooltipWrapper";
|
||||||
|
import { TimeoutReasonStore } from "./TimeoutReasonStore";
|
||||||
|
|
||||||
|
export const CountDown = findComponentLazy(m => m.prototype?.render?.toString().includes(".MAX_AGE_NEVER"));
|
||||||
|
|
||||||
|
export const enum DisplayStyle {
|
||||||
|
Tooltip = "tooltip",
|
||||||
|
Inline = "ssalggnikool"
|
||||||
|
}
|
||||||
|
|
||||||
|
export const settings = definePluginSettings({
|
||||||
|
displayStyle: {
|
||||||
|
description: "How to display the timeout duration and reason",
|
||||||
|
type: OptionType.SELECT,
|
||||||
|
options: [
|
||||||
|
{ label: "In the Tooltip", value: DisplayStyle.Tooltip },
|
||||||
|
{ label: "Next to the timeout icon", value: DisplayStyle.Inline, default: true },
|
||||||
|
],
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
migratePluginSettings("ShowTimeoutDetails", "ShowTimeoutDuration");
|
||||||
|
|
||||||
|
export default definePlugin({
|
||||||
|
name: "ShowTimeoutDetails",
|
||||||
|
description: "Shows how much longer a user's timeout will last and why they are timed out, either in the timeout icon tooltip or next to it",
|
||||||
|
authors: [Devs.Ven, Devs.Sqaaakoi],
|
||||||
|
tags: ["ShowTimeoutDuration", "ShowTimeoutReason"],
|
||||||
|
|
||||||
|
settings,
|
||||||
|
|
||||||
|
patches: [
|
||||||
|
{
|
||||||
|
find: ".GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY",
|
||||||
|
replacement: [
|
||||||
|
{
|
||||||
|
match: /(\i)\.Tooltip,{(text:.{0,30}\.Messages\.GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY)/,
|
||||||
|
replace: "$self.TooltipWrapper,{message:arguments[0].message,$2"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
|
||||||
|
TimeoutReasonStore,
|
||||||
|
|
||||||
|
TooltipWrapper: ErrorBoundary.wrap(TooltipWrapper, { noop: true })
|
||||||
|
});
|
35
src/plugins/showTimeoutDetails/styles.css
Normal file
35
src/plugins/showTimeoutDetails/styles.css
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
.vc-std-wrapper {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-std-wrapper [class*="communicationDisabled"] {
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-std-wrapper-text {
|
||||||
|
color: var(--status-danger);
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-std-automod :is(svg, .vc-std-wrapper-text) {
|
||||||
|
color: var(--status-warning);
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-std-tooltip {
|
||||||
|
max-width: 220px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-std-popout {
|
||||||
|
width: unset;
|
||||||
|
min-width: 180px;
|
||||||
|
max-width: 360px;
|
||||||
|
color: var(--text-normal);
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-std-popout-button-wrapper {
|
||||||
|
margin-top: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-std-popout-button {
|
||||||
|
padding: 2px 10px;
|
||||||
|
}
|
|
@ -1,92 +0,0 @@
|
||||||
/*
|
|
||||||
* Vencord, a Discord client mod
|
|
||||||
* Copyright (c) 2024 Vendicated and contributors
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*/
|
|
||||||
|
|
||||||
import "./styles.css";
|
|
||||||
|
|
||||||
import { definePluginSettings } from "@api/Settings";
|
|
||||||
import ErrorBoundary from "@components/ErrorBoundary";
|
|
||||||
import { Devs } from "@utils/constants";
|
|
||||||
import definePlugin, { OptionType } from "@utils/types";
|
|
||||||
import { findComponentLazy } from "@webpack";
|
|
||||||
import { ChannelStore, GuildMemberStore, i18n, Text, Tooltip } from "@webpack/common";
|
|
||||||
import { Message } from "discord-types/general";
|
|
||||||
import { FunctionComponent, ReactNode } from "react";
|
|
||||||
|
|
||||||
const CountDown = findComponentLazy(m => m.prototype?.render?.toString().includes(".MAX_AGE_NEVER"));
|
|
||||||
|
|
||||||
const enum DisplayStyle {
|
|
||||||
Tooltip = "tooltip",
|
|
||||||
Inline = "ssalggnikool"
|
|
||||||
}
|
|
||||||
|
|
||||||
const settings = definePluginSettings({
|
|
||||||
displayStyle: {
|
|
||||||
description: "How to display the timeout duration",
|
|
||||||
type: OptionType.SELECT,
|
|
||||||
options: [
|
|
||||||
{ label: "In the Tooltip", value: DisplayStyle.Tooltip },
|
|
||||||
{ label: "Next to the timeout icon", value: DisplayStyle.Inline, default: true },
|
|
||||||
],
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
function renderTimeout(message: Message, inline: boolean) {
|
|
||||||
const guildId = ChannelStore.getChannel(message.channel_id)?.guild_id;
|
|
||||||
if (!guildId) return null;
|
|
||||||
|
|
||||||
const member = GuildMemberStore.getMember(guildId, message.author.id);
|
|
||||||
if (!member?.communicationDisabledUntil) return null;
|
|
||||||
|
|
||||||
const countdown = () => (
|
|
||||||
<CountDown
|
|
||||||
deadline={new Date(member.communicationDisabledUntil!)}
|
|
||||||
showUnits
|
|
||||||
stopAtOneSec
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
|
|
||||||
return inline
|
|
||||||
? countdown()
|
|
||||||
: i18n.Messages.GUILD_ENABLE_COMMUNICATION_TIME_REMAINING.format({
|
|
||||||
username: message.author.username,
|
|
||||||
countdown
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export default definePlugin({
|
|
||||||
name: "ShowTimeoutDuration",
|
|
||||||
description: "Shows how much longer a user's timeout will last, either in the timeout icon tooltip or next to it",
|
|
||||||
authors: [Devs.Ven, Devs.Sqaaakoi],
|
|
||||||
|
|
||||||
settings,
|
|
||||||
|
|
||||||
patches: [
|
|
||||||
{
|
|
||||||
find: ".GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY",
|
|
||||||
replacement: [
|
|
||||||
{
|
|
||||||
match: /(\i)\.Tooltip,{(text:.{0,30}\.Messages\.GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY)/,
|
|
||||||
replace: "$self.TooltipWrapper,{message:arguments[0].message,$2"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
|
|
||||||
TooltipWrapper: ErrorBoundary.wrap(({ message, children, text }: { message: Message; children: FunctionComponent<any>; text: ReactNode; }) => {
|
|
||||||
if (settings.store.displayStyle === DisplayStyle.Tooltip) return <Tooltip
|
|
||||||
children={children}
|
|
||||||
text={renderTimeout(message, false)}
|
|
||||||
/>;
|
|
||||||
return (
|
|
||||||
<div className="vc-std-wrapper">
|
|
||||||
<Tooltip text={text} children={children} />
|
|
||||||
<Text variant="text-md/normal" color="status-danger">
|
|
||||||
{renderTimeout(message, true)} timeout remaining
|
|
||||||
</Text>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}, { noop: true })
|
|
||||||
});
|
|
|
@ -1,8 +0,0 @@
|
||||||
.vc-std-wrapper {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vc-std-wrapper [class*="communicationDisabled"] {
|
|
||||||
margin-right: 0;
|
|
||||||
}
|
|
|
@ -8,7 +8,7 @@ import { classNameFactory } from "@api/Styles";
|
||||||
import ErrorBoundary from "@components/ErrorBoundary";
|
import ErrorBoundary from "@components/ErrorBoundary";
|
||||||
import { classes } from "@utils/misc";
|
import { classes } from "@utils/misc";
|
||||||
import { findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
|
import { findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
|
||||||
import { ChannelStore, GuildStore, IconUtils, NavigationRouter, PermissionsBits, PermissionStore, showToast, Text, Toasts, Tooltip, useCallback, useMemo, UserStore, useStateFromStores } from "@webpack/common";
|
import { ChannelStore, GuildStore, IconUtils, NavigationRouter, PermissionsBits, PermissionStore, React, showToast, Text, Toasts, Tooltip, useMemo, UserStore, useStateFromStores } from "@webpack/common";
|
||||||
import { Channel } from "discord-types/general";
|
import { Channel } from "discord-types/general";
|
||||||
|
|
||||||
const cl = classNameFactory("vc-uvs-");
|
const cl = classNameFactory("vc-uvs-");
|
||||||
|
@ -17,7 +17,7 @@ const { selectVoiceChannel } = findByPropsLazy("selectChannel", "selectVoiceChan
|
||||||
const VoiceStateStore = findStoreLazy("VoiceStateStore");
|
const VoiceStateStore = findStoreLazy("VoiceStateStore");
|
||||||
const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
|
const UserSummaryItem = findComponentByCodeLazy("defaultRenderUser", "showDefaultAvatarsForNullUsers");
|
||||||
|
|
||||||
interface IconProps extends React.HTMLAttributes<HTMLDivElement> {
|
interface IconProps extends React.ComponentPropsWithoutRef<"div"> {
|
||||||
size?: number;
|
size?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,23 +71,18 @@ interface VoiceChannelTooltipProps {
|
||||||
|
|
||||||
function VoiceChannelTooltip({ channel }: VoiceChannelTooltipProps) {
|
function VoiceChannelTooltip({ channel }: VoiceChannelTooltipProps) {
|
||||||
const voiceStates = useStateFromStores([VoiceStateStore], () => VoiceStateStore.getVoiceStatesForChannel(channel.id));
|
const voiceStates = useStateFromStores([VoiceStateStore], () => VoiceStateStore.getVoiceStatesForChannel(channel.id));
|
||||||
|
|
||||||
const users = useMemo(
|
const users = useMemo(
|
||||||
() => Object.values<any>(voiceStates).map(voiceState => UserStore.getUser(voiceState.userId)).filter(user => user != null),
|
() => Object.values<any>(voiceStates).map(voiceState => UserStore.getUser(voiceState.userId)).filter(user => user != null),
|
||||||
[voiceStates]
|
[voiceStates]
|
||||||
);
|
);
|
||||||
|
|
||||||
const guild = useMemo(
|
const guild = channel.getGuildId() == null ? undefined : GuildStore.getGuild(channel.getGuildId());
|
||||||
() => channel.getGuildId() == null ? undefined : GuildStore.getGuild(channel.getGuildId()),
|
const guildIcon = guild?.icon == null ? undefined : IconUtils.getGuildIconURL({
|
||||||
[channel]
|
|
||||||
);
|
|
||||||
|
|
||||||
const guildIcon = useMemo(() => {
|
|
||||||
return guild?.icon == null ? undefined : IconUtils.getGuildIconURL({
|
|
||||||
id: guild.id,
|
id: guild.id,
|
||||||
icon: guild.icon,
|
icon: guild.icon,
|
||||||
size: 30
|
size: 30
|
||||||
});
|
});
|
||||||
}, [guild]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
@ -103,7 +98,7 @@ function VoiceChannelTooltip({ channel }: VoiceChannelTooltipProps) {
|
||||||
<UserSummaryItem
|
<UserSummaryItem
|
||||||
users={users}
|
users={users}
|
||||||
renderIcon={false}
|
renderIcon={false}
|
||||||
max={7}
|
max={13}
|
||||||
size={18}
|
size={18}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -119,11 +114,14 @@ const clickTimers = {} as Record<string, any>;
|
||||||
|
|
||||||
export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId }: VoiceChannelIndicatorProps) => {
|
export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId }: VoiceChannelIndicatorProps) => {
|
||||||
const channelId = useStateFromStores([VoiceStateStore], () => VoiceStateStore.getVoiceStateForUser(userId)?.channelId as string | undefined);
|
const channelId = useStateFromStores([VoiceStateStore], () => VoiceStateStore.getVoiceStateForUser(userId)?.channelId as string | undefined);
|
||||||
const channel = useMemo(() => channelId == null ? undefined : ChannelStore.getChannel(channelId), [channelId]);
|
|
||||||
|
|
||||||
const onClick = useCallback((e: React.MouseEvent) => {
|
const channel = channelId == null ? undefined : ChannelStore.getChannel(channelId);
|
||||||
|
if (channel == null) return null;
|
||||||
|
|
||||||
|
function onClick(e: React.MouseEvent) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
||||||
if (channel == null || channelId == null) return;
|
if (channel == null || channelId == null) return;
|
||||||
|
|
||||||
if (!PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel)) {
|
if (!PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel)) {
|
||||||
|
@ -147,18 +145,15 @@ export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId }: VoiceChanne
|
||||||
delete clickTimers[channelId];
|
delete clickTimers[channelId];
|
||||||
}, 250);
|
}, 250);
|
||||||
}
|
}
|
||||||
}, [channelId]);
|
}
|
||||||
|
|
||||||
const isLocked = useMemo(() => {
|
const isLocked = !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel) || !PermissionStore.can(PermissionsBits.CONNECT, channel);
|
||||||
return !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, channel) || !PermissionStore.can(PermissionsBits.CONNECT, channel);
|
|
||||||
}, [channelId]);
|
|
||||||
|
|
||||||
if (channel == null) return null;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Tooltip
|
<Tooltip
|
||||||
text={<VoiceChannelTooltip channel={channel} />}
|
text={<VoiceChannelTooltip channel={channel} />}
|
||||||
tooltipClassName={cl("tooltip-container")}
|
tooltipClassName={cl("tooltip-container")}
|
||||||
|
tooltipContentClassName={cl("tooltip-content")}
|
||||||
>
|
>
|
||||||
{props =>
|
{props =>
|
||||||
isLocked ?
|
isLocked ?
|
||||||
|
|
|
@ -32,7 +32,7 @@ const settings = definePluginSettings({
|
||||||
default: true,
|
default: true,
|
||||||
restartNeeded: true
|
restartNeeded: true
|
||||||
},
|
},
|
||||||
showInVoiceMemberList: {
|
showInMemberList: {
|
||||||
type: OptionType.BOOLEAN,
|
type: OptionType.BOOLEAN,
|
||||||
description: "Show a user's Voice Channel indicator in the member and DMs list",
|
description: "Show a user's Voice Channel indicator in the member and DMs list",
|
||||||
default: true,
|
default: true,
|
||||||
|
@ -82,12 +82,12 @@ export default definePlugin({
|
||||||
match: /\.subtext,children:.+?}\)\]}\)(?=])/,
|
match: /\.subtext,children:.+?}\)\]}\)(?=])/,
|
||||||
replace: "$&,$self.VoiceChannelIndicator({userId:arguments[0]?.user?.id})"
|
replace: "$&,$self.VoiceChannelIndicator({userId:arguments[0]?.user?.id})"
|
||||||
},
|
},
|
||||||
predicate: () => settings.store.showInVoiceMemberList
|
predicate: () => settings.store.showInMemberList
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
if (settings.store.showInVoiceMemberList) {
|
if (settings.store.showInMemberList) {
|
||||||
addDecorator("UserVoiceShow", ({ user }) => user == null ? null : <VoiceChannelIndicator userId={user.id} />);
|
addDecorator("UserVoiceShow", ({ user }) => user == null ? null : <VoiceChannelIndicator userId={user.id} />);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -15,7 +15,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.vc-uvs-tooltip-container {
|
.vc-uvs-tooltip-container {
|
||||||
max-width: 200px;
|
max-width: 300px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-uvs-tooltip-content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.vc-uvs-guild-name {
|
.vc-uvs-guild-name {
|
||||||
|
@ -31,7 +37,5 @@
|
||||||
|
|
||||||
.vc-uvs-vc-members {
|
.vc-uvs-vc-members {
|
||||||
display: flex;
|
display: flex;
|
||||||
margin: 8px 0;
|
|
||||||
flex-direction: row;
|
|
||||||
gap: 6px;
|
gap: 6px;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue