Merge updates from master, 2023-09-01

.dockerignore

@@ -1,9 +1,6 @@
 node_modules
-/.env
+.env
-/.git
+.git
-/.vscode
+.vscode
-/vendor
+vendor
-/cache/latte/*
+cache
-!/cache/latte/.gitkeep
-/cache/api/*
-!/cache/api/.gitkeep

.github/workflows/docker-publish.yml

@@ -42,9 +42,9 @@ jobs:
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@main
+        uses: sigstore/cosign-installer@v3.1.1
         with:
-          cosign-release: 'v2.0.0-rc.0'
+          cosign-release: 'v2.1.1'
 
 
       # Workaround: https://github.com/docker/build-push-action/issues/461
@@ -96,7 +96,6 @@ jobs:
       - name: Sign the published Docker image
         if: ${{ github.event_name != 'pull_request' }}
         env:
-          COSIGN_EXPERIMENTAL: "true"
+          DIGEST: ${{ steps.build-and-push.outputs.digest }}
-        # This step uses the identity token to provision an ephemeral certificate
+          TAGS: ${{ steps.meta.outputs.tags }}
-        # against the sigstore community Fulcio instance.
+        run: cosign sign --yes "${TAGS}@${DIGEST}"
-        run: cosign sign ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}

Dockerfile

@@ -1,25 +1,22 @@
-FROM php:8.1-apache
+FROM trafex/php-nginx:3.1.0
-WORKDIR /var/www/html
+
+# Add composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
-RUN apt update -y && apt upgrade -y \
-    && apt install -y --no-install-recommends libzip-dev \
-    && pecl install redis zip \
-    && docker-php-ext-enable redis zip \
-    && a2enmod rewrite headers \
-    && mkdir /cache \
-    && chown -R www-data:www-data /cache \
-    && rm -rf /var/www/html/*
 
-# Copy project to /var/www/html
+# Copy config
-COPY . .
+COPY ./misc/setup/docker/php.ini /etc/php81/conf.d/settings.ini
 
-# Run composer and clean
+USER root
-RUN composer update --no-cache \
+# Create cache folder
-    && composer install --no-interaction --optimize-autoloader --no-dev --no-cache \
+RUN mkdir /cache && chown -R nobody:nogroup /cache
-    && apt autoclean -y \
+# Install deps
-    && apt autoremove -y \
+RUN apk add --no-cache php81-redis php81-zip php81-tokenizer
-    && rm -rf /var/lib/apt/lists/* \
+USER nobody
-    && rm -rf /usr/bin/composer
 
-EXPOSE 80
+# Copy source
-CMD apachectl -D FOREGROUND
+COPY --chown=nobody . /var/www/html
+
+# Dependencies
+RUN composer install --no-interaction --optimize-autoloader --no-dev --no-cache
+
+EXPOSE 8080

app/Helpers/Wrappers.php

@@ -98,12 +98,6 @@ class Wrappers {
         // 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) {

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "pablouser1/proxitok",
     "description": "An alternative frontend for TikTok",
-    "version": "2.4.9.1",
+    "version": "2.4.9.2",
     "license": "AGPL-3.0-or-later",
     "type": "project",
     "authors": [
@@ -23,8 +23,8 @@
         "ext-mbstring": "*",
         "latte/latte": "^2.11",
         "bramus/router": "^1.6",
-        "josegonzalez/dotenv": "dev-master",
+        "pablouser1/tikscraper": "^2.3",
-        "pablouser1/tikscraper": "^2.3"
+        "josegonzalez/dotenv": "^4.0"
     },
     "autoload": {
         "psr-4": {

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": "790ea9098323ef66c520cfe44b92b7d3",
+    "content-hash": "f94f92790bfe52bdf38e6bd9ba80f40a",
     "packages": [
         {
             "name": "bramus/router",
@@ -99,16 +99,16 @@
         },
         {
             "name": "josegonzalez/dotenv",
-            "version": "dev-master",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/josegonzalez/php-dotenv.git",
-                "reference": "f6d2fb63610f98b7ae859031566228dbade1a79c"
+                "reference": "e97dbd3db53508dcd536e73ec787a7f11458d41d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/josegonzalez/php-dotenv/zipball/f6d2fb63610f98b7ae859031566228dbade1a79c",
+                "url": "https://api.github.com/repos/josegonzalez/php-dotenv/zipball/e97dbd3db53508dcd536e73ec787a7f11458d41d",
-                "reference": "f6d2fb63610f98b7ae859031566228dbade1a79c",
+                "reference": "e97dbd3db53508dcd536e73ec787a7f11458d41d",
                 "shasum": ""
             },
             "require": {
@@ -116,11 +116,10 @@
                 "php": ">=5.5.0"
             },
             "require-dev": {
-                "php-mock/php-mock-phpunit": "^1.1",
+                "php-coveralls/php-coveralls": "~2.0",
-                "satooshi/php-coveralls": "1.*",
+                "php-mock/php-mock-phpunit": "~1.1||~2.0",
-                "squizlabs/php_codesniffer": "2.*"
+                "squizlabs/php_codesniffer": "~2.9||~3.7"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "psr-0": {
@@ -151,9 +150,9 @@
             ],
             "support": {
                 "issues": "https://github.com/josegonzalez/php-dotenv/issues",
-                "source": "https://github.com/josegonzalez/php-dotenv/tree/master"
+                "source": "https://github.com/josegonzalez/php-dotenv/tree/4.0.0"
             },
-            "time": "2019-07-07T21:21:39+00:00"
+            "time": "2023-05-29T22:49:26+00:00"
         },
         {
             "name": "latte/latte",
@@ -614,16 +613,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v5.4.22",
+            "version": "v5.4.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b"
+                "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/4b850da0cc3a2a9181c1ed407adbca4733dc839b",
+                "url": "https://api.github.com/repos/symfony/process/zipball/e3c46cc5689c8782944274bb30702106ecbe3b64",
-                "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b",
+                "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64",
                 "shasum": ""
             },
             "require": {
@@ -656,7 +655,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.22"
+                "source": "https://github.com/symfony/process/tree/v5.4.24"
             },
             "funding": [
                 {
@@ -672,15 +671,13 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-06T21:29:33+00:00"
+            "time": "2023-05-17T11:26:05+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
+    "stability-flags": [],
-        "josegonzalez/dotenv": 20
-    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     container_name: proxitok-web
     image: ghcr.io/pablouser1/proxitok:master
     # ports:
-      #   - 8080:80
+    #   - 8080:8080
     environment:
       - LATTE_CACHE=/cache
       - API_CACHE=redis
@@ -64,6 +64,7 @@ services:
   signer:
     container_name: proxitok-signer
     image: ghcr.io/pablouser1/signtok:master
+    init: true
     networks:
       - proxitok
     user: nobody

misc/setup/docker/php.ini

@@ -0,0 +1,4 @@
+variables_order="EGPCS"
+[Date]
+date.timezone="UTC"
+expose_php=Off

templates/components/themes/default.latte

@@ -8,7 +8,13 @@
   	</figure>
   	<div class="media-content">
       <p>
-      	<strong>{$item->author->nickname}</strong>
+      	<strong>
+					{if $item->author->verified}
+					{include '../icon.latte', icon: 'check-o', text: $item->author->nickname}
+					{else}
+					{$item->author->nickname}
+					{/if}
+				</strong>
 				<small>
 					<a href="{url_user($item->author->uniqueId)}">@{$item->author->uniqueId}</a>
 				</small>
@@ -34,10 +40,9 @@
 			<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(isset($item->duetEnabled) ? $item->duetEnabled : boolval($item->duetDisplay))}</p>
-				<p>Can duet: {bool_to_str($item->duetEnabled)}</p>
+				<p>Can stitch (add this video to other ones): {bool_to_str(isset($item->stitchEnabled) ? $item->stitchEnabled : boolval($item->stitchDisplay))}</p>
-				<p>Can stitch (add this video to other ones): {bool_to_str($item->stitchEnabled)}</p>
+				<p>Can be shared: {bool_to_str(isset($item->shareEnabled) ? $item->shareEnabled : boolval($item->shareDisplay))}
-				<p>Can be shared: {bool_to_str($item->shareEnabled)}
 				{/block}
 				{/embed}
 			</div>

templates/views/user.latte

@@ -12,9 +12,9 @@
 	</figure>
 	<p class="title">
 		{if $info->detail->verified}
-		{include '../components/icon.latte', icon: 'check-o', text: $info->detail->uniqueId}
+		{include '../components/icon.latte', icon: 'check-o', text: $info->detail->nickname}
 		{else}
-		{$info->detail->uniqueId}
+		{$info->detail->nickname}
 		{/if}
 	</p>
 	<p class="subtitle">{include '../components/rss.latte'}</p>