Fixed /video and set user on video download

.github/workflows/tag.yaml

@@ -20,6 +20,6 @@ jobs:
       - name: Create Release
         uses: ncipollo/release-action@v1
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
           tag: v${{steps.version.outputs.prop}}
+          token: ${{ secrets.GITHUB_TOKEN }}
           allowUpdates: true

app/Controllers/ProxyController.php

@@ -25,7 +25,11 @@ class ProxyController {
         if (isset($_GET['download'])) {
             // Download
             $downloader = new \Sovit\TikTok\Download();
-            $downloader->url($url, "tiktok-video", 'mp4');
+            $filename = 'tiktok-video';
+            if (isset($_GET['id'], $_GET['user'])) {
+                $filename .= '-' . $_GET['user'] . '-' . $_GET['id'];
+            }
+            $downloader->url($url, $filename, 'mp4');
         } else {
             // Stream
             $streamer = new \Sovit\TikTok\Stream();

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')}"
+				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))}">
@@ -17,11 +17,11 @@
     {/foreach}
   </div>
 	<div n:ifset="$feed->info" class="buttons">
-		{if isset($_GET['cursor']) && $_GET['cursor'] != 0}
-    	<a class="button is-danger" href="?cursor=0">First</a>
-			<a class="button is-danger" href="?cursor={$feed->minCursor}">Back</a>
+		{if isset($_GET['cursor']) && $_GET['cursor'] != 0 }
+    	<a class="button is-danger" href="?">First</a>
+			<button class="button is-danger" onclick="history.back()">Back</button>
 		{/if}
-    <a n:attr="disabled => $feed->hasMore" class="button is-success" href="?cursor={$feed->maxCursor}">Next</a>
+    <a n:attr="disabled => !$feed->hasMore" class="button is-success" href="?cursor={$feed->maxCursor}">Next</a>
 	</div>
 </section>
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "pablouser1/proxitok",
     "description": "An alternative frontend for TikTok",
-    "version": "1.4.1",
+    "version": "1.4.1.2",
     "license": "AGPL-3.0-or-later",
     "type": "project",
     "homepage": "https://github.com/pablouser1/ProxiTok",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b40da817e3b81d14a1ed55aad52cf434",
+    "content-hash": "275eed5df34976f1f82201b8aef4bddd",
     "packages": [
         {
             "name": "bramus/router",

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>