-
+
+
{{else if eq .Other.AdBannerType 4}}
diff --git a/res/template/file_viewer.html b/res/template/file_viewer.html
index 5d6b253..dc98902 100644
--- a/res/template/file_viewer.html
+++ b/res/template/file_viewer.html
@@ -26,6 +26,8 @@
{{ template `viewer.css` }}
{{ template `modal.css` }}
+
+ {{ template `ad_headers` . }}
diff --git a/res/template/file_viewer_svelte.html b/res/template/file_viewer_svelte.html
index 5f0f280..4b8fc65 100644
--- a/res/template/file_viewer_svelte.html
+++ b/res/template/file_viewer_svelte.html
@@ -8,6 +8,7 @@
{{ template "opengraph" .OGData }}
{{ template "user_style" . }}
+ {{ template "user_style_js" . }}
@@ -23,7 +24,7 @@
diff --git a/svelte/src/file_viewer.js b/svelte/src/file_viewer.js
new file mode 100644
index 0000000..e6e97d0
--- /dev/null
+++ b/svelte/src/file_viewer.js
@@ -0,0 +1,8 @@
+import App from './file_viewer/FileViewer.svelte';
+
+const app = new App({
+ target: document.getElementById("body"),
+ props: {}
+});
+
+export default app;
diff --git a/svelte/src/file_viewer/DetailsWindow.svelte b/svelte/src/file_viewer/DetailsWindow.svelte
new file mode 100644
index 0000000..e0e3064
--- /dev/null
+++ b/svelte/src/file_viewer/DetailsWindow.svelte
@@ -0,0 +1,134 @@
+
+
+| Name | +{file.name} | +
| URL | +{domain_url()}/u/{file.id} | +
| Mime Type | +{file.mime_type} | +
| ID | +{file.id} | +
| Size | +{formatDataVolume(file.size, 4)} ( {formatThousands(file.size)} B ) | +
| Bandwidth | +{formatDataVolume(file.bandwidth_used, 4)} ( {formatThousands(file.bandwidth_used)} B ) | +
| Unique downloads | +{formatThousands(file.downloads)} | +
| + The unique download counter only counts downloads once per IP + address. So this number shows how many individual people have + attempted to download the file. The download counter on the + toolbar on the other hand shows how many real downloads the file + has had. Real downloads are counted by dividing the total + bandwidth usage by the size of the file. + | +|
| Upload Date | +{formatDate(file.date_upload, true, true, true)} | +
| Description | +{file.description} | +
Downloads
+Views
++ Charts rendered by the amazing Chart.js. +
+ +About
+ Pixeldrain is a file sharing platform. + Visit the home page for more information. + +Keyboard Controls
+| File Shortcuts | |
| c | = Copy URL of this page |
| i | = Toggle details window (this window) (info) |
| s | = Download the file you are currently viewing (save) |
| q | = Close the window (quit) |
| List Shortcuts | |
| a or ← | = View previous item in list |
| d or → | = View next item in list |
| r | = Toggle shuffle (random) |
| SHIFT + s | = Download all the files in the list as a zip archive |
Unavailable for legal reasons
++ This file has received an abuse report and was taken down. +
++ Type of abuse: {file.abuse_type}. Reporter: {file.abuse_reporter_name}. +
++ + {#if !audio_reload} + + + {/if} +
You are viewing a file on pixeldrain
++ Type: {file.mime_type}
+ No preview is available for this file type. Download to view it locally. +
+ +
+ Loading... ++ {:else if text_type === "code"} +
+ Loading... ++ {/if} +
This is a video file on pixeldrain
++ + upgrade Upgrade to Pro + + +
In the file manager you can see the files you have uploaded and the diff --git a/svelte/src/util/Chart.svelte b/svelte/src/util/Chart.svelte index dcc8b6b..8d69d98 100644 --- a/svelte/src/util/Chart.svelte +++ b/svelte/src/util/Chart.svelte @@ -35,7 +35,7 @@ onMount(() => { datasets: [ { label: label, - backgroundColor: window.highlight_color, + backgroundColor: "#"+window.style.highlightColor, borderWidth: 0, lineTension: 0, fill: true, diff --git a/svelte/src/util/Modal.svelte b/svelte/src/util/Modal.svelte index f99382d..4043840 100644 --- a/svelte/src/util/Modal.svelte +++ b/svelte/src/util/Modal.svelte @@ -22,19 +22,18 @@ const load_modal = modal => { } const dispatch = createEventDispatcher(); -export const show = () => { visible = true; dispatch("shown"); } -export const hide = () => { visible = false; dispatch("hidden"); } -export const toggle = () => { - if (visible) { - hide() - } else { - show() - } + +export const show = () => { set_visible(true) } +export const hide = () => { set_visible(false) } +export const toggle = () => { set_visible(!visible) } +export const set_visible = vis => { + visible = vis + dispatch("is_visible", visible) } const keydown = e => { if (e.key === 'Escape') { - hide(); + set_visible(false); return; } }; diff --git a/svelte/src/util/PixeldrainLogo.svelte b/svelte/src/util/PixeldrainLogo.svelte index cb2d9d9..11a5909 100644 --- a/svelte/src/util/PixeldrainLogo.svelte +++ b/svelte/src/util/PixeldrainLogo.svelte @@ -7,7 +7,6 @@ diff --git a/webcontroller/file_viewer.go b/webcontroller/file_viewer.go index 57641d5..9851d74 100644 --- a/webcontroller/file_viewer.go +++ b/webcontroller/file_viewer.go @@ -56,7 +56,7 @@ func (vd *viewerData) adType(files []pixelapi.ListFile) { none = 0 aAds = 1 patreon = 2 - soulStudio = 3 + adshares = 3 amarulaSolutions = 4 adMaven = 5 adSterra = 6 @@ -76,6 +76,8 @@ func (vd *viewerData) adType(files []pixelapi.ListFile) { // Skyscrapers aAdsSkyscraper = "a-ads" pixfutureSkyscraper = "pixfuture" + adsPlusSkyscraper = "adsplus" + adsharesSkyscraper = "adshares" // Floaters // propellerFloat = 1 @@ -108,10 +110,10 @@ func (vd *viewerData) adType(files []pixelapi.ListFile) { panic(fmt.Errorf("random number generator returned unrecognised number: %d", i)) } - switch i := rand.Intn(4); i { + switch i := rand.Intn(2); i { case 0: vd.AdSkyscraperType = aAdsSkyscraper - case 1, 2, 3: + case 1: vd.AdSkyscraperType = pixfutureSkyscraper default: panic(fmt.Errorf("random number generator returned unrecognised number: %d", i)) diff --git a/webcontroller/file_viewer_svelte.go b/webcontroller/file_viewer_svelte.go new file mode 100644 index 0000000..a2e765e --- /dev/null +++ b/webcontroller/file_viewer_svelte.go @@ -0,0 +1,156 @@ +package webcontroller + +import ( + "fmt" + "net/http" + "strings" + "time" + + "fornaxian.tech/pixeldrain_api_client/pixelapi" + "github.com/Fornaxian/log" + "github.com/julienschmidt/httprouter" +) + +type fileViewerData struct { + Type string `json:"type"` // file or list + APIResponse interface{} `json:"api_response"` + CaptchaKey string `json:"captcha_key"` + ViewToken string `json:"view_token"` + AdBannerType string `json:"ad_banner_type"` + AdSkyscraperType string `json:"ad_skyscraper_type"` + AdFloaterType string `json:"ad_floater_type"` + Embedded bool `json:"embedded"` + FileAdsEnabled bool `json:"file_ads_enabled"` + UserAdsEnabled bool `json:"user_ads_enabled"` +} + +// ServeFileViewer controller for GET /u/:id +func (wc *WebController) serveSvelteFile(w http.ResponseWriter, r *http.Request, p httprouter.Params) { + // If the user agent is Wget we redirect it to the API so that the file can + // be downloaded directly + if strings.HasPrefix(r.UserAgent(), "Wget/") { + http.Redirect(w, r, "/api/file/"+p.ByName("id"), http.StatusSeeOther) + return + } + + var err error + var ids = strings.Split(p.ByName("id"), ",") + var templateData = wc.newTemplateData(w, r) + + var files []pixelapi.ListFile + for _, id := range ids { + inf, err := templateData.PixelAPI.GetFileInfo(id) + if err != nil { + if pixelapi.ErrIsServerError(err) { + wc.templates.Get().ExecuteTemplate(w, "500", templateData) + return + } + continue + } + files = append(files, pixelapi.ListFile{FileInfo: inf}) + } + + if len(files) == 0 { + w.WriteHeader(http.StatusNotFound) + wc.templates.Get().ExecuteTemplate(w, "file_not_found", templateData) + return + } + + templateData.OGData = wc.metadataFromFile(files[0].FileInfo) + + var vd = fileViewerData{ + CaptchaKey: wc.captchaKey(), + ViewToken: wc.viewTokenOrBust(), + FileAdsEnabled: files[0].ShowAds, + UserAdsEnabled: !(templateData.Authenticated && templateData.User.Subscription.DisableAdDisplay), + } + + if len(ids) > 1 { + templateData.Title = fmt.Sprintf("%d files on pixeldrain", len(files)) + vd.Type = "list" + vd.APIResponse = pixelapi.ListInfo{ + Success: true, + Title: "Multiple files", + DateCreated: time.Now(), + Files: files, + } + } else { + templateData.Title = fmt.Sprintf("%s ~ pixeldrain", files[0].Name) + vd.Type = "file" + vd.APIResponse = files[0].FileInfo + } + + if _, ok := r.URL.Query()["embed"]; ok { + vd.Embedded = true + } + + templateData.Other = vd + + for _, file := range files { + if file.AbuseType != "" { + w.WriteHeader(http.StatusUnavailableForLegalReasons) + break + } + } + + err = wc.templates.Get().ExecuteTemplate(w, "file_viewer_svelte", templateData) + if err != nil && !strings.Contains(err.Error(), "broken pipe") { + log.Error("Error executing template file_viewer: %s", err) + } +} + +func (wc *WebController) serveSvelteList(w http.ResponseWriter, r *http.Request, p httprouter.Params) { + // If the user agent is Wget we redirect it to the API so that the file can + // be downloaded directly + if strings.HasPrefix(r.UserAgent(), "Wget/") { + http.Redirect(w, r, "/api/list/"+p.ByName("id")+"/zip", http.StatusSeeOther) + return + } + + var templateData = wc.newTemplateData(w, r) + var list, err = templateData.PixelAPI.GetListID(p.ByName("id")) + if err != nil { + if err, ok := err.(pixelapi.Error); ok && err.Status == http.StatusNotFound { + w.WriteHeader(http.StatusNotFound) + wc.templates.Get().ExecuteTemplate(w, "list_not_found", templateData) + } else { + log.Error("API request error occurred: %s", err) + w.WriteHeader(http.StatusInternalServerError) + wc.templates.Get().ExecuteTemplate(w, "500", templateData) + } + return + } + if len(list.Files) == 0 { + w.WriteHeader(http.StatusNotFound) + wc.templates.Get().ExecuteTemplate(w, "list_not_found", templateData) + return + } + + templateData.Title = fmt.Sprintf("%s ~ pixeldrain", list.Title) + templateData.OGData = wc.metadataFromList(list) + var vd = fileViewerData{ + Type: "list", + CaptchaKey: wc.captchaSiteKey, + ViewToken: wc.viewTokenOrBust(), + FileAdsEnabled: list.Files[0].ShowAds, + UserAdsEnabled: !(templateData.Authenticated && templateData.User.Subscription.DisableAdDisplay), + APIResponse: list, + } + + if _, ok := r.URL.Query()["embed"]; ok { + vd.Embedded = true + } + templateData.Other = vd + + for _, file := range list.Files { + if file.AbuseType != "" { + w.WriteHeader(http.StatusUnavailableForLegalReasons) + break + } + } + + err = wc.templates.Get().ExecuteTemplate(w, "file_viewer_svelte", templateData) + if err != nil && !strings.Contains(err.Error(), "broken pipe") { + log.Error("Error executing template file_viewer: %s", err) + } +} diff --git a/webcontroller/web_controller.go b/webcontroller/web_controller.go index eaea075..9bc601f 100644 --- a/webcontroller/web_controller.go +++ b/webcontroller/web_controller.go @@ -135,6 +135,8 @@ func New( {GET, "history" /* */, wc.serveTemplate("history_cookies", handlerOpts{})}, {GET, "u/:id" /* */, wc.serveFileViewer}, {GET, "u/:id/preview" /* */, wc.serveFilePreview}, + {GET, "u2/:id" /* */, wc.serveSvelteFile}, + {GET, "l2/:id" /* */, wc.serveSvelteList}, {GET, "l/:id" /* */, wc.serveListViewer}, {GET, "d/*path" /* */, wc.serveDirectory}, {GET, "t" /* */, wc.serveTemplate("text_editor", handlerOpts{})},