From 8dfadf1167a9aa4f12aa8dcc99f8351297335848 Mon Sep 17 00:00:00 2001 From: Fornax Date: Wed, 11 Jan 2023 19:23:02 +0100 Subject: [PATCH] Temporarily disable ads, add text to download bar --- svelte/src/file_viewer/AdLeaderboard.svelte | 44 +++---- svelte/src/file_viewer/FileViewer.svelte | 4 +- svelte/src/file_viewer/TransferLimit.svelte | 40 +++++- svelte/src/file_viewer/UkraineModal.svelte | 135 -------------------- svelte/src/file_viewer/UkrainePopup.svelte | 45 ------- svelte/src/file_viewer/viewers/Abuse.svelte | 4 + svelte/src/file_viewer/viewers/Video.svelte | 16 ++- svelte/src/home_page/FeatureTable.svelte | 22 ++-- svelte/src/home_page/UploadWidget.svelte | 15 +-- 9 files changed, 92 insertions(+), 233 deletions(-) delete mode 100644 svelte/src/file_viewer/UkraineModal.svelte delete mode 100644 svelte/src/file_viewer/UkrainePopup.svelte diff --git a/svelte/src/file_viewer/AdLeaderboard.svelte b/svelte/src/file_viewer/AdLeaderboard.svelte index 324665d..384b0ca 100644 --- a/svelte/src/file_viewer/AdLeaderboard.svelte +++ b/svelte/src/file_viewer/AdLeaderboard.svelte @@ -15,13 +15,13 @@ onMount(() => { } // 10% pixeldrain socials - // 90% pixfuture + // 90% patreon let rand = Math.random() if (rand < 0.1) { set_ad_type("pixeldrain_social") } else { - set_ad_type("pixfuture") + set_ad_type("pixeldrain_patreon") } }) @@ -96,31 +96,7 @@ head.valueimpression_loaded.subscribe(v => {
- {#if ad_type === "publisherrest_1"} -
- - shopping_cart - Click here for online shopping discounts! - shopping_cart - -
- {:else if ad_type === "publisherrest_2"} -
- - shopping_cart - Check our online shopping discounts! - shopping_cart - -
- {:else if ad_type === "publisherrest_3"} -
- - shopping_cart - Free coupon codes for online shopping! - shopping_cart - -
- {:else if ad_type === "aads"} + {#if ad_type === "aads"} -
- - {#if language === "EN"} -
- - play_circle - Watch on YouTube - - - play_circle - Watch on Pixeldrain - -
-
-

- An independent news agency asked me to show this video to my - Russian visitors. The goal is to prevent the spread of - misinformation. Russian news agencies are spreading propaganda, - they cannot be trusted. -

-

- Ukraine is not governed by nazis. The Ukrainian parliament and - president were democratically elected. It is a peaceful nation. -

-

- The Russian army is bombing cities and committing genocide - across the country. Thousands of civilians have been brutally - murdered. This has to stop as soon as possible. -

-
- {:else if language === "RU"} -
- - play_circle - Π‘ΠΌΠΎΡ‚Ρ€Π΅Ρ‚ΡŒ Π½Π° YouTube - - - play_circle - Π‘ΠΌΠΎΡ‚Ρ€Π΅Ρ‚ΡŒ Π½Π° Pixeldrain - -
-
-

- НСзависимоС ΠΈΠ½Ρ„ΠΎΡ€ΠΌΠ°Ρ†ΠΈΠΎΠ½Π½ΠΎΠ΅ агСнтство попросило мСня ΠΏΠΎΠΊΠ°Π·Π°Ρ‚ΡŒ это - Π²ΠΈΠ΄Π΅ΠΎ ΠΌΠΎΠΈΠΌ российским посСтитСлям. ЦСль состоит Π² Ρ‚ΠΎΠΌ, Ρ‡Ρ‚ΠΎΠ±Ρ‹ - ΠΏΡ€Π΅Π΄ΠΎΡ‚Π²Ρ€Π°Ρ‚ΠΈΡ‚ΡŒ распространСниС Π΄Π΅Π·ΠΈΠ½Ρ„ΠΎΡ€ΠΌΠ°Ρ†ΠΈΠΈ. РоссийскиС - ΠΈΠ½Ρ„ΠΎΡ€ΠΌΠ°Ρ†ΠΈΠΎΠ½Π½Ρ‹Π΅ агСнтства Ρ€Π°ΡΠΏΡ€ΠΎΡΡ‚Ρ€Π°Π½ΡΡŽΡ‚ ΠΏΡ€ΠΎΠΏΠ°Π³Π°Π½Π΄Ρƒ, ΠΈΠΌ нСльзя - Π΄ΠΎΠ²Π΅Ρ€ΡΡ‚ΡŒ. -

-

- Π£ΠΊΡ€Π°ΠΈΠ½Π° Π½Π΅ управляСтся нацистами. Украинский ΠΏΠ°Ρ€Π»Π°ΠΌΠ΅Π½Ρ‚ ΠΈ - ΠΏΡ€Π΅Π·ΠΈΠ΄Π΅Π½Ρ‚ Π±Ρ‹Π»ΠΈ ΠΈΠ·Π±Ρ€Π°Π½Ρ‹ дСмократичСским ΠΏΡƒΡ‚Π΅ΠΌ. Π­Ρ‚ΠΎ ΠΌΠΈΡ€ΠΎΠ»ΡŽΠ±ΠΈΠ²Π°Ρ - нация. -

-

- Российская армия Π±ΠΎΠΌΠ±ΠΈΡ‚ Π³ΠΎΡ€ΠΎΠ΄Π° ΠΈ ΡΠΎΠ²Π΅Ρ€ΡˆΠ°Π΅Ρ‚ Π³Π΅Π½ΠΎΡ†ΠΈΠ΄ Ρ‡Π΅Ρ€Π΅Π· всю - страну. Высячи ΠΌΠΈΡ€Π½Ρ‹Ρ… ΠΆΠΈΡ‚Π΅Π»Π΅ΠΉ Π±Ρ‹Π»ΠΈ звСрски ΡƒΠ±ΠΈΡ‚Ρ‹. Π­Ρ‚ΠΎ Π΄ΠΎΠ»ΠΆΠ½ΠΎ - ΠΏΡ€Π΅ΠΊΡ€Π°Ρ‚ΠΈΡ‚ΡŒΡΡ ΠΊΠ°ΠΊ ΠΌΠΎΠΆΠ½ΠΎ скорСС. -

-
- {/if} - - - - - - diff --git a/svelte/src/file_viewer/UkrainePopup.svelte b/svelte/src/file_viewer/UkrainePopup.svelte deleted file mode 100644 index 5373661..0000000 --- a/svelte/src/file_viewer/UkrainePopup.svelte +++ /dev/null @@ -1,45 +0,0 @@ - - -{#if visible} -
-
- πŸ‡ΊπŸ‡¦ Russia has invaded Ukraine and is attacking civilians! πŸ‡ΊπŸ‡¦
- There are a number of ways you can help: - Click here for more information. -
- -
-{/if} - - diff --git a/svelte/src/file_viewer/viewers/Abuse.svelte b/svelte/src/file_viewer/viewers/Abuse.svelte index 6758e16..c57f42c 100644 --- a/svelte/src/file_viewer/viewers/Abuse.svelte +++ b/svelte/src/file_viewer/viewers/Abuse.svelte @@ -24,6 +24,10 @@ let file = { The file was reported by users of pixeldrain with the report button in the toolbar. + {:else} + + The file was reported through pixeldrain's abuse e-mail address. + {/if}

diff --git a/svelte/src/file_viewer/viewers/Video.svelte b/svelte/src/file_viewer/viewers/Video.svelte index 60bc2f1..7f38a65 100644 --- a/svelte/src/file_viewer/viewers/Video.svelte +++ b/svelte/src/file_viewer/viewers/Video.svelte @@ -94,6 +94,15 @@ const fullscreen = () => { {#if file.allow_video_player} {#if !video_reload}

+ + {#if file.mime_type === "video/x-matroska" || file.mime_type === "video/quicktime"} +
+ This video file type is not compatible with every web + browser. If the video fails to play you can try downloading + the video and watching it locally. +
+ {/if} +
- 20 GB data transfer per week (168 hours). When this threshold is reached - your download speed will be reduced + 20 GB data transfer per week + (168 hours). When this threshold is reached your download speed will + be reduced
- Transfer limit of 2 terabyte per - month. If the transfer limit is exceeded the restrictions of the + Transfer limit of 2 terabytes + per month. If the transfer limit is exceeded the restrictions of the free plan will apply
@@ -84,9 +85,9 @@ onMount(() => {
Adver­tise­ments
-
+
No ads on files you share. No ads when viewing files uploaded by @@ -95,14 +96,13 @@ onMount(() => {
Privacy
-
+
- Completely - private. No third party scripts and no - logging + Completely private. No third + party tracking scripts and no logging
diff --git a/svelte/src/home_page/UploadWidget.svelte b/svelte/src/home_page/UploadWidget.svelte index 8e32f2d..f771a0f 100644 --- a/svelte/src/home_page/UploadWidget.svelte +++ b/svelte/src/home_page/UploadWidget.svelte @@ -465,16 +465,15 @@ const keydown = (e) => { Support me on Patreon!

- Pixeldrain is struggling to get by financially. Because anyone - can upload anything it's hard to find reputable advertisers who - want to advertise on pixeldrain. Every month the ad revenue just - barely covers the bandwidth costs. If this continues I will have - to reduce the file size and bandwidth limits even more. That's - not something I would like to do. + Pixeldrain costs a lot of money to maintain. Currently the site + makes just barely enough money to pay for hosting. I have never been + able to compensate myself for the hours I have put in developing + this project. Please consider getting getting a subscription so I + can continue working on pixeldrain and make it even better.

- Pro costs only €40 per year or €4 per month. You will get - some nice benefits and more features are on the way. You can + Pro costs only €40 per year or €4 per month. You will + get some nice benefits and more features are on the way. You can help with making pixeldrain the easiest and fastest way to share files online!