Hide download button on blocked files

This commit is contained in:
2021-11-02 09:34:02 +01:00
parent 06891d5d10
commit 43b86b6ca5
2 changed files with 23 additions and 13 deletions

View File

@@ -18,7 +18,6 @@ import Sharebar from "./Sharebar.svelte";
let is_list = false
let embedded = false
let view_token = ""
let file_preview
let current_file = {
id: "",
name: "loading...",
@@ -345,6 +344,7 @@ const keyboard_event = evt => {
<FileStats file={current_file}></FileStats>
<hr/>
{#if current_file.abuse_type === ""}
<button on:click={download} class="toolbar_button button_full_width">
<i class="icon">save</i>
<span>Download</span>
@@ -355,6 +355,7 @@ const keyboard_event = evt => {
<span>DL all files</span>
</button>
{/if}
{/if}
<button on:click={copy_url}
class="toolbar_button button_full_width"
class:button_highlight={copy_url_status === "copied"}
@@ -426,7 +427,6 @@ const keyboard_event = evt => {
<div id="file_preview" class="file_preview checkers" class:toolbar_visible class:skyscraper_visible>
<FilePreview
file={current_file}
bind:this={file_preview}
on:download={download}
on:prev={() => { if (list_navigator) { list_navigator.prev() }}}
on:next={() => { if (list_navigator) { list_navigator.next() }}}>
@@ -443,11 +443,11 @@ const keyboard_event = evt => {
{#if current_file.show_ads && window.viewer_data.user_ads_enabled}
<AdLeaderboard></AdLeaderboard>
{:else if !window.viewer_data.user_ads_enabled}
{:else if !window.viewer_data.user_ads_enabled && !embedded}
<div style="text-align: center; line-height: 1.3em; font-size: 13px;">
Thank you for supporting pixeldrain!
</div>
{:else if !current_file.show_ads}
{:else if !current_file.show_ads && !embedded}
<div style="text-align: center; line-height: 1.3em; font-size: 13px;">
The uploader of this file disabled advertisements. You can do the same for <a href="/#pro">only €2 per month</a>!
</div>

View File

@@ -93,7 +93,12 @@ func (wc *WebController) serveSvelteFile(w http.ResponseWriter, r *http.Request,
}
}
err = wc.templates.Get().ExecuteTemplate(w, "file_viewer_svelte", templateData)
var templateName = "file_viewer_svelte"
if browserCompat(r.UserAgent()) {
templateName = "file_viewer_compat"
}
err = wc.templates.Get().ExecuteTemplate(w, templateName, templateData)
if err != nil && !strings.Contains(err.Error(), "broken pipe") {
log.Error("Error executing template file_viewer: %s", err)
}
@@ -148,7 +153,12 @@ func (wc *WebController) serveSvelteList(w http.ResponseWriter, r *http.Request,
}
}
err = wc.templates.Get().ExecuteTemplate(w, "file_viewer_svelte", templateData)
var templateName = "file_viewer_svelte"
if browserCompat(r.UserAgent()) {
templateName = "file_viewer_compat"
}
err = wc.templates.Get().ExecuteTemplate(w, templateName, templateData)
if err != nil && !strings.Contains(err.Error(), "broken pipe") {
log.Error("Error executing template file_viewer: %s", err)
}