From f084f919e64054871f83990696a182050036cec6 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Mon, 25 Mar 2024 22:54:11 +0100 Subject: [PATCH] use browser app for shitcord one small step closing to completely ridding myself of this heap of garbage --- .config/firejail/discord.local | 8 ------- .local/share/applications/discord.desktop | 9 ++++++++ cgassets/tampermonkey-mzte/header.txt.cgt | 22 +++++++++++++++++++ .../tampermonkey-mzte/own_style.css.cgt | 8 +++---- .../site_styles/discord.com.css.cgt | 10 --------- cgassets/tampermonkey-mzte/style.css.cgt | 4 ++++ confgen.lua | 2 ++ plugins/tampermonkey-mzte/assets/header.txt | 11 ---------- .../assets/site_styles/discord.com.css | 4 ---- plugins/tampermonkey-mzte/assets/style.css | 4 ---- plugins/tampermonkey-mzte/src/Macro.hx | 10 +++++---- plugins/tampermonkey-mzte/src/Main.hx | 17 +++++++++----- 12 files changed, 59 insertions(+), 50 deletions(-) delete mode 100644 .config/firejail/discord.local create mode 100644 .local/share/applications/discord.desktop create mode 100644 cgassets/tampermonkey-mzte/header.txt.cgt rename plugins/tampermonkey-mzte/assets/own_style.css => cgassets/tampermonkey-mzte/own_style.css.cgt (54%) rename .config/discord/theme.css.cgt => cgassets/tampermonkey-mzte/site_styles/discord.com.css.cgt (99%) create mode 100644 cgassets/tampermonkey-mzte/style.css.cgt delete mode 100644 plugins/tampermonkey-mzte/assets/header.txt delete mode 100644 plugins/tampermonkey-mzte/assets/site_styles/discord.com.css delete mode 100644 plugins/tampermonkey-mzte/assets/style.css diff --git a/.config/firejail/discord.local b/.config/firejail/discord.local deleted file mode 100644 index 21ed307..0000000 --- a/.config/firejail/discord.local +++ /dev/null @@ -1,8 +0,0 @@ -# vim: filetype=firejail -# Make discord use xdg-desktop-portal to open links by pretending -# we're running inside flatpak (eww). -private-bin gdbus -env DE=flatpak - -# Whitelist symlink to theme in order to grant access to the link target file. -whitelist ~/.config/discord/theme.css diff --git a/.local/share/applications/discord.desktop b/.local/share/applications/discord.desktop new file mode 100644 index 0000000..5119652 --- /dev/null +++ b/.local/share/applications/discord.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Discord +StartupWMClass=discord +Comment=Shitcord Crap Messenger (browser app). +GenericName=Internet Messenger +Exec=openbrowser --app=https://discord.com/login +Icon=discord +Type=Application +Categories=Network;InstantMessaging; diff --git a/cgassets/tampermonkey-mzte/header.txt.cgt b/cgassets/tampermonkey-mzte/header.txt.cgt new file mode 100644 index 0000000..e26ed82 --- /dev/null +++ b/cgassets/tampermonkey-mzte/header.txt.cgt @@ -0,0 +1,22 @@ + + + +// ==UserScript== + +// @<% k %> <% val %> + +// ==/UserScript== diff --git a/plugins/tampermonkey-mzte/assets/own_style.css b/cgassets/tampermonkey-mzte/own_style.css.cgt similarity index 54% rename from plugins/tampermonkey-mzte/assets/own_style.css rename to cgassets/tampermonkey-mzte/own_style.css.cgt index eab606f..961445b 100644 --- a/plugins/tampermonkey-mzte/assets/own_style.css +++ b/cgassets/tampermonkey-mzte/own_style.css.cgt @@ -3,13 +3,13 @@ z-index: 100000; right: 0; bottom: 0; - font-family: "Iosevka Nerd Font", monospace; - color: #cdd6f4; + font-family: "<% opt.font %>", monospace; + color: #<% opt.catppuccin.text %>; font-size: 20px; - background-color: #1e1e2e; + background-color: #<% opt.catppuccin.base %>; margin-right: 20px; margin-bottom: 20px; border-style: solid; border-width: 2px; - border-color: #f38ba8; + border-color: #<% opt.catppuccin.red %>; } diff --git a/.config/discord/theme.css.cgt b/cgassets/tampermonkey-mzte/site_styles/discord.com.css.cgt similarity index 99% rename from .config/discord/theme.css.cgt rename to cgassets/tampermonkey-mzte/site_styles/discord.com.css.cgt index 50dec95..a92e370 100644 --- a/.config/discord/theme.css.cgt +++ b/cgassets/tampermonkey-mzte/site_styles/discord.com.css.cgt @@ -1,14 +1,4 @@ -/* -* Based on catppuccin mocha with minor changes. -* Use BeautifulDiscord to inject this. -*/ - /* === MZTE === */ -:root * { - font-family: "<% opt.font %>" !important; - border-radius: 0 !important; -} - /* Hide the stupid rounding masks on server icons */ :root foreignObject { mask: none !important; diff --git a/cgassets/tampermonkey-mzte/style.css.cgt b/cgassets/tampermonkey-mzte/style.css.cgt new file mode 100644 index 0000000..f8a1e21 --- /dev/null +++ b/cgassets/tampermonkey-mzte/style.css.cgt @@ -0,0 +1,4 @@ +:root * { + border-radius: 0 !important; + font-family: "<% opt.font %>", monospace !important; +} diff --git a/confgen.lua b/confgen.lua index 109fe4f..6ddf826 100644 --- a/confgen.lua +++ b/confgen.lua @@ -1,3 +1,5 @@ +cg.addPath "cgassets" + cg.addPath ".config" cg.addPath ".local" cg.addPath ".ssh" diff --git a/plugins/tampermonkey-mzte/assets/header.txt b/plugins/tampermonkey-mzte/assets/header.txt deleted file mode 100644 index bbd99f7..0000000 --- a/plugins/tampermonkey-mzte/assets/header.txt +++ /dev/null @@ -1,11 +0,0 @@ -// ==UserScript== -// @name MZTE -// @version 0.1.0 -// @description Random stuff -// @author LordMZTE -// @include * -// @run-at document-start -// @grant GM_registerMenuCommand -// @grant GM_getValue -// @grant GM_setValue -// ==/UserScript== diff --git a/plugins/tampermonkey-mzte/assets/site_styles/discord.com.css b/plugins/tampermonkey-mzte/assets/site_styles/discord.com.css deleted file mode 100644 index ed3508b..0000000 --- a/plugins/tampermonkey-mzte/assets/site_styles/discord.com.css +++ /dev/null @@ -1,4 +0,0 @@ -/* Hide the stupid rounding masks on server icons */ -:root foreignObject { - mask: none !important; -} diff --git a/plugins/tampermonkey-mzte/assets/style.css b/plugins/tampermonkey-mzte/assets/style.css deleted file mode 100644 index 4a302e8..0000000 --- a/plugins/tampermonkey-mzte/assets/style.css +++ /dev/null @@ -1,4 +0,0 @@ -:root * { - border-radius: 0 !important; - font-family: "Iosevka Nerd Font", monospace !important; -} diff --git a/plugins/tampermonkey-mzte/src/Macro.hx b/plugins/tampermonkey-mzte/src/Macro.hx index fbabf75..14c374f 100644 --- a/plugins/tampermonkey-mzte/src/Macro.hx +++ b/plugins/tampermonkey-mzte/src/Macro.hx @@ -7,23 +7,25 @@ import sys.io.File; using StringTools; +var assetRoot = "../../cgout/cgassets/tampermonkey-mzte"; + macro function init() { var oldHeader = Context.definedValue("source-header"); - var header = Std.string(File.read("assets/header.txt").readAll()); + var header = Std.string(File.read('$assetRoot/header.txt').readAll()); Compiler.define("source-header", '$header\n//$oldHeader'); return macro {}; } macro function fileContent(path:String):haxe.macro.Expr.ExprOf { - return macro $v{Std.string(File.read(path).readAll())}; + return macro $v{Std.string(File.read('$assetRoot/$path').readAll())}; } macro function siteStyles():haxe.macro.Expr.ExprOf> { var map:Array = []; - for (f in FileSystem.readDirectory("assets/site_styles")) { + for (f in FileSystem.readDirectory('$assetRoot/site_styles')) { if (f.endsWith(".css")) { - map.push(macro $v{f.substr(0, f.length - 4)} => Macro.fileContent($v{'assets/site_styles/$f'})); + map.push(macro $v{f.substr(0, f.length - 4)} => Macro.fileContent($v{'site_styles/$f'})); } } diff --git a/plugins/tampermonkey-mzte/src/Main.hx b/plugins/tampermonkey-mzte/src/Main.hx index 5df9f8b..fc6bd5d 100644 --- a/plugins/tampermonkey-mzte/src/Main.hx +++ b/plugins/tampermonkey-mzte/src/Main.hx @@ -1,13 +1,18 @@ +import actions.ClearCookiesAction; +import actions.ToggleStyleAction; +import actions.InfoAction; import js.Browser; +using Lambda; + function main() { var siteStyles = Macro.siteStyles(); var ownStyle = Browser.document.createStyleElement(); - ownStyle.innerHTML = Macro.fileContent("assets/own_style.css"); + ownStyle.innerHTML = Macro.fileContent("own_style.css"); var style = Browser.document.createStyleElement(); - style.innerHTML = Macro.fileContent("assets/style.css"); + style.innerHTML = Macro.fileContent("style.css"); Browser.document.addEventListener("DOMContentLoaded", () -> { Browser.document.body.appendChild(ownStyle); @@ -25,7 +30,9 @@ function main() { } }); - new actions.InfoAction().register(); - new actions.ToggleStyleAction(style).register(); - new actions.ClearCookiesAction().register(); + [ + new InfoAction(), + new ToggleStyleAction(style), + new ClearCookiesAction(), + ].iter(a -> a.register()); }