From 32f715e65fb8aae9bf3016395d45a83f6fcc09c5 Mon Sep 17 00:00:00 2001
From: Wim Brand <fornax@fornaxian.com>
Date: Mon, 11 Feb 2019 22:41:22 +0100
Subject: [PATCH] Super secret view counting

---
 pixelapi/file.go                     | 6 +++---
 res/static/script/Toolbar.js         | 2 +-
 res/template/file_viewer.html        | 2 +-
 res/template/fragments/api/list.html | 3 +--
 webcontroller/filePreview.go         | 2 +-
 webcontroller/fileViewer.go          | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pixelapi/file.go b/pixelapi/file.go
index 33739a5..4e27130 100644
--- a/pixelapi/file.go
+++ b/pixelapi/file.go
@@ -17,7 +17,7 @@ type FileInfo struct {
 	ID            string    `json:"id"`
 	Name          string    `json:"name"`
 	Size          uint64    `json:"size"`
-	Views         int       `json:"views"`
+	Views         int64     `json:"views"`
 	DateUpload    time.Time `json:"date_upload"`
 	DateLastView  time.Time `json:"date_last_view"`
 	MimeType      string    `json:"mime_type"`
@@ -26,9 +26,9 @@ type FileInfo struct {
 }
 
 // GetFileInfo gets the FileInfo from the pixeldrain API
-func (p *PixelAPI) GetFileInfo(id string) (resp *FileInfo, err error) {
+func (p *PixelAPI) GetFileInfo(id string, urlParam string) (resp *FileInfo, err error) {
 	resp = &FileInfo{}
-	err = p.jsonRequest("GET", p.apiEndpoint+"/file/"+id+"/info", resp)
+	err = p.jsonRequest("GET", p.apiEndpoint+"/file/"+id+"/info"+urlParam, resp)
 	if err != nil {
 		return nil, err
 	}
diff --git a/res/static/script/Toolbar.js b/res/static/script/Toolbar.js
index 6a6f848..40c17bf 100644
--- a/res/static/script/Toolbar.js
+++ b/res/static/script/Toolbar.js
@@ -67,6 +67,6 @@ var Toolbar = {
 		}, 10000);
 	},
 	setViews: function(amount){
-		$("#views").html(amount);
+		$("#views").html("Views: "+amount);
 	}
 };
diff --git a/res/template/file_viewer.html b/res/template/file_viewer.html
index 628dccb..ada0df8 100644
--- a/res/template/file_viewer.html
+++ b/res/template/file_viewer.html
@@ -46,7 +46,7 @@
 				<div>
 					<button class="toolbar_button button_full_width" onClick="Toolbar.toggle();">Hide Toolbar</button>
 
-					<!--Views: <span id="views" th:text="${data.views}">0</span>--><br/>
+					<div id="views" style="text-align: center;">Views: No</div>
 
 					<a href="/" id="btnHome" class="button toolbar_button button_full_width">
 						<img src="/res/img/pixeldrain_small.png" alt="Back to the Home page"/>
diff --git a/res/template/fragments/api/list.html b/res/template/fragments/api/list.html
index 4b05ae2..924f81c 100644
--- a/res/template/fragments/api/list.html
+++ b/res/template/fragments/api/list.html
@@ -16,7 +16,6 @@
 <pre>
 {
 	"title": "My beautiful photos",
-	"description": "An album of photos from my vacation in Austria",
 	"files": [ // Ordered array of files to add to the list
 		{
 			"id": "abc123",
@@ -71,7 +70,7 @@
 {
 	"success": false,
 	"value": "description_too_long",
-	"message": "The description of this list or one of the files in the list is too long, max 3000 characters allowed."
+	"message": "The description of one of the files in the list is too long, max 3000 characters allowed."
 }
 </pre>
 <pre>HTTP 422: Unprocessable Entity
diff --git a/webcontroller/filePreview.go b/webcontroller/filePreview.go
index a17f6a3..ca442da 100644
--- a/webcontroller/filePreview.go
+++ b/webcontroller/filePreview.go
@@ -24,7 +24,7 @@ func (wc *WebController) serveFilePreview(w http.ResponseWriter, r *http.Request
 		return
 	}
 	var api = pixelapi.New(wc.conf.APIURLInternal, "")
-	inf, err := api.GetFileInfo(p.ByName("id")) // TODO: Error handling
+	inf, err := api.GetFileInfo(p.ByName("id"), "?should_a_view_be_added=yes_gimme") // TODO: Error handling
 	if err != nil {
 		wc.serveNotFound(w, r)
 		return
diff --git a/webcontroller/fileViewer.go b/webcontroller/fileViewer.go
index 49c72bb..0a6d900 100644
--- a/webcontroller/fileViewer.go
+++ b/webcontroller/fileViewer.go
@@ -30,7 +30,7 @@ func (wc *WebController) serveFileViewer(w http.ResponseWriter, r *http.Request,
 	var api = pixelapi.New(wc.conf.APIURLInternal, "")
 	var finfo []*pixelapi.FileInfo
 	for _, id := range ids {
-		inf, err := api.GetFileInfo(id)
+		inf, err := api.GetFileInfo(id, "")
 		if err != nil {
 			continue
 		}