From 32de7376e12234a5816693b64466762d0732e3ff Mon Sep 17 00:00:00 2001 From: Sergio Brighenti Date: Sun, 25 Apr 2021 13:07:50 +0200 Subject: [PATCH] Added missing discord bot --- app/helpers.php | 2 +- composer.json | 2 +- composer.lock | 93 +++++++++++++++++++------------------- resources/lang/it.lang.php | 2 +- 4 files changed, 50 insertions(+), 49 deletions(-) diff --git a/app/helpers.php b/app/helpers.php index 3758920a..01c4115a 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -332,7 +332,7 @@ function isBot(string $userAgent) 'Slack', 'Twitterbot/', 'discord', - 'Discordbot/' + 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:38.0) Gecko/20100101 Firefox/38.0' // discord image bot ]; foreach ($bots as $bot) { diff --git a/composer.json b/composer.json index 55977e13..b50af575 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "sergix44/xbackbone", "license": "AGPL-3.0-only", - "version": "3.3.4", + "version": "3.3.5", "description": "A lightweight ShareX PHP backend", "type": "project", "require": { diff --git a/composer.lock b/composer.lock index 260139ec..2ada21bd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a343cfc9158b37ec7bedb12ae528b2be", + "content-hash": "8ad3d8582512f7a7b778d587f2de7bf7", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.173.23", + "version": "3.178.9", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "259fa1a47a46f81e66b1ea328ed961a58fa061c2" + "reference": "89710500988a8a7d77f1282fcf6a1d0ad8297eaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/259fa1a47a46f81e66b1ea328ed961a58fa061c2", - "reference": "259fa1a47a46f81e66b1ea328ed961a58fa061c2", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/89710500988a8a7d77f1282fcf6a1d0ad8297eaf", + "reference": "89710500988a8a7d77f1282fcf6a1d0ad8297eaf", "shasum": "" }, "require": { @@ -92,9 +92,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.173.23" + "source": "https://github.com/aws/aws-sdk-php/tree/3.178.9" }, - "time": "2021-03-05T19:20:35+00:00" + "time": "2021-04-23T18:28:02+00:00" }, { "name": "erusev/parsedown", @@ -202,16 +202,16 @@ }, { "name": "google/auth", - "version": "v1.15.0", + "version": "v1.15.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "b346c07de6613e26443d7b4830e5e1933b830dc4" + "reference": "4e0c9367719df9703e96f5ad613041b87742471c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/b346c07de6613e26443d7b4830e5e1933b830dc4", - "reference": "b346c07de6613e26443d7b4830e5e1933b830dc4", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/4e0c9367719df9703e96f5ad613041b87742471c", + "reference": "4e0c9367719df9703e96f5ad613041b87742471c", "shasum": "" }, "require": { @@ -225,7 +225,7 @@ "require-dev": { "guzzlehttp/promises": "0.1.1|^1.3", "kelvinmo/simplejwt": "^0.2.5|^0.5.1", - "phpseclib/phpseclib": "^2", + "phpseclib/phpseclib": "^2.0.31", "phpunit/phpunit": "^4.8.36|^5.7", "sebastian/comparator": ">=1.2.3", "squizlabs/php_codesniffer": "^3.5" @@ -253,22 +253,22 @@ "support": { "docs": "https://googleapis.github.io/google-auth-library-php/master/", "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.15.0" + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.15.1" }, - "time": "2021-02-05T20:50:04+00:00" + "time": "2021-04-21T17:42:05+00:00" }, { "name": "google/cloud-core", - "version": "v1.41.0", + "version": "v1.41.1", "source": { "type": "git", "url": "https://github.com/googleapis/google-cloud-php-core.git", - "reference": "2e58627e1c4f1417631ba4b0a1098b66ac98665c" + "reference": "6c39dfc66eb9e542fcc5d793a1c128d3d006a6b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/2e58627e1c4f1417631ba4b0a1098b66ac98665c", - "reference": "2e58627e1c4f1417631ba4b0a1098b66ac98665c", + "url": "https://api.github.com/repos/googleapis/google-cloud-php-core/zipball/6c39dfc66eb9e542fcc5d793a1c128d3d006a6b8", + "reference": "6c39dfc66eb9e542fcc5d793a1c128d3d006a6b8", "shasum": "" }, "require": { @@ -317,9 +317,9 @@ ], "description": "Google Cloud PHP shared dependency, providing functionality useful to all components.", "support": { - "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.41.0" + "source": "https://github.com/googleapis/google-cloud-php-core/tree/v1.41.1" }, - "time": "2021-01-13T22:28:48+00:00" + "time": "2021-03-18T20:36:57+00:00" }, { "name": "google/cloud-storage", @@ -617,16 +617,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.7.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3" + "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3", - "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1", + "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1", "shasum": "" }, "require": { @@ -686,9 +686,9 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.7.0" + "source": "https://github.com/guzzle/psr7/tree/1.8.1" }, - "time": "2020-09-30T07:37:11+00:00" + "time": "2021-03-21T16:25:00+00:00" }, { "name": "http-interop/http-factory-guzzle", @@ -3106,16 +3106,16 @@ }, { "name": "composer/xdebug-handler", - "version": "1.4.5", + "version": "1.4.6", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "f28d44c286812c714741478d968104c5e604a1d4" + "reference": "f27e06cd9675801df441b3656569b328e04aa37c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f28d44c286812c714741478d968104c5e604a1d4", - "reference": "f28d44c286812c714741478d968104c5e604a1d4", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f27e06cd9675801df441b3656569b328e04aa37c", + "reference": "f27e06cd9675801df441b3656569b328e04aa37c", "shasum": "" }, "require": { @@ -3123,7 +3123,8 @@ "psr/log": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8" + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", "autoload": { @@ -3149,7 +3150,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/1.4.5" + "source": "https://github.com/composer/xdebug-handler/tree/1.4.6" }, "funding": [ { @@ -3165,7 +3166,7 @@ "type": "tidelift" } ], - "time": "2020-11-13T08:04:11+00:00" + "time": "2021-03-25T17:01:18+00:00" }, { "name": "doctrine/instantiator", @@ -3707,16 +3708,16 @@ }, { "name": "nette/robot-loader", - "version": "v3.3.2", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/nette/robot-loader.git", - "reference": "9ad3afdd0d2422db7a58aee76e8b3b7a82f31af5" + "reference": "3973cf3970d1de7b30888fd10b92dac9e0c2fd82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/robot-loader/zipball/9ad3afdd0d2422db7a58aee76e8b3b7a82f31af5", - "reference": "9ad3afdd0d2422db7a58aee76e8b3b7a82f31af5", + "url": "https://api.github.com/repos/nette/robot-loader/zipball/3973cf3970d1de7b30888fd10b92dac9e0c2fd82", + "reference": "3973cf3970d1de7b30888fd10b92dac9e0c2fd82", "shasum": "" }, "require": { @@ -3733,7 +3734,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3768,9 +3769,9 @@ ], "support": { "issues": "https://github.com/nette/robot-loader/issues", - "source": "https://github.com/nette/robot-loader/tree/v3.3.2" + "source": "https://github.com/nette/robot-loader/tree/v3.4.0" }, - "time": "2021-03-06T15:56:17+00:00" + "time": "2021-03-07T15:12:01+00:00" }, { "name": "nette/schema", @@ -5442,16 +5443,16 @@ }, { "name": "symfony/console", - "version": "v4.4.20", + "version": "v4.4.21", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c98349bda966c70d6c08b4cd8658377c94166492" + "reference": "1ba4560dbbb9fcf5ae28b61f71f49c678086cf23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c98349bda966c70d6c08b4cd8658377c94166492", - "reference": "c98349bda966c70d6c08b4cd8658377c94166492", + "url": "https://api.github.com/repos/symfony/console/zipball/1ba4560dbbb9fcf5ae28b61f71f49c678086cf23", + "reference": "1ba4560dbbb9fcf5ae28b61f71f49c678086cf23", "shasum": "" }, "require": { @@ -5511,7 +5512,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.20" + "source": "https://github.com/symfony/console/tree/v4.4.21" }, "funding": [ { @@ -5527,7 +5528,7 @@ "type": "tidelift" } ], - "time": "2021-02-22T18:44:15+00:00" + "time": "2021-03-26T09:23:24+00:00" }, { "name": "symfony/dom-crawler", diff --git a/resources/lang/it.lang.php b/resources/lang/it.lang.php index 1ff91ed5..abaff9e8 100644 --- a/resources/lang/it.lang.php +++ b/resources/lang/it.lang.php @@ -152,7 +152,7 @@ 'user_create_password' => 'Se lasciato vuoto, si consiglia di inviare una notifica all\'utente via e-mail.', 'mail.new_account' => '%s – Nuovo account creato', 'send_notification' => 'Invia notifica e-mail', - 'auto_tagging' => 'Codifica automatica del caricamento', + 'auto_tagging' => 'Tagging automatico degli upload', 'mail.new_account_text_with_pw' => 'Ciao %s!
un nuovo account è stato creato per te su %s (%s), con le seguenti credenziali:

Nome utente: %s
Password: %s

Clicca su questo collegamento per andare alla pagina di accesso:
%s', 'mail.new_account_text_with_reset' => 'Ciao %s!
un nuovo account è stato creato per te su %s (%s), clicca sul seguente collegamento per impostare una password e attivarlo:

%s', 'mail.recover_text' => 'Ciao %s,
è stata richiesta una reimpostazione della password per il tuo account. Per completare la procedura clicca sul seguente collegamento:

%s

Se non sei stato/a tu a richiedere la reimpostazione della password, ignora semplicemente questa e-mail.',