Compare commits
10 commits
645749b5ae
...
6232502157
Author | SHA1 | Date | |
---|---|---|---|
6232502157 | |||
|
1a62249da6 | ||
|
21318850b1 | ||
|
885ad134b3 | ||
|
3e7d4e2623 | ||
|
d3691f74c4 | ||
|
268f3a1840 | ||
|
d6c43986fd | ||
|
bb7deeb09c | ||
|
0407be9847 |
32 changed files with 1678 additions and 134 deletions
|
@ -23,6 +23,7 @@ import monacoHtml from "~fileContent/../src/components/monacoWin.html";
|
||||||
import * as DataStore from "../src/api/DataStore";
|
import * as DataStore from "../src/api/DataStore";
|
||||||
import { debounce } from "../src/utils";
|
import { debounce } from "../src/utils";
|
||||||
import { getTheme, Theme } from "../src/utils/discord";
|
import { getTheme, Theme } from "../src/utils/discord";
|
||||||
|
import { getThemeInfo } from "../src/main/themes";
|
||||||
|
|
||||||
// Discord deletes this so need to store in variable
|
// Discord deletes this so need to store in variable
|
||||||
const { localStorage } = window;
|
const { localStorage } = window;
|
||||||
|
@ -34,8 +35,20 @@ const NOOP_ASYNC = async () => { };
|
||||||
|
|
||||||
const setCssDebounced = debounce((css: string) => VencordNative.quickCss.set(css));
|
const setCssDebounced = debounce((css: string) => VencordNative.quickCss.set(css));
|
||||||
|
|
||||||
|
const themeStore = DataStore.createStore("VencordThemes", "VencordThemeData");
|
||||||
|
|
||||||
// probably should make this less cursed at some point
|
// probably should make this less cursed at some point
|
||||||
window.VencordNative = {
|
window.VencordNative = {
|
||||||
|
themes: {
|
||||||
|
uploadTheme: (fileName: string, fileData: string) => DataStore.set(fileName, fileData, themeStore),
|
||||||
|
deleteTheme: (fileName: string) => DataStore.del(fileName, themeStore),
|
||||||
|
getThemesDir: async () => "",
|
||||||
|
getThemesList: () => DataStore.entries(themeStore).then(entries =>
|
||||||
|
entries.map(([name, css]) => getThemeInfo(css, name.toString()))
|
||||||
|
),
|
||||||
|
getThemeData: (fileName: string) => DataStore.get(fileName, themeStore)
|
||||||
|
},
|
||||||
|
|
||||||
native: {
|
native: {
|
||||||
getVersions: () => ({}),
|
getVersions: () => ({}),
|
||||||
openExternal: async (url) => void open(url, "_blank")
|
openExternal: async (url) => void open(url, "_blank")
|
||||||
|
@ -57,6 +70,7 @@ window.VencordNative = {
|
||||||
addChangeListener(cb) {
|
addChangeListener(cb) {
|
||||||
cssListeners.add(cb);
|
cssListeners.add(cb);
|
||||||
},
|
},
|
||||||
|
addThemeChangeListener: NOOP,
|
||||||
openFile: NOOP_ASYNC,
|
openFile: NOOP_ASYNC,
|
||||||
async openEditor() {
|
async openEditor() {
|
||||||
const features = `popup,width=${Math.min(window.innerWidth, 1000)},height=${Math.min(window.innerHeight, 1000)}`;
|
const features = `popup,width=${Math.min(window.innerWidth, 1000)},height=${Math.min(window.innerHeight, 1000)}`;
|
||||||
|
@ -81,5 +95,7 @@ window.VencordNative = {
|
||||||
get: () => localStorage.getItem("VencordSettings") || "{}",
|
get: () => localStorage.getItem("VencordSettings") || "{}",
|
||||||
set: async (s: string) => localStorage.setItem("VencordSettings", s),
|
set: async (s: string) => localStorage.setItem("VencordSettings", s),
|
||||||
getSettingsDir: async () => "LocalStorage"
|
getSettingsDir: async () => "LocalStorage"
|
||||||
}
|
},
|
||||||
|
|
||||||
|
pluginHelpers: {} as any,
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "vencord",
|
"name": "vencord",
|
||||||
"private": "true",
|
"private": "true",
|
||||||
"version": "1.4.1",
|
"version": "1.4.2",
|
||||||
"description": "The cutest Discord client mod",
|
"description": "The cutest Discord client mod",
|
||||||
"homepage": "https://github.com/Vendicated/Vencord#readme",
|
"homepage": "https://github.com/Vendicated/Vencord#readme",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
|
|
|
@ -27,6 +27,7 @@ export { PlainSettings, Settings };
|
||||||
import "./utils/quickCss";
|
import "./utils/quickCss";
|
||||||
import "./webpack/patchWebpack";
|
import "./webpack/patchWebpack";
|
||||||
|
|
||||||
|
import { get as dsGet } from "./api/DataStore";
|
||||||
import { showNotification } from "./api/Notifications";
|
import { showNotification } from "./api/Notifications";
|
||||||
import { PlainSettings, Settings } from "./api/Settings";
|
import { PlainSettings, Settings } from "./api/Settings";
|
||||||
import { patches, PMLogger, startAllPlugins } from "./plugins";
|
import { patches, PMLogger, startAllPlugins } from "./plugins";
|
||||||
|
@ -38,6 +39,22 @@ import { onceReady } from "./webpack";
|
||||||
import { SettingsRouter } from "./webpack/common";
|
import { SettingsRouter } from "./webpack/common";
|
||||||
|
|
||||||
async function syncSettings() {
|
async function syncSettings() {
|
||||||
|
// pre-check for local shared settings
|
||||||
|
if (
|
||||||
|
Settings.cloud.authenticated &&
|
||||||
|
await dsGet("Vencord_cloudSecret") === null // this has been enabled due to local settings share or some other bug
|
||||||
|
) {
|
||||||
|
// show a notification letting them know and tell them how to fix it
|
||||||
|
showNotification({
|
||||||
|
title: "Cloud Integrations",
|
||||||
|
body: "We've noticed you have cloud integrations enabled in another client! Due to limitations, you will " +
|
||||||
|
"need to re-authenticate to continue using them. Click here to go to the settings page to do so!",
|
||||||
|
color: "var(--yellow-360)",
|
||||||
|
onClick: () => SettingsRouter.open("VencordCloud")
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
Settings.cloud.settingsSync && // if it's enabled
|
Settings.cloud.settingsSync && // if it's enabled
|
||||||
Settings.cloud.authenticated // if cloud integrations are enabled
|
Settings.cloud.authenticated // if cloud integrations are enabled
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
import { IpcEvents } from "@utils/IpcEvents";
|
import { IpcEvents } from "@utils/IpcEvents";
|
||||||
import { IpcRes } from "@utils/types";
|
import { IpcRes } from "@utils/types";
|
||||||
import { ipcRenderer } from "electron";
|
import { ipcRenderer } from "electron";
|
||||||
|
import type { UserThemeHeader } from "main/themes";
|
||||||
|
|
||||||
function invoke<T = any>(event: IpcEvents, ...args: any[]) {
|
function invoke<T = any>(event: IpcEvents, ...args: any[]) {
|
||||||
return ipcRenderer.invoke(event, ...args) as Promise<T>;
|
return ipcRenderer.invoke(event, ...args) as Promise<T>;
|
||||||
|
@ -29,6 +30,14 @@ export function sendSync<T = any>(event: IpcEvents, ...args: any[]) {
|
||||||
}
|
}
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
themes: {
|
||||||
|
uploadTheme: (fileName: string, fileData: string) => invoke<void>(IpcEvents.UPLOAD_THEME, fileName, fileData),
|
||||||
|
deleteTheme: (fileName: string) => invoke<void>(IpcEvents.DELETE_THEME, fileName),
|
||||||
|
getThemesDir: () => invoke<string>(IpcEvents.GET_THEMES_DIR),
|
||||||
|
getThemesList: () => invoke<Array<UserThemeHeader>>(IpcEvents.GET_THEMES_LIST),
|
||||||
|
getThemeData: (fileName: string) => invoke<string | undefined>(IpcEvents.GET_THEME_DATA, fileName)
|
||||||
|
},
|
||||||
|
|
||||||
updater: {
|
updater: {
|
||||||
getUpdates: () => invoke<IpcRes<Record<"hash" | "author" | "message", string>[]>>(IpcEvents.GET_UPDATES),
|
getUpdates: () => invoke<IpcRes<Record<"hash" | "author" | "message", string>[]>>(IpcEvents.GET_UPDATES),
|
||||||
update: () => invoke<IpcRes<boolean>>(IpcEvents.UPDATE),
|
update: () => invoke<IpcRes<boolean>>(IpcEvents.UPDATE),
|
||||||
|
@ -50,6 +59,10 @@ export default {
|
||||||
ipcRenderer.on(IpcEvents.QUICK_CSS_UPDATE, (_, css) => cb(css));
|
ipcRenderer.on(IpcEvents.QUICK_CSS_UPDATE, (_, css) => cb(css));
|
||||||
},
|
},
|
||||||
|
|
||||||
|
addThemeChangeListener(cb: () => void) {
|
||||||
|
ipcRenderer.on(IpcEvents.THEME_UPDATE, cb);
|
||||||
|
},
|
||||||
|
|
||||||
openFile: () => invoke<void>(IpcEvents.OPEN_QUICKCSS),
|
openFile: () => invoke<void>(IpcEvents.OPEN_QUICKCSS),
|
||||||
openEditor: () => invoke<void>(IpcEvents.OPEN_MONACO_EDITOR),
|
openEditor: () => invoke<void>(IpcEvents.OPEN_MONACO_EDITOR),
|
||||||
},
|
},
|
||||||
|
|
|
@ -34,6 +34,7 @@ export interface Settings {
|
||||||
useQuickCss: boolean;
|
useQuickCss: boolean;
|
||||||
enableReactDevtools: boolean;
|
enableReactDevtools: boolean;
|
||||||
themeLinks: string[];
|
themeLinks: string[];
|
||||||
|
enabledThemes: string[];
|
||||||
frameless: boolean;
|
frameless: boolean;
|
||||||
transparent: boolean;
|
transparent: boolean;
|
||||||
winCtrlQ: boolean;
|
winCtrlQ: boolean;
|
||||||
|
@ -68,6 +69,7 @@ const DefaultSettings: Settings = {
|
||||||
autoUpdateNotification: true,
|
autoUpdateNotification: true,
|
||||||
useQuickCss: true,
|
useQuickCss: true,
|
||||||
themeLinks: [],
|
themeLinks: [],
|
||||||
|
enabledThemes: [],
|
||||||
enableReactDevtools: false,
|
enableReactDevtools: false,
|
||||||
frameless: false,
|
frameless: false,
|
||||||
transparent: false,
|
transparent: false,
|
||||||
|
@ -107,7 +109,7 @@ const saveSettingsOnFrequentAction = debounce(async () => {
|
||||||
}
|
}
|
||||||
}, 60_000);
|
}, 60_000);
|
||||||
|
|
||||||
type SubscriptionCallback = ((newValue: any, path: string) => void) & { _path?: string; };
|
type SubscriptionCallback = ((newValue: any, path: string) => void) & { _paths?: Array<string>; };
|
||||||
const subscriptions = new Set<SubscriptionCallback>();
|
const subscriptions = new Set<SubscriptionCallback>();
|
||||||
|
|
||||||
const proxyCache = {} as Record<string, any>;
|
const proxyCache = {} as Record<string, any>;
|
||||||
|
@ -164,7 +166,7 @@ function makeProxy(settings: any, root = settings, path = ""): Settings {
|
||||||
const setPath = `${path}${path && "."}${p}`;
|
const setPath = `${path}${path && "."}${p}`;
|
||||||
delete proxyCache[setPath];
|
delete proxyCache[setPath];
|
||||||
for (const subscription of subscriptions) {
|
for (const subscription of subscriptions) {
|
||||||
if (!subscription._path || subscription._path === setPath) {
|
if (!subscription._paths || subscription._paths.includes(setPath)) {
|
||||||
subscription(v, setPath);
|
subscription(v, setPath);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -235,7 +237,7 @@ type ResolvePropDeep<T, P> = P extends "" ? T :
|
||||||
export function addSettingsListener<Path extends keyof Settings>(path: Path, onUpdate: (newValue: Settings[Path], path: Path) => void): void;
|
export function addSettingsListener<Path extends keyof Settings>(path: Path, onUpdate: (newValue: Settings[Path], path: Path) => void): void;
|
||||||
export function addSettingsListener<Path extends string>(path: Path, onUpdate: (newValue: Path extends "" ? any : ResolvePropDeep<Settings, Path>, path: Path extends "" ? string : Path) => void): void;
|
export function addSettingsListener<Path extends string>(path: Path, onUpdate: (newValue: Path extends "" ? any : ResolvePropDeep<Settings, Path>, path: Path extends "" ? string : Path) => void): void;
|
||||||
export function addSettingsListener(path: string, onUpdate: (newValue: any, path: string) => void) {
|
export function addSettingsListener(path: string, onUpdate: (newValue: any, path: string) => void) {
|
||||||
(onUpdate as SubscriptionCallback)._path = path;
|
((onUpdate as SubscriptionCallback)._paths ??= []).push(path);
|
||||||
subscriptions.add(onUpdate);
|
subscriptions.add(onUpdate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -226,7 +226,7 @@ export default function PluginModal({ plugin, onRestartNeeded, onClose, transiti
|
||||||
</Forms.FormSection>
|
</Forms.FormSection>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<Forms.FormSection>
|
<Forms.FormSection className={Margins.bottom16}>
|
||||||
<Forms.FormTitle tag="h3">Settings</Forms.FormTitle>
|
<Forms.FormTitle tag="h3">Settings</Forms.FormTitle>
|
||||||
{renderSettings()}
|
{renderSettings()}
|
||||||
</Forms.FormSection>
|
</Forms.FormSection>
|
||||||
|
|
|
@ -22,10 +22,8 @@ import * as DataStore from "@api/DataStore";
|
||||||
import { showNotice } from "@api/Notices";
|
import { showNotice } from "@api/Notices";
|
||||||
import { Settings, useSettings } from "@api/Settings";
|
import { Settings, useSettings } from "@api/Settings";
|
||||||
import { classNameFactory } from "@api/Styles";
|
import { classNameFactory } from "@api/Styles";
|
||||||
import { Flex } from "@components/Flex";
|
|
||||||
import { Badge } from "@components/PluginSettings/components";
|
|
||||||
import PluginModal from "@components/PluginSettings/PluginModal";
|
import PluginModal from "@components/PluginSettings/PluginModal";
|
||||||
import { Switch } from "@components/Switch";
|
import { AddonCard } from "@components/VencordSettings/AddonCard";
|
||||||
import { SettingsTab } from "@components/VencordSettings/shared";
|
import { SettingsTab } from "@components/VencordSettings/shared";
|
||||||
import { ChangeList } from "@utils/ChangeList";
|
import { ChangeList } from "@utils/ChangeList";
|
||||||
import { Logger } from "@utils/Logger";
|
import { Logger } from "@utils/Logger";
|
||||||
|
@ -152,24 +150,23 @@ function PluginCard({ plugin, disabled, onRestartNeeded, onMouseEnter, onMouseLe
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex className={cl("card", { "card-disabled": disabled })} flexDirection="column" onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave}>
|
<AddonCard
|
||||||
<div className={cl("card-header")}>
|
name={plugin.name}
|
||||||
<Text variant="text-md/bold" className={cl("name")}>
|
description={plugin.description}
|
||||||
{plugin.name}{isNew && <Badge text="NEW" color="#ED4245" />}
|
isNew={isNew}
|
||||||
</Text>
|
enabled={isEnabled()}
|
||||||
|
setEnabled={toggleEnabled}
|
||||||
|
disabled={disabled}
|
||||||
|
onMouseEnter={onMouseEnter}
|
||||||
|
onMouseLeave={onMouseLeave}
|
||||||
|
infoButton={
|
||||||
<button role="switch" onClick={() => openModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
|
<button role="switch" onClick={() => openModal()} className={classes(ButtonClasses.button, cl("info-button"))}>
|
||||||
{plugin.options
|
{plugin.options
|
||||||
? <CogWheel />
|
? <CogWheel />
|
||||||
: <InfoIcon width="24" height="24" />}
|
: <InfoIcon width="24" height="24" />}
|
||||||
</button>
|
</button>
|
||||||
<Switch
|
}
|
||||||
checked={isEnabled()}
|
/>
|
||||||
onChange={toggleEnabled}
|
|
||||||
disabled={disabled}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<Text className={cl("note")} variant="text-sm/normal">{plugin.description}</Text>
|
|
||||||
</Flex >
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,38 +23,6 @@
|
||||||
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
|
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
|
||||||
}
|
}
|
||||||
|
|
||||||
.vc-plugins-card {
|
|
||||||
background-color: var(--background-secondary-alt);
|
|
||||||
color: var(--interactive-active);
|
|
||||||
border-radius: 8px;
|
|
||||||
display: block;
|
|
||||||
height: 100%;
|
|
||||||
padding: 12px;
|
|
||||||
width: 100%;
|
|
||||||
transition: 0.1s ease-out;
|
|
||||||
transition-property: box-shadow, transform, background, opacity;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vc-plugins-card-disabled {
|
|
||||||
opacity: 0.6;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vc-plugins-card:hover {
|
|
||||||
background-color: var(--background-tertiary);
|
|
||||||
transform: translateY(-1px);
|
|
||||||
box-shadow: var(--elevation-high);
|
|
||||||
}
|
|
||||||
|
|
||||||
.vc-plugins-card-header {
|
|
||||||
margin-top: auto;
|
|
||||||
display: flex;
|
|
||||||
width: 100%;
|
|
||||||
justify-content: flex-end;
|
|
||||||
height: 1.5rem;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vc-plugins-info-button {
|
.vc-plugins-info-button {
|
||||||
height: 24px;
|
height: 24px;
|
||||||
width: 24px;
|
width: 24px;
|
||||||
|
@ -86,27 +54,6 @@
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.vc-plugins-note {
|
|
||||||
height: 36px;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
display: -webkit-box;
|
|
||||||
-webkit-line-clamp: 2;
|
|
||||||
line-clamp: 2;
|
|
||||||
-webkit-box-orient: vertical;
|
|
||||||
/* stylelint-disable-next-line property-no-unknown */
|
|
||||||
box-orient: vertical;
|
|
||||||
}
|
|
||||||
|
|
||||||
.vc-plugins-name {
|
|
||||||
display: flex;
|
|
||||||
width: 100%;
|
|
||||||
align-items: center;
|
|
||||||
flex-grow: 1;
|
|
||||||
gap: 8px;
|
|
||||||
cursor: "default";
|
|
||||||
}
|
|
||||||
|
|
||||||
.vc-plugins-dep-name {
|
.vc-plugins-dep-name {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
|
77
src/components/VencordSettings/AddonCard.tsx
Normal file
77
src/components/VencordSettings/AddonCard.tsx
Normal file
|
@ -0,0 +1,77 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a modification for Discord's desktop app
|
||||||
|
* Copyright (c) 2023 Vendicated and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import "./addonCard.css";
|
||||||
|
|
||||||
|
import { classNameFactory } from "@api/Styles";
|
||||||
|
import { Badge } from "@components/Badge";
|
||||||
|
import { Switch } from "@components/Switch";
|
||||||
|
import { Text } from "@webpack/common";
|
||||||
|
import type { MouseEventHandler, ReactNode } from "react";
|
||||||
|
|
||||||
|
const cl = classNameFactory("vc-addon-");
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
name: ReactNode;
|
||||||
|
description: ReactNode;
|
||||||
|
enabled: boolean;
|
||||||
|
setEnabled: (enabled: boolean) => void;
|
||||||
|
disabled?: boolean;
|
||||||
|
isNew?: boolean;
|
||||||
|
onMouseEnter?: MouseEventHandler<HTMLDivElement>;
|
||||||
|
onMouseLeave?: MouseEventHandler<HTMLDivElement>;
|
||||||
|
|
||||||
|
infoButton?: ReactNode;
|
||||||
|
footer?: ReactNode;
|
||||||
|
author?: ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AddonCard({ disabled, isNew, name, infoButton, footer, author, enabled, setEnabled, description, onMouseEnter, onMouseLeave }: Props) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={cl("card", { "card-disabled": disabled })}
|
||||||
|
onMouseEnter={onMouseEnter}
|
||||||
|
onMouseLeave={onMouseLeave}
|
||||||
|
>
|
||||||
|
<div className={cl("header")}>
|
||||||
|
<div className={cl("name-author")}>
|
||||||
|
<Text variant="text-md/bold" className={cl("name")}>
|
||||||
|
{name}{isNew && <Badge text="NEW" color="#ED4245" />}
|
||||||
|
</Text>
|
||||||
|
{!!author && (
|
||||||
|
<Text variant="text-md/normal" className={cl("author")}>
|
||||||
|
{author}
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{infoButton}
|
||||||
|
|
||||||
|
<Switch
|
||||||
|
checked={enabled}
|
||||||
|
onChange={setEnabled}
|
||||||
|
disabled={disabled}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Text className={cl("note")} variant="text-sm/normal">{description}</Text>
|
||||||
|
|
||||||
|
{footer}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
|
@ -17,16 +17,35 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { useSettings } from "@api/Settings";
|
import { useSettings } from "@api/Settings";
|
||||||
|
import { classNameFactory } from "@api/Styles";
|
||||||
|
import { Flex } from "@components/Flex";
|
||||||
import { Link } from "@components/Link";
|
import { Link } from "@components/Link";
|
||||||
import { Margins } from "@utils/margins";
|
import { Margins } from "@utils/margins";
|
||||||
|
import { classes } from "@utils/misc";
|
||||||
|
import { showItemInFolder } from "@utils/native";
|
||||||
import { useAwaiter } from "@utils/react";
|
import { useAwaiter } from "@utils/react";
|
||||||
import { findLazy } from "@webpack";
|
import { findByCodeLazy, findByPropsLazy, findLazy } from "@webpack";
|
||||||
import { Button, Card, Forms, React, TextArea } from "@webpack/common";
|
import { Button, Card, FluxDispatcher, Forms, React, showToast, TabBar, TextArea, useEffect, useRef, useState } from "@webpack/common";
|
||||||
|
import { UserThemeHeader } from "main/themes";
|
||||||
|
import type { ComponentType, Ref, SyntheticEvent } from "react";
|
||||||
|
|
||||||
|
import { AddonCard } from "./AddonCard";
|
||||||
import { SettingsTab, wrapTab } from "./shared";
|
import { SettingsTab, wrapTab } from "./shared";
|
||||||
|
|
||||||
|
type FileInput = ComponentType<{
|
||||||
|
ref: Ref<HTMLInputElement>;
|
||||||
|
onChange: (e: SyntheticEvent<HTMLInputElement>) => void;
|
||||||
|
multiple?: boolean;
|
||||||
|
filters?: { name?: string; extensions: string[]; }[];
|
||||||
|
}>;
|
||||||
|
|
||||||
|
const InviteActions = findByPropsLazy("resolveInvite");
|
||||||
|
const TrashIcon = findByCodeLazy("M5 6.99902V18.999C5 20.101 5.897 20.999");
|
||||||
|
const FileInput: FileInput = findByCodeLazy("activateUploadDialogue=");
|
||||||
const TextAreaProps = findLazy(m => typeof m.textarea === "string");
|
const TextAreaProps = findLazy(m => typeof m.textarea === "string");
|
||||||
|
|
||||||
|
const cl = classNameFactory("vc-settings-theme-");
|
||||||
|
|
||||||
function Validator({ link }: { link: string; }) {
|
function Validator({ link }: { link: string; }) {
|
||||||
const [res, err, pending] = useAwaiter(() => fetch(link).then(res => {
|
const [res, err, pending] = useAwaiter(() => fetch(link).then(res => {
|
||||||
if (res.status > 300) throw `${res.status} ${res.statusText}`;
|
if (res.status > 300) throw `${res.status} ${res.statusText}`;
|
||||||
|
@ -75,10 +94,191 @@ function Validators({ themeLinks }: { themeLinks: string[]; }) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function ThemesTab() {
|
interface ThemeCardProps {
|
||||||
const settings = useSettings(["themeLinks"]);
|
theme: UserThemeHeader;
|
||||||
const [themeText, setThemeText] = React.useState(settings.themeLinks.join("\n"));
|
enabled: boolean;
|
||||||
|
onChange: (enabled: boolean) => void;
|
||||||
|
onDelete: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
function ThemeCard({ theme, enabled, onChange, onDelete }: ThemeCardProps) {
|
||||||
|
return (
|
||||||
|
<AddonCard
|
||||||
|
name={theme.name}
|
||||||
|
description={theme.description}
|
||||||
|
author={theme.author}
|
||||||
|
enabled={enabled}
|
||||||
|
setEnabled={onChange}
|
||||||
|
infoButton={
|
||||||
|
IS_WEB && (
|
||||||
|
<div style={{ cursor: "pointer", color: "var(--status-danger" }} onClick={onDelete}>
|
||||||
|
<TrashIcon />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
footer={
|
||||||
|
<Flex flexDirection="row" style={{ gap: "0.2em" }}>
|
||||||
|
{!!theme.website && <Link href={theme.website}>Website</Link>}
|
||||||
|
{!!(theme.website && theme.invite) && " • "}
|
||||||
|
{!!theme.invite && (
|
||||||
|
<Link
|
||||||
|
href={`https://discord.gg/${theme.invite}`}
|
||||||
|
onClick={async e => {
|
||||||
|
e.preventDefault();
|
||||||
|
const { invite } = await InviteActions.resolveInvite(theme.invite, "Desktop Modal");
|
||||||
|
if (!invite) return showToast("Invalid or expired invite");
|
||||||
|
|
||||||
|
FluxDispatcher.dispatch({
|
||||||
|
type: "INVITE_MODAL_OPEN",
|
||||||
|
invite,
|
||||||
|
code: theme.invite,
|
||||||
|
context: "APP"
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Discord Server
|
||||||
|
</Link>
|
||||||
|
)}
|
||||||
|
</Flex>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
enum ThemeTab {
|
||||||
|
LOCAL,
|
||||||
|
ONLINE
|
||||||
|
}
|
||||||
|
|
||||||
|
function ThemesTab() {
|
||||||
|
const settings = useSettings(["themeLinks", "enabledThemes"]);
|
||||||
|
|
||||||
|
const fileInputRef = useRef<HTMLInputElement>(null);
|
||||||
|
const [currentTab, setCurrentTab] = useState(ThemeTab.LOCAL);
|
||||||
|
const [themeText, setThemeText] = useState(settings.themeLinks.join("\n"));
|
||||||
|
const [userThemes, setUserThemes] = useState<UserThemeHeader[] | null>(null);
|
||||||
|
const [themeDir, , themeDirPending] = useAwaiter(VencordNative.themes.getThemesDir);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
refreshLocalThemes();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
async function refreshLocalThemes() {
|
||||||
|
const themes = await VencordNative.themes.getThemesList();
|
||||||
|
setUserThemes(themes);
|
||||||
|
}
|
||||||
|
|
||||||
|
// When a local theme is enabled/disabled, update the settings
|
||||||
|
function onLocalThemeChange(fileName: string, value: boolean) {
|
||||||
|
if (value) {
|
||||||
|
if (settings.enabledThemes.includes(fileName)) return;
|
||||||
|
settings.enabledThemes = [...settings.enabledThemes, fileName];
|
||||||
|
} else {
|
||||||
|
settings.enabledThemes = settings.enabledThemes.filter(f => f !== fileName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onFileUpload(e: SyntheticEvent<HTMLInputElement>) {
|
||||||
|
e.stopPropagation();
|
||||||
|
e.preventDefault();
|
||||||
|
if (!e.currentTarget?.files?.length) return;
|
||||||
|
const { files } = e.currentTarget;
|
||||||
|
|
||||||
|
const uploads = Array.from(files, file => {
|
||||||
|
const { name } = file;
|
||||||
|
if (!name.endsWith(".css")) return;
|
||||||
|
|
||||||
|
return new Promise<void>((resolve, reject) => {
|
||||||
|
const reader = new FileReader();
|
||||||
|
reader.onload = () => {
|
||||||
|
VencordNative.themes.uploadTheme(name, reader.result as string)
|
||||||
|
.then(resolve)
|
||||||
|
.catch(reject);
|
||||||
|
};
|
||||||
|
reader.readAsText(file);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
await Promise.all(uploads);
|
||||||
|
refreshLocalThemes();
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderLocalThemes() {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Card className="vc-settings-card">
|
||||||
|
<Forms.FormTitle tag="h5">Find Themes:</Forms.FormTitle>
|
||||||
|
<div style={{ marginBottom: ".5em", display: "flex", flexDirection: "column" }}>
|
||||||
|
<Link style={{ marginRight: ".5em" }} href="https://betterdiscord.app/themes">
|
||||||
|
BetterDiscord Themes
|
||||||
|
</Link>
|
||||||
|
<Link href="https://github.com/search?q=discord+theme">GitHub</Link>
|
||||||
|
</div>
|
||||||
|
<Forms.FormText>If using the BD site, click on "Download" and place the downloaded .theme.css file into your themes folder.</Forms.FormText>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
<Forms.FormSection title="Local Themes">
|
||||||
|
<Card className="vc-settings-quick-actions-card">
|
||||||
|
<>
|
||||||
|
{IS_WEB ?
|
||||||
|
(
|
||||||
|
<Button
|
||||||
|
size={Button.Sizes.SMALL}
|
||||||
|
disabled={themeDirPending}
|
||||||
|
>
|
||||||
|
Upload Theme
|
||||||
|
<FileInput
|
||||||
|
ref={fileInputRef}
|
||||||
|
onChange={onFileUpload}
|
||||||
|
multiple={true}
|
||||||
|
filters={[{ extensions: ["*.css"] }]}
|
||||||
|
/>
|
||||||
|
</Button>
|
||||||
|
) : (
|
||||||
|
<Button
|
||||||
|
onClick={() => showItemInFolder(themeDir!)}
|
||||||
|
size={Button.Sizes.SMALL}
|
||||||
|
disabled={themeDirPending}
|
||||||
|
>
|
||||||
|
Open Themes Folder
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
<Button
|
||||||
|
onClick={refreshLocalThemes}
|
||||||
|
size={Button.Sizes.SMALL}
|
||||||
|
>
|
||||||
|
Load missing Themes
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
onClick={() => VencordNative.quickCss.openEditor()}
|
||||||
|
size={Button.Sizes.SMALL}
|
||||||
|
>
|
||||||
|
Edit QuickCSS
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
<div className={cl("grid")}>
|
||||||
|
{userThemes?.map(theme => (
|
||||||
|
<ThemeCard
|
||||||
|
key={theme.fileName}
|
||||||
|
enabled={settings.enabledThemes.includes(theme.fileName)}
|
||||||
|
onChange={enabled => onLocalThemeChange(theme.fileName, enabled)}
|
||||||
|
onDelete={async () => {
|
||||||
|
onLocalThemeChange(theme.fileName, false);
|
||||||
|
await VencordNative.themes.deleteTheme(theme.fileName);
|
||||||
|
refreshLocalThemes();
|
||||||
|
}}
|
||||||
|
theme={theme}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</Forms.FormSection>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// When the user leaves the online theme textbox, update the settings
|
||||||
function onBlur() {
|
function onBlur() {
|
||||||
settings.themeLinks = [...new Set(
|
settings.themeLinks = [...new Set(
|
||||||
themeText
|
themeText
|
||||||
|
@ -89,51 +289,56 @@ function ThemesTab() {
|
||||||
)];
|
)];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function renderOnlineThemes() {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Card className="vc-settings-card vc-text-selectable">
|
||||||
|
<Forms.FormTitle tag="h5">Paste links to css files here</Forms.FormTitle>
|
||||||
|
<Forms.FormText>One link per line</Forms.FormText>
|
||||||
|
<Forms.FormText>Make sure to use direct links to files (raw or github.io)!</Forms.FormText>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
<Forms.FormSection title="Online Themes" tag="h5">
|
||||||
|
<TextArea
|
||||||
|
value={themeText}
|
||||||
|
onChange={setThemeText}
|
||||||
|
className={classes(TextAreaProps.textarea, "vc-settings-theme-links")}
|
||||||
|
placeholder="Theme Links"
|
||||||
|
spellCheck={false}
|
||||||
|
onBlur={onBlur}
|
||||||
|
rows={10}
|
||||||
|
/>
|
||||||
|
<Validators themeLinks={settings.themeLinks} />
|
||||||
|
</Forms.FormSection>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SettingsTab title="Themes">
|
<SettingsTab title="Themes">
|
||||||
<Card className="vc-settings-card vc-text-selectable">
|
<TabBar
|
||||||
<Forms.FormTitle tag="h5">Paste links to .theme.css files here</Forms.FormTitle>
|
type="top"
|
||||||
<Forms.FormText>One link per line</Forms.FormText>
|
look="brand"
|
||||||
<Forms.FormText><strong>Make sure to use the raw links or github.io links!</strong></Forms.FormText>
|
className="vc-settings-tab-bar"
|
||||||
<Forms.FormDivider className={Margins.top8 + " " + Margins.bottom8} />
|
selectedItem={currentTab}
|
||||||
<Forms.FormTitle tag="h5">Find Themes:</Forms.FormTitle>
|
onItemSelect={setCurrentTab}
|
||||||
<div style={{ marginBottom: ".5em" }}>
|
>
|
||||||
<Link style={{ marginRight: ".5em" }} href="https://betterdiscord.app/themes">
|
<TabBar.Item
|
||||||
BetterDiscord Themes
|
className="vc-settings-tab-bar-item"
|
||||||
</Link>
|
id={ThemeTab.LOCAL}
|
||||||
<Link href="https://github.com/search?q=discord+theme">GitHub</Link>
|
>
|
||||||
</div>
|
Local Themes
|
||||||
<Forms.FormText>If using the BD site, click on "Source" somewhere below the Download button</Forms.FormText>
|
</TabBar.Item>
|
||||||
<Forms.FormText>In the GitHub repository of your theme, find X.theme.css, click on it, then click the "Raw" button</Forms.FormText>
|
<TabBar.Item
|
||||||
<Forms.FormText>
|
className="vc-settings-tab-bar-item"
|
||||||
If the theme has configuration that requires you to edit the file:
|
id={ThemeTab.ONLINE}
|
||||||
<ul>
|
>
|
||||||
<li>• Make a <Link href="https://github.com/signup">GitHub</Link> account</li>
|
Online Themes
|
||||||
<li>• Click the fork button on the top right</li>
|
</TabBar.Item>
|
||||||
<li>• Edit the file</li>
|
</TabBar>
|
||||||
<li>• Use the link to your own repository instead</li>
|
|
||||||
<li>• Use the link to your own repository instead </li>
|
{currentTab === ThemeTab.LOCAL && renderLocalThemes()}
|
||||||
<li>OR</li>
|
{currentTab === ThemeTab.ONLINE && renderOnlineThemes()}
|
||||||
<li>• Paste the contents of the edited theme file into the QuickCSS editor</li>
|
|
||||||
</ul>
|
|
||||||
<Forms.FormDivider className={Margins.top8 + " " + Margins.bottom16} />
|
|
||||||
<Button
|
|
||||||
onClick={() => VencordNative.quickCss.openEditor()}
|
|
||||||
size={Button.Sizes.SMALL}>
|
|
||||||
Open QuickCSS File
|
|
||||||
</Button>
|
|
||||||
</Forms.FormText>
|
|
||||||
</Card>
|
|
||||||
<Forms.FormTitle tag="h5">Themes</Forms.FormTitle>
|
|
||||||
<TextArea
|
|
||||||
value={themeText}
|
|
||||||
onChange={setThemeText}
|
|
||||||
className={`${TextAreaProps.textarea} vc-settings-theme-links`}
|
|
||||||
placeholder="Theme Links"
|
|
||||||
spellCheck={false}
|
|
||||||
onBlur={onBlur}
|
|
||||||
/>
|
|
||||||
<Validators themeLinks={settings.themeLinks} />
|
|
||||||
</SettingsTab>
|
</SettingsTab>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
63
src/components/VencordSettings/addonCard.css
Normal file
63
src/components/VencordSettings/addonCard.css
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
.vc-addon-card {
|
||||||
|
background-color: var(--background-secondary-alt);
|
||||||
|
color: var(--interactive-active);
|
||||||
|
border-radius: 8px;
|
||||||
|
display: block;
|
||||||
|
height: 100%;
|
||||||
|
padding: 12px;
|
||||||
|
width: 100%;
|
||||||
|
transition: 0.1s ease-out;
|
||||||
|
transition-property: box-shadow, transform, background, opacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-addon-card-disabled {
|
||||||
|
opacity: 0.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-addon-card:hover {
|
||||||
|
background-color: var(--background-tertiary);
|
||||||
|
transform: translateY(-1px);
|
||||||
|
box-shadow: var(--elevation-high);
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-addon-header {
|
||||||
|
margin-top: auto;
|
||||||
|
display: flex;
|
||||||
|
width: 100%;
|
||||||
|
justify-content: flex-end;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
margin-bottom: 0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-addon-note {
|
||||||
|
height: 36px;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
display: -webkit-box;
|
||||||
|
-webkit-line-clamp: 2;
|
||||||
|
line-clamp: 2;
|
||||||
|
-webkit-box-orient: vertical;
|
||||||
|
/* stylelint-disable-next-line property-no-unknown */
|
||||||
|
box-orient: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-addon-name-author {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-addon-name {
|
||||||
|
display: flex;
|
||||||
|
width: 100%;
|
||||||
|
align-items: center;
|
||||||
|
flex-grow: 1;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-addon-author {
|
||||||
|
font-size: 0.8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-addon-author::before {
|
||||||
|
content: "by ";
|
||||||
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
.vc-settings-tab-bar {
|
.vc-settings-tab-bar {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
margin-bottom: -2px;
|
margin-bottom: 10px;
|
||||||
border-bottom: 2px solid var(--background-modifier-accent);
|
border-bottom: 2px solid var(--background-modifier-accent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,6 +43,7 @@
|
||||||
color: var(--text-normal) !important;
|
color: var(--text-normal) !important;
|
||||||
padding: 0.5em;
|
padding: 0.5em;
|
||||||
border: 1px solid var(--background-modifier-accent);
|
border: 1px solid var(--background-modifier-accent);
|
||||||
|
max-height: unset;
|
||||||
}
|
}
|
||||||
|
|
||||||
.vc-cloud-settings-sync-grid {
|
.vc-cloud-settings-sync-grid {
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import "./settingsStyles.css";
|
import "./settingsStyles.css";
|
||||||
|
import "./themesStyles.css";
|
||||||
|
|
||||||
import ErrorBoundary from "@components/ErrorBoundary";
|
import ErrorBoundary from "@components/ErrorBoundary";
|
||||||
import { handleComponentFailed } from "@components/handleComponentFailed";
|
import { handleComponentFailed } from "@components/handleComponentFailed";
|
||||||
|
|
29
src/components/VencordSettings/themesStyles.css
Normal file
29
src/components/VencordSettings/themesStyles.css
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
.vc-settings-theme-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-gap: 16px;
|
||||||
|
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-settings-theme-card {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
background-color: var(--background-secondary-alt);
|
||||||
|
color: var(--interactive-active);
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 1em;
|
||||||
|
width: 100%;
|
||||||
|
transition: 0.1s ease-out;
|
||||||
|
transition-property: box-shadow, transform, background, opacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-settings-theme-card-text {
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
height: 1.2em;
|
||||||
|
margin-bottom: 2px;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-settings-theme-author::before {
|
||||||
|
content: "by ";
|
||||||
|
}
|
|
@ -19,8 +19,8 @@
|
||||||
import { app, protocol, session } from "electron";
|
import { app, protocol, session } from "electron";
|
||||||
import { join } from "path";
|
import { join } from "path";
|
||||||
|
|
||||||
import { getSettings } from "./ipcMain";
|
import { ensureSafePath, getSettings } from "./ipcMain";
|
||||||
import { IS_VANILLA } from "./utils/constants";
|
import { IS_VANILLA, THEMES_DIR } from "./utils/constants";
|
||||||
import { installExt } from "./utils/extensions";
|
import { installExt } from "./utils/extensions";
|
||||||
|
|
||||||
if (IS_VENCORD_DESKTOP || !IS_VANILLA) {
|
if (IS_VENCORD_DESKTOP || !IS_VANILLA) {
|
||||||
|
@ -30,6 +30,16 @@ if (IS_VENCORD_DESKTOP || !IS_VANILLA) {
|
||||||
protocol.registerFileProtocol("vencord", ({ url: unsafeUrl }, cb) => {
|
protocol.registerFileProtocol("vencord", ({ url: unsafeUrl }, cb) => {
|
||||||
let url = unsafeUrl.slice("vencord://".length);
|
let url = unsafeUrl.slice("vencord://".length);
|
||||||
if (url.endsWith("/")) url = url.slice(0, -1);
|
if (url.endsWith("/")) url = url.slice(0, -1);
|
||||||
|
if (url.startsWith("/themes/")) {
|
||||||
|
const theme = url.slice("/themes/".length);
|
||||||
|
const safeUrl = ensureSafePath(THEMES_DIR, theme);
|
||||||
|
if (!safeUrl) {
|
||||||
|
cb({ statusCode: 403 });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
cb(safeUrl.replace(/\?v=\d+$/, ""));
|
||||||
|
return;
|
||||||
|
}
|
||||||
switch (url) {
|
switch (url) {
|
||||||
case "renderer.js.map":
|
case "renderer.js.map":
|
||||||
case "vencordDesktopRenderer.js.map":
|
case "vencordDesktopRenderer.js.map":
|
||||||
|
@ -75,7 +85,7 @@ if (IS_VENCORD_DESKTOP || !IS_VANILLA) {
|
||||||
const csp = parsePolicy(headers[header][0]);
|
const csp = parsePolicy(headers[header][0]);
|
||||||
|
|
||||||
for (const directive of ["style-src", "connect-src", "img-src", "font-src", "media-src", "worker-src"]) {
|
for (const directive of ["style-src", "connect-src", "img-src", "font-src", "media-src", "worker-src"]) {
|
||||||
csp[directive] = ["*", "blob:", "data:", "'unsafe-inline'"];
|
csp[directive] = ["*", "blob:", "data:", "vencord:", "'unsafe-inline'"];
|
||||||
}
|
}
|
||||||
// TODO: Restrict this to only imported packages with fixed version.
|
// TODO: Restrict this to only imported packages with fixed version.
|
||||||
// Perhaps auto generate with esbuild
|
// Perhaps auto generate with esbuild
|
||||||
|
|
|
@ -24,19 +24,51 @@ import { IpcEvents } from "@utils/IpcEvents";
|
||||||
import { Queue } from "@utils/Queue";
|
import { Queue } from "@utils/Queue";
|
||||||
import { BrowserWindow, ipcMain, shell } from "electron";
|
import { BrowserWindow, ipcMain, shell } from "electron";
|
||||||
import { mkdirSync, readFileSync, watch } from "fs";
|
import { mkdirSync, readFileSync, watch } from "fs";
|
||||||
import { open, readFile, writeFile } from "fs/promises";
|
import { open, readdir, readFile, writeFile } from "fs/promises";
|
||||||
import { join } from "path";
|
import { join, normalize } from "path";
|
||||||
|
|
||||||
import monacoHtml from "~fileContent/../components/monacoWin.html;base64";
|
import monacoHtml from "~fileContent/../components/monacoWin.html;base64";
|
||||||
|
|
||||||
import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE } from "./utils/constants";
|
import { getThemeInfo, stripBOM, UserThemeHeader } from "./themes";
|
||||||
|
import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE, THEMES_DIR } from "./utils/constants";
|
||||||
|
import { makeLinksOpenExternally } from "./utils/externalLinks";
|
||||||
|
|
||||||
mkdirSync(SETTINGS_DIR, { recursive: true });
|
mkdirSync(SETTINGS_DIR, { recursive: true });
|
||||||
|
mkdirSync(THEMES_DIR, { recursive: true });
|
||||||
|
|
||||||
|
export function ensureSafePath(basePath: string, path: string) {
|
||||||
|
const normalizedBasePath = normalize(basePath);
|
||||||
|
const newPath = join(basePath, path);
|
||||||
|
const normalizedPath = normalize(newPath);
|
||||||
|
return normalizedPath.startsWith(normalizedBasePath) ? normalizedPath : null;
|
||||||
|
}
|
||||||
|
|
||||||
function readCss() {
|
function readCss() {
|
||||||
return readFile(QUICKCSS_PATH, "utf-8").catch(() => "");
|
return readFile(QUICKCSS_PATH, "utf-8").catch(() => "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function listThemes(): Promise<UserThemeHeader[]> {
|
||||||
|
const files = await readdir(THEMES_DIR).catch(() => []);
|
||||||
|
|
||||||
|
const themeInfo: UserThemeHeader[] = [];
|
||||||
|
|
||||||
|
for (const fileName of files) {
|
||||||
|
const data = await getThemeData(fileName).then(stripBOM).catch(() => null);
|
||||||
|
if (!data) continue;
|
||||||
|
const parsed = getThemeInfo(data, fileName);
|
||||||
|
themeInfo.push(parsed);
|
||||||
|
}
|
||||||
|
|
||||||
|
return themeInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getThemeData(fileName: string) {
|
||||||
|
fileName = fileName.replace(/\?v=\d+$/, "");
|
||||||
|
const safePath = ensureSafePath(THEMES_DIR, fileName);
|
||||||
|
if (!safePath) return Promise.reject(`Unsafe path ${fileName}`);
|
||||||
|
return readFile(safePath, "utf-8");
|
||||||
|
}
|
||||||
|
|
||||||
export function readSettings() {
|
export function readSettings() {
|
||||||
try {
|
try {
|
||||||
return readFileSync(SETTINGS_FILE, "utf-8");
|
return readFileSync(SETTINGS_FILE, "utf-8");
|
||||||
|
@ -75,6 +107,10 @@ ipcMain.handle(IpcEvents.SET_QUICK_CSS, (_, css) =>
|
||||||
cssWriteQueue.push(() => writeFile(QUICKCSS_PATH, css))
|
cssWriteQueue.push(() => writeFile(QUICKCSS_PATH, css))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
ipcMain.handle(IpcEvents.GET_THEMES_DIR, () => THEMES_DIR);
|
||||||
|
ipcMain.handle(IpcEvents.GET_THEMES_LIST, () => listThemes());
|
||||||
|
ipcMain.handle(IpcEvents.GET_THEME_DATA, (_, fileName) => getThemeData(fileName));
|
||||||
|
|
||||||
ipcMain.handle(IpcEvents.GET_SETTINGS_DIR, () => SETTINGS_DIR);
|
ipcMain.handle(IpcEvents.GET_SETTINGS_DIR, () => SETTINGS_DIR);
|
||||||
ipcMain.on(IpcEvents.GET_SETTINGS, e => e.returnValue = readSettings());
|
ipcMain.on(IpcEvents.GET_SETTINGS, e => e.returnValue = readSettings());
|
||||||
|
|
||||||
|
@ -90,6 +126,10 @@ export function initIpc(mainWindow: BrowserWindow) {
|
||||||
mainWindow.webContents.postMessage(IpcEvents.QUICK_CSS_UPDATE, await readCss());
|
mainWindow.webContents.postMessage(IpcEvents.QUICK_CSS_UPDATE, await readCss());
|
||||||
}, 50));
|
}, 50));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
watch(THEMES_DIR, { persistent: false }, debounce(() => {
|
||||||
|
mainWindow.webContents.postMessage(IpcEvents.THEME_UPDATE, void 0);
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
ipcMain.handle(IpcEvents.OPEN_MONACO_EDITOR, async () => {
|
ipcMain.handle(IpcEvents.OPEN_MONACO_EDITOR, async () => {
|
||||||
|
@ -104,5 +144,8 @@ ipcMain.handle(IpcEvents.OPEN_MONACO_EDITOR, async () => {
|
||||||
sandbox: false
|
sandbox: false
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
makeLinksOpenExternally(win);
|
||||||
|
|
||||||
await win.loadURL(`data:text/html;base64,${monacoHtml}`);
|
await win.loadURL(`data:text/html;base64,${monacoHtml}`);
|
||||||
});
|
});
|
||||||
|
|
177
src/main/themes/LICENSE
Normal file
177
src/main/themes/LICENSE
Normal file
|
@ -0,0 +1,177 @@
|
||||||
|
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
81
src/main/themes/index.ts
Normal file
81
src/main/themes/index.ts
Normal file
|
@ -0,0 +1,81 @@
|
||||||
|
/* eslint-disable header/header */
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* BetterDiscord addon meta parser
|
||||||
|
* Copyright 2023 BetterDiscord contributors
|
||||||
|
* Copyright 2023 Vendicated and Vencord contributors
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const splitRegex = /[^\S\r\n]*?\r?(?:\r\n|\n)[^\S\r\n]*?\*[^\S\r\n]?/;
|
||||||
|
const escapedAtRegex = /^\\@/;
|
||||||
|
|
||||||
|
export interface UserThemeHeader {
|
||||||
|
fileName: string;
|
||||||
|
name: string;
|
||||||
|
author: string;
|
||||||
|
description: string;
|
||||||
|
version?: string;
|
||||||
|
license?: string;
|
||||||
|
source?: string;
|
||||||
|
website?: string;
|
||||||
|
invite?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
function makeHeader(fileName: string, opts: Partial<UserThemeHeader> = {}): UserThemeHeader {
|
||||||
|
return {
|
||||||
|
fileName,
|
||||||
|
name: opts.name ?? fileName.replace(/\.css$/i, ""),
|
||||||
|
author: opts.author ?? "Unknown Author",
|
||||||
|
description: opts.description ?? "A Discord Theme.",
|
||||||
|
version: opts.version,
|
||||||
|
license: opts.license,
|
||||||
|
source: opts.source,
|
||||||
|
website: opts.website,
|
||||||
|
invite: opts.invite
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function stripBOM(fileContent: string) {
|
||||||
|
if (fileContent.charCodeAt(0) === 0xFEFF) {
|
||||||
|
fileContent = fileContent.slice(1);
|
||||||
|
}
|
||||||
|
return fileContent;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getThemeInfo(css: string, fileName: string): UserThemeHeader {
|
||||||
|
if (!css) return makeHeader(fileName);
|
||||||
|
|
||||||
|
const block = css.split("/**", 2)?.[1]?.split("*/", 1)?.[0];
|
||||||
|
if (!block) return makeHeader(fileName);
|
||||||
|
|
||||||
|
const header: Partial<UserThemeHeader> = {};
|
||||||
|
let field = "";
|
||||||
|
let accum = "";
|
||||||
|
for (const line of block.split(splitRegex)) {
|
||||||
|
if (line.length === 0) continue;
|
||||||
|
if (line.charAt(0) === "@" && line.charAt(1) !== " ") {
|
||||||
|
header[field] = accum.trim();
|
||||||
|
const l = line.indexOf(" ");
|
||||||
|
field = line.substring(1, l);
|
||||||
|
accum = line.substring(l + 1);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
accum += " " + line.replace("\\n", "\n").replace(escapedAtRegex, "@");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
header[field] = accum.trim();
|
||||||
|
delete header[""];
|
||||||
|
return makeHeader(fileName, header);
|
||||||
|
}
|
|
@ -25,6 +25,7 @@ export const DATA_DIR = process.env.VENCORD_USER_DATA_DIR ?? (
|
||||||
: join(app.getPath("userData"), "..", "Vencord")
|
: join(app.getPath("userData"), "..", "Vencord")
|
||||||
);
|
);
|
||||||
export const SETTINGS_DIR = join(DATA_DIR, "settings");
|
export const SETTINGS_DIR = join(DATA_DIR, "settings");
|
||||||
|
export const THEMES_DIR = join(DATA_DIR, "themes");
|
||||||
export const QUICKCSS_PATH = join(SETTINGS_DIR, "quickCss.css");
|
export const QUICKCSS_PATH = join(SETTINGS_DIR, "quickCss.css");
|
||||||
export const SETTINGS_FILE = join(SETTINGS_DIR, "settings.json");
|
export const SETTINGS_FILE = join(SETTINGS_DIR, "settings.json");
|
||||||
export const ALLOWED_PROTOCOLS = [
|
export const ALLOWED_PROTOCOLS = [
|
||||||
|
|
48
src/main/utils/externalLinks.ts
Normal file
48
src/main/utils/externalLinks.ts
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a modification for Discord's desktop app
|
||||||
|
* Copyright (c) 2023 Vendicated and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { type BrowserWindow, shell } from "electron";
|
||||||
|
|
||||||
|
export function makeLinksOpenExternally(win: BrowserWindow) {
|
||||||
|
win.webContents.setWindowOpenHandler(({ url }) => {
|
||||||
|
switch (url) {
|
||||||
|
case "about:blank":
|
||||||
|
case "https://discord.com/popout":
|
||||||
|
case "https://ptb.discord.com/popout":
|
||||||
|
case "https://canary.discord.com/popout":
|
||||||
|
return { action: "allow" };
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
var { protocol } = new URL(url);
|
||||||
|
} catch {
|
||||||
|
return { action: "deny" };
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (protocol) {
|
||||||
|
case "http:":
|
||||||
|
case "https:":
|
||||||
|
case "mailto:":
|
||||||
|
case "steam:":
|
||||||
|
case "spotify:":
|
||||||
|
shell.openExternal(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
return { action: "deny" };
|
||||||
|
});
|
||||||
|
}
|
43
src/plugins/badge.ts
Normal file
43
src/plugins/badge.ts
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
/* eslint-disable header/header */
|
||||||
|
import { BadgePosition, ProfileBadge } from "@api/Badges";
|
||||||
|
import { Badges } from "@api/index";
|
||||||
|
import { Devs } from "@utils/constants";
|
||||||
|
import definePlugin from "@utils/types";
|
||||||
|
import { UserStore } from "@webpack/common";
|
||||||
|
|
||||||
|
const SHIGGY_BADGE = "https://cdn.discordapp.com/emojis/1101838344146665502.gif?size=240&quality=lossless";
|
||||||
|
const BLOBFOXBOX_BADGE = "https://cdn.discordapp.com/emojis/1036216552736952350.webp?size=240&quality=lossless";
|
||||||
|
|
||||||
|
const ShiggyBadge: ProfileBadge = {
|
||||||
|
description: "true shiggy fan",
|
||||||
|
image: SHIGGY_BADGE,
|
||||||
|
position: BadgePosition.START,
|
||||||
|
props: {
|
||||||
|
style: { transform: "scale(0.9)" }
|
||||||
|
},
|
||||||
|
shouldShow: ({ user }) => user.id === UserStore.getCurrentUser().id,
|
||||||
|
link: "https://ryanccn.dev/"
|
||||||
|
};
|
||||||
|
const BlobfoxBoxBadge: ProfileBadge = {
|
||||||
|
description: "blobfox",
|
||||||
|
image: BLOBFOXBOX_BADGE,
|
||||||
|
position: BadgePosition.START,
|
||||||
|
props: {
|
||||||
|
style: { transform: "scale(0.9)" }
|
||||||
|
},
|
||||||
|
shouldShow: ({ user }) => user.id === UserStore.getCurrentUser().id,
|
||||||
|
link: "https://ryanccn.dev/"
|
||||||
|
};
|
||||||
|
|
||||||
|
export default definePlugin({
|
||||||
|
name: "Ryan's Extra Badges",
|
||||||
|
description: "shiggy",
|
||||||
|
authors: [Devs.RyanCaoDev],
|
||||||
|
dependencies: ["BadgeAPI"],
|
||||||
|
|
||||||
|
|
||||||
|
start() {
|
||||||
|
Badges.addBadge(ShiggyBadge);
|
||||||
|
Badges.addBadge(BlobfoxBoxBadge);
|
||||||
|
},
|
||||||
|
});
|
63
src/plugins/bottom/components/Indicator.tsx
Normal file
63
src/plugins/bottom/components/Indicator.tsx
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a modification for Discord's desktop app
|
||||||
|
* Copyright (c) 2023 Vendicated and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This plugin was modified from code licensed under the following license:
|
||||||
|
*
|
||||||
|
* MIT License
|
||||||
|
*
|
||||||
|
* Copyright (c) 2021-present Sebastian Law
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { findByPropsLazy } from "@webpack";
|
||||||
|
import { Tooltip } from "@webpack/common";
|
||||||
|
|
||||||
|
export default function Indicator({ layers, bottom }: { layers: number; bottom: boolean; }) {
|
||||||
|
return (
|
||||||
|
<Tooltip color="black" position="top" text={layers <= 1 ? "🥺" : `Decoded from ${layers} nested bottom messages`}>
|
||||||
|
{({ onMouseLeave, onMouseEnter }) => (
|
||||||
|
<span
|
||||||
|
className={`power-bottom-indicator ${findByPropsLazy("edited").edited}`}
|
||||||
|
style={{ color: "var(--text-muted)" }}
|
||||||
|
onMouseEnter={onMouseEnter}
|
||||||
|
onMouseLeave={onMouseLeave}
|
||||||
|
>
|
||||||
|
{bottom ? "(bottom)" : "(original)"}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</Tooltip>
|
||||||
|
);
|
||||||
|
}
|
73
src/plugins/bottom/encoding.ts
Normal file
73
src/plugins/bottom/encoding.ts
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a modification for Discord's desktop app
|
||||||
|
* Copyright (c) 2023 Vendicated and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file was adapted from https://github.com/bottom-software-foundation/bottom-js
|
||||||
|
* Which is, hopefully, licensed under MIT.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const CHARACTER_VALUES: [number, string][] = [
|
||||||
|
[200, "🫂"],
|
||||||
|
[50, "💖"],
|
||||||
|
[10, "✨"],
|
||||||
|
[5, "🥺"],
|
||||||
|
[1, ","],
|
||||||
|
[0, "❤️"],
|
||||||
|
];
|
||||||
|
const SECTION_SEPERATOR = "👉👈";
|
||||||
|
const FINAL_TERMINATOR = new RegExp(`(${SECTION_SEPERATOR})?$`);
|
||||||
|
|
||||||
|
function encodeChar(charValue: number): string {
|
||||||
|
if (charValue === 0) return "";
|
||||||
|
const [val, currentCase]: [number, string] =
|
||||||
|
CHARACTER_VALUES.find(([val]) => charValue >= val) || CHARACTER_VALUES[-1];
|
||||||
|
return `${currentCase}${encodeChar(charValue - val)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function encode(value: string): string {
|
||||||
|
return Array.from(new TextEncoder().encode(value))
|
||||||
|
.map((v: number) => encodeChar(v) + SECTION_SEPERATOR)
|
||||||
|
.join("");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function decode(value: string): string {
|
||||||
|
return new TextDecoder().decode(Uint8Array.from(
|
||||||
|
value
|
||||||
|
.trim()
|
||||||
|
.replace(FINAL_TERMINATOR, "")
|
||||||
|
.split(SECTION_SEPERATOR)
|
||||||
|
.map(letters => {
|
||||||
|
return Array.from(letters)
|
||||||
|
.map(character => {
|
||||||
|
const [value, emoji]: [number, string] = CHARACTER_VALUES.find(
|
||||||
|
([_, em]) => em === character
|
||||||
|
) || [-1, ""];
|
||||||
|
if (!emoji) {
|
||||||
|
throw new TypeError(`Invalid bottom text: '${character}'`);
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
})
|
||||||
|
.reduce((p, c) => p + c);
|
||||||
|
})
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
export default {
|
||||||
|
encode: encode,
|
||||||
|
decode: decode
|
||||||
|
};
|
158
src/plugins/bottom/handler.ts
Normal file
158
src/plugins/bottom/handler.ts
Normal file
|
@ -0,0 +1,158 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a modification for Discord's desktop app
|
||||||
|
* Copyright (c) 2023 Vendicated and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This plugin was modified from code licensed under the following license:
|
||||||
|
*
|
||||||
|
* MIT License
|
||||||
|
*
|
||||||
|
* Copyright (c) 2021-present Sebastian Law
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { FluxDispatcher, MessageStore } from "@webpack/common";
|
||||||
|
import type { Message } from "discord-types/general";
|
||||||
|
|
||||||
|
import Bottom from "./encoding";
|
||||||
|
|
||||||
|
class BottomHandler {
|
||||||
|
|
||||||
|
cache: Record<string, Record<string, { originalContent: string; top?: boolean; layers?: number; }>>;
|
||||||
|
re: RegExp;
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.cache = {};
|
||||||
|
this.re = /((?:((?:\uD83E\uDEC2)?(?:💖)*(?:✨)*(?:🥺)*(?:,)*(❤️)?)(?:👉👈|\u200b))+)/gm;
|
||||||
|
}
|
||||||
|
|
||||||
|
isTranslated(message) {
|
||||||
|
if (
|
||||||
|
!this.cache[message.channel_id] ||
|
||||||
|
!this.cache[message.channel_id][message.id]
|
||||||
|
) { return false; }
|
||||||
|
|
||||||
|
return this.cache[message.channel_id][message.id].originalContent !== message.content;
|
||||||
|
}
|
||||||
|
|
||||||
|
translate(text: string, notNested: boolean) {
|
||||||
|
var original = text;
|
||||||
|
var translated = text;
|
||||||
|
var layers = 0;
|
||||||
|
while (original.match(this.re)) {
|
||||||
|
translated = original.replace(this.re, (str, p1, offset, s) => Bottom.decode(p1) || p1);
|
||||||
|
|
||||||
|
// the regex can sometimes pick up invalid bottom in which case we want to return to avoid an infinite loop
|
||||||
|
if (translated === original || notNested) break;
|
||||||
|
else {
|
||||||
|
original = translated;
|
||||||
|
layers++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
translated: translated,
|
||||||
|
layers: layers,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
translateMessage(message: Message, decodeLayers: boolean) {
|
||||||
|
if (!message.content || message.content.length === 0) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
// Build cache if it doesn't exist
|
||||||
|
if (!this.cache[message.channel_id]) {
|
||||||
|
this.cache[message.channel_id] = {};
|
||||||
|
}
|
||||||
|
if (!this.cache[message.channel_id][message.id]) {
|
||||||
|
this.cache[message.channel_id][message.id] = {
|
||||||
|
originalContent: message.content,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const cached = this.cache[message.channel_id][message.id];
|
||||||
|
|
||||||
|
if (this.isTranslated(message)) {
|
||||||
|
// if we're reverting back to original, just set the content back to original
|
||||||
|
message.content = cached.originalContent;
|
||||||
|
this.updateMessage(message);
|
||||||
|
} else {
|
||||||
|
// the message hasn't been edited, let's try to decode it
|
||||||
|
const { translated, layers } = this.translate(message.content, !decodeLayers);
|
||||||
|
if (translated === message.content) {
|
||||||
|
// we don't want to do anything if there is no bottom
|
||||||
|
// since the translation fails, mark this message to not show the indicator
|
||||||
|
cached.top = true;
|
||||||
|
throw new Error("No Bottom detected 🥺");
|
||||||
|
} else {
|
||||||
|
// let the indicator show how many layers of decoding we did
|
||||||
|
cached.layers = layers;
|
||||||
|
message.content = translated;
|
||||||
|
this.updateMessage(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
updateMessage(message: Message) {
|
||||||
|
console.log({
|
||||||
|
bottomTranslation: true,
|
||||||
|
type: "MESSAGE_UPDATE",
|
||||||
|
message,
|
||||||
|
});
|
||||||
|
FluxDispatcher.dispatch({
|
||||||
|
bottomTranslation: true,
|
||||||
|
type: "MESSAGE_UPDATE",
|
||||||
|
message,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
clearCache() {
|
||||||
|
for (const channelID in this.cache) {
|
||||||
|
for (const messageID in this.cache[channelID]) {
|
||||||
|
this.removeMessage(channelID, messageID);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.cache = {};
|
||||||
|
}
|
||||||
|
|
||||||
|
removeMessage(channelID: string, messageID: string, reset = true) {
|
||||||
|
const message = MessageStore.getMessage(channelID, messageID);
|
||||||
|
if (reset) {
|
||||||
|
message.content = this.cache[channelID][messageID].originalContent;
|
||||||
|
this.updateMessage(message);
|
||||||
|
}
|
||||||
|
delete this.cache[channelID][messageID];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default BottomHandler;
|
262
src/plugins/bottom/index.tsx
Normal file
262
src/plugins/bottom/index.tsx
Normal file
|
@ -0,0 +1,262 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a modification for Discord's desktop app
|
||||||
|
* Copyright (c) 2023 Vendicated and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This plugin was modified from code licensed under the following license:
|
||||||
|
*
|
||||||
|
* MIT License
|
||||||
|
*
|
||||||
|
* Copyright (c) 2021-present Sebastian Law
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
* SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { findOption, RequiredMessageOption } from "@api/Commands";
|
||||||
|
import { addAccessory, removeAccessory } from "@api/MessageAccessories";
|
||||||
|
import { addPreSendListener, removePreSendListener } from "@api/MessageEvents";
|
||||||
|
import { addButton, removeButton } from "@api/MessagePopover";
|
||||||
|
import { definePluginSettings } from "@api/settings";
|
||||||
|
import ErrorBoundary from "@components/ErrorBoundary";
|
||||||
|
import definePlugin, { OptionType } from "@utils/types";
|
||||||
|
import { ChannelStore, Toasts } from "@webpack/common";
|
||||||
|
|
||||||
|
import Indicator from "./components/Indicator";
|
||||||
|
import Bottom from "./encoding";
|
||||||
|
import BottomHandler from "./handler";
|
||||||
|
|
||||||
|
const Handler = new BottomHandler();
|
||||||
|
|
||||||
|
const settings = definePluginSettings({
|
||||||
|
"decode-layers": {
|
||||||
|
description: "Decode Layers",
|
||||||
|
type: OptionType.BOOLEAN,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
"auto-encode-send": {
|
||||||
|
description: "Automatically encode outgoing messages",
|
||||||
|
type: OptionType.BOOLEAN,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
"encode-send-type": {
|
||||||
|
description: "Automatic Encode Behavior",
|
||||||
|
type: OptionType.SELECT,
|
||||||
|
options:
|
||||||
|
[
|
||||||
|
{
|
||||||
|
label: "All",
|
||||||
|
default: true,
|
||||||
|
value: 0,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Inline (Greedy)",
|
||||||
|
value: 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Inline (Parsed)",
|
||||||
|
value: 2,
|
||||||
|
}
|
||||||
|
],
|
||||||
|
},
|
||||||
|
"inline-bottom-prefix": {
|
||||||
|
description: "Inline bottom prefix",
|
||||||
|
type: OptionType.STRING,
|
||||||
|
default: "👉",
|
||||||
|
},
|
||||||
|
"inline-bottom-suffix": {
|
||||||
|
description: "Inline bottom suffix",
|
||||||
|
type: OptionType.STRING,
|
||||||
|
default: "👈",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const escapeRegex: (string: string) => string = string => string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
||||||
|
|
||||||
|
function count(string: string, subString: string): number {
|
||||||
|
var n = 0;
|
||||||
|
var pos = 0;
|
||||||
|
const step = subString.length;
|
||||||
|
|
||||||
|
while (true) {
|
||||||
|
pos = string.indexOf(subString, pos);
|
||||||
|
if (pos >= 0) {
|
||||||
|
n++;
|
||||||
|
pos += step;
|
||||||
|
} else break;
|
||||||
|
}
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
function inlineEncode(p: string, s: string, text: string): string {
|
||||||
|
var np = count(text, p);
|
||||||
|
var ns = count(text, s);
|
||||||
|
|
||||||
|
if (np === 0 || ns === 0) return text;
|
||||||
|
|
||||||
|
var pl = p.length;
|
||||||
|
var sl = s.length;
|
||||||
|
const result: string[] = [];
|
||||||
|
let idx = 0;
|
||||||
|
|
||||||
|
while (true) {
|
||||||
|
var startIndex = text.indexOf(p, idx);
|
||||||
|
|
||||||
|
if (startIndex < 0) {
|
||||||
|
result.push(text.slice(idx));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
var endIndex = text.indexOf(s, startIndex + pl);
|
||||||
|
|
||||||
|
if (endIndex < 0) {
|
||||||
|
result.push(text.slice(idx));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
result.push(text.slice(idx, startIndex));
|
||||||
|
startIndex += pl;
|
||||||
|
result.push(Bottom.encode(text.slice(startIndex, endIndex)));
|
||||||
|
endIndex += sl;
|
||||||
|
idx = endIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result.join("");
|
||||||
|
}
|
||||||
|
|
||||||
|
export default definePlugin({
|
||||||
|
name: "Bottom",
|
||||||
|
description: "The Vencord plugin for bottom 🥺",
|
||||||
|
authors: [
|
||||||
|
{
|
||||||
|
id: 1038096782963507210n,
|
||||||
|
name: "skyevg",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
dependencies: ["MessagePopoverAPI", "CommandsAPI", "MessageEventsAPI", "MessageAccessoriesAPI"],
|
||||||
|
|
||||||
|
settings,
|
||||||
|
|
||||||
|
start() {
|
||||||
|
addButton("bottom", msg => {
|
||||||
|
return {
|
||||||
|
label: "Translate Bottom",
|
||||||
|
icon: () => (
|
||||||
|
<svg x="0" y="0" aria-hidden="false" width="22" height="22" viewBox="0 0 36 36" fill="currentColor" className="icon">
|
||||||
|
<circle fill="#FFCC4D" cx="18" cy="18" r="18" />
|
||||||
|
<path fill="#65471B" d="M20.996 27c-.103 0-.206-.016-.309-.049-1.76-.571-3.615-.571-5.375 0-.524.169-1.089-.117-1.26-.642-.171-.525.117-1.089.643-1.26 2.162-.702 4.447-.702 6.609 0 .525.171.813.735.643 1.26-.137.421-.529.691-.951.691z" />
|
||||||
|
<path fill="#FFF" d="M30.335 12.068c-.903 2.745-3.485 4.715-6.494 4.715-.144 0-.289-.005-.435-.014-1.477-.093-2.842-.655-3.95-1.584.036.495.076.997.136 1.54.152 1.388.884 2.482 2.116 3.163.82.454 1.8.688 2.813.752 1.734.109 3.57-.28 4.873-.909 1.377-.665 2.272-1.862 2.456-3.285.183-1.415-.354-2.924-1.515-4.378z" />
|
||||||
|
<path fill="#65471B" d="M21.351 7.583c-1.297.55-1.947 2.301-1.977 5.289l.039.068c.897 1.319 2.373 2.224 4.088 2.332.114.007.228.011.341.011 2.634 0 4.849-1.937 5.253-4.524-.115-.105-.221-.212-.343-.316-3.715-3.17-6.467-3.257-7.401-2.86z" />
|
||||||
|
<path fill="#F4900C" d="M23.841 16.783c3.009 0 5.591-1.97 6.494-4.715-.354-.443-.771-.88-1.241-1.309-.404 2.587-2.619 4.524-5.253 4.524-.113 0-.227-.004-.341-.011-1.715-.108-3.191-1.013-4.088-2.332l-.039-.068c-.007.701.021 1.473.083 2.313 1.108.929 2.473 1.491 3.95 1.584.146.01.291.014.435.014z" />
|
||||||
|
<circle fill="#FFF" cx="21.413" cy="10.705" r="1.107" />
|
||||||
|
<path fill="#FFF" d="M12.159 16.783c-3.009 0-5.591-1.97-6.494-4.715-1.161 1.454-1.697 2.963-1.515 4.377.185 1.423 1.079 2.621 2.456 3.285 1.303.629 3.138 1.018 4.873.909 1.013-.064 1.993-.297 2.813-.752 1.231-.681 1.963-1.775 2.116-3.163.06-.542.1-1.042.136-1.536-1.103.923-2.47 1.487-3.95 1.58-.146.011-.291.015-.435.015z" />
|
||||||
|
<path fill="#65471B" d="M12.159 15.283c.113 0 .227-.004.341-.011 1.715-.108 3.191-1.013 4.088-2.332l.039-.068c-.031-2.988-.68-4.739-1.977-5.289-.934-.397-3.687-.31-7.401 2.859-.122.104-.227.211-.343.316.404 2.588 2.619 4.525 5.253 4.525z" />
|
||||||
|
<path fill="#F4900C" d="M16.626 12.872l-.039.068c-.897 1.319-2.373 2.224-4.088 2.332-.114.007-.228.011-.341.011-2.634 0-4.849-1.937-5.253-4.524-.47.429-.887.866-1.241 1.309.903 2.745 3.485 4.715 6.494 4.715.144 0 .289-.005.435-.014 1.48-.093 2.847-.657 3.95-1.58.062-.841.091-1.614.083-2.317z" />
|
||||||
|
<path fill="#FFF" d="M9.781 11.81c.61-.038 1.074-.564 1.035-1.174-.038-.61-.564-1.074-1.174-1.036-.61.038-1.074.564-1.036 1.174.039.61.565 1.074 1.175 1.036z" />
|
||||||
|
</svg>
|
||||||
|
),
|
||||||
|
message: msg,
|
||||||
|
channel: ChannelStore.getChannel(msg.channel_id),
|
||||||
|
onClick: async () => {
|
||||||
|
try {
|
||||||
|
Handler.translateMessage(msg, settings.store["decode-layers"]);
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
Toasts.show(
|
||||||
|
{
|
||||||
|
id: Toasts.genId(),
|
||||||
|
message: e.message,
|
||||||
|
type: Toasts.Type.MESSAGE
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
addAccessory("bottom", props => {
|
||||||
|
try {
|
||||||
|
if (!Handler.cache[props.message.channel_id][props.message.id].top) {
|
||||||
|
try {
|
||||||
|
return (
|
||||||
|
<ErrorBoundary>
|
||||||
|
<Indicator layers={Handler.cache[props.message.channel_id][props.message.id].layers ?? 0} bottom={!Handler.isTranslated(props.message)} />
|
||||||
|
</ErrorBoundary>
|
||||||
|
);
|
||||||
|
} catch { }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
|
||||||
|
this.preSend = addPreSendListener((_, msg) => {
|
||||||
|
if (settings.store["auto-encode-send"]) {
|
||||||
|
const sendType = settings.store["encode-send-type"];
|
||||||
|
var { content } = msg;
|
||||||
|
|
||||||
|
switch (sendType) {
|
||||||
|
case 0: // all
|
||||||
|
content = Bottom.encode(content);
|
||||||
|
break;
|
||||||
|
case 1: // inline greedy
|
||||||
|
var prefix = escapeRegex(settings.store["inline-bottom-prefix"]);
|
||||||
|
var suffix = escapeRegex(settings.store["inline-bottom-suffix"]);
|
||||||
|
var reg = new RegExp(`${prefix}(.+)${suffix}`, "gm");
|
||||||
|
content = content.replace(reg, (str, p1, o, s) => Bottom.encode(p1));
|
||||||
|
break;
|
||||||
|
case 2: // inline parsed
|
||||||
|
var prefix = settings.store["inline-bottom-prefix"];
|
||||||
|
var suffix = settings.store["inline-bottom-prefix"];
|
||||||
|
content = inlineEncode(prefix, suffix, content);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
msg.content = content;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
stop() {
|
||||||
|
removeButton("bottom");
|
||||||
|
removeAccessory("bottom");
|
||||||
|
removePreSendListener(this.preSend);
|
||||||
|
},
|
||||||
|
|
||||||
|
commands: [
|
||||||
|
{
|
||||||
|
name: "bottom",
|
||||||
|
description: "Translate and send text as bottom 🥺",
|
||||||
|
options: [RequiredMessageOption],
|
||||||
|
execute: opts => ({
|
||||||
|
content: Bottom.encode(findOption(opts, "message", "")),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
]
|
||||||
|
});
|
|
@ -123,6 +123,7 @@ function TextReplace({ title, rulesArray, rulesKey, update }: TextReplaceProps)
|
||||||
const isRegexRules = title === "Using Regex";
|
const isRegexRules = title === "Using Regex";
|
||||||
|
|
||||||
async function onClickRemove(index: number) {
|
async function onClickRemove(index: number) {
|
||||||
|
if (index === rulesArray.length - 1) return;
|
||||||
rulesArray.splice(index, 1);
|
rulesArray.splice(index, 1);
|
||||||
|
|
||||||
await DataStore.set(rulesKey, rulesArray);
|
await DataStore.set(rulesKey, rulesArray);
|
||||||
|
|
46
src/plugins/useAltSearch.ts
Normal file
46
src/plugins/useAltSearch.ts
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a modification for Discord's desktop app
|
||||||
|
* Copyright (c) 2023 Vendicated and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import definePlugin, { OptionType } from "@utils/types";
|
||||||
|
|
||||||
|
export default definePlugin({
|
||||||
|
name: "UseAlternativeSearch",
|
||||||
|
description: "Use alternative search engine in right click menu",
|
||||||
|
authors: [
|
||||||
|
{
|
||||||
|
id: 1038096782963507210n,
|
||||||
|
name: "skyevg",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
patches: [
|
||||||
|
{
|
||||||
|
find: "https://www.google.com/search?q=",
|
||||||
|
replacement: {
|
||||||
|
match: /"https:\/\/www.google.com\/search\?q=".concat\(encodeURIComponent\(e\)\)/,
|
||||||
|
replace: "Vencord.Settings.plugins.UseAlternativeSearch.source.replace(\"!QUERY!\", encodeURIComponent(e))"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
options: {
|
||||||
|
source: {
|
||||||
|
description: "Search engine's url (use !QUERY! as replacement for the search term)",
|
||||||
|
type: OptionType.STRING,
|
||||||
|
default: "https://duckduckgo.com/?q=!QUERY!",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
|
@ -51,6 +51,8 @@ const VoiceChannelField = ErrorBoundary.wrap(({ user }: UserProps) => {
|
||||||
if (!channelId) return null;
|
if (!channelId) return null;
|
||||||
|
|
||||||
const channel = ChannelStore.getChannel(channelId);
|
const channel = ChannelStore.getChannel(channelId);
|
||||||
|
if (!channel) return null;
|
||||||
|
|
||||||
const guild = GuildStore.getGuild(channel.guild_id);
|
const guild = GuildStore.getGuild(channel.guild_id);
|
||||||
|
|
||||||
if (!guild) return null; // When in DM call
|
if (!guild) return null; // When in DM call
|
||||||
|
|
143
src/plugins/uwuifier.ts
Normal file
143
src/plugins/uwuifier.ts
Normal file
|
@ -0,0 +1,143 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a modification for Discord's desktop app
|
||||||
|
* Copyright (c) 2022 Vendicated and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { findOption, RequiredMessageOption } from "@api/Commands";
|
||||||
|
import { addPreEditListener, addPreSendListener, MessageObject, removePreEditListener, removePreSendListener } from "@api/MessageEvents";
|
||||||
|
import { definePluginSettings } from "@api/Settings";
|
||||||
|
import { Devs } from "@utils/constants";
|
||||||
|
import definePlugin, { OptionType } from "@utils/types";
|
||||||
|
|
||||||
|
const endings = [
|
||||||
|
"rawr x3",
|
||||||
|
"OwO",
|
||||||
|
"UwU",
|
||||||
|
"o.O",
|
||||||
|
"-.-",
|
||||||
|
">w<",
|
||||||
|
"(⑅˘꒳˘)",
|
||||||
|
"(ꈍᴗꈍ)",
|
||||||
|
"(˘ω˘)",
|
||||||
|
"(U ᵕ U❁)",
|
||||||
|
"σωσ",
|
||||||
|
"òωó",
|
||||||
|
"(///ˬ///✿)",
|
||||||
|
"(U ﹏ U)",
|
||||||
|
"( ͡o ω ͡o )",
|
||||||
|
"ʘwʘ",
|
||||||
|
":3",
|
||||||
|
":3", // important enough to have twice
|
||||||
|
"XD",
|
||||||
|
"nyaa~~",
|
||||||
|
"mya",
|
||||||
|
">_<",
|
||||||
|
"😳",
|
||||||
|
"🥺",
|
||||||
|
"😳😳😳",
|
||||||
|
"rawr",
|
||||||
|
"^^",
|
||||||
|
"^^;;",
|
||||||
|
"(ˆ ﻌ ˆ)♡",
|
||||||
|
"^•ﻌ•^",
|
||||||
|
"/(^•ω•^)",
|
||||||
|
"(✿oωo)"
|
||||||
|
];
|
||||||
|
|
||||||
|
const replacements = [
|
||||||
|
["small", "smol"],
|
||||||
|
["cute", "kawaii~"],
|
||||||
|
["fluff", "floof"],
|
||||||
|
["love", "luv"],
|
||||||
|
["stupid", "baka"],
|
||||||
|
["what", "nani"],
|
||||||
|
["meow", "nya~"],
|
||||||
|
["hello", "hewwo"],
|
||||||
|
];
|
||||||
|
|
||||||
|
const settings = definePluginSettings({
|
||||||
|
uwuEveryMessage: {
|
||||||
|
description: "Make every single message uwuified",
|
||||||
|
type: OptionType.BOOLEAN,
|
||||||
|
default: false,
|
||||||
|
restartNeeded: false
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
function selectRandomElement(arr) {
|
||||||
|
// generate a random index based on the length of the array
|
||||||
|
const randomIndex = Math.floor(Math.random() * arr.length);
|
||||||
|
|
||||||
|
// return the element at the randomly generated index
|
||||||
|
return arr[randomIndex];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function uwuify(message: string): string {
|
||||||
|
message = message.toLowerCase();
|
||||||
|
// words
|
||||||
|
for (const pair of replacements) {
|
||||||
|
message = message.replaceAll(pair[0], pair[1]);
|
||||||
|
}
|
||||||
|
message = message
|
||||||
|
.replaceAll(/([ \t\n])n/g, "$1ny") // nyaify
|
||||||
|
.replaceAll(/[lr]/g, "w") // [lr] > w
|
||||||
|
.replaceAll(/([ \t\n])([a-z])/g, (_, p1, p2) => Math.random() < .5 ? `${p1}${p2}-${p2}` : `${p1}${p2}`) // stutter
|
||||||
|
.replaceAll(/([^.,!][.,!])([ \t\n])/g, (_, p1, p2) => `${p1} ${selectRandomElement(endings)}${p2}`); // endings
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// actual command declaration
|
||||||
|
export default definePlugin({
|
||||||
|
name: "UwUifier",
|
||||||
|
description: "Simply uwuify commands",
|
||||||
|
authors: [Devs.echo, Devs.skyevg, Devs.PandaNinjas],
|
||||||
|
dependencies: ["CommandsAPI", "MessageEventsAPI"],
|
||||||
|
settings,
|
||||||
|
|
||||||
|
commands: [
|
||||||
|
{
|
||||||
|
name: "uwuify",
|
||||||
|
description: "uwuifies your messages",
|
||||||
|
options: [RequiredMessageOption],
|
||||||
|
|
||||||
|
execute: opts => ({
|
||||||
|
content: uwuify(findOption(opts, "message", "")),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
|
||||||
|
onSend(msg: MessageObject) {
|
||||||
|
// Only run when it's enabled
|
||||||
|
if (settings.store.uwuEveryMessage) {
|
||||||
|
msg.content = uwuify(msg.content);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
start() {
|
||||||
|
this.preSend = addPreSendListener((_, msg) => this.onSend(msg));
|
||||||
|
this.preEdit = addPreEditListener((_cid, _mid, msg) =>
|
||||||
|
this.onSend(msg)
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
|
stop() {
|
||||||
|
removePreSendListener(this.preSend);
|
||||||
|
removePreEditListener(this.preEdit);
|
||||||
|
},
|
||||||
|
});
|
|
@ -18,8 +18,14 @@
|
||||||
|
|
||||||
export const enum IpcEvents {
|
export const enum IpcEvents {
|
||||||
QUICK_CSS_UPDATE = "VencordQuickCssUpdate",
|
QUICK_CSS_UPDATE = "VencordQuickCssUpdate",
|
||||||
|
THEME_UPDATE = "VencordThemeUpdate",
|
||||||
GET_QUICK_CSS = "VencordGetQuickCss",
|
GET_QUICK_CSS = "VencordGetQuickCss",
|
||||||
SET_QUICK_CSS = "VencordSetQuickCss",
|
SET_QUICK_CSS = "VencordSetQuickCss",
|
||||||
|
UPLOAD_THEME = "VencordUploadTheme",
|
||||||
|
DELETE_THEME = "VencordDeleteTheme",
|
||||||
|
GET_THEMES_DIR = "VencordGetThemesDir",
|
||||||
|
GET_THEMES_LIST = "VencordGetThemesList",
|
||||||
|
GET_THEME_DATA = "VencordGetThemeData",
|
||||||
GET_SETTINGS_DIR = "VencordGetSettingsDir",
|
GET_SETTINGS_DIR = "VencordGetSettingsDir",
|
||||||
GET_SETTINGS = "VencordGetSettings",
|
GET_SETTINGS = "VencordGetSettings",
|
||||||
SET_SETTINGS = "VencordSetSettings",
|
SET_SETTINGS = "VencordSetSettings",
|
||||||
|
|
|
@ -46,15 +46,34 @@ async function initThemes() {
|
||||||
document.documentElement.appendChild(themesStyle);
|
document.documentElement.appendChild(themesStyle);
|
||||||
}
|
}
|
||||||
|
|
||||||
const { themeLinks } = Settings;
|
const { themeLinks, enabledThemes } = Settings;
|
||||||
const links = themeLinks.map(link => `@import url("${link.trim()}");`).join("\n");
|
|
||||||
themesStyle.textContent = links;
|
const links: string[] = [...themeLinks];
|
||||||
|
|
||||||
|
if (IS_WEB) {
|
||||||
|
for (const theme of enabledThemes) {
|
||||||
|
const themeData = await VencordNative.themes.getThemeData(theme);
|
||||||
|
if (!themeData) continue;
|
||||||
|
const blob = new Blob([themeData], { type: "text/css" });
|
||||||
|
links.push(URL.createObjectURL(blob));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const localThemes = enabledThemes.map(theme => `vencord:///themes/${theme}?v=${Date.now()}`);
|
||||||
|
links.push(...localThemes);
|
||||||
|
}
|
||||||
|
|
||||||
|
themesStyle.textContent = links.map(link => `@import url("${link.trim()}");`).join("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
document.addEventListener("DOMContentLoaded", () => {
|
document.addEventListener("DOMContentLoaded", () => {
|
||||||
|
initThemes();
|
||||||
|
|
||||||
toggle(Settings.useQuickCss);
|
toggle(Settings.useQuickCss);
|
||||||
addSettingsListener("useQuickCss", toggle);
|
addSettingsListener("useQuickCss", toggle);
|
||||||
|
|
||||||
initThemes();
|
|
||||||
addSettingsListener("themeLinks", initThemes);
|
addSettingsListener("themeLinks", initThemes);
|
||||||
|
addSettingsListener("enabledThemes", initThemes);
|
||||||
|
|
||||||
|
if (!IS_WEB)
|
||||||
|
VencordNative.quickCss.addThemeChangeListener(initThemes);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue