mirror of https://github.com/VERT-sh/VERT.git
feat: remove all external stuff (stripe, plausible, video) when PUB_DISABLE_ALL_EXTERNAL_REQUESTS is on
This commit is contained in:
parent
c5d349b6ed
commit
a92a551aab
|
|
@ -1,4 +1,4 @@
|
|||
import { PUB_ENV } from "$env/static/public";
|
||||
import { PUB_DISABLE_ALL_EXTERNAL_REQUESTS, PUB_ENV } from "$env/static/public";
|
||||
|
||||
export const GITHUB_URL_VERT = "https://github.com/VERT-sh/VERT";
|
||||
export const GITHUB_URL_VERTD = "https://github.com/VERT-sh/vertd";
|
||||
|
|
@ -11,3 +11,6 @@ export const VERT_NAME =
|
|||
? "VERT Nightly"
|
||||
: "VERT.sh";
|
||||
export const CONTACT_EMAIL = "hello@vert.sh";
|
||||
|
||||
export const DISABLE_ALL_EXTERNAL_REQUESTS =
|
||||
PUB_DISABLE_ALL_EXTERNAL_REQUESTS === "true";
|
||||
|
|
|
|||
|
|
@ -4,13 +4,7 @@ import { FFmpegConverter } from "./ffmpeg.svelte";
|
|||
import { PandocConverter } from "./pandoc.svelte";
|
||||
import { VertdConverter } from "./vertd.svelte";
|
||||
import { MagickConverter } from "./magick.svelte";
|
||||
|
||||
// export const converters = [
|
||||
// new MagickConverter(),
|
||||
// new FFmpegConverter(),
|
||||
// new VertdConverter(),
|
||||
// new PandocConverter(),
|
||||
// ];
|
||||
import { DISABLE_ALL_EXTERNAL_REQUESTS } from "$lib/consts";
|
||||
|
||||
const getConverters = (): Converter[] => {
|
||||
const converters: Converter[] = [
|
||||
|
|
@ -18,7 +12,7 @@ const getConverters = (): Converter[] => {
|
|||
new FFmpegConverter(),
|
||||
];
|
||||
|
||||
if (PUB_DISABLE_ALL_EXTERNAL_REQUESTS !== "true") {
|
||||
if (!DISABLE_ALL_EXTERNAL_REQUESTS) {
|
||||
converters.push(new VertdConverter());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
<script lang="ts">
|
||||
import Panel from "$lib/components/visual/Panel.svelte";
|
||||
import { HeartHandshakeIcon } from "lucide-svelte";
|
||||
import { GITHUB_URL_VERT } from "$lib/consts";
|
||||
import {
|
||||
DISABLE_ALL_EXTERNAL_REQUESTS,
|
||||
GITHUB_URL_VERT,
|
||||
} from "$lib/consts";
|
||||
import { m } from "$lib/paraglide/messages";
|
||||
import { link } from "$lib/store/index.svelte";
|
||||
|
||||
|
|
@ -90,6 +93,7 @@
|
|||
</div>
|
||||
|
||||
<!-- GitHub contributors -->
|
||||
{#if !DISABLE_ALL_EXTERNAL_REQUESTS}
|
||||
<div class="flex flex-col gap-4">
|
||||
<div class="flex flex-col gap-1">
|
||||
<h2 class="text-base font-bold">
|
||||
|
|
@ -133,5 +137,6 @@
|
|||
{m["about.credits.libraries_description"]()}
|
||||
</p>
|
||||
</div>
|
||||
{/if}
|
||||
</div></Panel
|
||||
>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
import { goto, beforeNavigate, afterNavigate } from "$app/navigation";
|
||||
|
||||
import { PUB_PLAUSIBLE_URL, PUB_HOSTNAME } from "$env/static/public";
|
||||
import { VERT_NAME } from "$lib/consts";
|
||||
import { DISABLE_ALL_EXTERNAL_REQUESTS, VERT_NAME } from "$lib/consts";
|
||||
import * as Layout from "$lib/components/layout";
|
||||
import * as Navbar from "$lib/components/layout/Navbar";
|
||||
import featuredImage from "$lib/assets/VERT_Feature.webp";
|
||||
|
|
@ -94,12 +94,14 @@
|
|||
|
||||
Settings.instance.load();
|
||||
|
||||
if (!DISABLE_ALL_EXTERNAL_REQUESTS) {
|
||||
VertdInstance.instance
|
||||
.url()
|
||||
.then((u) => fetch(`${u}/api/version`))
|
||||
.then((res) => {
|
||||
if (res.ok) $vertdLoaded = true;
|
||||
});
|
||||
}
|
||||
|
||||
return () => {
|
||||
window.removeEventListener("paste", handlePaste);
|
||||
|
|
@ -109,7 +111,9 @@
|
|||
|
||||
$effect(() => {
|
||||
enablePlausible =
|
||||
!!PUB_PLAUSIBLE_URL && Settings.instance.settings.plausible;
|
||||
!!PUB_PLAUSIBLE_URL &&
|
||||
Settings.instance.settings.plausible &&
|
||||
!DISABLE_ALL_EXTERNAL_REQUESTS;
|
||||
if (!enablePlausible && browser) {
|
||||
// reset pushState on opt-out so that plausible stops firing events on page navigation
|
||||
history.pushState = History.prototype.pushState;
|
||||
|
|
@ -128,7 +132,7 @@
|
|||
name="description"
|
||||
content="With VERT you can quickly convert any image, video and audio file. No ads, no tracking, open source, and all processing (other than video) is done on your device."
|
||||
/>
|
||||
<meta property="og:url" content="https://vert.sh">
|
||||
<meta property="og:url" content="https://vert.sh" />
|
||||
<meta property="og:type" content="website" />
|
||||
<meta
|
||||
property="og:title"
|
||||
|
|
@ -139,9 +143,9 @@
|
|||
content="With VERT you can quickly convert any image, video and audio file. No ads, no tracking, open source, and all processing (other than video) is done on your device."
|
||||
/>
|
||||
<meta property="og:image" content={featuredImage} />
|
||||
<meta name="twitter:card" content="summary_large_image">
|
||||
<meta property="twitter:domain" content="vert.sh">
|
||||
<meta property="twitter:url" content="https://vert.sh">
|
||||
<meta name="twitter:card" content="summary_large_image" />
|
||||
<meta property="twitter:domain" content="vert.sh" />
|
||||
<meta property="twitter:url" content="https://vert.sh" />
|
||||
<meta
|
||||
property="twitter:title"
|
||||
content="{VERT_NAME} — Free, fast, and awesome file converter"
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
import "overlayscrollbars/overlayscrollbars.css";
|
||||
import { onMount } from "svelte";
|
||||
import type { WorkerStatus } from "$lib/converters/converter.svelte";
|
||||
import { DISABLE_ALL_EXTERNAL_REQUESTS } from "$lib/consts";
|
||||
|
||||
const getSupportedFormats = (name: string) =>
|
||||
converters
|
||||
|
|
@ -28,7 +29,15 @@
|
|||
title: string;
|
||||
status: WorkerStatus;
|
||||
};
|
||||
} = $derived({
|
||||
} = $derived.by(() => {
|
||||
const output: {
|
||||
[key: string]: {
|
||||
formats: string;
|
||||
icon: typeof Image;
|
||||
title: string;
|
||||
status: WorkerStatus;
|
||||
};
|
||||
} = {
|
||||
Images: {
|
||||
formats: getSupportedFormats("imagemagick"),
|
||||
icon: Image,
|
||||
|
|
@ -53,12 +62,18 @@
|
|||
converters.find((c) => c.name === "pandoc")?.status ||
|
||||
"not-ready",
|
||||
},
|
||||
Video: {
|
||||
};
|
||||
|
||||
if (!DISABLE_ALL_EXTERNAL_REQUESTS) {
|
||||
output.Video = {
|
||||
formats: getSupportedFormats("vertd"),
|
||||
icon: Film,
|
||||
title: m["upload.cards.video"](),
|
||||
status: $vertdLoaded === true ? "ready" : "not-ready", // not using converter.status for this
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
return output;
|
||||
});
|
||||
|
||||
const getTooltip = (format: string) => {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
import avatarJovannMC from "$lib/assets/avatars/jovannmc.jpg";
|
||||
import avatarRealmy from "$lib/assets/avatars/realmy.jpg";
|
||||
import avatarAzurejelly from "$lib/assets/avatars/azurejelly.jpg";
|
||||
import { GITHUB_API_URL } from "$lib/consts";
|
||||
import { DISABLE_ALL_EXTERNAL_REQUESTS, GITHUB_API_URL } from "$lib/consts";
|
||||
import { dev } from "$app/environment";
|
||||
import { page } from "$app/state";
|
||||
import { m } from "$lib/paraglide/messages";
|
||||
|
|
@ -70,6 +70,10 @@
|
|||
let ghContribs: Contributor[] = [];
|
||||
|
||||
onMount(async () => {
|
||||
if (DISABLE_ALL_EXTERNAL_REQUESTS) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if the data is already in sessionStorage
|
||||
const cachedContribs = sessionStorage.getItem("ghContribs");
|
||||
if (cachedContribs) {
|
||||
|
|
@ -134,7 +138,9 @@
|
|||
}
|
||||
});
|
||||
|
||||
const donationsEnabled = dev || page.url.origin.endsWith("//vert.sh");
|
||||
const donationsEnabled =
|
||||
(dev || page.url.origin.endsWith("//vert.sh")) &&
|
||||
!DISABLE_ALL_EXTERNAL_REQUESTS;
|
||||
</script>
|
||||
|
||||
<div class="flex flex-col h-full items-center">
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
import { onMount } from "svelte";
|
||||
import { m } from "$lib/paraglide/messages";
|
||||
import { ToastManager } from "$lib/toast/index.svelte";
|
||||
import { DISABLE_ALL_EXTERNAL_REQUESTS } from "$lib/consts";
|
||||
|
||||
let settings = $state(Settings.Settings.instance.settings);
|
||||
|
||||
|
|
@ -63,12 +64,14 @@
|
|||
>
|
||||
<div class="flex flex-col gap-4 flex-1">
|
||||
<Settings.Conversion bind:settings />
|
||||
{#if !DISABLE_ALL_EXTERNAL_REQUESTS}
|
||||
<Settings.Vertd bind:settings />
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col gap-4 flex-1">
|
||||
<Settings.Appearance />
|
||||
{#if PUB_PLAUSIBLE_URL}
|
||||
{#if PUB_PLAUSIBLE_URL && !DISABLE_ALL_EXTERNAL_REQUESTS}
|
||||
<Settings.Privacy bind:settings />
|
||||
{/if}
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue