cswimr/Vencord
1
0
Fork 0
forked from CoastalCommitsArchival/github.com-Vendicated-Vencord
Code Pull requests Packages 1 Wiki Activity

[skip ci] Update Monaco; Fix code scanning errors

Browse source
This commit is contained in:
Vendicated 2023-04-29 04:16:28 +02:00
parent a2e03084b0
commit bf795c49df
No known key found for this signature in database
GPG key ID: A1DC0CFB5615D905
4 changed files with 63 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser/background.js
View file

@ -16,7 +16,7 @@ chrome.webRequest.onHeadersReceived.addListener(
// In main frame requests, the CSP needs to be removed to enable fetching of custom css // In main frame requests, the CSP needs to be removed to enable fetching of custom css
// as desired by the user // as desired by the user
removeFirst(responseHeaders, h => h.name.toLowerCase() === "content-security-policy"); removeFirst(responseHeaders, h => h.name.toLowerCase() === "content-security-policy");
} else if (type === "stylesheet" && url.startsWith("https://raw.githubusercontent.com")) { } else if (type === "stylesheet" && url.startsWith("https://raw.githubusercontent.com/")) {
// Most users will load css from GitHub, but GitHub doesn't set the correct content type, // Most users will load css from GitHub, but GitHub doesn't set the correct content type,
// so we fix it here // so we fix it here
removeFirst(responseHeaders, h => h.name.toLowerCase() === "content-type"); removeFirst(responseHeaders, h => h.name.toLowerCase() === "content-type");

46
src/components/monacoWin.html
View file

@ -1,11 +1,15 @@
<!doctype html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<title>Vencord QuickCSS Editor</title> <title>Vencord QuickCSS Editor</title>
<link rel="stylesheet" data-name="vs/editor/editor.main" <link
href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.min.css"> rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/editor/editor.main.min.css"
integrity="sha512-wB3xfL98hWg1bpkVYSyL0js/Jx9s7FsDg9aYO6nOMSJTgPuk/PFqxXQJKKSUjteZjeYrfgo9NFBOA1r9HwDuZw=="
crossorigin="anonymous"
referrerpolicy="no-referrer"
/>
<style> <style>
html, html,
body, body,
@ -24,17 +28,30 @@
<body> <body>
<div id="container"></div> <div id="container"></div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/loader.min.js"></script> <script
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs/loader.min.js"
integrity="sha512-A+6SvPGkIN9Rf0mUXmW4xh7rDvALXf/f0VtOUiHlDUSPknu2kcfz1KzLpOJyL2pO+nZS13hhIjLqVgiQExLJrw=="
crossorigin="anonymous"
referrerpolicy="no-referrer"
></script>
<script> <script>
require.config({ paths: { 'vs': 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs' } }); require.config({
require(["vs/editor/editor.main"], () => { paths: {
getCurrentCss().then(css => { vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.37.1/min/vs",
var editor = monaco.editor.create(document.getElementById('container'), { },
value: css,
language: 'css',
theme: getTheme(),
}); });
require(["vs/editor/editor.main"], () => {
getCurrentCss().then((css) => {
var editor = monaco.editor.create(
document.getElementById("container"),
{
value: css,
language: "css",
theme: getTheme(),
}
);
editor.onDidChangeModelContent(() => editor.onDidChangeModelContent(() =>
setCss(editor.getValue()) setCss(editor.getValue())
); );
@ -44,9 +61,6 @@
}); });
}); });
}); });
</script> </script>
</body> </body>
</html> </html>

2
src/plugins/messageLinkEmbeds.tsx
View file

@ -51,7 +51,7 @@ const SearchResultClasses = findByPropsLazy("message", "searchResult");
let AutoModEmbed: React.ComponentType<any> = () => null; let AutoModEmbed: React.ComponentType<any> = () => null;
const messageLinkRegex = /(?<!<)https?:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/(\d{17,20}|@me)\/(\d{17,20})\/(\d{17,20})/g; const messageLinkRegex = /(?<!<)https?:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/(\d{17,20}|@me)\/(\d{17,20})\/(\d{17,20})/g;
const tenorRegex = /https:\/\/(?:www.)?tenor\.com/; const tenorRegex = /^https:\/\/(?:www\.)?tenor\.com\//;
interface Attachment { interface Attachment {
height: number; height: number;

2
src/utils/types.ts
View file

@ -108,6 +108,8 @@ export interface PluginDef {
flux?: { flux?: {
[E in FluxEvents]?: (event: any) => void; [E in FluxEvents]?: (event: any) => void;
}; };
tags?: string[];
} }
export enum OptionType { export enum OptionType {