From 3b18934d27a4037d99f054078f900b5d323d81d0 Mon Sep 17 00:00:00 2001
From: Fornax <wim@fornaxian.tech>
Date: Mon, 30 Jan 2023 11:09:16 +0100
Subject: [PATCH] Fix download limit trigger

---
 svelte/src/file_viewer/DownloadLimitStore.js      | 7 +++++--
 svelte/src/file_viewer/viewers/FilePreview.svelte | 6 +++---
 svelte/src/user_home/Transactions.svelte          | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/svelte/src/file_viewer/DownloadLimitStore.js b/svelte/src/file_viewer/DownloadLimitStore.js
index 4570efd..79615b6 100644
--- a/svelte/src/file_viewer/DownloadLimitStore.js
+++ b/svelte/src/file_viewer/DownloadLimitStore.js
@@ -42,8 +42,11 @@ const loop = async () => {
 
 	// If the usage has not changed we increase the timeout with one second. If
 	// it did change we halve the timeout
-	if (new_limits.transfer_limit_used === limits.transfer_limit_used) {
-		timeout_ms += 1000
+	if (
+		new_limits.transfer_limit_used === limits.transfer_limit_used &&
+		new_limits.transfer_limit === limits.transfer_limit
+	) {
+		timeout_ms += 2000
 		if (timeout_ms > 60000) {
 			timeout_ms = 60000
 		}
diff --git a/svelte/src/file_viewer/viewers/FilePreview.svelte b/svelte/src/file_viewer/viewers/FilePreview.svelte
index 8e19cf6..35c1c38 100644
--- a/svelte/src/file_viewer/viewers/FilePreview.svelte
+++ b/svelte/src/file_viewer/viewers/FilePreview.svelte
@@ -19,6 +19,7 @@ let viewer
 let viewer_type = "loading"
 export let is_list = false
 let current_file
+let premium_download = false
 
 export const set_file = async file => {
 	if (file.id === "") {
@@ -31,14 +32,13 @@ export const set_file = async file => {
 		file.availability === "ip_download_limited_captcha_required"
 	) {
 		viewer_type = "rate_limit"
-	} else if (file.download_speed_limit > 0 && file.download_speed_limit <= 1<<20) {
-		viewer_type = "speed_limit"
 	} else {
 		viewer_type = file_type(file)
 	}
 
 	console.log("opening file", file)
 	current_file = file
+	premium_download = !file.show_ads
 
 	// Render the viewer component and set the file type
 	await tick()
@@ -48,7 +48,7 @@ export const set_file = async file => {
 }
 </script>
 
-{#if $download_limits.transfer_limit_used > $download_limits.transfer_limit}
+{#if !premium_download && $download_limits.transfer_limit_used > $download_limits.transfer_limit}
 	<SpeedLimit file={current_file} on:download></SpeedLimit>
 {:else if viewer_type === "loading"}
 	<div class="center">
diff --git a/svelte/src/user_home/Transactions.svelte b/svelte/src/user_home/Transactions.svelte
index 958a2a3..15de7fc 100644
--- a/svelte/src/user_home/Transactions.svelte
+++ b/svelte/src/user_home/Transactions.svelte
@@ -94,7 +94,7 @@ onMount(() => {
 	<p>
 		Here is a log of all transactions on your account balance. Usage is
 		calculated per day. The storage charge is divided by the average number
-		of months in a day (30.4375).
+		of days in a month (30.4375).
 	</p>
 	<p>
 		Example: If you have 2 TB stored on your pixeldrain account at €4 per TB