From 7d555a96ea3ea97d15a97b8b3e3afcdc736d78ac Mon Sep 17 00:00:00 2001 From: Vendicated Date: Sat, 22 Oct 2022 01:22:44 +0200 Subject: [PATCH] fix userscript, lint new files --- .eslintrc.json | 4 ++-- browser/Vencord.ts | 2 +- browser/background.js | 18 --------------- browser/content.js | 19 ---------------- browser/userscript.meta.js | 34 ++++++++++++++-------------- scripts/build/build.mjs | 18 +++++++++++++++ scripts/build/buildWeb.mjs | 20 +++++++++++++++- scripts/build/common.mjs | 18 +++++++++++++++ scripts/patcher/install.js | 1 + scripts/patcher/uninstall.js | 1 + src/api/MessageAccessories.ts | 18 +++++++++++++++ src/plugins/apiMessageAccessories.ts | 18 +++++++++++++++ 12 files changed, 113 insertions(+), 58 deletions(-) mode change 100644 => 100755 scripts/build/buildWeb.mjs mode change 100644 => 100755 scripts/patcher/install.js mode change 100644 => 100755 scripts/patcher/uninstall.js diff --git a/.eslintrc.json b/.eslintrc.json index 63be05b..7de658b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,7 +1,7 @@ { "root": true, "parser": "@typescript-eslint/parser", - "ignorePatterns": ["dist"], + "ignorePatterns": ["dist", "browser"], "plugins": ["header"], "rules": { // Since it's only been a month and Vencord has already been stolen @@ -13,7 +13,7 @@ [ { "pattern": "!?", - "template": "" + "template": " " }, " * Vencord, a modification for Discord's desktop app", { diff --git a/browser/Vencord.ts b/browser/Vencord.ts index 24976a1..ab27f16 100644 --- a/browser/Vencord.ts +++ b/browser/Vencord.ts @@ -1,4 +1,4 @@ -/* +/*! * Vencord, a modification for Discord's desktop app * Copyright (c) 2022 Vendicated and contributors * diff --git a/browser/background.js b/browser/background.js index 5ffe8e8..b79c94e 100644 --- a/browser/background.js +++ b/browser/background.js @@ -1,21 +1,3 @@ -/* - * 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 . -*/ - if (typeof browser === "undefined") { var browser = chrome; } diff --git a/browser/content.js b/browser/content.js index 8abf653..2c4b40e 100644 --- a/browser/content.js +++ b/browser/content.js @@ -1,22 +1,3 @@ -/* - * 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 . -*/ - - if (typeof browser === "undefined") { var browser = chrome; } diff --git a/browser/userscript.meta.js b/browser/userscript.meta.js index 0a73bc0..81cf3e7 100644 --- a/browser/userscript.meta.js +++ b/browser/userscript.meta.js @@ -1,20 +1,20 @@ -/* - * 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 . -*/ +// ==UserScript== +// @name Vencord +// @description A Discord client mod - Web version +// @version %version% +// @author Vendicated (https://github.com/Vendicated) +// @namespace https://github.com/Vendicated/Vencord +// @supportURL https://github.com/Vendicated/Vencord +// @license GPL-3.0 +// @match *://*.discord.com/* +// @grant none +// @run-at document-start +// @compatible chrome Chrome + Tampermonkey or Violentmonkey +// @compatible firefox Firefox Tampermonkey +// @compatible opera Opera + Tampermonkey or Violentmonkey +// @compatible edge Edge + Tampermonkey or Violentmonkey +// @compatible safari Safari + Tampermonkey or Violentmonkey +// ==/UserScript== // this UserScript DOES NOT work on Firefox with Violentmonkey or Greasemonkey due to a bug that makes it impossible diff --git a/scripts/build/build.mjs b/scripts/build/build.mjs index 73d220d..f6304b1 100755 --- a/scripts/build/build.mjs +++ b/scripts/build/build.mjs @@ -1,4 +1,22 @@ #!/usr/bin/node +/* + * 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 . +*/ + import esbuild from "esbuild"; import { commonOpts, gitHashPlugin, globPlugins, makeAllPackagesExternalPlugin } from "./common.mjs"; diff --git a/scripts/build/buildWeb.mjs b/scripts/build/buildWeb.mjs old mode 100644 new mode 100755 index 6299398..8abac2c --- a/scripts/build/buildWeb.mjs +++ b/scripts/build/buildWeb.mjs @@ -1,4 +1,22 @@ -// TODO: Modularise the plugins since both build scripts use them +#!/usr/bin/node +/* + * 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 . +*/ + import { createWriteStream, readFileSync } from "fs"; import yazl from "yazl"; diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs index 0def0c2..6143fb2 100644 --- a/scripts/build/common.mjs +++ b/scripts/build/common.mjs @@ -1,3 +1,21 @@ +/* + * 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 . +*/ + import { execSync } from "child_process"; import esbuild from "esbuild"; import { existsSync } from "fs"; diff --git a/scripts/patcher/install.js b/scripts/patcher/install.js old mode 100644 new mode 100755 index 90e1dbb..7fd3a8c --- a/scripts/patcher/install.js +++ b/scripts/patcher/install.js @@ -1,3 +1,4 @@ +#!/usr/bin/node /* * Vencord, a modification for Discord's desktop app * Copyright (c) 2022 Vendicated and contributors diff --git a/scripts/patcher/uninstall.js b/scripts/patcher/uninstall.js old mode 100644 new mode 100755 index 942375b..e9764a7 --- a/scripts/patcher/uninstall.js +++ b/scripts/patcher/uninstall.js @@ -1,3 +1,4 @@ +#!/usr/bin/node /* * Vencord, a modification for Discord's desktop app * Copyright (c) 2022 Vendicated and contributors diff --git a/src/api/MessageAccessories.ts b/src/api/MessageAccessories.ts index 3a46828..ee74af5 100644 --- a/src/api/MessageAccessories.ts +++ b/src/api/MessageAccessories.ts @@ -1,3 +1,21 @@ +/* + * 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 . +*/ + export type AccessoryCallback = (props: Record) => JSX.Element; export type Accessory = { callback: AccessoryCallback; diff --git a/src/plugins/apiMessageAccessories.ts b/src/plugins/apiMessageAccessories.ts index a2e8e70..8d01810 100644 --- a/src/plugins/apiMessageAccessories.ts +++ b/src/plugins/apiMessageAccessories.ts @@ -1,3 +1,21 @@ +/* + * 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 . +*/ + import { Devs } from "../utils/constants"; import definePlugin from "../utils/types";