mirror of
https://github.com/Vendicated/Vencord.git
synced 2024-09-19 22:20:34 +00:00
Compare commits
5 commits
555cbdc28d
...
0c3d92af2a
Author | SHA1 | Date | |
---|---|---|---|
|
0c3d92af2a | ||
|
8afd79dd50 | ||
|
65c5897dc3 | ||
|
20f2bb9045 | ||
|
86f16f68d7 |
15 changed files with 121 additions and 36 deletions
|
@ -292,10 +292,10 @@ export default function PluginSettings() {
|
|||
|
||||
if (!pluginFilter(p)) continue;
|
||||
|
||||
const isRequired = p.required || depMap[p.name]?.some(d => settings.plugins[d].enabled);
|
||||
const isRequired = p.required || p.isDependency || depMap[p.name]?.some(d => settings.plugins[d].enabled);
|
||||
|
||||
if (isRequired) {
|
||||
const tooltipText = p.required
|
||||
const tooltipText = p.required || !depMap[p.name]
|
||||
? "This plugin is required for Vencord to function."
|
||||
: makeDependencyList(depMap[p.name]?.filter(d => settings.plugins[d].enabled));
|
||||
|
||||
|
|
|
@ -142,7 +142,7 @@ export default definePlugin({
|
|||
required: true,
|
||||
description: "Helps us provide support to you",
|
||||
authors: [Devs.Ven],
|
||||
dependencies: ["CommandsAPI", "UserSettingsAPI", "MessageAccessoriesAPI"],
|
||||
dependencies: ["UserSettingsAPI", "MessageAccessoriesAPI"],
|
||||
|
||||
settings,
|
||||
|
||||
|
|
|
@ -27,7 +27,6 @@ export default definePlugin({
|
|||
name: "FriendInvites",
|
||||
description: "Create and manage friend invite links via slash commands (/create friend invite, /view friend invites, /revoke friend invites).",
|
||||
authors: [Devs.afn, Devs.Dziurwa],
|
||||
dependencies: ["CommandsAPI"],
|
||||
commands: [
|
||||
{
|
||||
name: "create friend invite",
|
||||
|
|
|
@ -105,6 +105,11 @@ for (const p of pluginsValues) if (isPluginEnabled(p.name)) {
|
|||
settings[d].enabled = true;
|
||||
dep.isDependency = true;
|
||||
});
|
||||
|
||||
if (p.commands?.length) {
|
||||
Plugins.CommandsAPI.isDependency = true;
|
||||
settings.CommandsAPI.enabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
for (const p of pluginsValues) {
|
||||
|
|
|
@ -82,7 +82,6 @@ export default definePlugin({
|
|||
default: true
|
||||
}
|
||||
},
|
||||
dependencies: ["CommandsAPI"],
|
||||
|
||||
async start() {
|
||||
for (const tag of await getTags()) createTagCommand(tag);
|
||||
|
|
|
@ -33,7 +33,6 @@ export default definePlugin({
|
|||
name: "MoreCommands",
|
||||
description: "echo, lenny, mock",
|
||||
authors: [Devs.Arjix, Devs.echo, Devs.Samu],
|
||||
dependencies: ["CommandsAPI"],
|
||||
commands: [
|
||||
{
|
||||
name: "echo",
|
||||
|
|
|
@ -24,7 +24,6 @@ export default definePlugin({
|
|||
name: "MoreKaomoji",
|
||||
description: "Adds more Kaomoji to discord. ヽ(´▽`)/",
|
||||
authors: [Devs.JacobTm],
|
||||
dependencies: ["CommandsAPI"],
|
||||
commands: [
|
||||
{ name: "dissatisfaction", description: " >﹏<" },
|
||||
{ name: "smug", description: "ಠ_ಠ" },
|
||||
|
|
|
@ -88,7 +88,6 @@ export default definePlugin({
|
|||
name: "petpet",
|
||||
description: "Adds a /petpet slash command to create headpet gifs from any image",
|
||||
authors: [Devs.Ven],
|
||||
dependencies: ["CommandsAPI"],
|
||||
commands: [
|
||||
{
|
||||
inputType: ApplicationCommandInputType.BUILT_IN,
|
||||
|
|
|
@ -6,18 +6,18 @@
|
|||
|
||||
import "./styles.css";
|
||||
|
||||
import { ChannelStore } from "@webpack/common";
|
||||
import { definePluginSettings } from "@api/Settings";
|
||||
import ErrorBoundary from "@components/ErrorBoundary";
|
||||
import { Devs } from "@utils/constants";
|
||||
import definePlugin, { OptionType } from "@utils/types";
|
||||
import { Message, User } from "discord-types/general";
|
||||
import { Message } from "discord-types/general";
|
||||
|
||||
interface UsernameProps {
|
||||
author: { nick: string; };
|
||||
message: Message;
|
||||
withMentionPrefix?: boolean;
|
||||
isRepliedMessage: boolean;
|
||||
userOverride?: User;
|
||||
}
|
||||
|
||||
const settings = definePluginSettings({
|
||||
|
@ -28,18 +28,27 @@ const settings = definePluginSettings({
|
|||
{ label: "Username then nickname", value: "user-nick", default: true },
|
||||
{ label: "Nickname then username", value: "nick-user" },
|
||||
{ label: "Username only", value: "user" },
|
||||
{ label: "Vanilla (Nickname prioritized)", value: "nick" },
|
||||
],
|
||||
},
|
||||
displayNames: {
|
||||
type: OptionType.BOOLEAN,
|
||||
description: "Use display names in place of usernames",
|
||||
default: false
|
||||
},
|
||||
|
||||
inReplies: {
|
||||
type: OptionType.BOOLEAN,
|
||||
default: false,
|
||||
description: "Also apply functionality to reply previews",
|
||||
},
|
||||
|
||||
inDirectMessages: {
|
||||
type: OptionType.BOOLEAN,
|
||||
default: false,
|
||||
description: "Also apply functionality to direct messages",
|
||||
},
|
||||
|
||||
inDirectGroups: {
|
||||
type: OptionType.BOOLEAN,
|
||||
default: false,
|
||||
description: "Also apply functionality to direct messages on groups",
|
||||
},
|
||||
});
|
||||
|
||||
export default definePlugin({
|
||||
|
@ -57,28 +66,79 @@ export default definePlugin({
|
|||
],
|
||||
settings,
|
||||
|
||||
renderUsername: ErrorBoundary.wrap(({ author, message, isRepliedMessage, withMentionPrefix, userOverride }: UsernameProps) => {
|
||||
renderUsername: ErrorBoundary.wrap(({ author, message, isRepliedMessage, withMentionPrefix }: UsernameProps) => {
|
||||
try {
|
||||
const user = userOverride ?? message.author;
|
||||
let { username } = user;
|
||||
if (settings.store.displayNames)
|
||||
username = (user as any).globalName || username;
|
||||
// Discord by default will display the username unless the user has set an nickname
|
||||
// The code will also do the same if certain settings are turned off
|
||||
|
||||
const { nick } = author;
|
||||
const prefix = withMentionPrefix ? "@" : "";
|
||||
// There is no way to get the nick from the message for some reason so this had to stay
|
||||
const nickname: string = author.nick;
|
||||
|
||||
if (isRepliedMessage && !settings.store.inReplies || username.toLowerCase() === nick.toLowerCase())
|
||||
return <>{prefix}{nick}</>;
|
||||
const userObj = message.author;
|
||||
const prefix: string = withMentionPrefix ? "@" : "";
|
||||
const username: string = userObj.username;
|
||||
const isRedundantDoubleUsername = (username.toLowerCase() === nickname.toLowerCase());
|
||||
let display_name = nickname;
|
||||
|
||||
if (settings.store.mode === "user-nick")
|
||||
return <>{prefix}{username} <span className="vc-smyn-suffix">{nick}</span></>;
|
||||
switch (settings.store.mode) {
|
||||
case "user-nick":
|
||||
if (!isRedundantDoubleUsername) {
|
||||
display_name = <>{prefix}{username} <span className="vc-smyn-suffix">{nickname}</span></>;
|
||||
}
|
||||
|
||||
if (settings.store.mode === "nick-user")
|
||||
return <>{prefix}{nick} <span className="vc-smyn-suffix">{username}</span></>;
|
||||
break;
|
||||
// the <span> makes the text gray
|
||||
|
||||
return <>{prefix}{username}</>;
|
||||
} catch {
|
||||
return <>{author?.nick}</>;
|
||||
case "nick-user":
|
||||
if (!isRedundantDoubleUsername) {
|
||||
display_name = <>{prefix}{nickname} <span className="vc-smyn-suffix">{username}</span></>;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case "user":
|
||||
display_name = <>{prefix}{username}</>;
|
||||
break;
|
||||
|
||||
case "vanilla":
|
||||
display_name = <>{prefix}{nickname}</>;
|
||||
break;
|
||||
}
|
||||
|
||||
const current_channel = ChannelStore.getChannel(message.channel_id);
|
||||
const isDM = (current_channel.guild_id === null);
|
||||
|
||||
if (isDM) {
|
||||
const isGroupChat = (current_channel.recipients.length > 1);
|
||||
const shouldDisplayDM = !isGroupChat && settings.store.inDirectMessages;
|
||||
const shouldDisplayGroup = isGroupChat && settings.store.inDirectGroups;
|
||||
|
||||
if (shouldDisplayDM || shouldDisplayGroup) {
|
||||
if (isRepliedMessage) {
|
||||
if (settings.store.inReplies) return display_name;
|
||||
|
||||
return nickname;
|
||||
}
|
||||
|
||||
return display_name;
|
||||
}
|
||||
|
||||
return nickname;
|
||||
}
|
||||
|
||||
// Servers
|
||||
if (isRepliedMessage) {
|
||||
if (settings.store.inReplies) return display_name;
|
||||
|
||||
return nickname;
|
||||
}
|
||||
|
||||
// Unless any of the functions above changed it, it will be the nickname
|
||||
return display_name;
|
||||
|
||||
} catch (errorMsg) {
|
||||
console.log(`ShowMeYourName ERROR: ${errorMsg}`);
|
||||
return <>{message?.author.username}</>;
|
||||
}
|
||||
}, { noop: true }),
|
||||
});
|
||||
|
|
|
@ -88,7 +88,7 @@ export default definePlugin({
|
|||
name: "SilentTyping",
|
||||
authors: [Devs.Ven, Devs.Rini, Devs.ImBanana],
|
||||
description: "Hide that you are typing",
|
||||
dependencies: ["CommandsAPI", "ChatInputButtonAPI"],
|
||||
dependencies: ["ChatInputButtonAPI"],
|
||||
settings,
|
||||
contextMenus: {
|
||||
"textarea-context": ChatBarContextCheckbox
|
||||
|
|
|
@ -76,7 +76,6 @@ export default definePlugin({
|
|||
name: "SpotifyShareCommands",
|
||||
description: "Share your current Spotify track, album or artist via slash command (/track, /album, /artist)",
|
||||
authors: [Devs.katlyn],
|
||||
dependencies: ["CommandsAPI"],
|
||||
commands: [
|
||||
{
|
||||
name: "track",
|
||||
|
|
|
@ -72,13 +72,13 @@ export interface PluginDef {
|
|||
stop?(): void;
|
||||
patches?: Omit<Patch, "plugin">[];
|
||||
/**
|
||||
* List of commands. If you specify these, you must add CommandsAPI to dependencies
|
||||
* List of commands that your plugin wants to register
|
||||
*/
|
||||
commands?: Command[];
|
||||
/**
|
||||
* A list of other plugins that your plugin depends on.
|
||||
* These will automatically be enabled and loaded before your plugin
|
||||
* Common examples are CommandsAPI, MessageEventsAPI...
|
||||
* Generally these will be API plugins
|
||||
*/
|
||||
dependencies?: string[],
|
||||
/**
|
||||
|
|
|
@ -28,6 +28,8 @@ export let Forms = {} as {
|
|||
FormText: t.FormText,
|
||||
};
|
||||
|
||||
export let Icons = {} as t.Icons;
|
||||
|
||||
export let Card: t.Card;
|
||||
export let Button: t.Button;
|
||||
export let Switch: t.Switch;
|
||||
|
@ -85,4 +87,5 @@ waitFor(["FormItem", "Button"], m => {
|
|||
Heading
|
||||
} = m);
|
||||
Forms = m;
|
||||
Icons = m;
|
||||
});
|
||||
|
|
11
src/webpack/common/types/components.d.ts
vendored
11
src/webpack/common/types/components.d.ts
vendored
|
@ -18,6 +18,8 @@
|
|||
|
||||
import type { ComponentType, CSSProperties, FunctionComponent, HtmlHTMLAttributes, HTMLProps, KeyboardEvent, MouseEvent, PropsWithChildren, PropsWithRef, ReactNode, Ref } from "react";
|
||||
|
||||
import { IconNames } from "./iconNames";
|
||||
|
||||
export type TextVariant = "heading-sm/normal" | "heading-sm/medium" | "heading-sm/semibold" | "heading-sm/bold" | "heading-md/normal" | "heading-md/medium" | "heading-md/semibold" | "heading-md/bold" | "heading-lg/normal" | "heading-lg/medium" | "heading-lg/semibold" | "heading-lg/bold" | "heading-xl/normal" | "heading-xl/medium" | "heading-xl/bold" | "heading-xxl/normal" | "heading-xxl/medium" | "heading-xxl/bold" | "eyebrow" | "heading-deprecated-14/normal" | "heading-deprecated-14/medium" | "heading-deprecated-14/bold" | "text-xxs/normal" | "text-xxs/medium" | "text-xxs/semibold" | "text-xxs/bold" | "text-xs/normal" | "text-xs/medium" | "text-xs/semibold" | "text-xs/bold" | "text-sm/normal" | "text-sm/medium" | "text-sm/semibold" | "text-sm/bold" | "text-md/normal" | "text-md/medium" | "text-md/semibold" | "text-md/bold" | "text-lg/normal" | "text-lg/medium" | "text-lg/semibold" | "text-lg/bold" | "display-sm" | "display-md" | "display-lg" | "code";
|
||||
export type FormTextTypes = Record<"DEFAULT" | "INPUT_PLACEHOLDER" | "DESCRIPTION" | "LABEL_BOLD" | "LABEL_SELECTED" | "LABEL_DESCRIPTOR" | "ERROR" | "SUCCESS", string>;
|
||||
export type HeadingTag = `h${1 | 2 | 3 | 4 | 5 | 6}`;
|
||||
|
@ -69,7 +71,7 @@ export type FormText = ComponentType<PropsWithChildren<{
|
|||
}> & TextProps> & { Types: FormTextTypes; };
|
||||
|
||||
export type Tooltip = ComponentType<{
|
||||
text: ReactNode;
|
||||
text: ReactNode | ComponentType;
|
||||
children: FunctionComponent<{
|
||||
onClick(): void;
|
||||
onMouseEnter(): void;
|
||||
|
@ -502,3 +504,10 @@ export type Avatar = ComponentType<PropsWithChildren<{
|
|||
type FocusLock = ComponentType<PropsWithChildren<{
|
||||
containerRef: RefObject<HTMLElement>;
|
||||
}>>;
|
||||
|
||||
export type Icon = ComponentType<JSX.IntrinsicElements["svg"] & {
|
||||
size?: string;
|
||||
colorClass?: string;
|
||||
} & Record<string, any>>;
|
||||
|
||||
export type Icons = Record<IconNames, Icon>;
|
||||
|
|
14
src/webpack/common/types/iconNames.d.ts
vendored
Normal file
14
src/webpack/common/types/iconNames.d.ts
vendored
Normal file
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue