bump

Added some details
Initial URLify of vid desc and profile
2024-12-06 19:27:30 +01:00 · 2023-04-02 20:18:10 +02:00 · 2023-04-02 20:14:48 +02:00 · 2023-04-02 19:55:04 +02:00 · 2023-04-01 18:45:10 +02:00 · 2023-04-01 17:09:12 +02:00
19 changed files with 233 additions and 33 deletions
@@ -40,7 +40,8 @@ Apply to: Main window (address bar)
 * Add custom amount of videos per page

 ## Credits
-[TheFrenchGhosty](https://thefrenchghosty.me) ([Github](https://github.com/TheFrenchGhosty)): Initial Dockerfile and fixes to a usable state.
+* [TheFrenchGhosty](https://thefrenchghosty.me) ([Github](https://github.com/TheFrenchGhosty)): Initial Dockerfile and fixes to a usable state.
+* [Jennifer Wjertzoch](https://wjertzochjennifer.medium.com): Carousel CSS Implementation

 ### External libraries
 * [TikScraperPHP](https://github.com/pablouser1/TikScraperPHP)
@@ -0,0 +1,7 @@
+<?php
+namespace App\Constants;
+
+abstract class TextExtras {
+    const USER = 0;
+    const HASHTAG = 1;
+}
@@ -71,7 +71,7 @@ class RedirectController {
     * to_endpoint maps a TikTok URL into a ProxiTok-compatible endpoint URL.
     */
    static private function to_endpoint(string $url): string {
-        if (preg_match('%^(?:https?://|www\.)?(?:vm\.|vt\.)?tiktok\.com/(?:t/)?([A-Za-z0-9]+)%', $url, $m)) {
+        if (preg_match('%^(?:https?://)?(?:www\.)?(?:vm\.|vt\.)?tiktok\.com/(?:t/)?([A-Za-z0-9]+)%', $url, $m)) {
            // Short video URL
            return '/@placeholder/video/' . $m[1];
        } elseif (preg_match('%^https://www\.tiktok\.com/(.+)%', $url, $m)) {
@@ -5,10 +5,9 @@ use App\Cache\ApcuCache;
 use App\Cache\JSONCache;
 use App\Cache\RedisCache;
 use App\Constants\CacheMethods;
+use App\Constants\TextExtras;
 use App\Models\BaseTemplate;

-use TikScraper\Constants\UserAgents as TikScraperUserAgents;
-
 class Wrappers {
    /**
     * Setup of Latte template engine
@@ -92,6 +91,40 @@ class Wrappers {
            return UrlBuilder::download($url, $username, $id, $watermark);
        });

+        $latte->addFunction('bool_to_str', function (bool $cond): string {
+            return $cond ? 'yes' : 'no';
+        });
+
+        // Add URLs to video descriptions
+        // TODO: Make it work with unicode characters such as emojis
+        $latte->addFunction('render_desc', function (string $desc, array $textExtras = []): string {
+            $bytesCount = strlen($desc);
+            $charsCount = mb_strlen($desc);
+            // Skip urlify for now if there is a special char like an emoji to avoid issues
+            if ($bytesCount !== $charsCount) {
+                return $desc;
+            }
+            $sanitizedDesc = htmlspecialchars($desc);
+            $out = $sanitizedDesc;
+            foreach ($textExtras as $extra) {
+                $url = '';
+                $text = mb_substr($desc, $extra->start, $extra->end - $extra->start, 'UTF-8');
+                switch ($extra->type) {
+                    // User URL
+                    case TextExtras::USER:
+                        $url = UrlBuilder::user(htmlspecialchars($extra->userUniqueId));
+                        break;
+                    // Hashtag URL
+                    case TextExtras::HASHTAG:
+                        $url = UrlBuilder::tag(htmlspecialchars($extra->hashtagName));
+                        break;
+                }
+
+                $out = str_replace($text, "<a href=\"$url\">$text</a>", $out);
+            }
+            return $out;
+        });
+
        $latte->render(Misc::getView($template), $base);
    }

@@ -1,7 +1,7 @@
 {
    "name": "pablouser1/proxitok",
    "description": "An alternative frontend for TikTok",
-    "version": "2.4.7.0",
+    "version": "2.4.9.0",
    "license": "AGPL-3.0-or-later",
    "type": "project",
    "authors": [
@@ -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": "97152c7473ad08a262f9db1af867faaa",
+    "content-hash": "d8e56c687ca265b350f34789ce3cf82b",
    "packages": [
        {
            "name": "bramus/router",
@@ -303,16 +303,16 @@
        },
        {
            "name": "pablouser1/tikscraper",
-            "version": "v2.3.6.0",
+            "version": "v2.3.6.2",
            "source": {
                "type": "git",
                "url": "https://github.com/pablouser1/TikScraperPHP.git",
-                "reference": "23eff4120eecfb01ed27e049dc36ed14a967cef8"
+                "reference": "10394fb5fb5213d05fe0eb29f7582423fc15d08a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/23eff4120eecfb01ed27e049dc36ed14a967cef8",
-                "reference": "23eff4120eecfb01ed27e049dc36ed14a967cef8",
+                "url": "https://api.github.com/repos/pablouser1/TikScraperPHP/zipball/10394fb5fb5213d05fe0eb29f7582423fc15d08a",
+                "reference": "10394fb5fb5213d05fe0eb29f7582423fc15d08a",
                "shasum": ""
            },
            "require": {
@@ -346,9 +346,9 @@
            "description": "Get data from TikTok API",
            "support": {
                "issues": "https://github.com/pablouser1/TikScraperPHP/issues",
-                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.3.6.0"
+                "source": "https://github.com/pablouser1/TikScraperPHP/tree/v2.3.6.2"
            },
-            "time": "2023-03-06T20:19:11+00:00"
+            "time": "2023-04-01T13:46:50+00:00"
        },
        {
            "name": "php-webdriver/webdriver",
@@ -614,16 +614,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v5.4.21",
+            "version": "v5.4.22",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "d4ce417ebcb0b7d090b4c178ed6d3accc518e8bd"
+                "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d4ce417ebcb0b7d090b4c178ed6d3accc518e8bd",
-                "reference": "d4ce417ebcb0b7d090b4c178ed6d3accc518e8bd",
+                "url": "https://api.github.com/repos/symfony/process/zipball/4b850da0cc3a2a9181c1ed407adbca4733dc839b",
+                "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b",
                "shasum": ""
            },
            "require": {
@@ -656,7 +656,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.21"
+                "source": "https://github.com/symfony/process/tree/v5.4.22"
            },
            "funding": [
                {
@@ -672,7 +672,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-21T19:46:44+00:00"
+            "time": "2023-03-06T21:29:33+00:00"
        }
    ],
    "packages-dev": [],
@@ -18,13 +18,47 @@ services:
    depends_on:
      - redis
      - signer
+    networks:
+      - proxitok
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+    cap_add:
+      - CHOWN
+      - SETGID
+      - SETUID
+
  redis:
    container_name: proxitok-redis
    image: redis:7-alpine
    command: redis-server --save 60 1 --loglevel warning
    restart: unless-stopped
+    networks:
+      - proxitok
+    user: nobody
+    read_only: true
+    security_opt:
+      - no-new-privileges:true
+    tmpfs:
+      - /data:size=10M,mode=0770,uid=65534,gid=65534,noexec,nosuid,nodev
+    cap_drop:
+      - ALL
+
  signer:
    container_name: proxitok-signer
    image: ghcr.io/pablouser1/signtok:master
+    networks:
+      - proxitok
+    user: nobody
+    read_only: true
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - ALL
+
 volumes:
  proxitok-cache:
+
+networks:
+  proxitok:
@@ -15,6 +15,7 @@
@import "./node_modules/css.gg/icons/scss/comment.scss";
@import "./node_modules/css.gg/icons/scss/share.scss";
@import "./node_modules/css.gg/icons/scss/software-download.scss";
+@import "./node_modules/css.gg/icons/scss/check-o.scss";

@import "./node_modules/css.gg/icons/scss/lock.scss";
@import "./node_modules/css.gg/icons/scss/lock-unlock.scss";
@@ -0,0 +1,68 @@
+/*
+CREDITS:
+	CSS Taken from: https://levelup.gitconnected.com/how-to-make-a-fully-accessible-css-only-carousel-40e8bd62032b
+	Author: Jennifer Wjertzoch (https://wjertzochjennifer.medium.com)
+	CodePen: https://codepen.io/jwjertzoch/pen/JjyGeRy
+*/
+
+.carousel {
+  margin: 0 auto;
+  overflow: hidden;
+  text-align: center;
+}
+
+.slides {
+  width: 100%;
+  display: flex;
+  overflow-x: scroll;
+  scrollbar-width: none;
+  scroll-snap-type: x mandatory;
+  scroll-behavior: smooth;
+}
+
+.slides::-webkit-scrollbar {
+  display: none;
+}
+
+.slides-item {
+	max-height: 75vh;
+  align-items: center;
+  display: flex;
+  flex-shrink: 0;
+  justify-content: center;
+  margin: 0 1rem;
+  position: relative;
+  scroll-snap-align: start;
+  transform: scale(1);
+  transform-origin: center center;
+  transition: transform .5s;
+  width: 100%;
+}
+
+.slides-item img {
+	max-height: 75vh;
+}
+
+.carousel__nav {
+  padding: 1.25rem .5rem;
+}
+
+.slider-nav {
+  align-items: center;
+  background-color: #ddd;
+  border-radius: 50%;
+  color: #000;
+  display: inline-flex;
+  height: 1.5rem;
+  justify-content: center;
+  padding: .5rem;
+  position: relative;
+  text-decoration: none;
+  width: 1.5rem;
+}
+
+.slider-nav:hover,
+.slider-nav:active {
+  background-color: #000;
+  color: #fff;
+}
@@ -0,0 +1,3 @@
+.new-line {
+	white-space: pre-wrap;
+}
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../../misc/scss/node_modules/css.gg/icons/scss/home.scss","../../misc/scss/node_modules/css.gg/icons/scss/options.scss","../../misc/scss/node_modules/css.gg/icons/scss/info.scss","../../misc/scss/node_modules/css.gg/icons/scss/code-slash.scss","../../misc/scss/node_modules/css.gg/icons/scss/search.scss","../../misc/scss/node_modules/css.gg/icons/scss/feed.scss","../../misc/scss/node_modules/css.gg/icons/scss/eye.scss","../../misc/scss/node_modules/css.gg/icons/scss/heart.scss","../../misc/scss/node_modules/css.gg/icons/scss/comment.scss","../../misc/scss/node_modules/css.gg/icons/scss/share.scss","../../misc/scss/node_modules/css.gg/icons/scss/software-download.scss","../../misc/scss/node_modules/css.gg/icons/scss/lock.scss","../../misc/scss/node_modules/css.gg/icons/scss/lock-unlock.scss","../../misc/scss/node_modules/css.gg/icons/scss/music.scss"],"names":[],"mappings":"AAAA,SACE,yLACA,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,aACA,gBACA,4BACA,2BACA,6BACA,4BACA,mBAEA,gBACE,WACA,cACA,sBACA,kBAGF,iBACE,WACA,cACA,sBACA,kBACA,qBACA,sBACA,2BACA,wBACA,SACA,kBACA,WACA,YACA,OAGF,gBACE,UACA,YACA,iBACA,oBACA,4BACA,6BACA,gBACA,SACA,SCjDJ,YACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,qCAEA,mBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,iBACA,mBAGF,oBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,iBACA,mBACA,SACA,UAGF,mBACE,YACA,WCnCN,SACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBAEA,iCACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,wBACA,SAGF,gBACE,WACA,WAGF,iBACE,WACA,QC5BN,eACI,cACA,kBACA,sBACA,6CACA,UACA,YACA,wBAEA,sBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,yBAGF,uBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,yBACA,sBACA,qBACA,UACA,QAGF,sBACE,uBACA,wBACA,WACA,QCrCN,WACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBACA,iBACA,gBAEA,kBACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,WACA,wBACA,yBACA,SACA,UCvBN,SACI,cACA,sBACA,wBACA,sBASA,iBACA,gBACA,kBACA,+BACA,UACA,WACA,kBAbA,iCACE,cACA,sBACA,wBACA,sBAWF,iCACE,WACA,kBACA,kBACA,WACA,WACA,QACA,SACA,WAGF,gBACE,UACA,QACA,WCnCN,QACI,kBACA,cACA,+BACA,WACA,YACA,iCACA,gCACA,gBACA,sBAEA,+BACE,WACA,cACA,oBACA,kBACA,sBAGF,eACE,QACA,8CACA,WACA,YAGF,gBACE,UACA,WACA,iBACA,WACA,SC/BN,UACI,iBACA,6BACA,8BACA,WACA,WACA,gBAeA,sBACA,kBACA,gHACA,cAhBA,iBACE,iBACA,6BACA,8BACA,WACA,WACA,gBACA,WACA,cACA,sBACA,kBAQF,kBACE,WACA,cACA,sBACA,kBAGF,iBACE,WACA,wBACA,QAGF,kBACE,WACA,YACA,sBACA,wBACA,UACA,QC7CN,YACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,gBACA,0CAEA,mBACE,WACA,cACA,sBACA,kBACA,UAGF,oBACE,WACA,cACA,sBACA,kBACA,UACA,iBACA,+BACA,+BACA,UACA,YACA,WAGF,mBACE,WACA,wBACA,qBACA,SACA,QCtCN,UACI,sBACA,kBACA,cACA,+BACA,UACA,WACA,wBACA,oBACA,kCAEA,iBACE,WACA,cACA,sBACA,kBACA,kBACA,WACA,WACA,wBACA,SAGF,kBACE,WACA,cACA,sBACA,kBACA,kBACA,WACA,WACA,wBACA,SACA,MACA,yBAGF,iBACE,SACA,wBCvCN,sBACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,iBACA,aACA,8BACA,+BACA,eAEA,6BACE,WACA,cACA,sBACA,kBACA,UACA,WACA,sBACA,wBACA,yBACA,SACA,WAGF,8BACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,YACA,wBACA,SACA,WCrCN,SACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,4BACA,2BACA,4BACA,iBAEA,gBACE,WACA,cACA,sBACA,kBACA,WACA,YACA,kBACA,+BACA,qBACA,UACA,QCxBN,gBACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,iBACA,8BACA,6BACA,4BACA,iBACA,iBAEA,+CACE,WACA,cACA,sBACA,kBAGF,uBACE,+BACA,qBACA,WACA,YACA,kBACA,UACA,SAGF,wBACE,UACA,WACA,wBACA,UACA,QCpCN,UACI,cACA,sBACA,iBAQA,2BACA,4BACA,gBACA,gBACA,kBACA,6CACA,WACA,YAbA,mCACE,cACA,sBACA,iBAYF,mCACE,WACA,kBACA,UACA,WACA,QACA,UACA,uBACA,mBAGF,iBACE","file":"cssgg.min.css"}
+{"version":3,"sourceRoot":"","sources":["../../misc/scss/node_modules/css.gg/icons/scss/home.scss","../../misc/scss/node_modules/css.gg/icons/scss/options.scss","../../misc/scss/node_modules/css.gg/icons/scss/info.scss","../../misc/scss/node_modules/css.gg/icons/scss/code-slash.scss","../../misc/scss/node_modules/css.gg/icons/scss/search.scss","../../misc/scss/node_modules/css.gg/icons/scss/feed.scss","../../misc/scss/node_modules/css.gg/icons/scss/eye.scss","../../misc/scss/node_modules/css.gg/icons/scss/heart.scss","../../misc/scss/node_modules/css.gg/icons/scss/comment.scss","../../misc/scss/node_modules/css.gg/icons/scss/share.scss","../../misc/scss/node_modules/css.gg/icons/scss/software-download.scss","../../misc/scss/node_modules/css.gg/icons/scss/check-o.scss","../../misc/scss/node_modules/css.gg/icons/scss/lock.scss","../../misc/scss/node_modules/css.gg/icons/scss/lock-unlock.scss","../../misc/scss/node_modules/css.gg/icons/scss/music.scss"],"names":[],"mappings":"AAAA,SACE,yLACA,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,aACA,gBACA,4BACA,2BACA,6BACA,4BACA,mBAEA,gBACE,WACA,cACA,sBACA,kBAGF,iBACE,WACA,cACA,sBACA,kBACA,qBACA,sBACA,2BACA,wBACA,SACA,kBACA,WACA,YACA,OAGF,gBACE,UACA,YACA,iBACA,oBACA,4BACA,6BACA,gBACA,SACA,SCjDJ,YACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,qCAEA,mBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,iBACA,mBAGF,oBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,iBACA,mBACA,SACA,UAGF,mBACE,YACA,WCnCN,SACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBAEA,iCACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,wBACA,SAGF,gBACE,WACA,WAGF,iBACE,WACA,QC5BN,eACI,cACA,kBACA,sBACA,6CACA,UACA,YACA,wBAEA,sBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,yBAGF,uBACE,WACA,cACA,sBACA,kBACA,UACA,WACA,yBACA,sBACA,qBACA,UACA,QAGF,sBACE,uBACA,wBACA,WACA,QCrCN,WACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,mBACA,iBACA,gBAEA,kBACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,WACA,wBACA,yBACA,SACA,UCvBN,SACI,cACA,sBACA,wBACA,sBASA,iBACA,gBACA,kBACA,+BACA,UACA,WACA,kBAbA,iCACE,cACA,sBACA,wBACA,sBAWF,iCACE,WACA,kBACA,kBACA,WACA,WACA,QACA,SACA,WAGF,gBACE,UACA,QACA,WCnCN,QACI,kBACA,cACA,+BACA,WACA,YACA,iCACA,gCACA,gBACA,sBAEA,+BACE,WACA,cACA,oBACA,kBACA,sBAGF,eACE,QACA,8CACA,WACA,YAGF,gBACE,UACA,WACA,iBACA,WACA,SC/BN,UACI,iBACA,6BACA,8BACA,WACA,WACA,gBAeA,sBACA,kBACA,gHACA,cAhBA,iBACE,iBACA,6BACA,8BACA,WACA,WACA,gBACA,WACA,cACA,sBACA,kBAQF,kBACE,WACA,cACA,sBACA,kBAGF,iBACE,WACA,wBACA,QAGF,kBACE,WACA,YACA,sBACA,wBACA,UACA,QC7CN,YACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,gBACA,0CAEA,mBACE,WACA,cACA,sBACA,kBACA,UAGF,oBACE,WACA,cACA,sBACA,kBACA,UACA,iBACA,+BACA,+BACA,UACA,YACA,WAGF,mBACE,WACA,wBACA,qBACA,SACA,QCtCN,UACI,sBACA,kBACA,cACA,+BACA,UACA,WACA,wBACA,oBACA,kCAEA,iBACE,WACA,cACA,sBACA,kBACA,kBACA,WACA,WACA,wBACA,SAGF,kBACE,WACA,cACA,sBACA,kBACA,kBACA,WACA,WACA,wBACA,SACA,MACA,yBAGF,iBACE,SACA,wBCvCN,sBACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,iBACA,aACA,8BACA,+BACA,eAEA,6BACE,WACA,cACA,sBACA,kBACA,UACA,WACA,sBACA,wBACA,yBACA,SACA,WAGF,8BACE,WACA,cACA,sBACA,kBACA,kBACA,UACA,YACA,wBACA,SACA,WCrCN,YACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,oBAEA,mBACE,WACA,cACA,sBACA,kBACA,SACA,SACA,UACA,YACA,0BACA,yBACA,mBACA,6BACA,wBCvBN,SACI,sBACA,kBACA,cACA,+BACA,WACA,YACA,iBACA,4BACA,2BACA,4BACA,iBAEA,gBACE,WACA,cACA,sBACA,kBACA,WACA,YACA,kBACA,+BACA,qBACA,UACA,QCxBN,gBACI,sBACA,kBACA,cACA,+BACA,WACA,WACA,iBACA,8BACA,6BACA,4BACA,iBACA,iBAEA,+CACE,WACA,cACA,sBACA,kBAGF,uBACE,+BACA,qBACA,WACA,YACA,kBACA,UACA,SAGF,wBACE,UACA,WACA,wBACA,UACA,QCpCN,UACI,cACA,sBACA,iBAQA,2BACA,4BACA,gBACA,gBACA,kBACA,6CACA,WACA,YAbA,mCACE,cACA,sBACA,iBAYF,mCACE,WACA,kBACA,UACA,WACA,QACA,UACA,uBACA,mBAGF,iBACE","file":"cssgg.min.css"}
@@ -0,0 +1,4 @@
+<details>
+	<summary>{$title}</summary>
+	{block content}{/block}
+</details>
@@ -31,5 +31,7 @@
 	{/if}
 	<link rel="stylesheet" href="{static('css', 'cssgg.min.css', true)}">
 	<link rel="stylesheet" href="{static('css', 'bulma.min.css', true)}">
+	<link rel="stylesheet" href="{static('css', 'misc.css')}">
+	<link rel="stylesheet" href="{static('css', 'carousel.css')}">
 	<title>{$title} - ProxiTok</title>
 </head>
@@ -0,0 +1,21 @@
+{if !isset($item->imagePost)}
+<video controls n:attr="autoplay => $isAutoplay" poster="{url_stream($item->video->originCover)}" preload="none">
+	<source src="{url_stream($item->video->playAddr)}" type="video/mp4" />
+</video>
+{else}
+<section class="carousel" aria-label="carousel" Tabindex="0">
+  <div class="slides">
+		{foreach $item->imagePost->images as $i => $image}
+		<div class="slides-item" id="image-{$i + 1}" tabindex="0">
+			<img src="{url_stream($image->imageURL->urlList[0])}" />
+		</div>
+		{/foreach}
+  </div>
+  <div class="carousel__nav">
+		{for $i = 0; $i < count($item->imagePost->images); $i++}
+		<a class="slider-nav" href="#image-{$i + 1}">{$i + 1}</a>
+		{/for}
+  </div>
+  <div class="carousel__skip-message" id="skip-link" tabindex="0"></div>
+</section>
+{/if}
@@ -1,5 +1,5 @@
 <div class="tags">
 	{foreach $challenges as $challenge}
-		<a class="tag is-rounded" href="{path('/tag/' . $challenge->title)}">#{$challenge->title}</a>
+		<a class="tag is-primary is-rounded" href="{path('/tag/' . $challenge->title)}">#{$challenge->title}</a>
 	{/foreach}
 </div>
@@ -17,17 +17,27 @@
 			{if !empty($item->challenges)}
 			<p>{include './common/tags.latte', challenges: $item->challenges}</p>
 			{/if}
-			<p n:ifcontent>{$item->desc}</p>
+			<p n:ifcontent>{render_desc($item->desc, $item->textExtra)|noescape}</p>
+			<p>Song: {$item->music->title}</p>
+			<audio controls preload="none" src="{url_stream($item->music->playUrl)}"></audio>
 			{include './common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}
 			<div class="has-text-centered">
-				<video width="{$item->video->width}" height="{$item->video->height}" controls preload="none" poster="{url_stream($item->video->originCover)}">
-					<source src="{url_stream($item->video->playAddr)}" type="video/mp4" />
-				</video>
+				{include './common/content.latte', item: $item, isAutoplay: false, isBig: false}
 			</div>
 			<p class="has-text-centered"><b>Download video</b></p>
 			{include './common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $item->author->uniqueId}
 			<p class="has-text-centered"><b>Share link</b></p>
 			{include './common/share.latte', uniqueId: $item->author->uniqueId, id: $item->id}
+			<div class="has-text-centered">
+				{embed '../details.latte', title: "Details"}
+				{block content}
+				<p>Is Ad: {bool_to_str($item->isAd)}
+				<p>Can duet: {bool_to_str($item->duetEnabled)}</p>
+				<p>Can stitch (add this video to other ones): {bool_to_str($item->stitchEnabled)}</p>
+				<p>Can be shared: {bool_to_str($item->shareEnabled)}
+				{/block}
+				{/embed}
+			</div>
  	</div>
 	</article>
 	{/foreach}
@@ -10,15 +10,31 @@
 	<figure class="image is-inline-block is-128x128">
 		<img class="is-rounded" src="{url_stream($info->detail->avatarLarger)}" />
 	</figure>
-	<p class="title">{$info->detail->uniqueId}</p>
+	<p class="title">
+		{if $info->detail->verified}
+		{include '../components/icon.latte', icon: 'check-o', text: $info->detail->uniqueId}
+		{else}
+		{$info->detail->uniqueId}
+		{/if}
+	</p>
 	<p class="subtitle">{include '../components/rss.latte'}</p>
 	{if $info->detail->privateAccount}
 	<p><strong>Private account</strong></p>
 	{/if}
-	<p></p>
-	<p>{$info->detail->signature}</p>
+	<b>Description</b>
+	<p class="new-line">{$info->detail->signature}</p>
+	{if isset($info->detail->bioLink)}
+	<p>Link: <a href="{$info->detail->bioLink->link}">{$info->detail->bioLink->link}</a></p>
+	{/if}
+	<b>Stats</b>
 	<p>Following: {number($info->stats->followingCount)} / Followers: {number($info->stats->followerCount)}</p>
 	<p>Hearts: {number($info->stats->heartCount)} / Videos: {$info->stats->videoCount}</p>
+	{embed '../components/details.latte', title: "Details"}
+	{block content}
+	<p>Region: {$info->detail->region}</p>
+	<p>Category: {$info->detail->commerceUserInfo->category}</p>
+	{/block}
+	{/embed}
 {/block}

 {block content}
@@ -9,11 +9,9 @@
 {/if}

 {block content}
-	<div class="columns is-centered is-vcentered is-gapless">
+	<div class="columns is-centered is-vcentered">
 		<div class="column has-text-centered">
-			<video controls autoplay poster="{url_stream($item->video->originCover)}">
-				<source src="{url_stream($item->video->playAddr)}" type="video/mp4" />
-			</video>
+			{include '../components/themes/common/content.latte', item: $item, isAutoplay: true, isBig: true}
 		</div>
 		<div class="column">
 			<div class="box">
@@ -35,7 +33,9 @@
 						<p>{include '../components/themes/common/tags.latte', challenges: $item->challenges}</p>
 						{/if}
 						<div class="content">
-							<p n:ifcontent>{$item->desc}</p>
+							<p n:ifcontent>{render_desc($item->desc, $item->textExtra)|noescape}</p>
+							<p>Song: {$item->music->title}</p>
+							<audio controls preload="none" src="{url_stream($item->music->playUrl)}"></audio>
 							{include '../components/themes/common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}
 							<div class="has-text-centered">
 								{include '../components/themes/common/share.latte', uniqueId: $info->detail->uniqueId, id: $item->id}
Author	SHA1	Message	Date
Pablo Ferreiro	3bd6c553f4	bump	2023-04-02 20:18:10 +02:00
Pablo Ferreiro	aadfeccab1	Added some details	2023-04-02 20:14:48 +02:00
Pablo Ferreiro	4188fcf064	Initial URLify of vid desc and profile	2023-04-02 19:55:04 +02:00
Pablo Ferreiro	9364a2e212	hotfix	2023-04-01 18:45:10 +02:00
Pablo Ferreiro	e5d416f696	pictures using carousel	2023-04-01 17:09:12 +02:00
Pablo Ferreiro	98a9ec2b65	hotfix	2023-04-01 16:35:17 +02:00
Pablo Ferreiro	33c723d786	Pictures support	2023-04-01 15:48:27 +02:00
Pablo Ferreiro	faee8d58f2	bump	2023-03-29 11:23:14 +02:00
Pablo Ferreiro	75e13bc7d2	Merge pull request #140 from NoPlagiarism/www_shortened Fix https:// + www in redirections (fixes #139)	2023-03-29 09:05:36 +00:00
Pablo Ferreiro	08145ee90b	Merge pull request #135 from kuanhulio/master harden docker-compose	2023-03-29 09:04:10 +00:00
NoPlagiarism	6194324452	Fix https:// + www in redirections (#139 )	2023-03-29 07:39:36 +05:00
Nullnet Services Administrator	48eccbc5ec	harden docker-compose	2023-03-18 21:10:24 -05:00