Discord Embed Format Minor Change & Help Nav

.github/workflows/test_suite.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ["7.3", "7.4", "8.0", "8.1", "8.2"]
+        php-versions: ["7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
 
     steps:
     - uses: actions/checkout@v2

CHANGELOG.md

@@ -5,6 +5,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+## [3.8.0] - 2025-01-18
+### Added
+- Support for PHP 8.4
+- Add an `app_email` option to the config (#616)
+- Exporting ShareX settings now work for the latest version of ShareX 16.1.0 (#617)
+- Option to upload file with a custom name (#588)
+- Upload from clipboard (#572)
+
+### Changed
+- Updated translations.
+- Updated dependencies.
+
+### Fixed
+- Page count calculation (#586)
+
 ## [3.7.0] - 2024-01-14
 ### Added
 - Added support for vanity urls.

app/Controllers/ClientController.php

@@ -21,30 +21,38 @@ class ClientController extends Controller
     public function getShareXConfig(Request $request, Response $response, int $id): Response
     {
         $user = make(UserRepository::class)->get($request, $id, true);
-
+    
         if (!$user->token) {
             $this->session->alert(lang('no_upload_token'), 'danger');
-
+    
             return redirect($response, $request->getHeaderLine('Referer'));
         }
-
+
+        $fileBaseName = $user->username . '-ShareX'; // Base file name without extension
+        $fileName = $fileBaseName . '.sxcu'; // Full file name with extension
+
         $json = [
+            'Version' => '16.1.0',
+            'Name' => $fileBaseName,
             'DestinationType' => 'ImageUploader, TextUploader, FileUploader',
+            'RequestMethod' => 'POST',
             'RequestURL' => route('upload'),
-            'FileFormName' => 'upload',
+            'Body' => 'MultipartFormData',
             'Arguments' => [
-                'file' => '$filename$',
-                'text' => '$input$',
+                'file' => '{filename}',
+                'text' => '{input}',
                 'token' => $user->token,
             ],
-            'URL' => '$json:url$',
-            'ThumbnailURL' => '$json:url$/raw',
-            'DeletionURL' => '$json:url$/delete/'.$user->token,
+            'FileFormName' => 'upload',
+            'URL' => '{json:url}',
+            'ThumbnailURL' => '{json:url}/raw',
+            'DeletionURL' => '{json:url}/delete/' . $user->token,
         ];
-
+    
         return json($response, $json, 200, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)
-            ->withHeader('Content-Disposition', 'attachment;filename="'.$user->username.'-ShareX.sxcu"');
+            ->withHeader('Content-Disposition', 'attachment;filename="' . $fileName . '"');
     }
+
 
     /**
      * @param  Request  $request

app/Controllers/UploadController.php

@@ -107,7 +107,7 @@ public function uploadEndpoint(Request $request, Response $response): Response
         }
 
         try {
-            $response = $this->saveMedia($response, $file, $user);
+            $response = $this->saveMedia($response, $file, $user, param($request, 'code'));
         } catch (Exception $e) {
             $this->updateUserQuota($request, $user->id, $file->getSize(), true);
             throw $e;
@@ -118,6 +118,7 @@ public function uploadEndpoint(Request $request, Response $response): Response
     /**
      * @param  Request  $request
      * @param  Response  $response
+     * @param $code
      * @return UploadedFileInterface
      * @throws ValidationException
      */
@@ -182,11 +183,19 @@ protected function validateUser(Request $request, Response $response, UploadedFi
      * @throws \League\Flysystem\FileExistsException
      * @throws \League\Flysystem\FileNotFoundException
      */
-    protected function saveMedia(Response $response, UploadedFileInterface $file, $user)
+    protected function saveMedia(Response $response, UploadedFileInterface $file, $user, $code)
     {
-        do {
-            $code = humanRandomString();
-        } while ($this->database->query('SELECT COUNT(*) AS `count` FROM `uploads` WHERE `code` = ?', $code)->fetch()->count > 0);
+        if ($code === null) {
+            do {
+                $code = humanRandomString();
+            } while ($this->database->query('SELECT COUNT(*) AS `count` FROM `uploads` WHERE `code` = ?', $code)->fetch()->count > 0);
+        } else {
+            $existingCodeCount = $this->database->query('SELECT COUNT(*) AS `count` FROM `uploads` WHERE `code` = ?', $code)->fetch()->count;
+            if ($existingCodeCount > 0) {
+                $this->json['message'] = 'Custom url code already exists.';
+                return json($response, $this->json, 409);
+            }
+        }
 
         $fileInfo = pathinfo($file->getClientFilename());
         $storagePath = "$user->user_code/$code.$fileInfo[extension]";

app/helpers.php

@@ -479,6 +479,12 @@ function dsnFromConfig(array $config): string
      */
     function platform_mail($mailbox = 'no-reply'): string
     {
+        $config = resolve('config');
+
+        if (isset($config['app_email'])) {
+            return $config['app_email'];
+        }
+
         return $mailbox.'@'.str_ireplace('www.', '', parse_url(resolve('config')['base_url'], PHP_URL_HOST));
     }
 }

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "sergix44/xbackbone",
   "license": "AGPL-3.0-only",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "A lightweight ShareX PHP backend",
   "type": "project",
   "require": {
@@ -25,7 +25,7 @@
     "slim/slim": "^4.0",
     "spatie/flysystem-dropbox": "^1.0",
     "superbalist/flysystem-google-storage": "^7.2",
-    "twig/twig": "^2.14"
+    "twig/twig": "^3.11"
   },
   "config": {
     "optimize-autoloader": true,