From dd5964cb97d9398c5d241a19c909e088056ae0e9 Mon Sep 17 00:00:00 2001
From: Pablo Ferreiro <pferreiromero@gmail.com>
Date: Mon, 7 Feb 2022 18:40:32 +0100
Subject: [PATCH] Fixed /video and set user on video download

---
 app/Controllers/ProxyController.php |  4 ++--
 components/feed.latte               |  2 +-
 composer.json                       |  2 +-
 views/video.latte                   | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Controllers/ProxyController.php b/app/Controllers/ProxyController.php
index 40d6cdc..a17e385 100644
--- a/app/Controllers/ProxyController.php
+++ b/app/Controllers/ProxyController.php
@@ -26,8 +26,8 @@ class ProxyController {
             // Download
             $downloader = new \Sovit\TikTok\Download();
             $filename = 'tiktok-video';
-            if (isset($_GET['id'])) {
-                $filename .= '-' . $_GET['id'];
+            if (isset($_GET['id'], $_GET['user'])) {
+                $filename .= '-' . $_GET['user'] . '-' . $_GET['id'];
             }
             $downloader->url($url, $filename, 'mp4');
         } else {
diff --git a/components/feed.latte b/components/feed.latte
index 1c5a4ee..d1ed201 100644
--- a/components/feed.latte
+++ b/components/feed.latte
@@ -6,7 +6,7 @@
     <div class="column is-one-quarter">
 			<a class="clickable-img" id="{$item->id}" href="#{$item->id}"
 				data-video_url="{path('/stream?url=' . urlencode($item->video->playAddr))}"
-				data-video_download="{path('/stream?url=' . urlencode($item->video->playAddr) . '&download=1&id=' . $item->id)}"
+				data-video_download="{path('/stream?url=' . urlencode($item->video->playAddr) . '&download=1&id=' . $item->id . '&user=' . $item->author->uniqueId)}"
         data-desc="{$item->desc}"
         data-music_title="{$item->music->title}"
         data-music_url="{path('/stream?url=' . urlencode($item->music->playUrl))}">
diff --git a/composer.json b/composer.json
index 337e02f..48358ee 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "pablouser1/proxitok",
     "description": "An alternative frontend for TikTok",
-    "version": "1.4.1.1",
+    "version": "1.4.1.2",
     "license": "AGPL-3.0-or-later",
     "type": "project",
     "homepage": "https://github.com/pablouser1/ProxiTok",
diff --git a/views/video.latte b/views/video.latte
index 6e65f09..f9cd64a 100644
--- a/views/video.latte
+++ b/views/video.latte
@@ -3,20 +3,20 @@
 {block content}
 	<div class="columns is-centered is-vcentered">
 		<div class="column">
-			<video controls poster="{path('stream?url=' . urlencode($item->items[0]->video->originCover))}">
-				<source src="{path('stream?url=' . urlencode($item->items[0]->video->playAddr))}" type="video/mp4" />
+			<video controls poster="{path('/stream?url=' . urlencode($item->items[0]->video->originCover))}">
+				<source src="{path('/stream?url=' . urlencode($item->items[0]->video->playAddr))}" type="video/mp4" />
 			</video>
 		</div>
 		<div class="column has-text-centered">
 			<div class="box">
-				<p class="title">Video by <a href="{path('@'.$item->info->detail->user->uniqueId)}">{$item->info->detail->user->uniqueId}</a></p>
+				<p class="title">Video by <a href="{path('/@'.$item->info->detail->user->uniqueId)}">{$item->info->detail->user->uniqueId}</a></p>
 				<p class="subtitle">{$item->items[0]->desc}</p>
 				<p>Played {number($item->info->detail->stats->playCount)} times</p>
 				<p>Shared {number($item->info->detail->stats->shareCount)} times / {number($item->info->detail->stats->commentCount)} comments</p>
 				<hr />
-				<a href="{path('stream?url=' . urlencode($item->items[0]->video->playAddr) . '&download=1')}" class="button is-info">Download video</a>
+				<a href="{path('/stream?url=' . urlencode($item->items[0]->video->playAddr) . '&download=1')}" class="button is-info">Download video</a>
       	<p>{$item->items[0]->music->title}</p>
-      	<audio src="{path('stream?url=' . urlencode($item->items[0]->music->playUrl))}" controls preload="none"></audio>
+      	<audio src="{path('/stream?url=' . urlencode($item->items[0]->music->playUrl))}" controls preload="none"></audio>
 			</div>
 		</div>
 	</div>