diff --git a/.env b/.env index a59ee2e..9332030 100644 --- a/.env +++ b/.env @@ -48,7 +48,7 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0 # YGGtracker # Application version, used for API and media cache -APP_VERSION=2.6.2 +APP_VERSION='2.2.0' # Application name APP_NAME=YGGtracker @@ -57,11 +57,7 @@ APP_NAME=YGGtracker APP_LOCALE=en # Supported locales for interface and content filters -APP_LOCALES=en|cs|nl|eo|fr|ja|ka|de|he|it|lv|pl|pt|ru|es|uk - -# Content categories, lowercase, enabled by default for new users -# src/Twig/AppExtension.php:transCategory -APP_CATEGORIES=movie|series|tv|animation|music|game|audiobook|podcast|book|archive|picture|software|other +APP_LOCALES=en|cs|eo|fr|ka|de|he|it|lv|pl|pt|ru|es|uk # Items per page on pagination APP_PAGINATION=10 @@ -73,54 +69,24 @@ APP_THEME=default APP_THEMES=default # Default sensitive status for new users -APP_SENSITIVE=1 +APP_SENSITIVE=0 # Default approved status for new users -APP_APPROVED=1 +APP_APPROVED=0 # Default Yggdrasil filters status for new users APP_YGGDRASIL=1 -# Default posters status for new users -APP_POSTERS=1 - # Build-in trackers append to downloads APP_TRACKERS=http://[201:23b4:991a:634d:8359:4521:5576:15b7]:2023/announce|http://[200:1e2f:e608:eb3a:2bf:1e62:87ba:e2f7]/announce|http://[316:c51a:62a3:8b9::5]/announce # List of crawlers where ignored in actions and activity features -APP_CRAWLERS=201:23b4:991a:634d:8359:4521:5576:15b7|30a:5fad::e|202:f2bc:f800:7cc4:c109:7857:5cae:6630|200:1554:e730:4030:605b:47be:6fb6:7b11 +APP_CRAWLERS=201:23b4:991a:634d:8359:4521:5576:15b7|30a:5fad::e -# Max torrent filesize for uploads (check upload_max_filesize in the php.ini) +# Max torrent filesize for uploads APP_TORRENT_FILE_SIZE_MAX=1024000 -# Max torrent poster filesize for uploads (check upload_max_filesize in the php.ini) -APP_TORRENT_POSTER_FILE_SIZE_MAX=10240000 - # Store wanted torrent files in /app/var/ftp by /app/crontab/torrent/scrape/{key} APP_TORRENT_WANTED_FTP_ENABLED=1 APP_TORRENT_WANTED_FTP_FOLDER=/yggtracker -APP_TORRENT_WANTED_FTP_APPROVED_ONLY=1 - -# Enable search index for torrent name -APP_INDEX_TORRENT_NAME_ENABLED=1 - -# Enable search index for torrent info hash v1 -APP_INDEX_TORRENT_HASH_V1_ENABLED=1 - -# Enable search index for torrent info hash v2 -APP_INDEX_TORRENT_HASH_V2_ENABLED=1 - -# Enable search index for torrent filenames -APP_INDEX_TORRENT_FILENAMES_ENABLED=1 - -# Enable search index for torrent source -APP_INDEX_TORRENT_SOURCE_ENABLED=1 - -# Enable search index for torrent comment -APP_INDEX_TORRENT_COMMENT_ENABLED=1 - -# Enable search index for words length greater than N chars -APP_INDEX_WORD_LENGTH_MIN=3 - -# Enable search index for words length not greater than N chars -APP_INDEX_WORD_LENGTH_MAX=255 \ No newline at end of file +APP_TORRENT_WANTED_FTP_APPROVED_ONLY=1 \ No newline at end of file diff --git a/README.md b/README.md index 6ab362a..1013d1f 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,22 @@ # YGGtracker -> [!NOTE] -> Take a look at [βtracker](https://github.com/yggverse/btracker) - the modern aggregation alternative written in Rust! +[![Crowdin](https://badges.crowdin.net/yggtracker/localized.svg)](https://crowdin.com/project/yggtracker) -A social-oriented BitTorrent catalog for the [Yggdrasil](https://github.com/yggdrasil-network) network, written in the Symfony framework. +BitTorrent Network for Yggdrasil -YGGtracker is a manually operated catalog and social network that allows users to share their torrents in the local network. Engine uses IPv6 `0200::/7` addresses to identify users without registration. +YGGtracker is catalog, open tracker and social network with many features that allow to convert, filter and download any torrent in [Yggdrasil network](https://github.com/yggdrasil-network) by community. + +Engine uses IPv6 `0200::/7` addresses to identify users without registration. #### [Showcase](https://github.com/YGGverse/YGGtracker/wiki/Showcase) ![Pasted image 1](https://github.com/YGGverse/YGGtracker/assets/108541346/962f7850-01e1-4add-9dbe-c11b80108a75) +#### Instances + +* `http://[201:23b4:991a:634d:8359:4521:5576:15b7]/yggtracker/` + + `ftp://[201:23b4:991a:634d:8359:4521:5576:15b7]:21/yggtracker/` + #### Installation ``` @@ -56,7 +62,7 @@ php bin/console doctrine:migrations:migrate ##### FTP -Setup anonymous read-only access to `/var/ftp` catalog ([read more](https://github.com/YGGverse/YGGtracker/wiki/Features#the-wanted)) +Setup anonymous read-only access to `/var/ftp` catalog ([read more](https://github.com/YGGverse/YGGtracker/wiki/Features#wanted)) ##### App settings @@ -64,7 +70,7 @@ Custom settings could be provided in the `/.env.local` file by overwriting defau #### Localization -[![Crowdin](https://badges.crowdin.net/yggtracker/localized.svg)](https://crowdin.com/project/yggtracker) +Join community translations by [Crowdin](https://crowdin.com/project/yggtracker) #### API @@ -79,6 +85,15 @@ git checkout main git checkout -b my-pr-branch-name ``` +#### Donate to contributors + +* @d47081: + + + ![wakatime](https://wakatime.com/badge/user/0b7fe6c1-b091-4c98-b930-75cfee17c7a5/project/059ec567-2c65-4c65-a48e-51dcc366f1a0.svg) + + [BTC](https://www.blockchain.com/explorer/addresses/btc/bc1qngdf2kwty6djjqpk0ynkpq9wmlrmtm7e0c534y) | [LTC](https://live.blockcypher.com/ltc/address/LUSiqzKsfB1vBLvpu515DZktG9ioKqLyj7) | [XMR](835gSR1Uvka19gnWPkU2pyRozZugRZSPHDuFL6YajaAqjEtMwSPr4jafM8idRuBWo7AWD3pwFQSYRMRW9XezqrK4BEXBgXE) | [ZEPH](ZEPHsADHXqnhfWhXrRcXnyBQMucE3NM7Ng5ZVB99XwA38PTnbjLKpCwcQVgoie8EJuWozKgBiTmDFW4iY7fNEgSEWyAy4dotqtX) + + Support our server by order [Linux VPS](https://www.yourserver.se/portal/aff.php?aff=610) + + Inspiration by [SomaFM Deep Space One](https://somafm.com/deepspaceone/) + #### License * Engine sources [MIT License](https://github.com/YGGverse/YGGtracker/blob/main/LICENSE) @@ -92,8 +107,7 @@ git checkout -b my-pr-branch-name * [Symfony Framework](https://symfony.com) * [SVG icons](https://icons.getbootstrap.com) * [Scrapper](https://github.com/medariox/scrapeer) / [Composer Edition](https://github.com/YGGverse/scrapeer) -* [Bencode](https://github.com/Rhilip/Bencode) -* [Transliteration](https://github.com/ashtokalo/php-translit) +* [Bencode Library](https://github.com/Rhilip/Bencode) * [Identicons](https://github.com/dmester/jdenticon-php) #### Support @@ -106,10 +120,9 @@ git checkout -b my-pr-branch-name * [Mastodon](https://mastodon.social/@YGGverse) -#### Integrations +#### Plugins -* [YGGtracker Search Plugin for qBittorrent](https://github.com/YGGverse/qbittorrent-yggtracker-search-plugin) -* [Crontab script that allows to receive wanted torrents from multiple YGGtracker nodes](https://github.com/YGGverse/yggtracker-wanted-torrents-receiver) +* [qBitTorrent](https://github.com/YGGverse/qbittorrent-yggtracker-search-plugin) #### See also diff --git a/composer.json b/composer.json index 0126d61..c0d3e3c 100644 --- a/composer.json +++ b/composer.json @@ -9,13 +9,11 @@ "php": ">=8.1", "ext-ctype": "*", "ext-iconv": "*", - "ashtokalo/php-translit": "^0.2.0", "doctrine/annotations": "^2.0", "doctrine/doctrine-bundle": "^2.10", "doctrine/doctrine-migrations-bundle": "^3.2", "doctrine/orm": "^2.16", "jdenticon/jdenticon": "^1.0", - "league/commonmark": "^2.4", "phpdocumentor/reflection-docblock": "^5.3", "phpstan/phpdoc-parser": "^1.24", "rhilip/bencode": "^2.3", @@ -46,9 +44,8 @@ "symfony/validator": "6.3.*", "symfony/web-link": "6.3.*", "symfony/yaml": "6.3.*", - "twig/extra-bundle": "^3.7", + "twig/extra-bundle": "^2.12|^3.0", "twig/intl-extra": "^3.7", - "twig/markdown-extra": "^3.7", "twig/string-extra": "^3.7", "twig/twig": "^2.12|^3.0", "yggverse/scrapeer": "^0.5.4" diff --git a/composer.lock b/composer.lock index efca9a6..e3eddf2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,126 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "99ad25219a6bff24126d6f83ebd1756a", + "content-hash": "3770ffcd80695bc10a22f8ece4f68d1f", "packages": [ - { - "name": "ashtokalo/php-translit", - "version": "0.2.0", - "source": { - "type": "git", - "url": "https://github.com/ashtokalo/php-translit.git", - "reference": "8ced36cbcd0ed8befb1388ef51935eb53bcfe5b3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ashtokalo/php-translit/zipball/8ced36cbcd0ed8befb1388ef51935eb53bcfe5b3", - "reference": "8ced36cbcd0ed8befb1388ef51935eb53bcfe5b3", - "shasum": "" - }, - "require": { - "php": ">=7.0" - }, - "require-dev": { - "phpunit/phpunit": "~7.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "ashtokalo\\translit\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PHP library to convert text from one script to another.", - "keywords": [ - "latinization", - "romanization", - "translit", - "transliteration" - ], - "support": { - "issues": "https://github.com/ashtokalo/php-translit/issues", - "source": "https://github.com/ashtokalo/php-translit/tree/0.2.0" - }, - "time": "2022-09-26T09:05:24+00:00" - }, - { - "name": "dflydev/dot-access-data", - "version": "v3.0.2", - "source": { - "type": "git", - "url": "https://github.com/dflydev/dflydev-dot-access-data.git", - "reference": "f41715465d65213d644d3141a6a93081be5d3549" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549", - "reference": "f41715465d65213d644d3141a6a93081be5d3549", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^0.12.42", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.3", - "scrutinizer/ocular": "1.6.0", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.0.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Dflydev\\DotAccessData\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dragonfly Development Inc.", - "email": "info@dflydev.com", - "homepage": "http://dflydev.com" - }, - { - "name": "Beau Simensen", - "email": "beau@dflydev.com", - "homepage": "http://beausimensen.com" - }, - { - "name": "Carlos Frutos", - "email": "carlos@kiwing.it", - "homepage": "https://github.com/cfrutos" - }, - { - "name": "Colin O'Dell", - "email": "colinodell@gmail.com", - "homepage": "https://www.colinodell.com" - } - ], - "description": "Given a deep data structure, access data by dot notation.", - "homepage": "https://github.com/dflydev/dflydev-dot-access-data", - "keywords": [ - "access", - "data", - "dot", - "notation" - ], - "support": { - "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues", - "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2" - }, - "time": "2022-10-27T11:44:00+00:00" - }, { "name": "doctrine/annotations", "version": "2.0.1", @@ -472,16 +354,16 @@ }, { "name": "doctrine/dbal", - "version": "3.7.2", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "0ac3c270590e54910715e9a1a044cc368df282b2" + "reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2", - "reference": "0ac3c270590e54910715e9a1a044cc368df282b2", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/00d03067f07482f025d41ab55e4ba0db5eca2cdf", + "reference": "00d03067f07482f025d41ab55e4ba0db5eca2cdf", "shasum": "" }, "require": { @@ -497,7 +379,7 @@ "doctrine/coding-standard": "12.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.1", - "phpstan/phpstan": "1.10.42", + "phpstan/phpstan": "1.10.35", "phpstan/phpstan-strict-rules": "^1.5", "phpunit/phpunit": "9.6.13", "psalm/plugin-phpunit": "0.18.4", @@ -565,7 +447,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.7.2" + "source": "https://github.com/doctrine/dbal/tree/3.7.0" }, "funding": [ { @@ -581,7 +463,7 @@ "type": "tidelift" } ], - "time": "2023-11-19T08:06:58+00:00" + "time": "2023-09-26T20:56:55+00:00" }, { "name": "doctrine/deprecations", @@ -632,59 +514,56 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "2.11.1", + "version": "2.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "4089f1424b724786c062aea50aae5f773449b94b" + "reference": "f28b1f78de3a2938ff05cfe751233097624cc756" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/4089f1424b724786c062aea50aae5f773449b94b", - "reference": "4089f1424b724786c062aea50aae5f773449b94b", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/f28b1f78de3a2938ff05cfe751233097624cc756", + "reference": "f28b1f78de3a2938ff05cfe751233097624cc756", "shasum": "" }, "require": { "doctrine/cache": "^1.11 || ^2.0", - "doctrine/dbal": "^3.7.0 || ^4.0", + "doctrine/dbal": "^3.6.0", "doctrine/persistence": "^2.2 || ^3", "doctrine/sql-formatter": "^1.0.1", "php": "^7.4 || ^8.0", - "symfony/cache": "^5.4 || ^6.0 || ^7.0", - "symfony/config": "^5.4 || ^6.0 || ^7.0", - "symfony/console": "^5.4 || ^6.0 || ^7.0", - "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", + "symfony/cache": "^5.4 || ^6.0", + "symfony/config": "^5.4 || ^6.0", + "symfony/console": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0", "symfony/deprecation-contracts": "^2.1 || ^3", - "symfony/doctrine-bridge": "^5.4.19 || ^6.0.7 || ^7.0", - "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0", - "symfony/polyfill-php80": "^1.15", + "symfony/doctrine-bridge": "^5.4.19 || ^6.0.7", + "symfony/framework-bundle": "^5.4 || ^6.0", "symfony/service-contracts": "^1.1.1 || ^2.0 || ^3" }, "conflict": { "doctrine/annotations": ">=3.0", - "doctrine/orm": "<2.14 || >=4.0", + "doctrine/orm": "<2.11 || >=3.0", "twig/twig": "<1.34 || >=2.0 <2.4" }, "require-dev": { "doctrine/annotations": "^1 || ^2", - "doctrine/coding-standard": "^12", + "doctrine/coding-standard": "^9.0", "doctrine/deprecations": "^1.0", - "doctrine/orm": "^2.14 || ^3.0", + "doctrine/orm": "^2.11 || ^3.0", "friendsofphp/proxy-manager-lts": "^1.0", "phpunit/phpunit": "^9.5.26 || ^10.0", "psalm/plugin-phpunit": "^0.18.4", "psalm/plugin-symfony": "^4", "psr/log": "^1.1.4 || ^2.0 || ^3.0", - "symfony/phpunit-bridge": "^6.1 || ^7.0", - "symfony/property-info": "^5.4 || ^6.0 || ^7.0", - "symfony/proxy-manager-bridge": "^5.4 || ^6.0 || ^7.0", - "symfony/security-bundle": "^5.4 || ^6.0 || ^7.0", - "symfony/string": "^5.4 || ^6.0 || ^7.0", - "symfony/twig-bridge": "^5.4 || ^6.0 || ^7.0", - "symfony/validator": "^5.4 || ^6.0 || ^7.0", - "symfony/var-exporter": "^5.4 || ^6.2 || ^7.0", - "symfony/web-profiler-bundle": "^5.4 || ^6.0 || ^7.0", - "symfony/yaml": "^5.4 || ^6.0 || ^7.0", + "symfony/phpunit-bridge": "^6.1", + "symfony/property-info": "^5.4 || ^6.0", + "symfony/proxy-manager-bridge": "^5.4 || ^6.0", + "symfony/security-bundle": "^5.4 || ^6.0", + "symfony/twig-bridge": "^5.4 || ^6.0", + "symfony/validator": "^5.4 || ^6.0", + "symfony/web-profiler-bundle": "^5.4 || ^6.0", + "symfony/yaml": "^5.4 || ^6.0", "twig/twig": "^1.34 || ^2.12 || ^3.0", "vimeo/psalm": "^4.30" }, @@ -731,7 +610,7 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineBundle/issues", - "source": "https://github.com/doctrine/DoctrineBundle/tree/2.11.1" + "source": "https://github.com/doctrine/DoctrineBundle/tree/2.10.2" }, "funding": [ { @@ -747,44 +626,38 @@ "type": "tidelift" } ], - "time": "2023-11-15T20:01:50+00:00" + "time": "2023-08-06T09:31:40+00:00" }, { "name": "doctrine/doctrine-migrations-bundle", - "version": "3.3.0", + "version": "3.2.4", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", - "reference": "1dd42906a5fb9c5960723e2ebb45c68006493835" + "reference": "94e6b0fe1a50901d52f59dbb9b4b0737718b2c1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/1dd42906a5fb9c5960723e2ebb45c68006493835", - "reference": "1dd42906a5fb9c5960723e2ebb45c68006493835", + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/94e6b0fe1a50901d52f59dbb9b4b0737718b2c1e", + "reference": "94e6b0fe1a50901d52f59dbb9b4b0737718b2c1e", "shasum": "" }, "require": { - "doctrine/doctrine-bundle": "^2.4", + "doctrine/doctrine-bundle": "~1.0|~2.0", "doctrine/migrations": "^3.2", "php": "^7.2|^8.0", - "symfony/deprecation-contracts": "^2.1 || ^3", - "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0" + "symfony/framework-bundle": "~3.4|~4.0|~5.0|~6.0" }, "require-dev": { - "doctrine/coding-standard": "^12", - "doctrine/orm": "^2.6 || ^3", - "doctrine/persistence": "^2.0 || ^3 ", + "doctrine/coding-standard": "^9", + "doctrine/orm": "^2.6", + "doctrine/persistence": "^1.3||^2.0", "phpstan/phpstan": "^1.4", "phpstan/phpstan-deprecation-rules": "^1", "phpstan/phpstan-phpunit": "^1", "phpstan/phpstan-strict-rules": "^1.1", - "phpstan/phpstan-symfony": "^1.3", "phpunit/phpunit": "^8.5|^9.5", - "psalm/plugin-phpunit": "^0.18.4", - "psalm/plugin-symfony": "^3 || ^5", - "symfony/phpunit-bridge": "^6.3 || ^7", - "symfony/var-exporter": "^5.4 || ^6 || ^7", - "vimeo/psalm": "^4.30 || ^5.15" + "vimeo/psalm": "^4.22" }, "type": "symfony-bundle", "autoload": { @@ -822,7 +695,7 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues", - "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.3.0" + "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.2.4" }, "funding": [ { @@ -838,7 +711,7 @@ "type": "tidelift" } ], - "time": "2023-11-13T19:44:41+00:00" + "time": "2023-06-02T08:19:26+00:00" }, { "name": "doctrine/event-manager", @@ -1172,47 +1045,47 @@ }, { "name": "doctrine/migrations", - "version": "3.7.2", + "version": "3.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "47af29eef49f29ebee545947e8b2a4b3be318c8a" + "reference": "e542ad8bcd606d7a18d0875babb8a6d963c9c059" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/47af29eef49f29ebee545947e8b2a4b3be318c8a", - "reference": "47af29eef49f29ebee545947e8b2a4b3be318c8a", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/e542ad8bcd606d7a18d0875babb8a6d963c9c059", + "reference": "e542ad8bcd606d7a18d0875babb8a6d963c9c059", "shasum": "" }, "require": { "composer-runtime-api": "^2", - "doctrine/dbal": "^3.5.1 || ^4", + "doctrine/dbal": "^3.5.1", "doctrine/deprecations": "^0.5.3 || ^1", "doctrine/event-manager": "^1.2 || ^2.0", "php": "^8.1", "psr/log": "^1.1.3 || ^2 || ^3", - "symfony/console": "^5.4 || ^6.0 || ^7.0", - "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0", - "symfony/var-exporter": "^6.2 || ^7.0" + "symfony/console": "^4.4.16 || ^5.4 || ^6.0", + "symfony/stopwatch": "^4.4 || ^5.4 || ^6.0", + "symfony/var-exporter": "^6.2" }, "conflict": { - "doctrine/orm": "<2.12 || >=4" + "doctrine/orm": "<2.12" }, "require-dev": { - "doctrine/coding-standard": "^12", - "doctrine/orm": "^2.13 || ^3", + "doctrine/coding-standard": "^9", + "doctrine/orm": "^2.13", "doctrine/persistence": "^2 || ^3", "doctrine/sql-formatter": "^1.0", "ext-pdo_sqlite": "*", - "phpstan/phpstan": "^1.10", - "phpstan/phpstan-deprecation-rules": "^1.1", - "phpstan/phpstan-phpunit": "^1.3", - "phpstan/phpstan-strict-rules": "^1.4", - "phpstan/phpstan-symfony": "^1.3", - "phpunit/phpunit": "^10.3", - "symfony/cache": "^5.4 || ^6.0 || ^7.0", - "symfony/process": "^5.4 || ^6.0 || ^7.0", - "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-deprecation-rules": "^1", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.1", + "phpstan/phpstan-symfony": "^1.1", + "phpunit/phpunit": "^9.5.24", + "symfony/cache": "^4.4 || ^5.4 || ^6.0", + "symfony/process": "^4.4 || ^5.4 || ^6.0", + "symfony/yaml": "^4.4 || ^5.4 || ^6.0" }, "suggest": { "doctrine/sql-formatter": "Allows to generate formatted SQL with the diff command.", @@ -1254,7 +1127,7 @@ ], "support": { "issues": "https://github.com/doctrine/migrations/issues", - "source": "https://github.com/doctrine/migrations/tree/3.7.2" + "source": "https://github.com/doctrine/migrations/tree/3.6.0" }, "funding": [ { @@ -1270,20 +1143,20 @@ "type": "tidelift" } ], - "time": "2023-12-05T11:35:05+00:00" + "time": "2023-02-15T18:49:46+00:00" }, { "name": "doctrine/orm", - "version": "2.17.1", + "version": "2.16.2", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "1a4fe6e0bb67762370937a7e6cee3da40a9122d1" + "reference": "17500f56eaa930f5cd14d765bc2cd851c7d37cc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/1a4fe6e0bb67762370937a7e6cee3da40a9122d1", - "reference": "1a4fe6e0bb67762370937a7e6cee3da40a9122d1", + "url": "https://api.github.com/repos/doctrine/orm/zipball/17500f56eaa930f5cd14d765bc2cd851c7d37cc0", + "reference": "17500f56eaa930f5cd14d765bc2cd851c7d37cc0", "shasum": "" }, "require": { @@ -1301,7 +1174,7 @@ "ext-ctype": "*", "php": "^7.1 || ^8.0", "psr/cache": "^1 || ^2 || ^3", - "symfony/console": "^4.2 || ^5.0 || ^6.0 || ^7.0", + "symfony/console": "^4.2 || ^5.0 || ^6.0", "symfony/polyfill-php72": "^1.23", "symfony/polyfill-php80": "^1.16" }, @@ -1312,14 +1185,14 @@ "doctrine/annotations": "^1.13 || ^2", "doctrine/coding-standard": "^9.0.2 || ^12.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "~1.4.10 || 1.10.35", + "phpstan/phpstan": "~1.4.10 || 1.10.28", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", "psr/log": "^1 || ^2 || ^3", "squizlabs/php_codesniffer": "3.7.2", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/var-exporter": "^4.4 || ^5.4 || ^6.2", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", - "vimeo/psalm": "4.30.0 || 5.15.0" + "vimeo/psalm": "4.30.0 || 5.14.1" }, "suggest": { "ext-dom": "Provides support for XSD validation for XML mapping files", @@ -1369,9 +1242,9 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.17.1" + "source": "https://github.com/doctrine/orm/tree/2.16.2" }, - "time": "2023-11-17T06:25:40+00:00" + "time": "2023-08-27T18:21:56+00:00" }, { "name": "doctrine/persistence", @@ -1639,206 +1512,18 @@ }, "time": "2022-10-30T17:15:02+00:00" }, - { - "name": "league/commonmark", - "version": "2.4.1", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/commonmark.git", - "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/3669d6d5f7a47a93c08ddff335e6d945481a1dd5", - "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "league/config": "^1.1.1", - "php": "^7.4 || ^8.0", - "psr/event-dispatcher": "^1.0", - "symfony/deprecation-contracts": "^2.1 || ^3.0", - "symfony/polyfill-php80": "^1.16" - }, - "require-dev": { - "cebe/markdown": "^1.0", - "commonmark/cmark": "0.30.0", - "commonmark/commonmark.js": "0.30.0", - "composer/package-versions-deprecated": "^1.8", - "embed/embed": "^4.4", - "erusev/parsedown": "^1.0", - "ext-json": "*", - "github/gfm": "0.29.0", - "michelf/php-markdown": "^1.4 || ^2.0", - "nyholm/psr7": "^1.5", - "phpstan/phpstan": "^1.8.2", - "phpunit/phpunit": "^9.5.21", - "scrutinizer/ocular": "^1.8.1", - "symfony/finder": "^5.3 | ^6.0", - "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0", - "unleashedtech/php-coding-standard": "^3.1.1", - "vimeo/psalm": "^4.24.0 || ^5.0.0" - }, - "suggest": { - "symfony/yaml": "v2.3+ required if using the Front Matter extension" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - } - }, - "autoload": { - "psr-4": { - "League\\CommonMark\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Colin O'Dell", - "email": "colinodell@gmail.com", - "homepage": "https://www.colinodell.com", - "role": "Lead Developer" - } - ], - "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and GitHub-Flavored Markdown (GFM)", - "homepage": "https://commonmark.thephpleague.com", - "keywords": [ - "commonmark", - "flavored", - "gfm", - "github", - "github-flavored", - "markdown", - "md", - "parser" - ], - "support": { - "docs": "https://commonmark.thephpleague.com/", - "forum": "https://github.com/thephpleague/commonmark/discussions", - "issues": "https://github.com/thephpleague/commonmark/issues", - "rss": "https://github.com/thephpleague/commonmark/releases.atom", - "source": "https://github.com/thephpleague/commonmark" - }, - "funding": [ - { - "url": "https://www.colinodell.com/sponsor", - "type": "custom" - }, - { - "url": "https://www.paypal.me/colinpodell/10.00", - "type": "custom" - }, - { - "url": "https://github.com/colinodell", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/league/commonmark", - "type": "tidelift" - } - ], - "time": "2023-08-30T16:55:00+00:00" - }, - { - "name": "league/config", - "version": "v1.2.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/config.git", - "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/config/zipball/754b3604fb2984c71f4af4a9cbe7b57f346ec1f3", - "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3", - "shasum": "" - }, - "require": { - "dflydev/dot-access-data": "^3.0.1", - "nette/schema": "^1.2", - "php": "^7.4 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^1.8.2", - "phpunit/phpunit": "^9.5.5", - "scrutinizer/ocular": "^1.8.1", - "unleashedtech/php-coding-standard": "^3.1", - "vimeo/psalm": "^4.7.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.2-dev" - } - }, - "autoload": { - "psr-4": { - "League\\Config\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Colin O'Dell", - "email": "colinodell@gmail.com", - "homepage": "https://www.colinodell.com", - "role": "Lead Developer" - } - ], - "description": "Define configuration arrays with strict schemas and access values with dot notation", - "homepage": "https://config.thephpleague.com", - "keywords": [ - "array", - "config", - "configuration", - "dot", - "dot-access", - "nested", - "schema" - ], - "support": { - "docs": "https://config.thephpleague.com/", - "issues": "https://github.com/thephpleague/config/issues", - "rss": "https://github.com/thephpleague/config/releases.atom", - "source": "https://github.com/thephpleague/config" - }, - "funding": [ - { - "url": "https://www.colinodell.com/sponsor", - "type": "custom" - }, - { - "url": "https://www.paypal.me/colinpodell/10.00", - "type": "custom" - }, - { - "url": "https://github.com/colinodell", - "type": "github" - } - ], - "time": "2022-12-11T20:36:23+00:00" - }, { "name": "monolog/monolog", - "version": "3.5.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448" + "reference": "e2392369686d420ca32df3803de28b5d6f76867d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448", - "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/e2392369686d420ca32df3803de28b5d6f76867d", + "reference": "e2392369686d420ca32df3803de28b5d6f76867d", "shasum": "" }, "require": { @@ -1914,7 +1599,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.5.0" + "source": "https://github.com/Seldaek/monolog/tree/3.4.0" }, "funding": [ { @@ -1926,155 +1611,7 @@ "type": "tidelift" } ], - "time": "2023-10-27T15:32:31+00:00" - }, - { - "name": "nette/schema", - "version": "v1.2.5", - "source": { - "type": "git", - "url": "https://github.com/nette/schema.git", - "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a", - "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a", - "shasum": "" - }, - "require": { - "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0", - "php": "7.1 - 8.3" - }, - "require-dev": { - "nette/tester": "^2.3 || ^2.4", - "phpstan/phpstan-nette": "^1.0", - "tracy/tracy": "^2.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "📐 Nette Schema: validating data structures against a given Schema.", - "homepage": "https://nette.org", - "keywords": [ - "config", - "nette" - ], - "support": { - "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.2.5" - }, - "time": "2023-10-05T20:37:59+00:00" - }, - { - "name": "nette/utils", - "version": "v4.0.3", - "source": { - "type": "git", - "url": "https://github.com/nette/utils.git", - "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/a9d127dd6a203ce6d255b2e2db49759f7506e015", - "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015", - "shasum": "" - }, - "require": { - "php": ">=8.0 <8.4" - }, - "conflict": { - "nette/finder": "<3", - "nette/schema": "<1.2.2" - }, - "require-dev": { - "jetbrains/phpstorm-attributes": "dev-master", - "nette/tester": "^2.5", - "phpstan/phpstan": "^1.0", - "tracy/tracy": "^2.9" - }, - "suggest": { - "ext-gd": "to use Image", - "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()", - "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", - "ext-json": "to use Nette\\Utils\\Json", - "ext-mbstring": "to use Strings::lower() etc...", - "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.", - "homepage": "https://nette.org", - "keywords": [ - "array", - "core", - "datetime", - "images", - "json", - "nette", - "paginator", - "password", - "slugify", - "string", - "unicode", - "utf-8", - "utility", - "validation" - ], - "support": { - "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.0.3" - }, - "time": "2023-10-29T21:02:13+00:00" + "time": "2023-06-21T08:46:11+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2246,16 +1783,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.4", + "version": "1.24.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496" + "reference": "bcad8d995980440892759db0c32acae7c8e79442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6bd0c26f3786cd9b7c359675cb789e35a8e07496", - "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", + "reference": "bcad8d995980440892759db0c32acae7c8e79442", "shasum": "" }, "require": { @@ -2287,9 +1824,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.4" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" }, - "time": "2023-11-26T18:29:22+00:00" + "time": "2023-09-26T12:28:12+00:00" }, { "name": "psr/cache", @@ -2599,23 +2136,22 @@ }, { "name": "rhilip/bencode", - "version": "v2.4.2", + "version": "v2.3.3", "source": { "type": "git", "url": "https://github.com/Rhilip/Bencode.git", - "reference": "d5b51d02f73017834c53aa76aff2403fb753ac97" + "reference": "fd37d13bb745352d40879dbbfa6da85af91e49f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Rhilip/Bencode/zipball/d5b51d02f73017834c53aa76aff2403fb753ac97", - "reference": "d5b51d02f73017834c53aa76aff2403fb753ac97", + "url": "https://api.github.com/repos/Rhilip/Bencode/zipball/fd37d13bb745352d40879dbbfa6da85af91e49f1", + "reference": "fd37d13bb745352d40879dbbfa6da85af91e49f1", "shasum": "" }, "require": { "php": "^7.3|^8.0" }, "require-dev": { - "ext-json": "*", "phpunit/phpunit": "^9.0" }, "suggest": { @@ -2645,22 +2181,22 @@ ], "support": { "issues": "https://github.com/Rhilip/Bencode/issues", - "source": "https://github.com/Rhilip/Bencode/tree/v2.4.2" + "source": "https://github.com/Rhilip/Bencode/tree/v2.3.3" }, - "time": "2023-11-05T11:24:41+00:00" + "time": "2023-05-27T01:47:00+00:00" }, { "name": "symfony/asset", - "version": "v6.3.8", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/asset.git", - "reference": "b2382a403f2111836301623d89e9af3d84989525" + "reference": "b77a4cc8e266b7e0db688de740f9ee7253aa411c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/asset/zipball/b2382a403f2111836301623d89e9af3d84989525", - "reference": "b2382a403f2111836301623d89e9af3d84989525", + "url": "https://api.github.com/repos/symfony/asset/zipball/b77a4cc8e266b7e0db688de740f9ee7253aa411c", + "reference": "b77a4cc8e266b7e0db688de740f9ee7253aa411c", "shasum": "" }, "require": { @@ -2700,7 +2236,7 @@ "description": "Manages URL generation and versioning of web assets such as CSS stylesheets, JavaScript files and image files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/asset/tree/v6.3.8" + "source": "https://github.com/symfony/asset/tree/v6.3.0" }, "funding": [ { @@ -2716,20 +2252,20 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:07:48+00:00" + "time": "2023-04-21T14:41:17+00:00" }, { "name": "symfony/cache", - "version": "v6.3.9", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "8c6e84272e4febbb1fed3c5b9f3c722537c2bd55" + "reference": "6c1a3ea078c4d88ee892530945df63a87981b2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/8c6e84272e4febbb1fed3c5b9f3c722537c2bd55", - "reference": "8c6e84272e4febbb1fed3c5b9f3c722537c2bd55", + "url": "https://api.github.com/repos/symfony/cache/zipball/6c1a3ea078c4d88ee892530945df63a87981b2da", + "reference": "6c1a3ea078c4d88ee892530945df63a87981b2da", "shasum": "" }, "require": { @@ -2738,7 +2274,7 @@ "psr/log": "^1.1|^2|^3", "symfony/cache-contracts": "^2.5|^3", "symfony/service-contracts": "^2.5|^3", - "symfony/var-exporter": "^6.3.6" + "symfony/var-exporter": "^6.2.10" }, "conflict": { "doctrine/dbal": "<2.13.1", @@ -2753,7 +2289,7 @@ }, "require-dev": { "cache/integration-tests": "dev-master", - "doctrine/dbal": "^2.13.1|^3|^4", + "doctrine/dbal": "^2.13.1|^3.0", "predis/predis": "^1.1|^2.0", "psr/simple-cache": "^1.0|^2.0|^3.0", "symfony/config": "^5.4|^6.0", @@ -2796,7 +2332,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.3.9" + "source": "https://github.com/symfony/cache/tree/v6.3.5" }, "funding": [ { @@ -2812,20 +2348,20 @@ "type": "tidelift" } ], - "time": "2023-11-24T13:24:35+00:00" + "time": "2023-09-26T15:48:55+00:00" }, { "name": "symfony/cache-contracts", - "version": "v3.4.0", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "1d74b127da04ffa87aa940abe15446fa89653778" + "reference": "ad945640ccc0ae6e208bcea7d7de4b39b569896b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778", - "reference": "1d74b127da04ffa87aa940abe15446fa89653778", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/ad945640ccc0ae6e208bcea7d7de4b39b569896b", + "reference": "ad945640ccc0ae6e208bcea7d7de4b39b569896b", "shasum": "" }, "require": { @@ -2872,7 +2408,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/cache-contracts/tree/v3.3.0" }, "funding": [ { @@ -2888,7 +2424,7 @@ "type": "tidelift" } ], - "time": "2023-09-25T12:52:38+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/clock", @@ -2965,16 +2501,16 @@ }, { "name": "symfony/config", - "version": "v6.3.8", + "version": "v6.3.2", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "b7a63887960359e5b59b15826fa9f9be10acbe88" + "reference": "b47ca238b03e7b0d7880ffd1cf06e8d637ca1467" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/b7a63887960359e5b59b15826fa9f9be10acbe88", - "reference": "b7a63887960359e5b59b15826fa9f9be10acbe88", + "url": "https://api.github.com/repos/symfony/config/zipball/b47ca238b03e7b0d7880ffd1cf06e8d637ca1467", + "reference": "b47ca238b03e7b0d7880ffd1cf06e8d637ca1467", "shasum": "" }, "require": { @@ -3020,7 +2556,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.3.8" + "source": "https://github.com/symfony/config/tree/v6.3.2" }, "funding": [ { @@ -3036,20 +2572,20 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:28:21+00:00" + "time": "2023-07-19T20:22:16+00:00" }, { "name": "symfony/console", - "version": "v6.3.9", + "version": "v6.3.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0566dbd051f8648d980592c7849f5d90d2c7c60c" + "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0566dbd051f8648d980592c7849f5d90d2c7c60c", - "reference": "0566dbd051f8648d980592c7849f5d90d2c7c60c", + "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6", + "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", "shasum": "" }, "require": { @@ -3110,7 +2646,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.3.9" + "source": "https://github.com/symfony/console/tree/v6.3.4" }, "funding": [ { @@ -3126,7 +2662,7 @@ "type": "tidelift" } ], - "time": "2023-11-20T16:36:29+00:00" + "time": "2023-08-16T10:10:12+00:00" }, { "name": "symfony/crowdin-translation-provider", @@ -3203,16 +2739,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v6.3.10", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "51383a1d9d7e93d5c3c76ddc32672de1b3e82c77" + "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/51383a1d9d7e93d5c3c76ddc32672de1b3e82c77", - "reference": "51383a1d9d7e93d5c3c76ddc32672de1b3e82c77", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ed62b3bf98346e1f45529a7b6be2196739bb993", + "reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993", "shasum": "" }, "require": { @@ -3264,7 +2800,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.3.10" + "source": "https://github.com/symfony/dependency-injection/tree/v6.3.5" }, "funding": [ { @@ -3280,11 +2816,11 @@ "type": "tidelift" } ], - "time": "2023-12-01T14:25:58+00:00" + "time": "2023-09-25T16:46:40+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.4.0", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -3331,7 +2867,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" }, "funding": [ { @@ -3351,16 +2887,16 @@ }, { "name": "symfony/doctrine-bridge", - "version": "v6.3.8", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "8842d289d41320a0f725e996b4e58d84af398a9e" + "reference": "9977eb1adf999ceded213e88c1ac6dff7a1a0306" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/8842d289d41320a0f725e996b4e58d84af398a9e", - "reference": "8842d289d41320a0f725e996b4e58d84af398a9e", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/9977eb1adf999ceded213e88c1ac6dff7a1a0306", + "reference": "9977eb1adf999ceded213e88c1ac6dff7a1a0306", "shasum": "" }, "require": { @@ -3393,8 +2929,8 @@ "doctrine/annotations": "^1.13.1|^2", "doctrine/collections": "^1.0|^2.0", "doctrine/data-fixtures": "^1.1", - "doctrine/dbal": "^2.13.1|^3|^4", - "doctrine/orm": "^2.12|^3", + "doctrine/dbal": "^2.13.1|^3.0", + "doctrine/orm": "^2.12", "psr/log": "^1|^2|^3", "symfony/cache": "^5.4|^6.0", "symfony/config": "^5.4|^6.0", @@ -3441,7 +2977,7 @@ "description": "Provides integration for Doctrine with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/doctrine-bridge/tree/v6.3.8" + "source": "https://github.com/symfony/doctrine-bridge/tree/v6.3.5" }, "funding": [ { @@ -3457,24 +2993,24 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:07:48+00:00" + "time": "2023-09-29T16:16:03+00:00" }, { "name": "symfony/doctrine-messenger", - "version": "v6.3.10", + "version": "v6.3.1", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-messenger.git", - "reference": "b225f860450a34291bc5983f87d57fb7b9ef18b8" + "reference": "f1c253e24ae6d2bc4939b1439e074e6d2e73ecdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-messenger/zipball/b225f860450a34291bc5983f87d57fb7b9ef18b8", - "reference": "b225f860450a34291bc5983f87d57fb7b9ef18b8", + "url": "https://api.github.com/repos/symfony/doctrine-messenger/zipball/f1c253e24ae6d2bc4939b1439e074e6d2e73ecdb", + "reference": "f1c253e24ae6d2bc4939b1439e074e6d2e73ecdb", "shasum": "" }, "require": { - "doctrine/dbal": "^2.13|^3|^4", + "doctrine/dbal": "^2.13|^3.0", "php": ">=8.1", "symfony/messenger": "^5.4|^6.0", "symfony/service-contracts": "^2.5|^3" @@ -3513,7 +3049,7 @@ "description": "Symfony Doctrine Messenger Bridge", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/doctrine-messenger/tree/v6.3.10" + "source": "https://github.com/symfony/doctrine-messenger/tree/v6.3.1" }, "funding": [ { @@ -3529,20 +3065,20 @@ "type": "tidelift" } ], - "time": "2023-12-01T09:24:52+00:00" + "time": "2023-06-24T11:51:27+00:00" }, { "name": "symfony/dotenv", - "version": "v6.3.7", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", - "reference": "7dfbe2976f3c1b7cfa8fac2212a050bfa9bd7d9e" + "reference": "ceadb434fe2a6763a03d2d110441745834f3dd1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/7dfbe2976f3c1b7cfa8fac2212a050bfa9bd7d9e", - "reference": "7dfbe2976f3c1b7cfa8fac2212a050bfa9bd7d9e", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/ceadb434fe2a6763a03d2d110441745834f3dd1e", + "reference": "ceadb434fe2a6763a03d2d110441745834f3dd1e", "shasum": "" }, "require": { @@ -3587,7 +3123,7 @@ "environment" ], "support": { - "source": "https://github.com/symfony/dotenv/tree/v6.3.7" + "source": "https://github.com/symfony/dotenv/tree/v6.3.0" }, "funding": [ { @@ -3603,7 +3139,7 @@ "type": "tidelift" } ], - "time": "2023-10-26T18:15:14+00:00" + "time": "2023-04-21T14:41:17+00:00" }, { "name": "symfony/error-handler", @@ -3761,7 +3297,7 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.4.0", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", @@ -3817,7 +3353,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0" }, "funding": [ { @@ -4028,16 +3564,16 @@ }, { "name": "symfony/flex", - "version": "v2.4.2", + "version": "v2.3.3", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "67ee785f1aedada76461de7a7ec10cd7f8ff8d36" + "reference": "9c402af768c6c9f8126a9ffa192ecf7c16581e35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/67ee785f1aedada76461de7a7ec10cd7f8ff8d36", - "reference": "67ee785f1aedada76461de7a7ec10cd7f8ff8d36", + "url": "https://api.github.com/repos/symfony/flex/zipball/9c402af768c6c9f8126a9ffa192ecf7c16581e35", + "reference": "9c402af768c6c9f8126a9ffa192ecf7c16581e35", "shasum": "" }, "require": { @@ -4073,7 +3609,7 @@ "description": "Composer plugin for Symfony", "support": { "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v2.4.2" + "source": "https://github.com/symfony/flex/tree/v2.3.3" }, "funding": [ { @@ -4089,20 +3625,20 @@ "type": "tidelift" } ], - "time": "2023-12-05T14:09:35+00:00" + "time": "2023-08-04T09:02:35+00:00" }, { "name": "symfony/form", - "version": "v6.3.10", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "5afc7334b9d60dd0799612faf3d103b25bc60ae4" + "reference": "0f9ad8600c1021983d096512066ee54332aa3139" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/5afc7334b9d60dd0799612faf3d103b25bc60ae4", - "reference": "5afc7334b9d60dd0799612faf3d103b25bc60ae4", + "url": "https://api.github.com/repos/symfony/form/zipball/0f9ad8600c1021983d096512066ee54332aa3139", + "reference": "0f9ad8600c1021983d096512066ee54332aa3139", "shasum": "" }, "require": { @@ -4170,7 +3706,7 @@ "description": "Allows to easily create, process and reuse HTML forms", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/form/tree/v6.3.10" + "source": "https://github.com/symfony/form/tree/v6.3.5" }, "funding": [ { @@ -4186,20 +3722,20 @@ "type": "tidelift" } ], - "time": "2023-11-30T11:08:22+00:00" + "time": "2023-09-10T17:47:23+00:00" }, { "name": "symfony/framework-bundle", - "version": "v6.3.9", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "f83d20092e98c3ae8b5874b8f0787546c5c61cda" + "reference": "567cafcfc08e3076b47290a7558b0ca17a98b0ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/f83d20092e98c3ae8b5874b8f0787546c5c61cda", - "reference": "f83d20092e98c3ae8b5874b8f0787546c5c61cda", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/567cafcfc08e3076b47290a7558b0ca17a98b0ce", + "reference": "567cafcfc08e3076b47290a7558b0ca17a98b0ce", "shasum": "" }, "require": { @@ -4314,7 +3850,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v6.3.9" + "source": "https://github.com/symfony/framework-bundle/tree/v6.3.5" }, "funding": [ { @@ -4330,20 +3866,20 @@ "type": "tidelift" } ], - "time": "2023-11-24T10:25:33+00:00" + "time": "2023-09-29T10:45:15+00:00" }, { "name": "symfony/http-client", - "version": "v6.3.8", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "0314e2d49939a9831929d6fc81c01c6df137fd0a" + "reference": "213e564da4cbf61acc9728d97e666bcdb868c10d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/0314e2d49939a9831929d6fc81c01c6df137fd0a", - "reference": "0314e2d49939a9831929d6fc81c01c6df137fd0a", + "url": "https://api.github.com/repos/symfony/http-client/zipball/213e564da4cbf61acc9728d97e666bcdb868c10d", + "reference": "213e564da4cbf61acc9728d97e666bcdb868c10d", "shasum": "" }, "require": { @@ -4406,7 +3942,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.3.8" + "source": "https://github.com/symfony/http-client/tree/v6.3.5" }, "funding": [ { @@ -4422,20 +3958,20 @@ "type": "tidelift" } ], - "time": "2023-11-06T18:31:59+00:00" + "time": "2023-09-29T15:57:12+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v3.4.0", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "1ee70e699b41909c209a0c930f11034b93578654" + "reference": "3b66325d0176b4ec826bffab57c9037d759c31fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654", - "reference": "1ee70e699b41909c209a0c930f11034b93578654", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/3b66325d0176b4ec826bffab57c9037d759c31fb", + "reference": "3b66325d0176b4ec826bffab57c9037d759c31fb", "shasum": "" }, "require": { @@ -4484,7 +4020,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.3.0" }, "funding": [ { @@ -4500,20 +4036,20 @@ "type": "tidelift" } ], - "time": "2023-07-30T20:28:31+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.3.9", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "49a04fd3a21edc9ce503ab78e9f342805fefe780" + "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49a04fd3a21edc9ce503ab78e9f342805fefe780", - "reference": "49a04fd3a21edc9ce503ab78e9f342805fefe780", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b50f5e281d722cb0f4c296f908bacc3e2b721957", + "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957", "shasum": "" }, "require": { @@ -4523,12 +4059,12 @@ "symfony/polyfill-php83": "^1.27" }, "conflict": { - "symfony/cache": "<6.3" + "symfony/cache": "<6.2" }, "require-dev": { - "doctrine/dbal": "^2.13.1|^3|^4", + "doctrine/dbal": "^2.13.1|^3.0", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^6.3", + "symfony/cache": "^5.4|^6.0", "symfony/dependency-injection": "^5.4|^6.0", "symfony/expression-language": "^5.4|^6.0", "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4", @@ -4561,7 +4097,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.3.9" + "source": "https://github.com/symfony/http-foundation/tree/v6.3.5" }, "funding": [ { @@ -4577,20 +4113,20 @@ "type": "tidelift" } ], - "time": "2023-11-20T16:36:29+00:00" + "time": "2023-09-04T21:33:54+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.3.10", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8d8e7aa60593fd0a2e3c1cea08cc687314841b61" + "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8d8e7aa60593fd0a2e3c1cea08cc687314841b61", - "reference": "8d8e7aa60593fd0a2e3c1cea08cc687314841b61", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9f991a964368bee8d883e8d57ced4fe9fff04dfc", + "reference": "9f991a964368bee8d883e8d57ced4fe9fff04dfc", "shasum": "" }, "require": { @@ -4674,7 +4210,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.3.10" + "source": "https://github.com/symfony/http-kernel/tree/v6.3.5" }, "funding": [ { @@ -4690,20 +4226,20 @@ "type": "tidelift" } ], - "time": "2023-12-01T16:57:27+00:00" + "time": "2023-09-30T06:37:04+00:00" }, { "name": "symfony/intl", - "version": "v6.3.7", + "version": "v6.3.2", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "4cc98c05f2c55150a6aa5b3e20667f7a6d06cca9" + "reference": "1f8cb145c869ed089a8531c51a6a4b31ed0b3c69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/4cc98c05f2c55150a6aa5b3e20667f7a6d06cca9", - "reference": "4cc98c05f2c55150a6aa5b3e20667f7a6d06cca9", + "url": "https://api.github.com/repos/symfony/intl/zipball/1f8cb145c869ed089a8531c51a6a4b31ed0b3c69", + "reference": "1f8cb145c869ed089a8531c51a6a4b31ed0b3c69", "shasum": "" }, "require": { @@ -4756,7 +4292,7 @@ "localization" ], "support": { - "source": "https://github.com/symfony/intl/tree/v6.3.7" + "source": "https://github.com/symfony/intl/tree/v6.3.2" }, "funding": [ { @@ -4772,7 +4308,7 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:11:45+00:00" + "time": "2023-07-20T07:43:09+00:00" }, { "name": "symfony/mailer", @@ -4856,23 +4392,22 @@ }, { "name": "symfony/messenger", - "version": "v6.3.9", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/messenger.git", - "reference": "096b151f955d5ac56cc61a3ca0e16b38ff093805" + "reference": "fb29632c2abdc52f4f10f9402f8f93ebb8938234" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/messenger/zipball/096b151f955d5ac56cc61a3ca0e16b38ff093805", - "reference": "096b151f955d5ac56cc61a3ca0e16b38ff093805", + "url": "https://api.github.com/repos/symfony/messenger/zipball/fb29632c2abdc52f4f10f9402f8f93ebb8938234", + "reference": "fb29632c2abdc52f4f10f9402f8f93ebb8938234", "shasum": "" }, "require": { "php": ">=8.1", "psr/log": "^1|^2|^3", - "symfony/clock": "^6.3", - "symfony/deprecation-contracts": "^2.5|^3" + "symfony/clock": "^6.3" }, "conflict": { "symfony/console": "<6.3", @@ -4886,6 +4421,7 @@ "psr/cache": "^1.0|^2.0|^3.0", "symfony/console": "^6.3", "symfony/dependency-injection": "^5.4|^6.0", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/event-dispatcher": "^5.4|^6.0", "symfony/http-kernel": "^5.4|^6.0", "symfony/process": "^5.4|^6.0", @@ -4923,7 +4459,7 @@ "description": "Helps applications send and receive messages to/from other applications or via message queues", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/messenger/tree/v6.3.9" + "source": "https://github.com/symfony/messenger/tree/v6.3.5" }, "funding": [ { @@ -4939,7 +4475,7 @@ "type": "tidelift" } ], - "time": "2023-11-22T19:13:10+00:00" + "time": "2023-09-29T16:11:24+00:00" }, { "name": "symfony/mime", @@ -5027,16 +4563,16 @@ }, { "name": "symfony/monolog-bridge", - "version": "v6.3.8", + "version": "v6.3.1", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bridge.git", - "reference": "2bbfc8bd9d6f966b69eda20c66762580a0410c78" + "reference": "04b04b8e465e0fa84940e5609b6796a8b4e51bf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/2bbfc8bd9d6f966b69eda20c66762580a0410c78", - "reference": "2bbfc8bd9d6f966b69eda20c66762580a0410c78", + "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/04b04b8e465e0fa84940e5609b6796a8b4e51bf1", + "reference": "04b04b8e465e0fa84940e5609b6796a8b4e51bf1", "shasum": "" }, "require": { @@ -5085,7 +4621,7 @@ "description": "Provides integration for Monolog with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/monolog-bridge/tree/v6.3.8" + "source": "https://github.com/symfony/monolog-bridge/tree/v6.3.1" }, "funding": [ { @@ -5101,34 +4637,34 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:07:48+00:00" + "time": "2023-06-08T11:13:32+00:00" }, { "name": "symfony/monolog-bundle", - "version": "v3.10.0", + "version": "v3.8.0", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181" + "reference": "a41bbcdc1105603b6d73a7d9a43a3788f8e0fb7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181", - "reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/a41bbcdc1105603b6d73a7d9a43a3788f8e0fb7d", + "reference": "a41bbcdc1105603b6d73a7d9a43a3788f8e0fb7d", "shasum": "" }, "require": { - "monolog/monolog": "^1.25.1 || ^2.0 || ^3.0", - "php": ">=7.2.5", - "symfony/config": "^5.4 || ^6.0 || ^7.0", - "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", - "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0", - "symfony/monolog-bridge": "^5.4 || ^6.0 || ^7.0" + "monolog/monolog": "^1.22 || ^2.0 || ^3.0", + "php": ">=7.1.3", + "symfony/config": "~4.4 || ^5.0 || ^6.0", + "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0", + "symfony/http-kernel": "~4.4 || ^5.0 || ^6.0", + "symfony/monolog-bridge": "~4.4 || ^5.0 || ^6.0" }, "require-dev": { - "symfony/console": "^5.4 || ^6.0 || ^7.0", - "symfony/phpunit-bridge": "^6.3 || ^7.0", - "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + "symfony/console": "~4.4 || ^5.0 || ^6.0", + "symfony/phpunit-bridge": "^5.2 || ^6.0", + "symfony/yaml": "~4.4 || ^5.0 || ^6.0" }, "type": "symfony-bundle", "extra": { @@ -5166,7 +4702,7 @@ ], "support": { "issues": "https://github.com/symfony/monolog-bundle/issues", - "source": "https://github.com/symfony/monolog-bundle/tree/v3.10.0" + "source": "https://github.com/symfony/monolog-bundle/tree/v3.8.0" }, "funding": [ { @@ -5182,20 +4718,20 @@ "type": "tidelift" } ], - "time": "2023-11-06T17:08:13+00:00" + "time": "2022-05-10T14:24:36+00:00" }, { "name": "symfony/notifier", - "version": "v6.3.6", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/notifier.git", - "reference": "2e39d4a9a96e25d127ffe30171127f6ef73934df" + "reference": "a30aee1bf767835d7948138c1629e310cee26a8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/notifier/zipball/2e39d4a9a96e25d127ffe30171127f6ef73934df", - "reference": "2e39d4a9a96e25d127ffe30171127f6ef73934df", + "url": "https://api.github.com/repos/symfony/notifier/zipball/a30aee1bf767835d7948138c1629e310cee26a8b", + "reference": "a30aee1bf767835d7948138c1629e310cee26a8b", "shasum": "" }, "require": { @@ -5244,7 +4780,7 @@ "notifier" ], "support": { - "source": "https://github.com/symfony/notifier/tree/v6.3.6" + "source": "https://github.com/symfony/notifier/tree/v6.3.0" }, "funding": [ { @@ -5260,7 +4796,7 @@ "type": "tidelift" } ], - "time": "2023-10-07T07:32:05+00:00" + "time": "2023-05-12T10:17:15+00:00" }, { "name": "symfony/options-resolver", @@ -5331,16 +4867,16 @@ }, { "name": "symfony/password-hasher", - "version": "v6.3.8", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/password-hasher.git", - "reference": "82161c4bebf77900372083ec6e484b5f055b0cba" + "reference": "278d3a49715073879f75e372ad80b8cfeca949d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/password-hasher/zipball/82161c4bebf77900372083ec6e484b5f055b0cba", - "reference": "82161c4bebf77900372083ec6e484b5f055b0cba", + "url": "https://api.github.com/repos/symfony/password-hasher/zipball/278d3a49715073879f75e372ad80b8cfeca949d3", + "reference": "278d3a49715073879f75e372ad80b8cfeca949d3", "shasum": "" }, "require": { @@ -5383,7 +4919,7 @@ "password" ], "support": { - "source": "https://github.com/symfony/password-hasher/tree/v6.3.8" + "source": "https://github.com/symfony/password-hasher/tree/v6.3.5" }, "funding": [ { @@ -5399,7 +4935,7 @@ "type": "tidelift" } ], - "time": "2023-11-06T10:58:05+00:00" + "time": "2023-09-25T17:05:16+00:00" }, { "name": "symfony/polyfill-intl-grapheme", @@ -6043,16 +5579,16 @@ }, { "name": "symfony/property-info", - "version": "v6.3.9", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "664ae7ad443d7cc591ff3e15496b954e4cefe729" + "reference": "7f3a03716112269741fe2a809f8f791a371d1fcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/664ae7ad443d7cc591ff3e15496b954e4cefe729", - "reference": "664ae7ad443d7cc591ff3e15496b954e4cefe729", + "url": "https://api.github.com/repos/symfony/property-info/zipball/7f3a03716112269741fe2a809f8f791a371d1fcd", + "reference": "7f3a03716112269741fe2a809f8f791a371d1fcd", "shasum": "" }, "require": { @@ -6106,7 +5642,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v6.3.9" + "source": "https://github.com/symfony/property-info/tree/v6.3.0" }, "funding": [ { @@ -6122,20 +5658,20 @@ "type": "tidelift" } ], - "time": "2023-11-24T11:57:32+00:00" + "time": "2023-05-19T08:06:44+00:00" }, { "name": "symfony/routing", - "version": "v6.3.10", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "cb7404232d49dd11cc971b832fcbd49e7c22b049" + "reference": "82616e59acd3e3d9c916bba798326cb7796d7d31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/cb7404232d49dd11cc971b832fcbd49e7c22b049", - "reference": "cb7404232d49dd11cc971b832fcbd49e7c22b049", + "url": "https://api.github.com/repos/symfony/routing/zipball/82616e59acd3e3d9c916bba798326cb7796d7d31", + "reference": "82616e59acd3e3d9c916bba798326cb7796d7d31", "shasum": "" }, "require": { @@ -6189,7 +5725,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.3.10" + "source": "https://github.com/symfony/routing/tree/v6.3.5" }, "funding": [ { @@ -6205,7 +5741,7 @@ "type": "tidelift" } ], - "time": "2023-12-01T14:25:58+00:00" + "time": "2023-09-20T16:05:51+00:00" }, { "name": "symfony/runtime", @@ -6288,16 +5824,16 @@ }, { "name": "symfony/security-bundle", - "version": "v6.3.8", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/security-bundle.git", - "reference": "57889ebb1ac3403d550c787c4fde127261abacb6" + "reference": "2df460eacceb11b9287cfafddda4d27023dd9001" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-bundle/zipball/57889ebb1ac3403d550c787c4fde127261abacb6", - "reference": "57889ebb1ac3403d550c787c4fde127261abacb6", + "url": "https://api.github.com/repos/symfony/security-bundle/zipball/2df460eacceb11b9287cfafddda4d27023dd9001", + "reference": "2df460eacceb11b9287cfafddda4d27023dd9001", "shasum": "" }, "require": { @@ -6314,8 +5850,7 @@ "symfony/password-hasher": "^5.4|^6.0", "symfony/security-core": "^6.2", "symfony/security-csrf": "^5.4|^6.0", - "symfony/security-http": "^6.3.6", - "symfony/service-contracts": "^2.5|^3" + "symfony/security-http": "^6.3.4" }, "conflict": { "symfony/browser-kit": "<5.4", @@ -6379,7 +5914,7 @@ "description": "Provides a tight integration of the Security component into the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-bundle/tree/v6.3.8" + "source": "https://github.com/symfony/security-bundle/tree/v6.3.5" }, "funding": [ { @@ -6395,20 +5930,20 @@ "type": "tidelift" } ], - "time": "2023-11-09T09:33:10+00:00" + "time": "2023-09-25T17:05:55+00:00" }, { "name": "symfony/security-core", - "version": "v6.3.7", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "7ceb30fed93f5ea40ccde3173d1f7712527c0d62" + "reference": "ec8f24dc1195f46483510892271d01a5202bba70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/7ceb30fed93f5ea40ccde3173d1f7712527c0d62", - "reference": "7ceb30fed93f5ea40ccde3173d1f7712527c0d62", + "url": "https://api.github.com/repos/symfony/security-core/zipball/ec8f24dc1195f46483510892271d01a5202bba70", + "reference": "ec8f24dc1195f46483510892271d01a5202bba70", "shasum": "" }, "require": { @@ -6464,7 +5999,7 @@ "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-core/tree/v6.3.7" + "source": "https://github.com/symfony/security-core/tree/v6.3.5" }, "funding": [ { @@ -6480,7 +6015,7 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:11:45+00:00" + "time": "2023-09-10T17:47:23+00:00" }, { "name": "symfony/security-csrf", @@ -6552,16 +6087,16 @@ }, { "name": "symfony/security-http", - "version": "v6.3.8", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/security-http.git", - "reference": "19f7b5f5d20879a976d6d376e359bc975dfc6002" + "reference": "47058ea557a4c64ba86e9249651222842bd52e2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-http/zipball/19f7b5f5d20879a976d6d376e359bc975dfc6002", - "reference": "19f7b5f5d20879a976d6d376e359bc975dfc6002", + "url": "https://api.github.com/repos/symfony/security-http/zipball/47058ea557a4c64ba86e9249651222842bd52e2a", + "reference": "47058ea557a4c64ba86e9249651222842bd52e2a", "shasum": "" }, "require": { @@ -6571,8 +6106,7 @@ "symfony/http-kernel": "^6.3", "symfony/polyfill-mbstring": "~1.0", "symfony/property-access": "^5.4|^6.0", - "symfony/security-core": "^6.3", - "symfony/service-contracts": "^2.5|^3" + "symfony/security-core": "^6.3" }, "conflict": { "symfony/clock": "<6.3", @@ -6620,7 +6154,7 @@ "description": "Symfony Security Component - HTTP Integration", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-http/tree/v6.3.8" + "source": "https://github.com/symfony/security-http/tree/v6.3.5" }, "funding": [ { @@ -6636,20 +6170,20 @@ "type": "tidelift" } ], - "time": "2023-11-09T21:20:12+00:00" + "time": "2023-08-30T06:30:46+00:00" }, { "name": "symfony/serializer", - "version": "v6.3.10", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "6eee0fd95f5caa1e77cab29552620ebf8e5b1a5f" + "reference": "855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/6eee0fd95f5caa1e77cab29552620ebf8e5b1a5f", - "reference": "6eee0fd95f5caa1e77cab29552620ebf8e5b1a5f", + "url": "https://api.github.com/repos/symfony/serializer/zipball/855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c", + "reference": "855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c", "shasum": "" }, "require": { @@ -6714,7 +6248,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v6.3.10" + "source": "https://github.com/symfony/serializer/tree/v6.3.5" }, "funding": [ { @@ -6730,20 +6264,20 @@ "type": "tidelift" } ], - "time": "2023-12-01T14:25:58+00:00" + "time": "2023-09-29T16:18:53+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.4.0", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838" + "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838", - "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", + "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", "shasum": "" }, "require": { @@ -6796,7 +6330,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.3.0" }, "funding": [ { @@ -6812,7 +6346,7 @@ "type": "tidelift" } ], - "time": "2023-07-30T20:28:31+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/stopwatch", @@ -6878,16 +6412,16 @@ }, { "name": "symfony/string", - "version": "v6.3.9", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "56427887aeaf540e9bbd121ad6c43f14ad3ce136" + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/56427887aeaf540e9bbd121ad6c43f14ad3ce136", - "reference": "56427887aeaf540e9bbd121ad6c43f14ad3ce136", + "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", "shasum": "" }, "require": { @@ -6944,7 +6478,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.9" + "source": "https://github.com/symfony/string/tree/v6.3.5" }, "funding": [ { @@ -6960,20 +6494,20 @@ "type": "tidelift" } ], - "time": "2023-11-28T20:40:29+00:00" + "time": "2023-09-18T10:38:32+00:00" }, { "name": "symfony/translation", - "version": "v6.3.7", + "version": "v6.3.3", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "30212e7c87dcb79c83f6362b00bde0e0b1213499" + "reference": "3ed078c54bc98bbe4414e1e9b2d5e85ed5a5c8bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/30212e7c87dcb79c83f6362b00bde0e0b1213499", - "reference": "30212e7c87dcb79c83f6362b00bde0e0b1213499", + "url": "https://api.github.com/repos/symfony/translation/zipball/3ed078c54bc98bbe4414e1e9b2d5e85ed5a5c8bd", + "reference": "3ed078c54bc98bbe4414e1e9b2d5e85ed5a5c8bd", "shasum": "" }, "require": { @@ -7039,7 +6573,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.3.7" + "source": "https://github.com/symfony/translation/tree/v6.3.3" }, "funding": [ { @@ -7055,20 +6589,20 @@ "type": "tidelift" } ], - "time": "2023-10-28T23:11:45+00:00" + "time": "2023-07-31T07:08:24+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.4.0", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5" + "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/dee0c6e5b4c07ce851b462530088e64b255ac9c5", - "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/02c24deb352fb0d79db5486c0c79905a85e37e86", + "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86", "shasum": "" }, "require": { @@ -7117,7 +6651,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.3.0" }, "funding": [ { @@ -7133,20 +6667,20 @@ "type": "tidelift" } ], - "time": "2023-07-25T15:08:44+00:00" + "time": "2023-05-30T17:17:10+00:00" }, { "name": "symfony/twig-bridge", - "version": "v6.3.8", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "c51407623959a626784ff302419026f56dc4e1ba" + "reference": "18f2cbe1d46ad43c4d3bd45e5e6279172068e064" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/c51407623959a626784ff302419026f56dc4e1ba", - "reference": "c51407623959a626784ff302419026f56dc4e1ba", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/18f2cbe1d46ad43c4d3bd45e5e6279172068e064", + "reference": "18f2cbe1d46ad43c4d3bd45e5e6279172068e064", "shasum": "" }, "require": { @@ -7225,7 +6759,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v6.3.8" + "source": "https://github.com/symfony/twig-bridge/tree/v6.3.5" }, "funding": [ { @@ -7241,20 +6775,20 @@ "type": "tidelift" } ], - "time": "2023-11-09T21:20:12+00:00" + "time": "2023-09-12T06:57:20+00:00" }, { "name": "symfony/twig-bundle", - "version": "v6.3.8", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/twig-bundle.git", - "reference": "82429320fe931dd50825ec08140c54b3a315bf79" + "reference": "d0cd4d1675c0582d27c2e8bb0dc27c0303d8e3ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/82429320fe931dd50825ec08140c54b3a315bf79", - "reference": "82429320fe931dd50825ec08140c54b3a315bf79", + "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/d0cd4d1675c0582d27c2e8bb0dc27c0303d8e3ea", + "reference": "d0cd4d1675c0582d27c2e8bb0dc27c0303d8e3ea", "shasum": "" }, "require": { @@ -7310,7 +6844,7 @@ "description": "Provides a tight integration of Twig into the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bundle/tree/v6.3.8" + "source": "https://github.com/symfony/twig-bundle/tree/v6.3.0" }, "funding": [ { @@ -7326,20 +6860,20 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:07:48+00:00" + "time": "2023-05-06T09:53:41+00:00" }, { "name": "symfony/validator", - "version": "v6.3.9", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "c118889931856af47b0732b609f3ac2ddccd1da6" + "reference": "48e815ba3b5eb72e632588dbf7ea2dc4e608ee47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/c118889931856af47b0732b609f3ac2ddccd1da6", - "reference": "c118889931856af47b0732b609f3ac2ddccd1da6", + "url": "https://api.github.com/repos/symfony/validator/zipball/48e815ba3b5eb72e632588dbf7ea2dc4e608ee47", + "reference": "48e815ba3b5eb72e632588dbf7ea2dc4e608ee47", "shasum": "" }, "require": { @@ -7406,7 +6940,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.3.9" + "source": "https://github.com/symfony/validator/tree/v6.3.5" }, "funding": [ { @@ -7422,20 +6956,20 @@ "type": "tidelift" } ], - "time": "2023-11-29T07:44:47+00:00" + "time": "2023-09-29T07:41:15+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.3.8", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a" + "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/81acabba9046550e89634876ca64bfcd3c06aa0a", - "reference": "81acabba9046550e89634876ca64bfcd3c06aa0a", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3d9999376be5fea8de47752837a3e1d1c5f69ef5", + "reference": "3d9999376be5fea8de47752837a3e1d1c5f69ef5", "shasum": "" }, "require": { @@ -7490,7 +7024,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.3.8" + "source": "https://github.com/symfony/var-dumper/tree/v6.3.5" }, "funding": [ { @@ -7506,20 +7040,20 @@ "type": "tidelift" } ], - "time": "2023-11-08T10:42:36+00:00" + "time": "2023-09-12T10:11:35+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.3.10", + "version": "v6.3.4", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "7bfcf232a9c7e4acad00e96774e340eb86d10bf0" + "reference": "df1f8aac5751871b83d30bf3e2c355770f8f0691" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/7bfcf232a9c7e4acad00e96774e340eb86d10bf0", - "reference": "7bfcf232a9c7e4acad00e96774e340eb86d10bf0", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/df1f8aac5751871b83d30bf3e2c355770f8f0691", + "reference": "df1f8aac5751871b83d30bf3e2c355770f8f0691", "shasum": "" }, "require": { @@ -7564,7 +7098,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.3.10" + "source": "https://github.com/symfony/var-exporter/tree/v6.3.4" }, "funding": [ { @@ -7580,7 +7114,7 @@ "type": "tidelift" } ], - "time": "2023-11-29T16:00:50+00:00" + "time": "2023-08-16T18:14:47+00:00" }, { "name": "symfony/web-link", @@ -7667,16 +7201,16 @@ }, { "name": "symfony/yaml", - "version": "v6.3.8", + "version": "v6.3.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92" + "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/3493af8a8dad7fa91c77fa473ba23ecd95334a92", - "reference": "3493af8a8dad7fa91c77fa473ba23ecd95334a92", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e23292e8c07c85b971b44c1c4b87af52133e2add", + "reference": "e23292e8c07c85b971b44c1c4b87af52133e2add", "shasum": "" }, "require": { @@ -7719,7 +7253,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.3.8" + "source": "https://github.com/symfony/yaml/tree/v6.3.3" }, "funding": [ { @@ -7735,31 +7269,31 @@ "type": "tidelift" } ], - "time": "2023-11-06T10:58:05+00:00" + "time": "2023-07-31T07:08:24+00:00" }, { "name": "twig/extra-bundle", - "version": "v3.8.0", + "version": "v3.7.1", "source": { "type": "git", "url": "https://github.com/twigphp/twig-extra-bundle.git", - "reference": "32807183753de0388c8e59f7ac2d13bb47311140" + "reference": "f10baafe6eb0ecd615d52d5cbfb713a39f68e8f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/32807183753de0388c8e59f7ac2d13bb47311140", - "reference": "32807183753de0388c8e59f7ac2d13bb47311140", + "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/f10baafe6eb0ecd615d52d5cbfb713a39f68e8f3", + "reference": "f10baafe6eb0ecd615d52d5cbfb713a39f68e8f3", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/framework-bundle": "^5.4|^6.0|^7.0", - "symfony/twig-bundle": "^5.4|^6.0|^7.0", - "twig/twig": "^3.0" + "symfony/framework-bundle": "^5.4|^6.0", + "symfony/twig-bundle": "^5.4|^6.0", + "twig/twig": "^2.7|^3.0" }, "require-dev": { "league/commonmark": "^1.0|^2.0", - "symfony/phpunit-bridge": "^6.4|^7.0", + "symfony/phpunit-bridge": "^5.4|^6.3", "twig/cache-extra": "^3.0", "twig/cssinliner-extra": "^2.12|^3.0", "twig/html-extra": "^2.12|^3.0", @@ -7797,7 +7331,7 @@ "twig" ], "support": { - "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.8.0" + "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.7.1" }, "funding": [ { @@ -7809,29 +7343,29 @@ "type": "tidelift" } ], - "time": "2023-11-21T14:02:01+00:00" + "time": "2023-07-29T15:34:56+00:00" }, { "name": "twig/intl-extra", - "version": "v3.8.0", + "version": "v3.7.1", "source": { "type": "git", "url": "https://github.com/twigphp/intl-extra.git", - "reference": "7b3db67c700735f473a265a97e1adaeba3e6ca0c" + "reference": "4f4fe572f635534649cc069e1dafe4a8ad63774d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/intl-extra/zipball/7b3db67c700735f473a265a97e1adaeba3e6ca0c", - "reference": "7b3db67c700735f473a265a97e1adaeba3e6ca0c", + "url": "https://api.github.com/repos/twigphp/intl-extra/zipball/4f4fe572f635534649cc069e1dafe4a8ad63774d", + "reference": "4f4fe572f635534649cc069e1dafe4a8ad63774d", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/intl": "^5.4|^6.0|^7.0", - "twig/twig": "^3.0" + "php": ">=7.1.3", + "symfony/intl": "^5.4|^6.0", + "twig/twig": "^2.7|^3.0" }, "require-dev": { - "symfony/phpunit-bridge": "^6.4|^7.0" + "symfony/phpunit-bridge": "^5.4|^6.3" }, "type": "library", "autoload": { @@ -7861,7 +7395,7 @@ "twig" ], "support": { - "source": "https://github.com/twigphp/intl-extra/tree/v3.8.0" + "source": "https://github.com/twigphp/intl-extra/tree/v3.7.1" }, "funding": [ { @@ -7873,98 +7407,30 @@ "type": "tidelift" } ], - "time": "2023-11-21T17:27:48+00:00" - }, - { - "name": "twig/markdown-extra", - "version": "v3.8.0", - "source": { - "type": "git", - "url": "https://github.com/twigphp/markdown-extra.git", - "reference": "b6e4954ab60030233df5d293886b5404558daac8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twigphp/markdown-extra/zipball/b6e4954ab60030233df5d293886b5404558daac8", - "reference": "b6e4954ab60030233df5d293886b5404558daac8", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "twig/twig": "^3.0" - }, - "require-dev": { - "erusev/parsedown": "^1.7", - "league/commonmark": "^1.0|^2.0", - "league/html-to-markdown": "^4.8|^5.0", - "michelf/php-markdown": "^1.8|^2.0", - "symfony/phpunit-bridge": "^6.4|^7.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Twig\\Extra\\Markdown\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - } - ], - "description": "A Twig extension for Markdown", - "homepage": "https://twig.symfony.com", - "keywords": [ - "html", - "markdown", - "twig" - ], - "support": { - "source": "https://github.com/twigphp/markdown-extra/tree/v3.8.0" - }, - "funding": [ - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/twig/twig", - "type": "tidelift" - } - ], - "time": "2023-11-21T14:02:01+00:00" + "time": "2023-07-29T15:34:56+00:00" }, { "name": "twig/string-extra", - "version": "v3.8.0", + "version": "v3.7.1", "source": { "type": "git", "url": "https://github.com/twigphp/string-extra.git", - "reference": "b0c9037d96baff79abe368dc092a59b726517548" + "reference": "7230d630a25e91cd91a2bd8e2f0e872962507eab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/string-extra/zipball/b0c9037d96baff79abe368dc092a59b726517548", - "reference": "b0c9037d96baff79abe368dc092a59b726517548", + "url": "https://api.github.com/repos/twigphp/string-extra/zipball/7230d630a25e91cd91a2bd8e2f0e872962507eab", + "reference": "7230d630a25e91cd91a2bd8e2f0e872962507eab", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/string": "^5.4|^6.0|^7.0", + "symfony/string": "^5.4|^6.0", "symfony/translation-contracts": "^1.1|^2|^3", - "twig/twig": "^3.0" + "twig/twig": "^2.7|^3.0" }, "require-dev": { - "symfony/phpunit-bridge": "^6.4|^7.0" + "symfony/phpunit-bridge": "^5.4|^6.3" }, "type": "library", "autoload": { @@ -7996,7 +7462,7 @@ "unicode" ], "support": { - "source": "https://github.com/twigphp/string-extra/tree/v3.8.0" + "source": "https://github.com/twigphp/string-extra/tree/v3.7.1" }, "funding": [ { @@ -8008,31 +7474,30 @@ "type": "tidelift" } ], - "time": "2023-11-21T14:02:01+00:00" + "time": "2023-07-29T15:34:56+00:00" }, { "name": "twig/twig", - "version": "v3.8.0", + "version": "v3.7.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" + "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", + "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php80": "^1.22" + "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" + "symfony/phpunit-bridge": "^5.4.9|^6.3" }, "type": "library", "autoload": { @@ -8068,7 +7533,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.8.0" + "source": "https://github.com/twigphp/Twig/tree/v3.7.1" }, "funding": [ { @@ -8080,7 +7545,7 @@ "type": "tidelift" } ], - "time": "2023-11-21T18:54:41+00:00" + "time": "2023-08-28T11:09:02+00:00" }, { "name": "webmozart/assert", @@ -8797,16 +8262,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.15", + "version": "9.6.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1" + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1", - "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", "shasum": "" }, "require": { @@ -8880,7 +8345,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" }, "funding": [ { @@ -8896,7 +8361,7 @@ "type": "tidelift" } ], - "time": "2023-12-01T16:55:19+00:00" + "time": "2023-09-19T05:39:22+00:00" }, { "name": "sebastian/cli-parser", @@ -9864,16 +9329,16 @@ }, { "name": "symfony/browser-kit", - "version": "v6.3.8", + "version": "v6.3.2", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe" + "reference": "ca4a988488f61ac18f8f845445eabdd36f89aa8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e270297dbee59168274c2b535ab1bccd593e6ffe", - "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ca4a988488f61ac18f8f845445eabdd36f89aa8d", + "reference": "ca4a988488f61ac18f8f845445eabdd36f89aa8d", "shasum": "" }, "require": { @@ -9912,7 +9377,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v6.3.8" + "source": "https://github.com/symfony/browser-kit/tree/v6.3.2" }, "funding": [ { @@ -9928,7 +9393,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:07:48+00:00" + "time": "2023-07-06T06:56:43+00:00" }, { "name": "symfony/css-selector", @@ -10071,16 +9536,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v6.3.9", + "version": "v6.3.4", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "b7065c123ae977a008568a3d016a17a110df7a8e" + "reference": "3fdd2a3d5fdc363b2e8dbf817f9726a4d013cbd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b7065c123ae977a008568a3d016a17a110df7a8e", - "reference": "b7065c123ae977a008568a3d016a17a110df7a8e", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/3fdd2a3d5fdc363b2e8dbf817f9726a4d013cbd1", + "reference": "3fdd2a3d5fdc363b2e8dbf817f9726a4d013cbd1", "shasum": "" }, "require": { @@ -10118,7 +9583,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.3.9" + "source": "https://github.com/symfony/dom-crawler/tree/v6.3.4" }, "funding": [ { @@ -10134,20 +9599,20 @@ "type": "tidelift" } ], - "time": "2023-11-20T16:36:29+00:00" + "time": "2023-08-01T07:43:40+00:00" }, { "name": "symfony/maker-bundle", - "version": "v1.52.0", + "version": "v1.51.1", "source": { "type": "git", "url": "https://github.com/symfony/maker-bundle.git", - "reference": "112f9466c94a46ca33dc441eee59a12cd1790757" + "reference": "0890fd3cf1e2a5221f9b3c6ee1769c537aef683d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/112f9466c94a46ca33dc441eee59a12cd1790757", - "reference": "112f9466c94a46ca33dc441eee59a12cd1790757", + "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/0890fd3cf1e2a5221f9b3c6ee1769c537aef683d", + "reference": "0890fd3cf1e2a5221f9b3c6ee1769c537aef683d", "shasum": "" }, "require": { @@ -10210,7 +9675,7 @@ ], "support": { "issues": "https://github.com/symfony/maker-bundle/issues", - "source": "https://github.com/symfony/maker-bundle/tree/v1.52.0" + "source": "https://github.com/symfony/maker-bundle/tree/v1.51.1" }, "funding": [ { @@ -10226,20 +9691,20 @@ "type": "tidelift" } ], - "time": "2023-10-31T18:23:49+00:00" + "time": "2023-09-18T18:17:31+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v6.4.1", + "version": "v6.3.2", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "cca5373a41d45edbeaf38b7b67f376da2205ff95" + "reference": "e020e1efbd1b42cb670fcd7d19a25abbddba035d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/cca5373a41d45edbeaf38b7b67f376da2205ff95", - "reference": "cca5373a41d45edbeaf38b7b67f376da2205ff95", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e020e1efbd1b42cb670fcd7d19a25abbddba035d", + "reference": "e020e1efbd1b42cb670fcd7d19a25abbddba035d", "shasum": "" }, "require": { @@ -10250,7 +9715,7 @@ }, "require-dev": { "symfony/deprecation-contracts": "^2.5|^3.0", - "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^5.4|^6.0", "symfony/polyfill-php81": "^1.27" }, "bin": [ @@ -10291,7 +9756,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v6.4.1" + "source": "https://github.com/symfony/phpunit-bridge/tree/v6.3.2" }, "funding": [ { @@ -10307,26 +9772,26 @@ "type": "tidelift" } ], - "time": "2023-12-01T09:25:07+00:00" + "time": "2023-07-12T16:00:22+00:00" }, { "name": "symfony/web-profiler-bundle", - "version": "v6.3.8", + "version": "v6.3.2", "source": { "type": "git", "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "4167c20cbdbb1152007fa731718c8c0362f28617" + "reference": "6101b5ab7857c373d237e121f9060c68b32e1373" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/4167c20cbdbb1152007fa731718c8c0362f28617", - "reference": "4167c20cbdbb1152007fa731718c8c0362f28617", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/6101b5ab7857c373d237e121f9060c68b32e1373", + "reference": "6101b5ab7857c373d237e121f9060c68b32e1373", "shasum": "" }, "require": { "php": ">=8.1", "symfony/config": "^5.4|^6.0", - "symfony/framework-bundle": "^5.4|^6.0,<6.4", + "symfony/framework-bundle": "^5.4|^6.0", "symfony/http-kernel": "^6.3", "symfony/routing": "^5.4|^6.0", "symfony/twig-bundle": "^5.4|^6.0", @@ -10372,7 +9837,7 @@ "dev" ], "support": { - "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.3.8" + "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.3.2" }, "funding": [ { @@ -10388,20 +9853,20 @@ "type": "tidelift" } ], - "time": "2023-10-31T14:41:59+00:00" + "time": "2023-07-19T20:17:28+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.2", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", + "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", "shasum": "" }, "require": { @@ -10430,7 +9895,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + "source": "https://github.com/theseer/tokenizer/tree/1.2.1" }, "funding": [ { @@ -10438,7 +9903,7 @@ "type": "github" } ], - "time": "2023-11-20T00:12:19+00:00" + "time": "2021-07-28T10:34:58+00:00" } ], "aliases": [], diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml index 210ba05..bd2fce8 100644 --- a/config/packages/translation.yaml +++ b/config/packages/translation.yaml @@ -8,7 +8,7 @@ framework: crowdin: dsn: '%env(CROWDIN_DSN)%' domains: ['messages'] - locales: ['en','cs','nl','eo','fr', 'ja', 'ka','de','he','it','lv','pl','pt','ru','es','uk'] + locales: ['en','cs','eo','fr','ka','de','he','it','lv','pl','pt','ru','es','uk'] # loco: # dsn: '%env(LOCO_DSN)%' # lokalise: diff --git a/config/services.yaml b/config/services.yaml index b515a42..e53a8b1 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -11,27 +11,16 @@ parameters: app.trackers: '%env(APP_TRACKERS)%' app.crawlers: '%env(APP_CRAWLERS)%' app.locales: '%env(APP_LOCALES)%' - app.categories: '%env(APP_CATEGORIES)%' app.themes: '%env(APP_THEMES)%' app.locale: '%env(APP_LOCALE)%' app.theme: '%env(APP_THEME)%' app.sensitive: '%env(APP_SENSITIVE)%' app.approved: '%env(APP_APPROVED)%' app.yggdrasil: '%env(APP_YGGDRASIL)%' - app.posters: '%env(APP_POSTERS)%' app.torrent.size.max: '%env(APP_TORRENT_FILE_SIZE_MAX)%' - app.torrent.poster.size.max: '%env(APP_TORRENT_POSTER_FILE_SIZE_MAX)%' app.torrent.wanted.ftp.enabled: '%env(APP_TORRENT_WANTED_FTP_ENABLED)%' app.torrent.wanted.ftp.folder: '%env(APP_TORRENT_WANTED_FTP_FOLDER)%' app.torrent.wanted.ftp.approved: '%env(APP_TORRENT_WANTED_FTP_APPROVED_ONLY)%' - app.index.torrent.name.enabled: '%env(APP_INDEX_TORRENT_NAME_ENABLED)%' - app.index.torrent.filenames.enabled: '%env(APP_INDEX_TORRENT_FILENAMES_ENABLED)%' - app.index.torrent.hash.v1.enabled: '%env(APP_INDEX_TORRENT_HASH_V1_ENABLED)%' - app.index.torrent.hash.v2.enabled: '%env(APP_INDEX_TORRENT_HASH_V2_ENABLED)%' - app.index.torrent.source.enabled: '%env(APP_INDEX_TORRENT_SOURCE_ENABLED)%' - app.index.torrent.comment.enabled: '%env(APP_INDEX_TORRENT_COMMENT_ENABLED)%' - app.index.word.length.min: '%env(APP_INDEX_WORD_LENGTH_MIN)%' - app.index.word.length.max: '%env(APP_INDEX_WORD_LENGTH_MAX)%' services: # default configuration for services in *this* file diff --git a/migrations/Version20231026163131.php b/migrations/Version20231026163131.php deleted file mode 100644 index 51c0288..0000000 --- a/migrations/Version20231026163131.php +++ /dev/null @@ -1,37 +0,0 @@ -addSql('ALTER TABLE torrent ADD COLUMN status BOOLEAN DEFAULT 1'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE TEMPORARY TABLE __temp__torrent AS SELECT id, user_id, added, scraped, locales, sensitive, approved, md5file, keywords, seeders, peers, leechers FROM torrent'); - $this->addSql('DROP TABLE torrent'); - $this->addSql('CREATE TABLE torrent (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER NOT NULL, added INTEGER NOT NULL, scraped INTEGER DEFAULT NULL, locales CLOB NOT NULL --(DC2Type:simple_array) - , sensitive BOOLEAN NOT NULL, approved BOOLEAN NOT NULL, md5file VARCHAR(32) NOT NULL, keywords CLOB DEFAULT NULL --(DC2Type:simple_array) - , seeders INTEGER DEFAULT NULL, peers INTEGER DEFAULT NULL, leechers INTEGER DEFAULT NULL)'); - $this->addSql('INSERT INTO torrent (id, user_id, added, scraped, locales, sensitive, approved, md5file, keywords, seeders, peers, leechers) SELECT id, user_id, added, scraped, locales, sensitive, approved, md5file, keywords, seeders, peers, leechers FROM __temp__torrent'); - $this->addSql('DROP TABLE __temp__torrent'); - } -} diff --git a/migrations/Version20231029184600.php b/migrations/Version20231029184600.php deleted file mode 100644 index 634e2a1..0000000 --- a/migrations/Version20231029184600.php +++ /dev/null @@ -1,35 +0,0 @@ -addSql('CREATE TABLE torrent_poster (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, torrent_id INTEGER NOT NULL, user_id INTEGER NOT NULL, added INTEGER NOT NULL, approved BOOLEAN NOT NULL, md5file VARCHAR(32) NOT NULL)'); - $this->addSql('ALTER TABLE user ADD COLUMN posters BOOLEAN NOT NULL DEFAULT 1'); - $this->addSql('ALTER TABLE torrent ADD COLUMN torrent_poster_id BOOLEAN NULL'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE torrent_poster'); - $this->addSql('ALTER TABLE user DROP COLUMN posters'); - $this->addSql('ALTER TABLE torrent DROP COLUMN torrent_poster_id'); - } -} diff --git a/migrations/Version20231030225418.php b/migrations/Version20231030225418.php deleted file mode 100644 index e43e71d..0000000 --- a/migrations/Version20231030225418.php +++ /dev/null @@ -1,31 +0,0 @@ -addSql('ALTER TABLE torrent_poster ADD COLUMN position BOOLEAN NOT NULL DEFAULT "center"'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE torrent_poster DROP COLUMN position'); - } -} diff --git a/migrations/Version20231103235504.php b/migrations/Version20231103235504.php deleted file mode 100644 index 1ec3213..0000000 --- a/migrations/Version20231103235504.php +++ /dev/null @@ -1,37 +0,0 @@ -addSql('CREATE TABLE torrent_categories (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, torrent_id INTEGER NOT NULL, user_id INTEGER NOT NULL, added INTEGER NOT NULL, value CLOB NOT NULL --(DC2Type:simple_array) - , approved BOOLEAN NOT NULL)'); - $this->addSql('ALTER TABLE user ADD COLUMN categories CLOB DEFAULT "other"'); - $this->addSql('ALTER TABLE torrent ADD COLUMN categories CLOB DEFAULT "other"'); - $this->addSql('UPDATE user SET categories = "movie,series,tv,animation,music,game,audiobook,podcast,book,archive,picture,software,other"'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE torrent_categories'); - $this->addSql('ALTER TABLE user DROP COLUMN categories'); - $this->addSql('ALTER TABLE torrent DROP COLUMN categories'); - } -} diff --git a/public/asset/default/css/framework.css b/public/asset/default/css/framework.css index 0ca71e6..5a2ef07 100644 --- a/public/asset/default/css/framework.css +++ b/public/asset/default/css/framework.css @@ -15,18 +15,6 @@ float: left; } -.word-break { - word-break: break-word; -} - -.overflow-auto { - overflow: auto; -} - -.float-left { - float: left; -} - .float-right { float: right; } @@ -160,6 +148,10 @@ a.button-green:hover { vertical-align: middle; } +.top--2-px { + top: -2px; +} + .top-2-px { top: 2px; } @@ -197,36 +189,21 @@ a.button-green:hover { } .border-color-default { - border: 1px rgba(93, 98, 125, .6) solid; + border: 1px #5d627d solid; } .border-bottom-default { - border-bottom: 1px rgba(93, 98, 125, .6) solid; + border-bottom: 1px #5d627d solid; } .border-top-default { - border-top: 1px rgba(93, 98, 125, .6) solid; -} - -.border-bottom-dashed { - border-bottom: 1px rgba(93, 98, 125, .6) dashed; -} - -.border-top-dashed { - border-top: 1px rgba(93, 98, 125, .6) dashed; + border-top: 1px #5d627d solid; } .border-width-2-px { border-width: 2px; } -.background-poster { - background-position: center; - background-repeat: no-repeat; - background-size: cover; - background-blend-mode: soft-light; -} - .background-color-night { background-color: #34384f; } @@ -382,10 +359,6 @@ a:visited.background-color-hover-night-light:hover { padding-bottom: 24px; } -.margin-t-4-px { - margin-top: 4px; -} - .margin-l-4-px { margin-left: 4px; } diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php index c8bb152..4ac57f1 100644 --- a/src/Controller/ActivityController.php +++ b/src/Controller/ActivityController.php @@ -560,7 +560,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName() @@ -607,7 +606,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName() @@ -654,7 +652,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName() @@ -702,7 +699,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName() @@ -749,7 +745,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName() @@ -788,102 +783,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), - 'name' => $torrentService->readTorrentFileByTorrentId( - $torrent->getId() - )->getName() - ], - 'session' => - [ - 'user' => - [ - 'id' => $user->getId(), - 'sensitive' => $user->isSensitive(), - 'moderator' => $user->isModerator(), - 'owner' => $user->getId() === $torrent->getUserId(), - ] - ] - ] - ); - - break; - - // Torrent Status - case $activity::EVENT_TORRENT_STATUS_ADD: - - // Init torrent - if (!$torrent = $torrentService->getTorrent($activity->getTorrentId())) - { - throw $this->createNotFoundException(); - } - - return $this->render( - 'default/activity/event/torrent/status/add' . $extension, - [ - 'id' => $activity->getId(), - 'added' => $activity->getAdded(), - 'user' => - [ - 'id' => $activity->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $activity->getUserId() - )->getAddress() - ) - ], - 'torrent' => - [ - 'id' => $torrent->getId(), - 'sensitive' => $torrent->isSensitive(), - 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), - 'name' => $torrentService->readTorrentFileByTorrentId( - $torrent->getId() - )->getName() - ], - 'session' => - [ - 'user' => - [ - 'id' => $user->getId(), - 'sensitive' => $user->isSensitive(), - 'moderator' => $user->isModerator(), - 'owner' => $user->getId() === $torrent->getUserId(), - ] - ] - ] - ); - - break; - - case $activity::EVENT_TORRENT_STATUS_DELETE: - - // Init torrent - if (!$torrent = $torrentService->getTorrent($activity->getTorrentId())) - { - throw $this->createNotFoundException(); - } - - return $this->render( - 'default/activity/event/torrent/status/delete' . $extension, - [ - 'id' => $activity->getId(), - 'added' => $activity->getAdded(), - 'user' => - [ - 'id' => $activity->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $activity->getUserId() - )->getAddress() - ) - ], - 'torrent' => - [ - 'id' => $torrent->getId(), - 'sensitive' => $torrent->isSensitive(), - 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName() @@ -931,7 +830,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName(), @@ -984,7 +882,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName(), @@ -1037,7 +934,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName(), @@ -1090,7 +986,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName(), @@ -1116,219 +1011,6 @@ class ActivityController extends AbstractController break; - /// Torrent Categories - case $activity::EVENT_TORRENT_CATEGORIES_ADD: - - // Init torrent - if (!$torrent = $torrentService->getTorrent($activity->getTorrentId())) - { - throw $this->createNotFoundException(); - } - - return $this->render( - 'default/activity/event/torrent/categories/add' . $extension, - [ - 'id' => $activity->getId(), - 'added' => $activity->getAdded(), - 'user' => - [ - 'id' => $activity->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $activity->getUserId() - )->getAddress() - ) - ], - 'torrent' => - [ - 'id' => $torrent->getId(), - 'sensitive' => $torrent->isSensitive(), - 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), - 'name' => $torrentService->readTorrentFileByTorrentId( - $torrent->getId() - )->getName(), - 'categories' => [ - 'id' => $activity->getData()['torrentCategoriesId'], - 'exist' => $torrentService->getTorrentCategories( - $activity->getData()['torrentCategoriesId'] // could be deleted by moderator, remove links - ) - ] - ], - 'session' => - [ - 'user' => - [ - 'id' => $user->getId(), - 'sensitive' => $user->isSensitive(), - 'moderator' => $user->isModerator(), - 'owner' => $user->getId() === $torrent->getUserId(), - ] - ] - ] - ); - - break; - - case $activity::EVENT_TORRENT_CATEGORIES_DELETE: - - // Init torrent - if (!$torrent = $torrentService->getTorrent($activity->getTorrentId())) - { - throw $this->createNotFoundException(); - } - - return $this->render( - 'default/activity/event/torrent/categories/delete' . $extension, - [ - 'id' => $activity->getId(), - 'added' => $activity->getAdded(), - 'user' => - [ - 'id' => $activity->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $activity->getUserId() - )->getAddress() - ) - ], - 'torrent' => - [ - 'id' => $torrent->getId(), - 'sensitive' => $torrent->isSensitive(), - 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), - 'name' => $torrentService->readTorrentFileByTorrentId( - $torrent->getId() - )->getName(), - 'categories' => [ - 'id' => $activity->getData()['torrentCategoriesId'], - 'exist' => $torrentService->getTorrentCategories( - $activity->getData()['torrentCategoriesId'] // could be deleted by moderator, remove links - ) - ] - ], - 'session' => - [ - 'user' => - [ - 'id' => $user->getId(), - 'sensitive' => $user->isSensitive(), - 'moderator' => $user->isModerator(), - 'owner' => $user->getId() === $torrent->getUserId(), - ] - ] - ] - ); - - break; - - case $activity::EVENT_TORRENT_CATEGORIES_APPROVE_ADD: - - // Init torrent - if (!$torrent = $torrentService->getTorrent($activity->getTorrentId())) - { - throw $this->createNotFoundException(); - } - - return $this->render( - 'default/activity/event/torrent/categories/approve/add' . $extension, - [ - 'id' => $activity->getId(), - 'added' => $activity->getAdded(), - 'user' => - [ - 'id' => $activity->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $activity->getUserId() - )->getAddress() - ) - ], - 'torrent' => - [ - 'id' => $torrent->getId(), - 'sensitive' => $torrent->isSensitive(), - 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), - 'name' => $torrentService->readTorrentFileByTorrentId( - $torrent->getId() - )->getName(), - 'categories' => [ - 'id' => $activity->getData()['torrentCategoriesId'], - 'exist' => $torrentService->getTorrentCategories( - $activity->getData()['torrentCategoriesId'] // could be deleted by moderator, remove links - ) - ] - ], - 'session' => - [ - 'user' => - [ - 'id' => $user->getId(), - 'sensitive' => $user->isSensitive(), - 'moderator' => $user->isModerator(), - 'owner' => $user->getId() === $torrent->getUserId(), - ] - ] - ] - ); - - break; - - case $activity::EVENT_TORRENT_CATEGORIES_APPROVE_DELETE: - - // Init torrent - if (!$torrent = $torrentService->getTorrent($activity->getTorrentId())) - { - throw $this->createNotFoundException(); - } - - return $this->render( - 'default/activity/event/torrent/categories/approve/delete' . $extension, - [ - 'id' => $activity->getId(), - 'added' => $activity->getAdded(), - 'user' => - [ - 'id' => $activity->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $activity->getUserId() - )->getAddress() - ) - ], - 'torrent' => - [ - 'id' => $torrent->getId(), - 'sensitive' => $torrent->isSensitive(), - 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), - 'name' => $torrentService->readTorrentFileByTorrentId( - $torrent->getId() - )->getName(), - 'categories' => [ - 'id' => $activity->getData()['torrentCategoriesId'], - 'exist' => $torrentService->getTorrentCategories( - $activity->getData()['torrentCategoriesId'] // could be deleted by moderator, remove links - ) - ] - ], - 'session' => - [ - 'user' => - [ - 'id' => $user->getId(), - 'sensitive' => $user->isSensitive(), - 'moderator' => $user->isModerator(), - 'owner' => $user->getId() === $torrent->getUserId(), - ] - ] - ] - ); - - break; - /// Torrent Sensitive case $activity::EVENT_TORRENT_SENSITIVE_ADD: @@ -1357,7 +1039,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName(), @@ -1410,7 +1091,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName(), @@ -1463,7 +1143,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName(), @@ -1516,7 +1195,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName(), @@ -1542,219 +1220,6 @@ class ActivityController extends AbstractController break; - /// Torrent Poster - case $activity::EVENT_TORRENT_POSTER_ADD: - - // Init torrent - if (!$torrent = $torrentService->getTorrent($activity->getTorrentId())) - { - throw $this->createNotFoundException(); - } - - return $this->render( - 'default/activity/event/torrent/poster/add' . $extension, - [ - 'id' => $activity->getId(), - 'added' => $activity->getAdded(), - 'user' => - [ - 'id' => $activity->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $activity->getUserId() - )->getAddress() - ) - ], - 'torrent' => - [ - 'id' => $torrent->getId(), - 'sensitive' => $torrent->isSensitive(), - 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), - 'name' => $torrentService->readTorrentFileByTorrentId( - $torrent->getId() - )->getName(), - 'poster' => [ - 'id' => $activity->getData()['torrentPosterId'], - 'exist' => $torrentService->getTorrentPoster( - $activity->getData()['torrentPosterId'] // could be deleted by moderator, remove links - ) - ] - ], - 'session' => - [ - 'user' => - [ - 'id' => $user->getId(), - 'sensitive' => $user->isSensitive(), - 'moderator' => $user->isModerator(), - 'owner' => $user->getId() === $torrent->getUserId(), - ] - ] - ] - ); - - break; - - case $activity::EVENT_TORRENT_POSTER_DELETE: - - // Init torrent - if (!$torrent = $torrentService->getTorrent($activity->getTorrentId())) - { - throw $this->createNotFoundException(); - } - - return $this->render( - 'default/activity/event/torrent/poster/delete' . $extension, - [ - 'id' => $activity->getId(), - 'added' => $activity->getAdded(), - 'user' => - [ - 'id' => $activity->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $activity->getUserId() - )->getAddress() - ) - ], - 'torrent' => - [ - 'id' => $torrent->getId(), - 'sensitive' => $torrent->isSensitive(), - 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), - 'name' => $torrentService->readTorrentFileByTorrentId( - $torrent->getId() - )->getName(), - 'poster' => [ - 'id' => $activity->getData()['torrentPosterId'], - 'exist' => $torrentService->getTorrentPoster( - $activity->getData()['torrentPosterId'] // could be deleted by moderator, remove links - ) - ] - ], - 'session' => - [ - 'user' => - [ - 'id' => $user->getId(), - 'sensitive' => $user->isSensitive(), - 'moderator' => $user->isModerator(), - 'owner' => $user->getId() === $torrent->getUserId(), - ] - ] - ] - ); - - break; - - case $activity::EVENT_TORRENT_POSTER_APPROVE_ADD: - - // Init torrent - if (!$torrent = $torrentService->getTorrent($activity->getTorrentId())) - { - throw $this->createNotFoundException(); - } - - return $this->render( - 'default/activity/event/torrent/poster/approve/add' . $extension, - [ - 'id' => $activity->getId(), - 'added' => $activity->getAdded(), - 'user' => - [ - 'id' => $activity->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $activity->getUserId() - )->getAddress() - ) - ], - 'torrent' => - [ - 'id' => $torrent->getId(), - 'sensitive' => $torrent->isSensitive(), - 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), - 'name' => $torrentService->readTorrentFileByTorrentId( - $torrent->getId() - )->getName(), - 'poster' => [ - 'id' => $activity->getData()['torrentPosterId'], - 'exist' => $torrentService->getTorrentPoster( - $activity->getData()['torrentPosterId'] // could be deleted by moderator, remove links - ) - ] - ], - 'session' => - [ - 'user' => - [ - 'id' => $user->getId(), - 'sensitive' => $user->isSensitive(), - 'moderator' => $user->isModerator(), - 'owner' => $user->getId() === $torrent->getUserId(), - ] - ] - ] - ); - - break; - - case $activity::EVENT_TORRENT_POSTER_APPROVE_DELETE: - - // Init torrent - if (!$torrent = $torrentService->getTorrent($activity->getTorrentId())) - { - throw $this->createNotFoundException(); - } - - return $this->render( - 'default/activity/event/torrent/poster/approve/delete' . $extension, - [ - 'id' => $activity->getId(), - 'added' => $activity->getAdded(), - 'user' => - [ - 'id' => $activity->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $activity->getUserId() - )->getAddress() - ) - ], - 'torrent' => - [ - 'id' => $torrent->getId(), - 'sensitive' => $torrent->isSensitive(), - 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), - 'name' => $torrentService->readTorrentFileByTorrentId( - $torrent->getId() - )->getName(), - 'poster' => [ - 'id' => $activity->getData()['torrentPosterId'], - 'exist' => $torrentService->getTorrentPoster( - $activity->getData()['torrentPosterId'] // could be deleted by moderator, remove links - ) - ] - ], - 'session' => - [ - 'user' => - [ - 'id' => $user->getId(), - 'sensitive' => $user->isSensitive(), - 'moderator' => $user->isModerator(), - 'owner' => $user->getId() === $torrent->getUserId(), - ] - ] - ] - ); - - break; - /// Torrent star case $activity::EVENT_TORRENT_STAR_ADD: @@ -1783,7 +1248,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName() @@ -1830,7 +1294,6 @@ class ActivityController extends AbstractController 'id' => $torrent->getId(), 'sensitive' => $torrent->isSensitive(), 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), 'name' => $torrentService->readTorrentFileByTorrentId( $torrent->getId() )->getName() @@ -1889,7 +1352,6 @@ class ActivityController extends AbstractController $this->getParameter('app.theme'), $this->getParameter('app.sensitive'), $this->getParameter('app.yggdrasil'), - $this->getParameter('app.posters'), $this->getParameter('app.approved') ); diff --git a/src/Controller/SearchController.php b/src/Controller/SearchController.php index 8cb63bc..e515162 100644 --- a/src/Controller/SearchController.php +++ b/src/Controller/SearchController.php @@ -9,156 +9,20 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Request; use App\Service\UserService; -use App\Service\TorrentService; use App\Service\ActivityService; class SearchController extends AbstractController { public function module( - Request $request, - UserService $userService, - TorrentService $torrentService, - ActivityService $activityService + ?string $query, + ?string $type ): Response { - // Defaults - $locales = []; - $categories = []; - $sensitive = []; - - // Request - $query = $request->get('query') ? urldecode($request->get('query')) : ''; - $filter = $request->get('filter') ? true : false; - - // Extended search - if ($filter) - { - // Init user - $user = $this->initUser( - $request, - $userService, - $activityService - ); - - // Keywords - $keywords = explode(' ', $query); - - // Locales - foreach (explode('|', $this->getParameter('app.locales')) as $locale) - { - - if ($request->get('locales')) - { - $checked = in_array($locale, (array) $request->get('locales')); - } - - else - { - $checked = in_array($locale, $user->getLocales()); - } - - $locales[] = - [ - 'value' => $locale, - 'checked' => $checked, - 'total' => $torrentService->findTorrentsTotal( - 0, - $keywords, - [$locale], - $request->get('categories') ? $request->get('categories') : $user->getCategories(), - $request->get('sensitive') ? null : false, - !$user->isModerator() ? true : null, - !$user->isModerator() ? true : null, - ) - ]; - } - - // Categories - foreach (explode('|', $this->getParameter('app.categories')) as $category) - { - if ($request->get('categories')) - { - $checked = in_array($category, (array) $request->get('categories')); - } - - else - { - $checked = in_array($category, $user->getCategories()); - } - - $categories[] = - [ - 'value' => $category, - 'checked' => $checked, - 'total' => $torrentService->findTorrentsTotal( - 0, - $keywords, - $request->get('locales') ? $request->get('locales') : $user->getLocales(), - [$category], - $request->get('sensitive') ? null : false, - !$user->isModerator() ? true : null, - !$user->isModerator() ? true : null, - ) - ]; - } - - // Sensitive - $sensitive = - [ - 'checked' => $request->get('sensitive'), - 'total' => $torrentService->findTorrentsTotal( - 0, - $keywords, - $request->get('locales') ? $request->get('locales') : $user->getLocales(), - $request->get('categories') ? $request->get('categories') : $user->getCategories(), - true, - !$user->isModerator() ? true : null, - !$user->isModerator() ? true : null, - ) - ]; - } - return $this->render( 'default/search/module.html.twig', [ - 'query' => $query, - 'filter' => $filter, - 'sensitive' => $sensitive, - 'locales' => $locales, - 'categories' => $categories, + 'query' => $query ? urldecode($query) : '', ] ); } - - private function initUser( - Request $request, - UserService $userService, - ActivityService $activityService - ): ?\App\Entity\User - { - // Init user - if (!$user = $userService->findUserByAddress($request->getClientIp())) - { - $user = $userService->addUser( - $request->getClientIp(), - time(), - $this->getParameter('app.locale'), - explode('|', $this->getParameter('app.locales')), - $activityService->getEventCodes(), - $this->getParameter('app.theme'), - $this->getParameter('app.sensitive'), - $this->getParameter('app.yggdrasil'), - $this->getParameter('app.posters'), - $this->getParameter('app.approved') - ); - - // Add user join event - $activityService->addEventUserAdd( - $user->getId(), - time() - ); - } - - return $user; - } } \ No newline at end of file diff --git a/src/Controller/TorrentController.php b/src/Controller/TorrentController.php index 38205db..5e97ac0 100644 --- a/src/Controller/TorrentController.php +++ b/src/Controller/TorrentController.php @@ -57,17 +57,13 @@ class TorrentController extends AbstractController } // Sensitive filter - // @TODO add blur effect or sensitive notice instead of 404 on direct request #37 - /* - if (!$user->isModerator() && $user->isSensitive() && $torrent->isSensitive()) + if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && $user->isSensitive()) { throw $this->createNotFoundException(); } - */ - // Access filter - if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && - (!$torrent->isStatus() || !$torrent->isApproved())) + // Approved filter + if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && !$torrent->isApproved()) { throw $this->createNotFoundException(); } @@ -109,38 +105,14 @@ class TorrentController extends AbstractController // Init page $page = $request->get('page') ? (int) $request->get('page') : 1; - // Poster - if ($user->isPosters() && $torrent->getTorrentPosterId()) - { - $torrentPoster = $torrentService->getTorrentPoster( - $torrent->getTorrentPosterId() - ); - - $poster = [ - 'position' => $torrentPoster->getPosition(), - 'url' => $request->getScheme() . '://' . - $request->getHttpHost() . - $request->getBasePath() . - $torrentService->getImageUriByTorrentPosterId( - $torrentPoster->getId() - ) - ]; - } - - else - { - $poster = false; - } - // Render template return $this->render('default/torrent/info.html.twig', [ 'session' => [ - 'user' => $user, + 'user' => $user, 'id' => $user->getId(), - 'moderator' => $user->isModerator(), - 'owner' => $user->getId() === $torrent->getUserId(), + 'moderator' => $user->isModerator() ], 'torrent' => [ @@ -153,13 +125,11 @@ class TorrentController extends AbstractController 'peers' => (int) $torrent->getPeers(), 'leechers' => (int) $torrent->getLeechers(), ], - 'keywords' => $torrent->getKeywords(), - 'locales' => $torrent->getLocales(), - 'categories' => $torrent->getCategories(), - 'sensitive' => $torrent->isSensitive(), - 'approved' => $torrent->isApproved(), - 'status' => $torrent->isStatus(), - 'download' => + 'keywords' => $torrent->getKeywords(), + 'locales' => $torrent->getLocales(), + 'sensitive' => $torrent->isSensitive(), + 'approved' => $torrent->isApproved(), + 'download' => [ 'file' => [ @@ -182,7 +152,7 @@ class TorrentController extends AbstractController ) ] ], - 'star' => + 'star' => [ 'exist' => (bool) $torrentService->findTorrentStar( $torrent->getId(), @@ -192,8 +162,7 @@ class TorrentController extends AbstractController $torrent->getId() ) ], - 'contributors' => $contributors, - 'poster' => $poster + 'contributors' => $contributors ], 'file' => [ @@ -207,9 +176,7 @@ class TorrentController extends AbstractController 'private' => $file->isPrivate(), 'source' => $file->getSource(), 'comment' => $file->getComment(), - 'tree' => $file->getFileTree( - \Rhilip\Bencode\TorrentFile::FILETREE_SORT_NATURAL // #34 @TODO cyrillic - ), + 'tree' => $file->getFileTree(), //'trackers' => $file->getAnnounceList(), 'hash' => [ @@ -265,24 +232,18 @@ class TorrentController extends AbstractController // Get total torrents $total = $torrentService->findTorrentsTotal( - $request->get('filter') ? 0 : $user->getId(), $query, - $request->get('filter') ? (array) $request->get('locales') : $user->getLocales(), - $request->get('filter') ? (array) $request->get('categories') : $user->getCategories(), - $request->get('filter') ? ($request->get('sensitive') ? null : false) : ($user->isSensitive() ? false : null), - !$user->isModerator() ? true : null, - !$user->isModerator() ? true : null, + $user->getLocales(), + !$user->isModerator() && $user->isSensitive() ? false : null, // hide on sensitive mode enabled or show all + !$user->isModerator() ? true : null, // show approved content only for regular users ); $torrents = []; foreach ($torrentService->findTorrents( - $request->get('filter') ? 0 : $user->getId(), $query, - $request->get('filter') ? (array) $request->get('locales') : $user->getLocales(), - $request->get('filter') ? (array) $request->get('categories') : $user->getCategories(), - $request->get('filter') ? ($request->get('sensitive') ? null : false) : ($user->isSensitive() ? false : null), - !$user->isModerator() ? true : null, - !$user->isModerator() ? true : null, + $user->getLocales(), + !$user->isModerator() && $user->isSensitive() ? false : null, // hide on sensitive mode enabled or show all + !$user->isModerator() ? true : null, // show approved content only for regular users $this->getParameter('app.pagination'), ($page - 1) * $this->getParameter('app.pagination') ) as $torrent) @@ -293,6 +254,18 @@ class TorrentController extends AbstractController throw $this->createNotFoundException(); // @TODO exception } + // Generate keywords + /* @TODO deprecated, based on active search result + $keywords = []; + foreach ($torrent->getKeywords() as $keyword) + { + if (in_array($keyword, $query)) + { + $keywords[] = $keyword; + } + } + */ + // Generate keywords by extension $keywords = []; @@ -316,29 +289,6 @@ class TorrentController extends AbstractController arsort($keywords); - // Poster - if ($user->isPosters() && $torrent->getTorrentPosterId()) - { - $torrentPoster = $torrentService->getTorrentPoster( - $torrent->getTorrentPosterId() - ); - - $poster = [ - 'position' => $torrentPoster->getPosition(), - 'url' => $request->getScheme() . '://' . - $request->getHttpHost() . - $request->getBasePath() . - $torrentService->getImageUriByTorrentPosterId( - $torrentPoster->getId() - ) - ]; - } - - else - { - $poster = false; - } - // Push torrent $torrents[] = [ @@ -346,7 +296,6 @@ class TorrentController extends AbstractController 'added' => $torrent->getAdded(), 'approved' => $torrent->isApproved(), 'sensitive' => $torrent->isSensitive(), - 'status' => $torrent->isStatus(), 'file' => [ 'name' => $file->getName(), @@ -406,7 +355,6 @@ class TorrentController extends AbstractController $torrent->getId() ) ], - 'poster' => $poster ]; } @@ -453,25 +401,19 @@ class TorrentController extends AbstractController // Get total torrents $total = $torrentService->findTorrentsTotal( - $user->getId(), [], $user->getLocales(), - $user->getCategories(), - $user->isSensitive() ? false : null, - !$user->isModerator() ? true : null, - !$user->isModerator() ? true : null, + !$user->isModerator() && $user->isSensitive() ? false : null, // hide on sensitive mode enabled or show all + !$user->isModerator() ? true : null, // show approved content only for regular users ); // Create torrents list $torrents = []; foreach ($torrentService->findTorrents( - $user->getId(), [], $user->getLocales(), - $user->getCategories(), - $user->isSensitive() ? false : null, - !$user->isModerator() ? true : null, - !$user->isModerator() ? true : null, + !$user->isModerator() && $user->isSensitive() ? false : null, // hide on sensitive mode enabled or show all + !$user->isModerator() ? true : null, // show approved content only for regular users $this->getParameter('app.pagination'), ($page - 1) * $this->getParameter('app.pagination') ) as $torrent) @@ -505,29 +447,6 @@ class TorrentController extends AbstractController arsort($keywords); - // Poster - if ($user->isPosters() && $torrent->getTorrentPosterId()) - { - $torrentPoster = $torrentService->getTorrentPoster( - $torrent->getTorrentPosterId() - ); - - $poster = [ - 'position' => $torrentPoster->getPosition(), - 'url' => $request->getScheme() . '://' . - $request->getHttpHost() . - $request->getBasePath() . - $torrentService->getImageUriByTorrentPosterId( - $torrentPoster->getId() - ) - ]; - } - - else - { - $poster = false; - } - // Push torrent $torrents[] = [ @@ -535,7 +454,6 @@ class TorrentController extends AbstractController 'added' => $torrent->getAdded(), 'approved' => $torrent->isApproved(), 'sensitive' => $torrent->isSensitive(), - 'status' => $torrent->isStatus(), 'file' => [ 'name' => $file->getName(), @@ -552,6 +470,15 @@ class TorrentController extends AbstractController 'peers' => (int) $torrent->getPeers(), 'leechers' => (int) $torrent->getLeechers(), ], + 'user' => + [ + 'id' => $torrent->getUserId(), + 'identicon' => $userService->identicon( + $userService->getUser( + $torrent->getUserId() + )->getAddress() + ) + ], 'keywords' => $keywords, 'download' => [ @@ -586,7 +513,6 @@ class TorrentController extends AbstractController $torrent->getId() ) ], - 'poster' => $poster ]; } @@ -632,25 +558,19 @@ class TorrentController extends AbstractController // Get total torrents $total = $torrentService->findTorrentsTotal( - $request->get('filter') ? 0 : $user->getId(), $query, - $request->get('filter') ? (array) $request->get('locales') : $user->getLocales(), - $request->get('filter') ? (array) $request->get('categories') : $user->getCategories(), - $request->get('filter') ? ($request->get('sensitive') ? null : false) : ($user->isSensitive() ? false : null), - !$user->isModerator() ? true : null, - !$user->isModerator() ? true : null, + $user->getLocales(), + !$user->isModerator() && $user->isSensitive() ? false : null, // hide on sensitive mode enabled or show all + !$user->isModerator() ? true : null // show approved content only for regular users ); // Create torrents list $torrents = []; foreach ($torrentService->findTorrents( - $request->get('filter') ? 0 : $user->getId(), $query, - $request->get('filter') ? (array) $request->get('locales') : $user->getLocales(), - $request->get('filter') ? (array) $request->get('categories') : $user->getCategories(), - $request->get('filter') ? ($request->get('sensitive') ? null : false) : ($user->isSensitive() ? false : null), - !$user->isModerator() ? true : null, - !$user->isModerator() ? true : null, + $user->getLocales(), + !$user->isModerator() && $user->isSensitive() ? false : null, // hide on sensitive mode enabled or show all + !$user->isModerator() ? true : null, // show approved content only for regular users $this->getParameter('app.pagination'), ($page - 1) * $this->getParameter('app.pagination') ) as $torrent) @@ -663,9 +583,9 @@ class TorrentController extends AbstractController $torrents[] = [ - 'id' => $torrent->getId(), - 'added' => $torrent->getAdded(), - 'file' => + 'id' => $torrent->getId(), + 'added' => $torrent->getAdded(), + 'file' => [ 'name' => $file->getName(), ], @@ -704,91 +624,33 @@ class TorrentController extends AbstractController ActivityService $activityService ): Response { - // Init user - $user = $this->initUser( - $request, - $userService, - $activityService - ); - // Init request - $query = $request->get('query') ? - explode(' ', urldecode($request->get('query'))) : []; + $query = $request->get('query') ? explode(' ', urldecode($request->get('query'))) : []; + $page = $request->get('page') ? (int) $request->get('page') : 1; - $page = $request->get('page') ? - (int) $request->get('page') : 1; + $locales = $request->get('locales') ? explode('|', $request->get('locales')) : explode('|', $this->getParameter('app.locales')); + $sensitive = $request->get('sensitive') ? (bool) $request->get('sensitive') : null; - $filter = $request->get('filter') ? - true : false; - - if ($request->get('locales')) - { - $locales = explode('|', $request->get('locales')); - } - - else - { - $locales = $user->getLocales(); - } - - if ($request->get('categories')) - { - $categories = explode('|', $request->get('categories')); - } - - else - { - $categories = $user->getCategories(); - } - - switch ($request->get('sensitive')) - { - case 'true': - $sensitive = true; - break; - case 'false': - $sensitive = false; - break; - default: - $sensitive = $user->isSensitive() ? false : null; - } - - switch ($request->get('yggdrasil')) - { - case 'true': - $yggdrasil = true; - break; - case 'false': - $yggdrasil = false; - break; - default: - $yggdrasil = $user->isYggdrasil(); - } + $yggdrasil = $request->get('yggdrasil') ? (bool) $request->get('yggdrasil') : false; // Init trackers $trackers = explode('|', $this->getParameter('app.trackers')); // Get total torrents $total = $torrentService->findTorrentsTotal( - $filter ? 0 : $user->getId(), $query, $locales, - $categories, $sensitive, - !$user->isModerator() ? true : null, - !$user->isModerator() ? true : null, + true, // approved only ); // Create torrents list $torrents = []; foreach ($torrentService->findTorrents( - $filter ? 0 : $user->getId(), $query, $locales, - $categories, $sensitive, - !$user->isModerator() ? true : null, - !$user->isModerator() ? true : null, + true, // approved only $this->getParameter('app.pagination'), ($page - 1) * $this->getParameter('app.pagination') ) as $torrent) @@ -802,15 +664,28 @@ class TorrentController extends AbstractController // Apply yggdrasil filters $file = $this->filterYggdrasil($file, $yggdrasil); + // Generate url + $url = []; + foreach ($locales as $locale) + { + $url[$locale] = $this->generateUrl( + 'torrent_info', + [ + '_locale' => $locale, + 'torrentId' => $torrent->getId(), + ], + false + ); + } + $torrents[] = [ 'torrent' => [ - 'id' => $torrent->getId(), - 'added' => $torrent->getAdded(), - 'locales' => $torrent->getLocales(), - 'categories' => $torrent->getCategories(), - 'sensitive' => $torrent->isSensitive(), + 'id' => $torrent->getId(), + 'added' => $torrent->getAdded(), + 'locales' => $torrent->getLocales(), + 'sensitive' => $torrent->isSensitive(), 'file' => [ 'name' => $file->getName(), @@ -832,7 +707,7 @@ class TorrentController extends AbstractController ], false ), - //'urn' => $file->getMagnetLink() + 'urn' => $file->getMagnetLink() ], 'scrape' => [ @@ -840,18 +715,23 @@ class TorrentController extends AbstractController 'peers' => (int) $torrent->getPeers(), 'leechers' => (int) $torrent->getLeechers(), ], - 'url' => $this->generateUrl( - 'torrent_info', - [ - '_locale' => $user->getLocale(), - 'torrentId' => $torrent->getId(), - ], - false - ) + 'url' => $url ], ]; } + $url = []; + foreach ($locales as $locale) + { + $url[$locale] = $this->generateUrl( + 'torrent_recent', + [ + '_locale' => $locale + ], + false + ); + } + return $this->json( [ 'version' => time(), @@ -859,13 +739,7 @@ class TorrentController extends AbstractController [ 'name' => $this->getParameter('app.name'), 'version' => $this->getParameter('app.version'), - 'url' => $this->generateUrl( - 'torrent_recent', - [ - '_locale' => $user->getLocale() - ], - false - ) + 'url' => $url ], 'torrents' => $torrents ] @@ -920,14 +794,6 @@ class TorrentController extends AbstractController 'value' => $request->get('locales') ? $request->get('locales') : [$request->get('_locale')], ] ], - 'categories' => - [ - 'error' => [], - 'attribute' => - [ - 'value' => $request->get('categories') ? $request->get('categories') : [], - ] - ], 'torrent' => [ 'error' => [], @@ -964,25 +830,6 @@ class TorrentController extends AbstractController $form['locales']['error'][] = $translator->trans('At least one locale required'); } - /// Categories - $categories = []; - if ($request->get('categories')) - { - foreach ((array) $request->get('categories') as $locale) - { - if (in_array($locale, explode('|', $this->getParameter('app.categories')))) - { - $categories[] = $locale; - } - } - } - - //// At least one valid locale required - if (!$categories) - { - $form['categories']['error'][] = $translator->trans('At least one category required'); - } - /// Torrent if ($file = $request->files->get('torrent')) { @@ -1011,29 +858,16 @@ class TorrentController extends AbstractController } // Request is valid - if (empty($form['torrent']['error']) && empty($form['locales']['error']) && empty($form['categories']['error'])) + if (empty($form['torrent']['error']) && empty($form['locales']['error'])) { // Save data $torrent = $torrentService->add( - $file->getPathName(), - - (bool) $this->getParameter('app.index.torrent.name.enabled'), - (bool) $this->getParameter('app.index.torrent.filenames.enabled'), - (bool) $this->getParameter('app.index.torrent.hash.v1.enabled'), - (bool) $this->getParameter('app.index.torrent.hash.v2.enabled'), - (bool) $this->getParameter('app.index.torrent.source.enabled'), - (bool) $this->getParameter('app.index.torrent.comment.enabled'), - (int) $this->getParameter('app.index.word.length.min'), - (int) $this->getParameter('app.index.word.length.max'), - $user->getId(), time(), (array) $locales, - (array) $categories, (bool) $request->get('sensitive'), - $user->isApproved(), - $user->isStatus() + $user->isApproved() ); // Add activity event @@ -1058,14 +892,13 @@ class TorrentController extends AbstractController return $this->render( 'default/torrent/submit.html.twig', [ - 'locales' => explode('|', $this->getParameter('app.locales')), - 'categories' => explode('|', $this->getParameter('app.categories')), - 'form' => $form, + 'locales' => explode('|', $this->getParameter('app.locales')), + 'form' => $form, ] ); } - // Torrent moderation + #[Route( '/{_locale}/torrent/{torrentId}/approve/toggle', name: 'torrent_approve_toggle', @@ -1142,82 +975,6 @@ class TorrentController extends AbstractController ); } - #[Route( - '/{_locale}/torrent/{torrentId}/status/toggle', - name: 'torrent_status_toggle', - requirements: - [ - '_locale' => '%app.locales%', - 'torrentId' => '\d+', - ], - methods: - [ - 'GET' - ] - )] - public function status( - Request $request, - UserService $userService, - TorrentService $torrentService, - ActivityService $activityService - ): Response - { - // Init user - $user = $this->initUser( - $request, - $userService, - $activityService - ); - - // Init torrent - if (!$torrent = $torrentService->getTorrent($request->get('torrentId'))) - { - throw $this->createNotFoundException(); - } - - // Check permissions - if (!($user->isModerator() || $user->getId() == $torrent->getUserId())) - { - // @TODO - throw new \Exception( - $translator->trans('Access denied') - ); - } - - // Register activity event - if (!$torrent->isStatus()) - { - $activityService->addEventTorrentStatusAdd( - $user->getId(), - $torrent->getId(), - time() - ); - } - - else - { - $activityService->addEventTorrentStatusDelete( - $user->getId(), - $torrent->getId(), - time() - ); - } - - // Update status - $torrentService->toggleTorrentStatus( - $torrent->getId() - ); - - // Redirect back to form - return $this->redirectToRoute( - 'torrent_info', - [ - '_locale' => $request->get('_locale'), - 'torrentId' => $torrent->getId() - ] - ); - } - // Torrent locales #[Route( '/{_locale}/torrent/{torrentId}/edit/locales/{torrentLocalesId}', @@ -1580,363 +1337,6 @@ class TorrentController extends AbstractController ); } - // Torrent categories - #[Route( - '/{_locale}/torrent/{torrentId}/edit/categories/{torrentCategoriesId}', - name: 'torrent_categories_edit', - requirements: - [ - '_locale' => '%app.locales%', - 'torrentId' => '\d+', - 'torrentCategoriesId' => '\d+', - ], - defaults: - [ - 'torrentCategoriesId' => null, - ], - methods: - [ - 'GET', - 'POST' - ] - )] - public function editCategories( - Request $request, - TranslatorInterface $translator, - UserService $userService, - TorrentService $torrentService, - ActivityService $activityService - ): Response - { - // Init user - $user = $this->initUser( - $request, - $userService, - $activityService - ); - - if (!$user->isStatus()) - { - // @TODO - throw new \Exception( - $translator->trans('Access denied') - ); - } - - // Init torrent - if (!$torrent = $torrentService->getTorrent($request->get('torrentId'))) - { - throw $this->createNotFoundException(); - } - - // Init torrent categories - $torrentCategoriesCurrent = [ - 'userId' => null, - 'value' => [] - ]; - - // Get from edition version requested - if ($request->get('torrentCategoriesId')) - { - if ($torrentCategories = $torrentService->getTorrentCategories($request->get('torrentCategoriesId'))) - { - $torrentCategoriesCurrent['userId'] = $torrentCategories->getUserId(); - - foreach ($torrentCategories->getValue() as $value) - { - $torrentCategoriesCurrent['value'][] = $value; - } - } - - else - { - throw $this->createNotFoundException(); - } - } - - // Otherwise, get latest available - else - { - if ($torrentCategories = $torrentService->findLastTorrentCategoriesByTorrentId($torrent->getId())) - { - $torrentCategoriesCurrent['userId'] = $torrentCategories->getUserId(); - - foreach ($torrentCategories->getValue() as $value) - { - $torrentCategoriesCurrent['value'][] = $value; - } - - // Update active categories - $request->attributes->set('torrentCategoriesId', $torrentCategories->getId()); - } - } - - // Init edition history - $editions = []; - foreach ($torrentService->findTorrentCategoriesByTorrentId($torrent->getId()) as $torrentCategoriesEdition) - { - $editions[] = - [ - 'id' => $torrentCategoriesEdition->getId(), - 'added' => $torrentCategoriesEdition->getAdded(), - 'approved' => $torrentCategoriesEdition->isApproved(), - 'active' => $torrentCategoriesEdition->getId() == $request->get('torrentCategoriesId'), - 'user' => - [ - 'id' => $torrentCategoriesEdition->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $torrentCategoriesEdition->getUserId() - )->getAddress() - ), - ] - ]; - } - - // Init form - $form = - [ - 'categories' => - [ - 'error' => [], - 'attribute' => - [ - 'value' => $request->get('categories') ? $request->get('categories') : $torrentCategoriesCurrent['value'], - ] - ] - ]; - - // Process request - if ($request->isMethod('post')) - { - /// Categories - $categories = []; - if ($request->get('categories')) - { - foreach ((array) $request->get('categories') as $category) - { - if (in_array($category, explode('|', $this->getParameter('app.categories')))) - { - $categories[] = $category; - } - } - } - - //// At least one valid category required - if (!$categories) - { - $form['categories']['error'][] = $translator->trans('At least one category required'); - } - - // Request is valid - if (empty($form['categories']['error'])) - { - // Save data - $torrentCategories = $torrentService->addTorrentCategories( - $torrent->getId(), - $user->getId(), - time(), - $categories, - $user->isApproved() - ); - - // Register activity event - $activityService->addEventTorrentCategoriesAdd( - $user->getId(), - $torrent->getId(), - time(), - $torrentCategories->getId() - ); - - // Redirect to info page - return $this->redirectToRoute( - 'torrent_info', - [ - '_locale' => $request->get('_locale'), - 'torrentId' => $torrent->getId() - ] - ); - } - } - - // Render form template - return $this->render( - 'default/torrent/edit/categories.html.twig', - [ - 'torrentId' => $torrent->getId(), - 'categories' => explode('|', $this->getParameter('app.categories')), - 'editions' => $editions, - 'form' => $form, - 'session' => - [ - 'moderator' => $user->isModerator(), - 'owner' => $torrentCategoriesCurrent['userId'] === $user->getId(), - ] - ] - ); - } - - #[Route( - '/{_locale}/torrent/{torrentId}/approve/categories/{torrentCategoriesId}', - name: 'torrent_categories_approve', - requirements: - [ - '_locale' => '%app.locales%', - 'torrentId' => '\d+', - 'torrentCategoriesId' => '\d+', - ], - methods: - [ - 'GET' - ] - )] - public function approveCategories( - Request $request, - TranslatorInterface $translator, - UserService $userService, - TorrentService $torrentService, - ActivityService $activityService - ): Response - { - // Init user - $user = $this->initUser( - $request, - $userService, - $activityService - ); - - // Init torrent - if (!$torrent = $torrentService->getTorrent($request->get('torrentId'))) - { - throw $this->createNotFoundException(); - } - - // Init torrent categories - if (!$torrentCategories = $torrentService->getTorrentCategories($request->get('torrentCategoriesId'))) - { - throw $this->createNotFoundException(); - } - - // Check permissions - if (!$user->isModerator()) - { - // @TODO - throw new \Exception( - $translator->trans('Access denied') - ); - } - - // Register activity event - if (!$torrentCategories->isApproved()) - { - $activityService->addEventTorrentCategoriesApproveAdd( - $user->getId(), - $torrent->getId(), - time(), - $torrentCategories->getId() - ); - } - - else - { - $activityService->addEventTorrentCategoriesApproveDelete( - $user->getId(), - $torrent->getId(), - time(), - $torrentCategories->getId() - ); - } - - // Update approved - $torrentService->toggleTorrentCategoriesApproved( - $torrentCategories->getId() - ); - - // Redirect back to form - return $this->redirectToRoute( - 'torrent_categories_edit', - [ - '_locale' => $request->get('_locale'), - 'torrentId' => $torrent->getId(), - 'torrentCategoriesId' => $torrentCategories->getId(), - ] - ); - } - - #[Route( - '/{_locale}/torrent/{torrentId}/delete/categories/{torrentCategoriesId}', - name: 'torrent_categories_delete', - requirements: - [ - '_locale' => '%app.locales%', - 'torrentId' => '\d+', - 'torrentCategoriesId' => '\d+', - ], - methods: - [ - 'GET' - ] - )] - public function deleteCategories( - Request $request, - TranslatorInterface $translator, - UserService $userService, - TorrentService $torrentService, - ActivityService $activityService - ): Response - { - // Init user - $user = $this->initUser( - $request, - $userService, - $activityService - ); - - // Init torrent - if (!$torrent = $torrentService->getTorrent($request->get('torrentId'))) - { - throw $this->createNotFoundException(); - } - - // Init torrent categories - if (!$torrentCategories = $torrentService->getTorrentCategories($request->get('torrentCategoriesId'))) - { - throw $this->createNotFoundException(); - } - - // Check permissions - if (!($user->isModerator() || $user->getId() === $torrentCategories->getUserId())) - { - // @TODO - throw new \Exception( - $translator->trans('Access denied') - ); - } - - // Add activity event - $activityService->addEventTorrentCategoriesDelete( - $user->getId(), - $torrent->getId(), - time(), - $torrentCategories->getId() - ); - - // Update approved - $torrentService->deleteTorrentCategories( - $torrentCategories->getId() - ); - - // Redirect back to form - return $this->redirectToRoute( - 'torrent_categories_edit', - [ - '_locale' => $request->get('_locale'), - 'torrentId' => $torrent->getId(), - 'torrentCategoriesId' => $torrentCategories->getId(), - ] - ); - } - // Torrent sensitive #[Route( '/{_locale}/torrent/{torrentId}/edit/sensitive/{torrentSensitiveId}', @@ -2269,396 +1669,6 @@ class TorrentController extends AbstractController ); } - // Torrent poster - #[Route( - '/{_locale}/torrent/{torrentId}/edit/poster/{torrentPosterId}', - name: 'torrent_poster_edit', - requirements: - [ - '_locale' => '%app.locales%', - 'torrentId' => '\d+', - 'torrentPosterId' => '\d+', - ], - defaults: - [ - 'torrentPosterId' => null, - ], - methods: - [ - 'GET', - 'POST' - ] - )] - public function editPoster( - Request $request, - TranslatorInterface $translator, - UserService $userService, - TorrentService $torrentService, - ActivityService $activityService - ): Response - { - // Init user - $user = $this->initUser( - $request, - $userService, - $activityService - ); - - if (!$user->isStatus()) - { - // @TODO - throw new \Exception( - $translator->trans('Access denied') - ); - } - - // Init torrent - if (!$torrent = $torrentService->getTorrent($request->get('torrentId'))) - { - throw $this->createNotFoundException(); - } - - // Init poster value - if ($request->get('torrentPosterId')) - { - if ($torrentPoster = $torrentService->getTorrentPoster($request->get('torrentPosterId'))) - { - $torrentPosterCurrent = - [ - 'id' => $torrentPoster->getId(), - 'userId' => $torrentPoster->getUserId(), - 'value' => 'src' // @TODO - ]; - } - - else - { - throw $this->createNotFoundException(); - } - } - else - { - if ($torrentPoster = $torrentService->findLastTorrentPosterByTorrentId($torrent->getId())) - { - $torrentPosterCurrent = - [ - 'id' => $torrentPoster->getId(), - 'userId' => $torrentPoster->getUserId(), - 'value' => 'src' // @TODO - ]; - } - - else - { - $torrentPosterCurrent = - [ - 'id' => null, - 'userId' => null, - 'value' => false, - ]; - } - } - - // Init position - $position = in_array( - $request->get('position'), - [ - 'center', - 'top', - 'bottom' - ] - ) ? $request->get('position') : 'center'; - - // Init edition history - $editions = []; - foreach ($torrentService->findTorrentPosterByTorrentId($torrent->getId()) as $torrentPosterEdition) - { - $editions[] = - [ - 'id' => $torrentPosterEdition->getId(), - 'added' => $torrentPosterEdition->getAdded(), - 'position' => $torrentPosterEdition->getPosition(), - 'approved' => $torrentPosterEdition->isApproved(), - 'active' => $torrentPosterEdition->getId() == $torrentPosterCurrent['id'], - 'user' => - [ - 'id' => $torrentPosterEdition->getUserId(), - 'identicon' => $userService->identicon( - $userService->getUser( - $torrentPosterEdition->getUserId() - )->getAddress() - ), - ], - 'poster' => - $request->getScheme() . '://' . - $request->getHttpHost() . - $request->getBasePath() . - $torrentService->getImageUriByTorrentPosterId( - $torrentPosterEdition->getId() - ) - ]; - } - - // Init form - $form = - [ - 'poster' => - [ - 'error' => [] - ], - 'position' => - [ - 'error' => [], - 'attribute' => - [ - 'value' => $position - ] - ] - ]; - - // Process request - if ($request->isMethod('post')) - { - if ($request->get('id') && $torrentService->getTorrentPoster($request->get('id'))) - { - $filename = $torrentService->getStorageFilepathByTorrentPosterId( - $request->get('id') - ); - } - - else if ($file = $request->files->get('poster')) - { - //// Validate poster file - if (filesize($file->getPathName()) > $this->getParameter('app.torrent.poster.size.max')) - { - $form['poster']['error'][] = $translator->trans('Poster file out of size limit'); - } - - //// Validate image format - if (!@getimagesize($file->getPathName())) - { - $form['poster']['error'][] = $translator->trans('Image file not supported'); - } - - $filename = $file->getPathName(); - } - - else - { - $form['poster']['error'][] = $translator->trans('Poster file required'); - - $filename = false; - } - - // Request is valid - if (empty($form['poster']['error'])) - { - // Save data - $torrentPoster = $torrentService->addTorrentPoster( - $filename, - $position, - $torrent->getId(), - $user->getId(), - time(), - $user->isApproved() - ); - - // Add activity event - $activityService->addEventTorrentPosterAdd( - $user->getId(), - $torrent->getId(), - time(), - $torrentPoster->getId() - ); - - // Redirect to info page created - return $this->redirectToRoute( - 'torrent_info', - [ - '_locale' => $request->get('_locale'), - 'torrentId' => $torrent->getId() - ] - ); - } - } - - // Render form template - return $this->render( - 'default/torrent/edit/poster.html.twig', - [ - 'torrentId' => $torrent->getId(), - 'editions' => $editions, - 'form' => $form, - 'session' => - [ - 'moderator' => $user->isModerator(), - 'owner' => $torrentPosterCurrent['userId'] === $user->getId(), - ] - ] - ); - } - - #[Route( - '/{_locale}/torrent/{torrentId}/approve/poster/{torrentPosterId}', - name: 'torrent_poster_approve', - requirements: - [ - '_locale' => '%app.locales%', - 'torrentId' => '\d+', - 'torrentPosterId' => '\d+', - ], - methods: - [ - 'GET' - ] - )] - public function approvePoster( - Request $request, - TranslatorInterface $translator, - UserService $userService, - TorrentService $torrentService, - ActivityService $activityService - ): Response - { - // Init user - $user = $this->initUser( - $request, - $userService, - $activityService - ); - - // Init torrent - if (!$torrent = $torrentService->getTorrent($request->get('torrentId'))) - { - throw $this->createNotFoundException(); - } - - // Init torrent poster - if (!$torrentPoster = $torrentService->getTorrentPoster($request->get('torrentPosterId'))) - { - throw $this->createNotFoundException(); - } - - // Check permissions - if (!$user->isModerator()) - { - // @TODO - throw new \Exception( - $translator->trans('Access denied') - ); - } - - // Add activity event - if (!$torrentPoster->isApproved()) - { - $activityService->addEventTorrentPosterApproveAdd( - $user->getId(), - $torrent->getId(), - time(), - $torrentPoster->getId() - ); - } - - else - { - $activityService->addEventTorrentPosterApproveDelete( - $user->getId(), - $torrent->getId(), - time(), - $torrentPoster->getId() - ); - } - - // Update approved - $torrentService->toggleTorrentPosterApproved( - $torrentPoster->getId() - ); - - // Redirect - return $this->redirectToRoute( - 'torrent_poster_edit', - [ - '_locale' => $request->get('_locale'), - 'torrentId' => $torrent->getId(), - 'torrentPosterId' => $torrentPoster->getId(), - ] - ); - } - - #[Route( - '/{_locale}/torrent/{torrentId}/delete/poster/{torrentPosterId}', - name: 'torrent_poster_delete', - requirements: - [ - '_locale' => '%app.locales%', - 'torrentId' => '\d+', - 'torrentPosterId' => '\d+', - ], - methods: - [ - 'GET' - ] - )] - public function deletePoster( - Request $request, - TranslatorInterface $translator, - UserService $userService, - TorrentService $torrentService, - ActivityService $activityService - ): Response - { - // Init user - $user = $this->initUser( - $request, - $userService, - $activityService - ); - - // Init torrent - if (!$torrent = $torrentService->getTorrent($request->get('torrentId'))) - { - throw $this->createNotFoundException(); - } - - // Init torrent poster - if (!$torrentPoster = $torrentService->getTorrentPoster($request->get('torrentPosterId'))) - { - throw $this->createNotFoundException(); - } - - // Check permissions - if (!($user->isModerator() || $user->getId() === $torrentPoster->getUserId())) - { - // @TODO - throw new \Exception( - $translator->trans('Access denied') - ); - } - - // Add activity event - $activityService->addEventTorrentPosterDelete( - $user->getId(), - $torrent->getId(), - time(), - $torrentPoster->getId() - ); - - // Update approved - $torrentService->deleteTorrentPoster( - $torrentPoster->getId() - ); - - // Redirect - return $this->redirectToRoute( - 'torrent_poster_edit', - [ - '_locale' => $request->get('_locale'), - 'torrentId' => $torrent->getId(), - 'torrentPosterId' => $torrentPoster->getId(), - ] - ); - } - // Torrent star #[Route( '/{_locale}/torrent/{torrentId}/star/toggle', @@ -2797,9 +1807,14 @@ class TorrentController extends AbstractController throw $this->createNotFoundException(); } - // Access filter - if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && - (!$torrent->isStatus() || !$torrent->isApproved())) + // Sensitive filter + if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && $user->isSensitive()) + { + throw $this->createNotFoundException(); + } + + // Approved filter + if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && !$torrent->isApproved()) { throw $this->createNotFoundException(); } @@ -2811,12 +1826,6 @@ class TorrentController extends AbstractController time() ); - // Request scrape - $torrentService->updateTorrentScraped( - $torrent->getId(), - 0 - ); - // Register download event $activityService->addEventTorrentDownloadFileAdd( $user->getId(), @@ -2849,10 +1858,14 @@ class TorrentController extends AbstractController $response->headers->set( 'Content-Disposition', sprintf( - 'attachment; filename="%s [%s#%s].torrent";', - $file->getName(), - $this->getParameter('app.name'), - $torrent->getId() + 'attachment; filename="%s#%s.%s.torrent";', + mb_strtolower( + $this->getParameter('app.name') + ), + $torrent->getId(), + mb_strtolower( + $file->getName() + ) ) ); @@ -2915,9 +1928,14 @@ class TorrentController extends AbstractController throw $this->createNotFoundException(); } - // Access filter - if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && - (!$torrent->isStatus() || !$torrent->isApproved())) + // Sensitive filter + if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && $user->isSensitive()) + { + throw $this->createNotFoundException(); + } + + // Approved filter + if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && !$torrent->isApproved()) { throw $this->createNotFoundException(); } @@ -2929,12 +1947,6 @@ class TorrentController extends AbstractController time() ); - // Request scrape - $torrentService->updateTorrentScraped( - $torrent->getId(), - 0 - ); - // Register download event $activityService->addEventTorrentDownloadFileAdd( $user->getId(), @@ -2967,9 +1979,11 @@ class TorrentController extends AbstractController $response->headers->set( 'Content-Disposition', sprintf( - 'attachment; filename="%s [wanted#%s].torrent";', - $file->getName(), - $torrent->getId() + 'attachment; filename="wanted#%s.%s.torrent";', + $torrent->getId(), + mb_strtolower( + $file->getName() + ) ) ); @@ -3032,9 +2046,14 @@ class TorrentController extends AbstractController throw $this->createNotFoundException(); } - // Access filter - if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && - (!$torrent->isStatus() || !$torrent->isApproved())) + // Sensitive filter + if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && $user->isSensitive()) + { + throw $this->createNotFoundException(); + } + + // Approved filter + if (!$user->isModerator() && $user->getId() != $torrent->getUserId() && !$torrent->isApproved()) { throw $this->createNotFoundException(); } @@ -3046,12 +2065,6 @@ class TorrentController extends AbstractController time() ); - // Request scrape - $torrentService->updateTorrentScraped( - $torrent->getId(), - 0 - ); - // Register download event $activityService->addEventTorrentDownloadMagnetAdd( $user->getId(), @@ -3211,9 +2224,10 @@ class TorrentController extends AbstractController $torrentService->copyToFtpStorage( $torrent->getId(), sprintf( - '%s/torrents/wanted/all/wanted#%s.torrent', + '%s/torrents/wanted/all/wanted#%s.%s.torrent', $this->getParameter('app.torrent.wanted.ftp.folder'), - $torrent->getId() + $torrent->getId(), + $file->getName() ) ); @@ -3223,9 +2237,10 @@ class TorrentController extends AbstractController $torrentService->copyToFtpStorage( $torrent->getId(), sprintf( - '%s/torrents/wanted/sensitive/yes/wanted#%s.torrent', + '%s/torrents/wanted/sensitive/yes/wanted#%s.%s.torrent', $this->getParameter('app.torrent.wanted.ftp.folder'), - $torrent->getId() + $torrent->getId(), + $file->getName() ) ); } @@ -3235,9 +2250,10 @@ class TorrentController extends AbstractController $torrentService->copyToFtpStorage( $torrent->getId(), sprintf( - '%s/torrents/wanted/sensitive/no/wanted#%s.torrent', + '%s/torrents/wanted/sensitive/no/wanted#%s.%s.torrent', $this->getParameter('app.torrent.wanted.ftp.folder'), - $torrent->getId() + $torrent->getId(), + $file->getName() ) ); } @@ -3248,10 +2264,11 @@ class TorrentController extends AbstractController $torrentService->copyToFtpStorage( $torrent->getId(), sprintf( - '%s/torrents/wanted/locale/%s/wanted#%s.torrent', + '%s/torrents/wanted/locale/%s/wanted#%s.%s.torrent', $this->getParameter('app.torrent.wanted.ftp.folder'), $locale, - $torrent->getId() + $torrent->getId(), + $file->getName() ) ); } @@ -3264,26 +2281,29 @@ class TorrentController extends AbstractController /// All $torrentService->removeFromFtpStorage( sprintf( - '%s/torrents/wanted/all/wanted#%s.torrent', + '%s/torrents/wanted/all/wanted#%s.%s.torrent', $this->getParameter('app.torrent.wanted.ftp.folder'), - $torrent->getId() + $torrent->getId(), + $file->getName() ) ); /// Sensitive $torrentService->removeFromFtpStorage( sprintf( - '%s/torrents/wanted/sensitive/yes/wanted#%s.torrent', + '%s/torrents/wanted/sensitive/yes/wanted#%s.%s.torrent', $this->getParameter('app.torrent.wanted.ftp.folder'), - $torrent->getId() + $torrent->getId(), + $file->getName() ) ); $torrentService->removeFromFtpStorage( sprintf( - '%s/torrents/wanted/sensitive/no/wanted#%s.torrent', + '%s/torrents/wanted/sensitive/no/wanted#%s.%s.torrent', $this->getParameter('app.torrent.wanted.ftp.folder'), - $torrent->getId() + $torrent->getId(), + $file->getName() ) ); @@ -3292,10 +2312,11 @@ class TorrentController extends AbstractController { $torrentService->removeFromFtpStorage( sprintf( - '%s/torrents/wanted/locale/%s/wanted#%s.torrent', + '%s/torrents/wanted/locale/%s/wanted#%s.%s.torrent', $this->getParameter('app.torrent.wanted.ftp.folder'), $locale, - $torrent->getId() + $torrent->getId(), + $file->getName() ) ); } @@ -3321,16 +2342,7 @@ class TorrentController extends AbstractController ): Response { // Reindex keywords - $torrentService->reindexTorrentKeywordsAll( - (bool) $this->getParameter('app.index.torrent.name.enabled'), - (bool) $this->getParameter('app.index.torrent.filenames.enabled'), - (bool) $this->getParameter('app.index.torrent.hash.v1.enabled'), - (bool) $this->getParameter('app.index.torrent.hash.v2.enabled'), - (bool) $this->getParameter('app.index.torrent.source.enabled'), - (bool) $this->getParameter('app.index.torrent.comment.enabled'), - (int) $this->getParameter('app.index.word.length.min'), - (int) $this->getParameter('app.index.word.length.max') - ); + $torrentService->reindexTorrentKeywordsAll(); // Render response return new Response(); // @TODO @@ -3359,15 +2371,12 @@ class TorrentController extends AbstractController 'locale' => $locale, 'locales' => $locales, 'torrents' => $torrentService->findTorrents( - 0, // no user session init, pass 0 - [], // without keywords filter - $locales, // all system locales - $categories, // all system locales - null, // all sensitive levels - true, // approved only - true, // enabled only - 1000, // @TODO limit - 0 // offset + [], // without keywords filter + $locales, // all system locales + null, // all sensitive levels + true, // approved only + 1000, // @TODO limit + 0 // offset ) ], $response @@ -3392,7 +2401,6 @@ class TorrentController extends AbstractController $this->getParameter('app.theme'), $this->getParameter('app.sensitive'), $this->getParameter('app.yggdrasil'), - $this->getParameter('app.posters'), $this->getParameter('app.approved') ); diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index 538af56..4b75626 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -85,23 +85,6 @@ class UserController extends AbstractController ); } - // Update categories - if ($request->get('categories')) - { - $categories = []; - foreach ((array) $request->get('categories') as $category) - { - if (in_array($category, explode('|', $this->getParameter('app.categories')))) - { - $categories[] = $category; - } - } - - $user->setCategories( - $categories - ); - } - // Update theme if (in_array($request->get('theme'), explode('|', $this->getParameter('app.themes')))) { @@ -134,11 +117,6 @@ class UserController extends AbstractController $request->get('yggdrasil') === 'true' ); - // Update posters - $user->setPosters( - $request->get('posters') === 'true' - ); - // Save changes to DB $userService->save($user); @@ -156,21 +134,18 @@ class UserController extends AbstractController 'default/user/settings.html.twig', [ 'user' => [ - 'id' => $user->getId(), - 'sensitive' => $user->isSensitive(), - 'yggdrasil' => $user->isYggdrasil(), - 'posters' => $user->isPosters(), - 'locale' => $user->getLocale(), - 'locales' => $user->getLocales(), - 'categories' => $user->getCategories(), - 'events' => $user->getEvents(), - 'theme' => $user->getTheme(), - 'added' => $user->getAdded() + 'id' => $user->getId(), + 'sensitive' => $user->isSensitive(), + 'yggdrasil' => $user->isYggdrasil(), + 'locale' => $user->getLocale(), + 'locales' => $user->getLocales(), + 'events' => $user->getEvents(), + 'theme' => $user->getTheme(), + 'added' => $user->getAdded() ], - 'locales' => explode('|', $this->getParameter('app.locales')), - 'categories' => explode('|', $this->getParameter('app.categories')), - 'themes' => explode('|', $this->getParameter('app.themes')), - 'events' => $activityService->getEventsTree() + 'locales' => explode('|', $this->getParameter('app.locales')), + 'themes' => explode('|', $this->getParameter('app.themes')), + 'events' => $activityService->getEventsTree() ] ); } @@ -236,21 +211,19 @@ class UserController extends AbstractController 'moderator' => $user->isModerator() ], 'user' => [ - 'id' => $userTarget->getId(), - 'address' => $userTarget->getAddress(), - 'moderator' => $userTarget->isModerator(), - 'approved' => $userTarget->isApproved(), - 'status' => $userTarget->isStatus(), - 'posters' => $userTarget->isPosters(), - 'sensitive' => $userTarget->isSensitive(), - 'yggdrasil' => $userTarget->isYggdrasil(), - 'locale' => $userTarget->getLocale(), - 'locales' => $userTarget->getLocales(), - 'categories' => $user->getCategories(), - 'events' => $userTarget->getEvents(), - 'theme' => $userTarget->getTheme(), - 'added' => $userTarget->getAdded(), - 'identicon' => $userService->identicon( + 'id' => $userTarget->getId(), + 'address' => $userTarget->getAddress(), + 'moderator' => $userTarget->isModerator(), + 'approved' => $userTarget->isApproved(), + 'status' => $userTarget->isStatus(), + 'sensitive' => $userTarget->isSensitive(), + 'yggdrasil' => $userTarget->isYggdrasil(), + 'locale' => $userTarget->getLocale(), + 'locales' => $userTarget->getLocales(), + 'events' => $userTarget->getEvents(), + 'theme' => $userTarget->getTheme(), + 'added' => $userTarget->getAdded(), + 'identicon' => $userService->identicon( $userTarget->getAddress(), 48 ), @@ -318,12 +291,6 @@ class UserController extends AbstractController ); } - // Block crawler requests - if (in_array($request->getClientIp(), explode('|', $this->getParameter('app.crawlers')))) - { - throw $this->createNotFoundException(); - } - // Init target user if (!$userTarget = $userService->getUser($request->get('userId'))) { @@ -571,21 +538,11 @@ class UserController extends AbstractController true ); - $torrentService->setTorrentCategoriesApprovedByUserId( - $userTarget->getId(), - true - ); - $torrentService->setTorrentSensitivesApprovedByUserId( $userTarget->getId(), true ); - $torrentService->setTorrentPostersApprovedByUserId( - $userTarget->getId(), - true - ); - // @TODO make event for each item } @@ -656,7 +613,6 @@ class UserController extends AbstractController $this->getParameter('app.theme'), $this->getParameter('app.sensitive'), $this->getParameter('app.yggdrasil'), - $this->getParameter('app.posters'), $this->getParameter('app.approved') ); diff --git a/src/Entity/Activity.php b/src/Entity/Activity.php index 1be1097..3b208b9 100644 --- a/src/Entity/Activity.php +++ b/src/Entity/Activity.php @@ -20,57 +20,44 @@ class Activity // Event codes /// User - public const EVENT_USER_ADD = 1000; + public const EVENT_USER_ADD = 1000; - public const EVENT_USER_APPROVE_ADD = 1200; - public const EVENT_USER_APPROVE_DELETE = 1201; + public const EVENT_USER_APPROVE_ADD = 1200; + public const EVENT_USER_APPROVE_DELETE = 1201; - public const EVENT_USER_MODERATOR_ADD = 1300; - public const EVENT_USER_MODERATOR_DELETE = 1301; + public const EVENT_USER_MODERATOR_ADD = 1300; + public const EVENT_USER_MODERATOR_DELETE = 1301; - public const EVENT_USER_STATUS_ADD = 1400; - public const EVENT_USER_STATUS_DELETE = 1401; + public const EVENT_USER_STATUS_ADD = 1400; + public const EVENT_USER_STATUS_DELETE = 1401; - public const EVENT_USER_STAR_ADD = 1500; - public const EVENT_USER_STAR_DELETE = 1501; + public const EVENT_USER_STAR_ADD = 1500; + public const EVENT_USER_STAR_DELETE = 1501; /// Torrent - public const EVENT_TORRENT_ADD = 2000; + public const EVENT_TORRENT_ADD = 2000; - public const EVENT_TORRENT_APPROVE_ADD = 1100; - public const EVENT_TORRENT_APPROVE_DELETE = 1101; + public const EVENT_TORRENT_APPROVE_ADD = 1100; + public const EVENT_TORRENT_APPROVE_DELETE = 1101; - public const EVENT_TORRENT_LOCALES_ADD = 2200; - public const EVENT_TORRENT_LOCALES_DELETE = 2201; - public const EVENT_TORRENT_LOCALES_APPROVE_ADD = 2210; - public const EVENT_TORRENT_LOCALES_APPROVE_DELETE = 2211; + public const EVENT_TORRENT_LOCALES_ADD = 2200; + public const EVENT_TORRENT_LOCALES_DELETE = 2201; + public const EVENT_TORRENT_LOCALES_APPROVE_ADD = 2210; + public const EVENT_TORRENT_LOCALES_APPROVE_DELETE = 2211; - public const EVENT_TORRENT_SENSITIVE_ADD = 2300; - public const EVENT_TORRENT_SENSITIVE_DELETE = 2301; - public const EVENT_TORRENT_SENSITIVE_APPROVE_ADD = 2310; - public const EVENT_TORRENT_SENSITIVE_APPROVE_DELETE = 2311; + public const EVENT_TORRENT_SENSITIVE_ADD = 2300; + public const EVENT_TORRENT_SENSITIVE_DELETE = 2301; + public const EVENT_TORRENT_SENSITIVE_APPROVE_ADD = 2310; + public const EVENT_TORRENT_SENSITIVE_APPROVE_DELETE = 2311; - public const EVENT_TORRENT_STAR_ADD = 2400; - public const EVENT_TORRENT_STAR_DELETE = 2401; + public const EVENT_TORRENT_STAR_ADD = 2400; + public const EVENT_TORRENT_STAR_DELETE = 2401; - public const EVENT_TORRENT_DOWNLOAD_FILE_ADD = 2500; + public const EVENT_TORRENT_DOWNLOAD_FILE_ADD = 2500; - public const EVENT_TORRENT_DOWNLOAD_MAGNET_ADD = 2600; + public const EVENT_TORRENT_DOWNLOAD_MAGNET_ADD = 2600; - public const EVENT_TORRENT_WANTED_ADD = 2700; - - public const EVENT_TORRENT_STATUS_ADD = 1800; - public const EVENT_TORRENT_STATUS_DELETE = 1801; - - public const EVENT_TORRENT_POSTER_ADD = 2800; - public const EVENT_TORRENT_POSTER_DELETE = 2801; - public const EVENT_TORRENT_POSTER_APPROVE_ADD = 2810; - public const EVENT_TORRENT_POSTER_APPROVE_DELETE = 2811; - - public const EVENT_TORRENT_CATEGORIES_ADD = 2900; - public const EVENT_TORRENT_CATEGORIES_DELETE = 2901; - public const EVENT_TORRENT_CATEGORIES_APPROVE_ADD = 2910; - public const EVENT_TORRENT_CATEGORIES_APPROVE_DELETE = 2911; + public const EVENT_TORRENT_WANTED_ADD = 2700; // ... diff --git a/src/Entity/Torrent.php b/src/Entity/Torrent.php index 515a62e..876bd1e 100644 --- a/src/Entity/Torrent.php +++ b/src/Entity/Torrent.php @@ -33,9 +33,6 @@ class Torrent #[ORM\Column] private ?bool $approved = null; - #[ORM\Column] - private ?bool $status = null; - #[ORM\Column(length: 32)] private ?string $md5file = null; @@ -51,12 +48,6 @@ class Torrent #[ORM\Column(nullable: true)] private ?int $leechers = null; - #[ORM\Column(nullable: true)] - private ?int $torrentPosterId = null; - - #[ORM\Column(type: Types::SIMPLE_ARRAY)] - private ?array $categories = null; - public function getId(): ?int { return $this->id; @@ -165,18 +156,6 @@ class Torrent return $this; } - public function isStatus(): ?bool - { - return $this->status; - } - - public function setStatus(bool $status): static - { - $this->status = $status; - - return $this; - } - public function getSeeders(): ?int { return $this->seeders; @@ -212,28 +191,4 @@ class Torrent return $this; } - - public function getTorrentPosterId(): ?int - { - return $this->torrentPosterId; - } - - public function setTorrentPosterId(?int $torrentPosterId): static - { - $this->torrentPosterId = $torrentPosterId; - - return $this; - } - - public function getCategories(): ?array - { - return $this->categories; - } - - public function setCategories(?array $categories): static - { - $this->categories = $categories; - - return $this; - } } diff --git a/src/Entity/TorrentCategories.php b/src/Entity/TorrentCategories.php deleted file mode 100644 index 9d73809..0000000 --- a/src/Entity/TorrentCategories.php +++ /dev/null @@ -1,103 +0,0 @@ -id; - } - - public function setId(string $id): static - { - $this->id = $id; - - return $this; - } - - public function getTorrentId(): ?int - { - return $this->torrentId; - } - - public function setTorrentId(int $torrentId): static - { - $this->torrentId = $torrentId; - - return $this; - } - - public function getUserId(): ?int - { - return $this->userId; - } - - public function setUserId(int $userId): static - { - $this->userId = $userId; - - return $this; - } - - public function getAdded(): ?int - { - return $this->added; - } - - public function setAdded(int $added): static - { - $this->added = $added; - - return $this; - } - - public function getValue(): array - { - return $this->value; - } - - public function setValue(array $value): static - { - $this->value = $value; - - return $this; - } - - public function isApproved(): ?bool - { - return $this->approved; - } - - public function setApproved(bool $approved): static - { - $this->approved = $approved; - - return $this; - } -} diff --git a/src/Entity/TorrentPoster.php b/src/Entity/TorrentPoster.php deleted file mode 100644 index b25c481..0000000 --- a/src/Entity/TorrentPoster.php +++ /dev/null @@ -1,117 +0,0 @@ -id; - } - - public function setId(string $id): static - { - $this->id = $id; - - return $this; - } - - public function getTorrentId(): ?int - { - return $this->torrentId; - } - - public function setTorrentId(int $torrentId): static - { - $this->torrentId = $torrentId; - - return $this; - } - - public function getUserId(): ?int - { - return $this->userId; - } - - public function setUserId(int $userId): static - { - $this->userId = $userId; - - return $this; - } - - public function getAdded(): ?int - { - return $this->added; - } - - public function setAdded(int $added): static - { - $this->added = $added; - - return $this; - } - - public function isApproved(): ?bool - { - return $this->approved; - } - - public function setApproved(bool $approved): static - { - $this->approved = $approved; - - return $this; - } - - public function getMd5file(): ?string - { - return $this->md5file; - } - - public function setMd5file(string $md5file): static - { - $this->md5file = $md5file; - - return $this; - } - - public function getPosition(): ?string - { - return $this->position; - } - - public function setPosition(string $position): static - { - $this->position = $position; - - return $this; - } -} diff --git a/src/Entity/User.php b/src/Entity/User.php index 330a97a..7339f65 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -47,12 +47,6 @@ class User #[ORM\Column] private ?bool $yggdrasil = null; - #[ORM\Column] - private ?bool $posters = null; - - #[ORM\Column(type: Types::SIMPLE_ARRAY)] - private ?array $categories = null; - public function getId(): ?int { return $this->id; @@ -196,28 +190,4 @@ class User return $this; } - - public function isPosters(): ?bool - { - return $this->posters; - } - - public function setPosters(bool $posters): static - { - $this->posters = $posters; - - return $this; - } - - public function getCategories(): ?array - { - return $this->categories; - } - - public function setCategories(?array $categories): static - { - $this->categories = $categories; - - return $this; - } } diff --git a/src/Repository/TorrentCategoriesRepository.php b/src/Repository/TorrentCategoriesRepository.php deleted file mode 100644 index 030f69c..0000000 --- a/src/Repository/TorrentCategoriesRepository.php +++ /dev/null @@ -1,23 +0,0 @@ - - * - * @method TorrentCategories|null find($id, $lockMode = null, $lockVersion = null) - * @method TorrentCategories|null findOneBy(array $criteria, array $orderBy = null) - * @method TorrentCategories[] findAll() - * @method TorrentCategories[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) - */ -class TorrentCategoriesRepository extends ServiceEntityRepository -{ - public function __construct(ManagerRegistry $registry) - { - parent::__construct($registry, TorrentCategories::class); - } -} diff --git a/src/Repository/TorrentPosterRepository.php b/src/Repository/TorrentPosterRepository.php deleted file mode 100644 index 235231c..0000000 --- a/src/Repository/TorrentPosterRepository.php +++ /dev/null @@ -1,23 +0,0 @@ - - * - * @method TorrentPoster|null find($id, $lockMode = null, $lockVersion = null) - * @method TorrentPoster|null findOneBy(array $criteria, array $orderBy = null) - * @method TorrentPoster[] findAll() - * @method TorrentPoster[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) - */ -class TorrentPosterRepository extends ServiceEntityRepository -{ - public function __construct(ManagerRegistry $registry) - { - parent::__construct($registry, TorrentPoster::class); - } -} diff --git a/src/Repository/TorrentRepository.php b/src/Repository/TorrentRepository.php index 536a72f..01a10ec 100644 --- a/src/Repository/TorrentRepository.php +++ b/src/Repository/TorrentRepository.php @@ -22,50 +22,38 @@ class TorrentRepository extends ServiceEntityRepository } public function findTorrentsTotal( - int $userId, array $keywords, - ?array $locales, - ?array $categories, + array $locales, ?bool $sensitive = null, - ?bool $approved = null, - ?bool $status = null, - int $limit = 10, - int $offset = 0 + ?bool $approved = null, + int $limit = 10, + int $offset = 0 ): int { return $this->getTorrentsQueryByFilter( - $userId, $keywords, $locales, - $categories, $sensitive, $approved, - $status, )->select('count(t.id)') ->getQuery() ->getSingleScalarResult(); } public function findTorrents( - int $userId, array $keywords, - ?array $locales, - ?array $categories, + array $locales, ?bool $sensitive = null, - ?bool $approved = null, - ?bool $status = null, + ?bool $approved = null, int $limit = 10, int $offset = 0 ): array { return $this->getTorrentsQueryByFilter( - $userId, $keywords, $locales, - $categories, $sensitive, $approved, - $status, )->setMaxResults($limit) ->setFirstResult($offset) ->orderBy('t.id', 'DESC') // same as t.added @@ -74,168 +62,56 @@ class TorrentRepository extends ServiceEntityRepository } private function getTorrentsQueryByFilter( - int $userId, - ?array $keywords, - ?array $locales, - ?array $categories, - ?bool $sensitive = null, - ?bool $approved = null, - ?bool $status = null + array $keywords, + array $locales, + ?bool $sensitive = null, + ?bool $approved = null, ): \Doctrine\ORM\QueryBuilder { $query = $this->createQueryBuilder('t'); - if (is_array($keywords)) + if ($keywords) // @TODO ANY or DTS { + $andX = $query->expr()->andX(); + foreach ($keywords as $i => $keyword) { - // Make query to the index case insensitive - $keyword = mb_strtolower($keyword); + $keyword = mb_strtolower($keyword); // all keywords stored in lowercase - // Init OR condition for each word form - $orKeywords = $query->expr()->orX(); - - $orKeywords->add("t.keywords LIKE :keyword{$i}"); + $andX->add("t.keywords LIKE :keyword{$i}"); $query->setParameter(":keyword{$i}", "%{$keyword}%"); - - // Generate word forms for each transliteration locale #33 - foreach ($this->generateWordForms($keyword) as $j => $wordForm) - { - $orKeywords->add("t.keywords LIKE :keyword{$i}{$j}"); - $query->setParameter(":keyword{$i}{$j}", "%{$wordForm}%"); - } - - // Append AND condition - $query->andWhere($orKeywords); } + + $query->andWhere($andX); } - if (is_array($locales)) + if ($locales) // @TODO ANY or DTS { - $orLocales = $query->expr()->orX(); + //$orX = $query->expr()->orX(); + $orX = $query->expr()->orX(); foreach ($locales as $i => $locale) { - $orLocales->add("t.locales LIKE :locale{$i}"); - $orLocales->add("t.userId = :userId"); + $orX->add("t.locales LIKE :locale{$i}"); $query->setParameter(":locale{$i}", "%{$locale}%"); - $query->setParameter('userId', $userId); } - $query->andWhere($orLocales); - } - - if (is_array($categories)) - { - $orCategories = $query->expr()->orX(); - - foreach ($categories as $i => $category) - { - $orCategories->add("t.categories LIKE :category{$i}"); - $orCategories->add("t.userId = :userId"); - - $query->setParameter(":category{$i}", "%{$category}%"); - $query->setParameter('userId', $userId); - } - - $query->andWhere($orCategories); + $query->andWhere($orX); } if (is_bool($sensitive)) { - $orSensitive = $query->expr()->orX(); - - $orSensitive->add("t.sensitive = :sensitive"); - $orSensitive->add("t.userId = :userId"); - - $query->setParameter('sensitive', $sensitive); - $query->setParameter('userId', $userId); - - $query->andWhere($orSensitive); + $query->andWhere('t.sensitive = :sensitive') + ->setParameter('sensitive', $sensitive); } if (is_bool($approved)) { - $orApproved = $query->expr()->orX(); - - $orApproved->add("t.approved = :approved"); - $orApproved->add("t.userId = :userId"); - - $query->setParameter('approved', $approved); - $query->setParameter('userId', $userId); - - $query->andWhere($orApproved); - } - - if (is_bool($status)) - { - $orStatus = $query->expr()->orX(); - - $orStatus->add("t.status = :status"); - $orStatus->add("t.userId = :userId"); - - $query->setParameter('status', $status); - $query->setParameter('userId', $userId); - - $query->andWhere($orStatus); + $query->andWhere('t.approved = :approved') + ->setParameter('approved', $approved); } return $query; } - - // Word forms generator to improve search results - // e.g. transliteration rules for latin filenames - private function generateWordForms( - string $keyword, - // #33 supported locales: - // https://github.com/ashtokalo/php-translit - array $transliteration = [ - 'be', - 'bg', - 'el', - 'hy', - 'kk', - 'mk', - 'ru', - 'ka', - 'uk' - ], - // Additional char forms - array $charForms = - [ - 'c' => 'k', - 'k' => 'c', - ] - ): array - { - $wordForms = []; - - // Apply transliteration - foreach ($transliteration as $locale) - { - $wordForms[] = \ashtokalo\translit\Translit::object()->convert( - $keyword, - $locale - ); - } - - // Apply char forms - foreach ($wordForms as $wordForm) - { - foreach ($charForms as $from => $to) - { - $wordForms[] = str_replace( - $from, - $to, - $wordForm - ); - } - } - - // Remove duplicates - return array_unique( - $wordForms - ); - } } diff --git a/src/Service/ActivityService.php b/src/Service/ActivityService.php index dd785d1..4dbbb74 100644 --- a/src/Service/ActivityService.php +++ b/src/Service/ActivityService.php @@ -51,30 +51,17 @@ class ActivityService Activity::EVENT_TORRENT_LOCALES_APPROVE_ADD, Activity::EVENT_TORRENT_LOCALES_APPROVE_DELETE, - Activity::EVENT_TORRENT_CATEGORIES_ADD, - Activity::EVENT_TORRENT_CATEGORIES_DELETE, - Activity::EVENT_TORRENT_CATEGORIES_APPROVE_ADD, - Activity::EVENT_TORRENT_CATEGORIES_APPROVE_DELETE, - Activity::EVENT_TORRENT_SENSITIVE_ADD, Activity::EVENT_TORRENT_SENSITIVE_DELETE, Activity::EVENT_TORRENT_SENSITIVE_APPROVE_ADD, Activity::EVENT_TORRENT_SENSITIVE_APPROVE_DELETE, - Activity::EVENT_TORRENT_POSTER_ADD, - Activity::EVENT_TORRENT_POSTER_DELETE, - Activity::EVENT_TORRENT_POSTER_APPROVE_ADD, - Activity::EVENT_TORRENT_POSTER_APPROVE_DELETE, - Activity::EVENT_TORRENT_STAR_ADD, Activity::EVENT_TORRENT_STAR_DELETE, Activity::EVENT_TORRENT_DOWNLOAD_FILE_ADD, Activity::EVENT_TORRENT_DOWNLOAD_MAGNET_ADD, - Activity::EVENT_TORRENT_STATUS_ADD, - Activity::EVENT_TORRENT_STATUS_DELETE, - Activity::EVENT_TORRENT_WANTED_ADD, ]; } @@ -282,55 +269,6 @@ class ActivityService break; - /// Torrent categories - case Activity::EVENT_TORRENT_CATEGORIES_ADD: - - $events - [ - $this->translatorInterface->trans('Torrent categories') - ] - [ - $this->translatorInterface->trans('Added') - ] = $code; - - break; - - case Activity::EVENT_TORRENT_CATEGORIES_DELETE: - - $events - [ - $this->translatorInterface->trans('Torrent categories') - ] - [ - $this->translatorInterface->trans('Deleted') - ] = $code; - - break; - - case Activity::EVENT_TORRENT_CATEGORIES_APPROVE_ADD: - - $events - [ - $this->translatorInterface->trans('Torrent categories') - ] - [ - $this->translatorInterface->trans('Approved') - ] = $code; - - break; - - case Activity::EVENT_TORRENT_CATEGORIES_APPROVE_DELETE: - - $events - [ - $this->translatorInterface->trans('Torrent categories') - ] - [ - $this->translatorInterface->trans('Disapproved') - ] = $code; - - break; - /// Torrent sensitive case Activity::EVENT_TORRENT_SENSITIVE_ADD: @@ -380,55 +318,6 @@ class ActivityService break; - /// Torrent poster - case Activity::EVENT_TORRENT_POSTER_ADD: - - $events - [ - $this->translatorInterface->trans('Torrent posters') - ] - [ - $this->translatorInterface->trans('Added') - ] = $code; - - break; - - case Activity::EVENT_TORRENT_POSTER_DELETE: - - $events - [ - $this->translatorInterface->trans('Torrent posters') - ] - [ - $this->translatorInterface->trans('Deleted') - ] = $code; - - break; - - case Activity::EVENT_TORRENT_POSTER_APPROVE_ADD: - - $events - [ - $this->translatorInterface->trans('Torrent posters') - ] - [ - $this->translatorInterface->trans('Approved') - ] = $code; - - break; - - case Activity::EVENT_TORRENT_POSTER_APPROVE_DELETE: - - $events - [ - $this->translatorInterface->trans('Torrent posters') - ] - [ - $this->translatorInterface->trans('Disapproved') - ] = $code; - - break; - /// Torrent stars case Activity::EVENT_TORRENT_STAR_ADD: @@ -490,30 +379,6 @@ class ActivityService ] = $code; break; - - case Activity::EVENT_TORRENT_STATUS_ADD: - - $events - [ - $this->translatorInterface->trans('Torrents') - ] - [ - $this->translatorInterface->trans('Enabled') - ] = $code; - - break; - - case Activity::EVENT_TORRENT_STATUS_DELETE: - - $events - [ - $this->translatorInterface->trans('Torrents') - ] - [ - $this->translatorInterface->trans('Disabled') - ] = $code; - - break; } } @@ -996,65 +861,6 @@ class ActivityService return $activity; } - public function addEventTorrentStatusAdd( - int $userId, - int $torrentId, - int $added - ): ?Activity - { - $activity = new Activity(); - - $activity->setEvent( - Activity::EVENT_TORRENT_STATUS_ADD - ); - - $activity->setUserId( - $userId - ); - - $activity->setTorrentId( - $torrentId - ); - - $activity->setAdded( - $added - ); - - $this->entityManagerInterface->persist($activity); - $this->entityManagerInterface->flush(); - - return $activity; - } - - public function addEventTorrentStatusDelete( - int $userId, - int $torrentId, - int $added - ): ?Activity - { - $activity = new Activity(); - - $activity->setEvent( - Activity::EVENT_TORRENT_STATUS_DELETE - ); - - $activity->setUserId( - $userId - ); - - $activity->setTorrentId( - $torrentId - ); - - $activity->setAdded( - $added - ); - - $this->entityManagerInterface->persist($activity); - $this->entityManagerInterface->flush(); - - return $activity; - } public function addEventTorrentWantedAdd( int $userId, @@ -1357,155 +1163,6 @@ class ActivityService return $activity; } - /// Torrent categories - public function addEventTorrentCategoriesAdd( - int $userId, - int $torrentId, - int $added, - int $torrentCategoriesId, - ): ?Activity - { - $activity = new Activity(); - - $activity->setEvent( - Activity::EVENT_TORRENT_CATEGORIES_ADD - ); - - $activity->setUserId( - $userId - ); - - $activity->setTorrentId( - $torrentId - ); - - $activity->setAdded( - $added - ); - - $activity->setData( - [ - 'torrentCategoriesId' => $torrentCategoriesId - ] - ); - - $this->entityManagerInterface->persist($activity); - $this->entityManagerInterface->flush(); - - return $activity; - } - - public function addEventTorrentCategoriesDelete( - int $userId, - int $torrentId, - int $added, - int $torrentCategoriesId, - ): ?Activity - { - $activity = new Activity(); - - $activity->setEvent( - Activity::EVENT_TORRENT_CATEGORIES_DELETE - ); - - $activity->setUserId( - $userId - ); - - $activity->setTorrentId( - $torrentId - ); - - $activity->setAdded( - $added - ); - - $activity->setData( - [ - 'torrentCategoriesId' => $torrentCategoriesId - ] - ); - - $this->entityManagerInterface->persist($activity); - $this->entityManagerInterface->flush(); - - return $activity; - } - - public function addEventTorrentCategoriesApproveAdd( - int $userId, - int $torrentId, - int $added, - int $torrentCategoriesId, - ): ?Activity - { - $activity = new Activity(); - - $activity->setEvent( - Activity::EVENT_TORRENT_CATEGORIES_APPROVE_ADD - ); - - $activity->setUserId( - $userId - ); - - $activity->setTorrentId( - $torrentId - ); - - $activity->setAdded( - $added - ); - - $activity->setData( - [ - 'torrentCategoriesId' => $torrentCategoriesId - ] - ); - - $this->entityManagerInterface->persist($activity); - $this->entityManagerInterface->flush(); - - return $activity; - } - - public function addEventTorrentCategoriesApproveDelete( - int $userId, - int $torrentId, - int $added, - int $torrentCategoriesId, - ): ?Activity - { - $activity = new Activity(); - - $activity->setEvent( - Activity::EVENT_TORRENT_CATEGORIES_APPROVE_DELETE - ); - - $activity->setUserId( - $userId - ); - - $activity->setTorrentId( - $torrentId - ); - - $activity->setAdded( - $added - ); - - $activity->setData( - [ - 'torrentCategoriesId' => $torrentCategoriesId - ] - ); - - $this->entityManagerInterface->persist($activity); - $this->entityManagerInterface->flush(); - - return $activity; - } - /// Torrent sensitive public function addEventTorrentSensitiveAdd( int $userId, @@ -1654,153 +1311,4 @@ class ActivityService return $activity; } - - /// Torrent poster - public function addEventTorrentPosterAdd( - int $userId, - int $torrentId, - int $added, - int $torrentPosterId, - ): ?Activity - { - $activity = new Activity(); - - $activity->setEvent( - Activity::EVENT_TORRENT_POSTER_ADD - ); - - $activity->setUserId( - $userId - ); - - $activity->setTorrentId( - $torrentId - ); - - $activity->setAdded( - $added - ); - - $activity->setData( - [ - 'torrentPosterId' => $torrentPosterId - ] - ); - - $this->entityManagerInterface->persist($activity); - $this->entityManagerInterface->flush(); - - return $activity; - } - - public function addEventTorrentPosterDelete( - int $userId, - int $torrentId, - int $added, - int $torrentPosterId, - ): ?Activity - { - $activity = new Activity(); - - $activity->setEvent( - Activity::EVENT_TORRENT_POSTER_DELETE - ); - - $activity->setUserId( - $userId - ); - - $activity->setTorrentId( - $torrentId - ); - - $activity->setAdded( - $added - ); - - $activity->setData( - [ - 'torrentPosterId' => $torrentPosterId - ] - ); - - $this->entityManagerInterface->persist($activity); - $this->entityManagerInterface->flush(); - - return $activity; - } - - public function addEventTorrentPosterApproveAdd( - int $userId, - int $torrentId, - int $added, - int $torrentPosterId, - ): ?Activity - { - $activity = new Activity(); - - $activity->setEvent( - Activity::EVENT_TORRENT_POSTER_APPROVE_ADD - ); - - $activity->setUserId( - $userId - ); - - $activity->setTorrentId( - $torrentId - ); - - $activity->setAdded( - $added - ); - - $activity->setData( - [ - 'torrentPosterId' => $torrentPosterId - ] - ); - - $this->entityManagerInterface->persist($activity); - $this->entityManagerInterface->flush(); - - return $activity; - } - - public function addEventTorrentPosterApproveDelete( - int $userId, - int $torrentId, - int $added, - int $torrentPosterId, - ): ?Activity - { - $activity = new Activity(); - - $activity->setEvent( - Activity::EVENT_TORRENT_POSTER_APPROVE_DELETE - ); - - $activity->setUserId( - $userId - ); - - $activity->setTorrentId( - $torrentId - ); - - $activity->setAdded( - $added - ); - - $activity->setData( - [ - 'torrentPosterId' => $torrentPosterId - ] - ); - - $this->entityManagerInterface->persist($activity); - $this->entityManagerInterface->flush(); - - return $activity; - } } \ No newline at end of file diff --git a/src/Service/TorrentService.php b/src/Service/TorrentService.php index c0c3d52..5e2c4c3 100644 --- a/src/Service/TorrentService.php +++ b/src/Service/TorrentService.php @@ -4,18 +4,14 @@ namespace App\Service; use App\Entity\Torrent; use App\Entity\TorrentLocales; -use App\Entity\TorrentCategories; use App\Entity\TorrentSensitive; -use App\Entity\TorrentPoster; use App\Entity\TorrentStar; use App\Entity\TorrentDownloadFile; use App\Entity\TorrentDownloadMagnet; use App\Repository\TorrentRepository; use App\Repository\TorrentLocalesRepository; -use App\Repository\TorrentCategoriesRepository; use App\Repository\TorrentSensitiveRepository; -use App\Repository\TorrentPosterRepository; use App\Repository\TorrentStarRepository; use App\Repository\TorrentDownloadFileRepository; use App\Repository\TorrentDownloadMagnetRepository; @@ -66,239 +62,63 @@ class TorrentService ); } - public function generateTorrentKeywordsByString( - string $string, - int $wordLengthMin, - int $wordLengthMax, - ): array - { - $words = explode( - ' ', - preg_replace( - '/[\s]+/', - ' ', - preg_replace( - '/[\W_]+/u', - ' ', - $string - ) - ) - ); - - // Apply words filter - foreach ((array) $words as $key => $value) - { - // Apply word length filter - $length = mb_strlen($value); - - if ($length < $wordLengthMin || $length > $wordLengthMax) - { - unset($words[$key]); - } - - else - { - // Apply case insensitive search conversion - $words[$key] = mb_strtolower($value); - } - } - - // Build simple array - $keywords = []; - foreach ((array) $words as $word) - { - $keywords[] = $word; - } - - // Return unique keywords - return array_unique( - $keywords - ); - } - public function generateTorrentKeywordsByTorrentFilepath( - string $filepath, - - bool $extractName, - bool $extractFilenames, - bool $extractInfoHashV1, - bool $extractInfoHashV2, - bool $extractSource, - bool $extractComment, - - int $wordLengthMin, - int $wordLengthMax - + int $minLength = 3 ): array { $keywords = []; if ($file = $this->readTorrentFileByFilepath($filepath)) { - if ($extractName) + foreach ($file->getFileList() as $list) { - if ($name = $file->getName(false)) - { - $keywords = array_merge( - $keywords, - $this->generateTorrentKeywordsByString( - $name, - $wordLengthMin, - $wordLengthMax + $words = explode( + ' ', + preg_replace( + '/[\s]+/', + ' ', + preg_replace( + '/[\W_]+/u', + ' ', + $list['path'] ) - ); - } - } + ) + ); - if ($extractFilenames) - { - foreach ($file->getFileList() as $list) + foreach ($words as $key => $value) { - $keywords = array_merge( - $keywords, - $this->generateTorrentKeywordsByString( - $list['path'], - $wordLengthMin, - $wordLengthMax - ) - ); - } - } + if (mb_strlen($value) < $minLength) + { + unset($words[$key]); + } - if ($extractSource) - { - if ($source = $file->getSource(false)) - { - $keywords = array_merge( - $keywords, - $this->generateTorrentKeywordsByString( - $source, - $wordLengthMin, - $wordLengthMax - ) - ); + else + { + $words[$key] = mb_strtolower($value); + } } - } - if ($extractComment) - { - if ($comment = $file->getComment(false)) - { - $keywords = array_merge( - $keywords, - $this->generateTorrentKeywordsByString( - $comment, - $wordLengthMin, - $wordLengthMax - ) - ); - } - } - - if ($extractInfoHashV1) - { if ($hash = $file->getInfoHashV1(false)) { $keywords[] = $hash; } - } - if ($extractInfoHashV2) - { if ($hash = $file->getInfoHashV2(false)) { $keywords[] = $hash; } + + if ($name = $file->getName(false)) + { + $keywords[] = $name; + } + + $keywords = array_merge($keywords, $words); } } - return array_unique( - $keywords - ); - } - - public function getImageUriByTorrentPosterId( - int $torrentPosterId, - int $quality = 100, - int $width = 748, - int $height = 0, - float $opacity = 1, - bool $grayscale = false, - string $format = 'webp' - ): string - { - $uri = sprintf( - '/posters/%s.%s', - implode('/', str_split($torrentPosterId)), - $format - ); - - $filename = sprintf( - '%s/public/posters/%s.%s', - $this->kernelInterface->getProjectDir(), - implode('/', str_split($torrentPosterId)), - $format - ); - - if (file_exists($filename)) - { - return $uri; - } - - $path = explode('/', $filename); - - array_pop($path); - - @mkdir(implode('/', $path), 0755, true); - - $image = new \Imagick(); - - $image->readImage( - $this->getStorageFilepathByTorrentPosterId( - $torrentPosterId - ) - ); - - $image->setImageFormat($format); - $image->setImageCompressionQuality($quality); - - if ($width || $height) - { - $image->adaptiveResizeImage( - $width, - $height - ); - } - - if ($grayscale) - { - $image->setImageType( - \Imagick::IMGTYPE_GRAYSCALE - ); - } - - if ($opacity) - { - $image->setImageOpacity( - $opacity - ); - } - - $image->writeImage( - $filename - ); - - return $uri; - } - - public function getStorageFilepathByTorrentPosterId(int $torrentPosterId): string - { - return sprintf( - '%s/var/posters/%s.original', - $this->kernelInterface->getProjectDir(), - implode('/', str_split($torrentPosterId)) - ); + return array_unique($keywords); } public function getStorageFilepathByTorrentId(int $torrentId): string @@ -323,11 +143,6 @@ class TorrentService { $contributors = []; - foreach ($this->findTorrentCategoriesByTorrentId($torrent->getId()) as $torrentCategory) - { - $contributors[] = $torrentCategory->getUserId(); - } - foreach ($this->findTorrentLocalesByTorrentId($torrent->getId()) as $torrentLocale) { $contributors[] = $torrentLocale->getUserId(); @@ -338,11 +153,6 @@ class TorrentService $contributors[] = $torrentSensitive->getUserId(); } - foreach ($this->findTorrentPosterByTorrentId($torrent->getId()) as $torrentPoster) - { - $contributors[] = $torrentPoster->getUserId(); - } - $contributors[] = $torrent->getUserId(); return array_unique($contributors); @@ -377,27 +187,12 @@ class TorrentService } public function add( - string $filepath, - - bool $extractName, - bool $extractFilenames, - bool $extractInfoHashV1, - bool $extractInfoHashV2, - bool $extractSource, - bool $extractComment, - - int $wordLengthMin, - int $wordLengthMax, - - int $userId, - int $added, - array $locales, - array $categories, - bool $sensitive, - bool $approved, - bool $status - + int $userId, + int $added, + array $locales, + bool $sensitive, + bool $approved ): ?Torrent { $torrent = $this->addTorrent( @@ -405,21 +200,11 @@ class TorrentService $added, md5_file($filepath), $this->generateTorrentKeywordsByTorrentFilepath( - $filepath, - $extractName, - $extractFilenames, - $extractInfoHashV1, - $extractInfoHashV2, - $extractSource, - $extractComment, - $wordLengthMin, - $wordLengthMax + $filepath ), $locales, - $categories, $sensitive, - $approved, - $status + $approved ); $filesystem = new Filesystem(); @@ -438,14 +223,6 @@ class TorrentService $approved ); - $this->addTorrentCategories( - $torrent->getId(), - $userId, - $added, - $categories, - $approved - ); - $this->addTorrentSensitive( $torrent->getId(), $userId, @@ -471,10 +248,8 @@ class TorrentService string $md5file, array $keywords, array $locales, - array $categories, bool $sensitive, - bool $approved, - bool $status + bool $approved ): ?Torrent { $torrent = new Torrent(); @@ -484,10 +259,8 @@ class TorrentService $torrent->setMd5File($md5file); $torrent->setKeywords($keywords); $torrent->setLocales($locales); - $torrent->setCategories($categories); $torrent->setSensitive($sensitive); $torrent->setApproved($approved); - $torrent->setStatus($status); $this->entityManagerInterface->persist($torrent); $this->entityManagerInterface->flush(); @@ -519,30 +292,6 @@ class TorrentService return $torrent; } - public function toggleTorrentStatus( - int $torrentId - ): ?Torrent - { - $torrent = $this->getTorrent($torrentId); - - $torrent->setStatus( - !$torrent->isStatus() // toggle current value - ); - - $this->entityManagerInterface->persist($torrent); - $this->entityManagerInterface->flush(); - - $this->updateTorrentLocales( - $torrent->getId() - ); - - $this->updateTorrentSensitive( - $torrent->getId() - ); - - return $torrent; - } - public function getTorrentScrapeQueue(): ?Torrent { return $this->entityManagerInterface @@ -556,52 +305,40 @@ class TorrentService } public function findTorrents( - int $userId, array $keywords, - ?array $locales, - ?array $categories, + array $locales, ?bool $sensitive, ?bool $approved, - ?bool $status, - int $limit, - int $offset + int $limit, + int $offset ) : array { return $this->entityManagerInterface ->getRepository(Torrent::class) ->findTorrents( - $userId, $keywords, $locales, - $categories, $sensitive, $approved, - $status, $limit, $offset ); } public function findTorrentsTotal( - int $userId, array $keywords, - ?array $locales, - ?array $categories, + array $locales, ?bool $sensitive, - ?bool $approved, - ?bool $status + ?bool $approved ) : int { return $this->entityManagerInterface ->getRepository(Torrent::class) ->findTorrentsTotal( - $userId, $keywords, $locales, - $categories, $sensitive, - $approved, - $status + $approved ); } @@ -670,48 +407,6 @@ class TorrentService } } - public function updateTorrentCategories( - int $torrentId - ): void - { - if ($torrent = $this->getTorrent($torrentId)) - { - if ($torrentCategories = $this->entityManagerInterface - ->getRepository(TorrentCategories::class) - ->findOneBy( - [ - 'torrentId' => $torrentId, - 'approved' => true, - ], - [ - 'id' => 'DESC' - ] - )) - { - $torrent->setCategories($torrentCategories->getValue()); - - $this->entityManagerInterface->persist($torrent); - $this->entityManagerInterface->flush(); - } - } - } - - public function updateTorrentScraped( - int $torrentId, - int $time - ): void - { - if ($torrent = $this->getTorrent($torrentId)) - { - $torrent->setScraped( - $time - ); - - $this->entityManagerInterface->persist($torrent); - $this->entityManagerInterface->flush(); - } - } - public function updateTorrentScrape( int $torrentId, int $seeders, @@ -742,16 +437,7 @@ class TorrentService } } - public function reindexTorrentKeywordsAll( - bool $extractName, - bool $extractFilenames, - bool $extractInfoHashV1, - bool $extractInfoHashV2, - bool $extractSource, - bool $extractComment, - int $wordLengthMin, - int $wordLengthMax - ): void + public function reindexTorrentKeywordsAll(): void { foreach ($this->entityManagerInterface ->getRepository(Torrent::class) @@ -761,15 +447,7 @@ class TorrentService $this->generateTorrentKeywordsByTorrentFilepath( $this->getStorageFilepathByTorrentId( $torrent->getId() - ), - $extractName, - $extractFilenames, - $extractInfoHashV1, - $extractInfoHashV2, - $extractSource, - $extractComment, - $wordLengthMin, - $wordLengthMax + ) ) ); @@ -940,133 +618,6 @@ class TorrentService } } - // Torrent category - public function getTorrentCategories( - int $torrentCategoryId - ): ?TorrentCategories - { - return $this->entityManagerInterface - ->getRepository(TorrentCategories::class) - ->find($torrentCategoryId); - } - - public function findLastTorrentCategoriesByTorrentId( - int $torrentId - ): ?TorrentCategories - { - return $this->entityManagerInterface - ->getRepository(TorrentCategories::class) - ->findOneBy( - [ - 'torrentId' => $torrentId - ], - [ - 'id' => 'DESC' - ] - ); - } - - public function findTorrentCategoriesByTorrentId(int $torrentId): array - { - return $this->entityManagerInterface - ->getRepository(TorrentCategories::class) - ->findBy( - [ - 'torrentId' => $torrentId, - ], - [ - 'id' => 'DESC' - ] - ); - } - - public function toggleTorrentCategoriesApproved( - int $torrentCategoriesId - ): ?TorrentCategories - { - $torrentCategories = $this->getTorrentCategories($torrentCategoriesId); - - $torrentCategories->setApproved( - !$torrentCategories->isApproved() // toggle current value - ); - - $this->entityManagerInterface->persist($torrentCategories); - $this->entityManagerInterface->flush(); - - $this->updateTorrentCategories( - $torrentCategories->getTorrentId() - ); - - return $torrentCategories; - } - - public function deleteTorrentCategories( - int $torrentCategoriesId - ): ?TorrentCategories - { - $torrentCategories = $this->getTorrentCategories($torrentCategoriesId); - - $this->entityManagerInterface->remove($torrentCategories); - $this->entityManagerInterface->flush(); - - $this->updateTorrentCategories( - $torrentCategories->getTorrentId() - ); - - return $torrentCategories; - } - - public function addTorrentCategories( - int $torrentId, - int $userId, - int $added, - array $value, - bool $approved - ): ?TorrentCategories - { - $torrentCategories = new TorrentCategories(); - - $torrentCategories->setTorrentId($torrentId); - $torrentCategories->setUserId($userId); - $torrentCategories->setAdded($added); - $torrentCategories->setValue($value); - $torrentCategories->setApproved($approved); - - $this->entityManagerInterface->persist($torrentCategories); - $this->entityManagerInterface->flush(); - - $this->updateTorrentCategories( - $torrentId - ); - - return $torrentCategories; - } - - public function setTorrentCategoriesApprovedByUserId( - int $userId, - bool $value - ): void - { - foreach ($this->entityManagerInterface - ->getRepository(TorrentCategories::class) - ->findBy( - [ - 'userId' => $userId - ]) as $torrentCategories) - { - $torrentCategories->setApproved( - $value - ); - - $this->entityManagerInterface->persist($torrentCategories); - $this->entityManagerInterface->flush(); - - $this->updateTorrentCategories( - $torrentCategories->getTorrentId(), - ); - } - } - // Torrent sensitive public function getTorrentSensitive( int $torrentSensitiveId @@ -1198,218 +749,6 @@ class TorrentService } } - // Torrent poster - public function getTorrentPoster( - int $torrentPosterId - ): ?TorrentPoster - { - return $this->entityManagerInterface - ->getRepository(TorrentPoster::class) - ->find( - $torrentPosterId - ); - } - - public function findTorrentPosterByMd5File( - string $md5file - ): ?Torrent - { - return $this->entityManagerInterface - ->getRepository(TorrentPoster::class) - ->findOneBy( - [ - 'md5file' => $md5file - ] - ); - } - - public function findLastTorrentPosterByTorrentId( - int $torrentId - ): ?TorrentPoster - { - return $this->entityManagerInterface - ->getRepository(TorrentPoster::class) - ->findOneBy( - [ - 'torrentId' => $torrentId - ], - [ - 'id' => 'DESC' - ] - ); - } - - public function findTorrentPosterByTorrentId( - int $torrentId - ): array - { - return $this->entityManagerInterface - ->getRepository(TorrentPoster::class) - ->findBy( - [ - 'torrentId' => $torrentId - ], - [ - 'id' => 'DESC' - ] - ); - } - - public function toggleTorrentPosterApproved( - int $torrentPosterId - ): ?TorrentPoster - { - $torrentPoster = $this->entityManagerInterface - ->getRepository(TorrentPoster::class) - ->find($torrentPosterId); - - $torrentPoster->setApproved( - !$torrentPoster->isApproved() // toggle current value - ); - - $this->entityManagerInterface->persist($torrentPoster); - $this->entityManagerInterface->flush(); - - $this->updateTorrentPoster( - $torrentPoster->getTorrentId() - ); - - return $torrentSensitive; - } - - public function deleteTorrentPoster( - int $torrentPosterId - ): ?TorrentPoster - { - // Remove torrent file from permanent storage - $filesystem = new Filesystem(); - $filesystem->remove( - $this->getStorageFilepathByTorrentPosterId( - $torrentPosterId - ) - ); - - // Remove from DB - $torrentPoster = $this->getTorrentPoster( - $torrentPosterId - ); - - $this->entityManagerInterface->remove($torrentPoster); - $this->entityManagerInterface->flush(); - - // Update torrent - $this->updateTorrentPoster( - $torrentPoster->getTorrentId() - ); - - return $torrentSensitive; - } - - public function addTorrentPoster( - string $filename, - string $position, - int $torrentId, - int $userId, - int $added, - bool $approved - ): ?TorrentPoster - { - // Add new DB record - $torrentPoster = new TorrentPoster(); - - $torrentPoster->setTorrentId($torrentId); - $torrentPoster->setUserId($userId); - $torrentPoster->setAdded($added); - $torrentPoster->setApproved($approved); - $torrentPoster->setPosition($position); - $torrentPoster->setMd5file( - md5_file($filename) - ); - - $this->entityManagerInterface->persist($torrentPoster); - $this->entityManagerInterface->flush(); - - // Save file in permanent storage - $filesystem = new Filesystem(); - $filesystem->copy( - $filename, - $this->getStorageFilepathByTorrentPosterId( - $torrentPoster->getId() - ) - ); - - // Update torrent info - $this->updateTorrentPoster( - $torrentId - ); - - return $torrentPoster; - } - - public function setTorrentPostersApprovedByUserId( - int $userId, - bool $value - ): void - { - foreach ($this->entityManagerInterface - ->getRepository(TorrentPoster::class) - ->findBy( - [ - 'userId' => $userId - ]) as $torrentPoster) - { - $torrentPoster->setApproved( - $value - ); - - $this->entityManagerInterface->persist($torrentPoster); - $this->entityManagerInterface->flush(); - - $this->updateTorrentPoster( - $torrentPoster->getTorrentId(), - ); - } - } - - public function updateTorrentPoster( - int $torrentId, - ): void - { - if ($torrent = $this->getTorrent($torrentId)) - { - if ($torrentPoster = $this->entityManagerInterface - ->getRepository(TorrentPoster::class) - ->findOneBy( - [ - 'torrentId' => $torrentId, - 'approved' => true, - ], - [ - 'id' => 'DESC' - ] - )) - { - $torrent->setTorrentPosterId( - $torrentPoster->getId() - ); - } - - else - { - $torrent->setTorrentPosterId( - null - ); - } - - $this->entityManagerInterface->persist($torrent); - $this->entityManagerInterface->flush(); - } - } - - - - - // Torrent star public function findTorrentStar( int $torrentId, diff --git a/src/Service/UserService.php b/src/Service/UserService.php index eeba420..2459d5d 100644 --- a/src/Service/UserService.php +++ b/src/Service/UserService.php @@ -32,7 +32,6 @@ class UserService string $theme, bool $sensitive = true, bool $yggdrasil = true, - bool $posters = true, bool $approved = false, bool $moderator = false, bool $status = true @@ -85,10 +84,6 @@ class UserService $yggdrasil ); - $user->setPosters( - $posters - ); - $this->entityManagerInterface->persist($user); $this->entityManagerInterface->flush(); diff --git a/src/Twig/AppExtension.php b/src/Twig/AppExtension.php index 440ca6c..6cf5813 100644 --- a/src/Twig/AppExtension.php +++ b/src/Twig/AppExtension.php @@ -39,27 +39,13 @@ class AppExtension extends AbstractExtension 'formatAgo' ] ), - new TwigFilter( - 'url_to_markdown', - [ - $this, - 'urlToMarkdown' - ] - ), - new TwigFilter( - 'trans_category', - [ - $this, - 'transCategory' - ] - ), ]; } public function formatBytes( int $bytes, int $precision = 2 - ): string + ) : string { $size = [ $this->translator->trans('B'), @@ -80,7 +66,7 @@ class AppExtension extends AbstractExtension public function formatAgo( int $time, - ): string + ) : string { $diff = time() - $time; @@ -149,40 +135,6 @@ class AppExtension extends AbstractExtension } } - public function urlToMarkdown( - string $text - ): string - { - return preg_replace( - '~(https?://(?:www\.)?[^\(\s\)]+)~i', - '[$1]($1)', - $text - ); - } - - public function transCategory( - string $name - ): string - { - switch ($name) - { - case 'movie': return $this->translator->trans('movie'); - case 'series': return $this->translator->trans('series'); - case 'tv': return $this->translator->trans('tv'); - case 'animation': return $this->translator->trans('animation'); - case 'music': return $this->translator->trans('music'); - case 'game': return $this->translator->trans('game'); - case 'audiobook': return $this->translator->trans('audiobook'); - case 'podcast': return $this->translator->trans('podcast'); - case 'book': return $this->translator->trans('book'); - case 'archive': return $this->translator->trans('archive'); - case 'picture': return $this->translator->trans('picture'); - case 'software': return $this->translator->trans('software'); - case 'other': return $this->translator->trans('other'); - default: return $name; - } - } - private function plural(int $number, array $texts) { $cases = [2, 0, 1, 1, 1, 2]; diff --git a/templates/default/activity/event/torrent/add.html.twig b/templates/default/activity/event/torrent/add.html.twig index b7e2610..42e2c30 100644 --- a/templates/default/activity/event/torrent/add.html.twig +++ b/templates/default/activity/event/torrent/add.html.twig @@ -8,12 +8,13 @@ {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% endif %} + {% else %} + {% if torrent.approved == false %} + #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/add.rss.twig b/templates/default/activity/event/torrent/add.rss.twig index db55c4c..174c82c 100644 --- a/templates/default/activity/event/torrent/add.rss.twig +++ b/templates/default/activity/event/torrent/add.rss.twig @@ -6,11 +6,9 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/approve/add.html.twig b/templates/default/activity/event/torrent/approve/add.html.twig index e394ecb..ab2350c 100644 --- a/templates/default/activity/event/torrent/approve/add.html.twig +++ b/templates/default/activity/event/torrent/approve/add.html.twig @@ -11,11 +11,7 @@ {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% if torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/approve/add.rss.twig b/templates/default/activity/event/torrent/approve/add.rss.twig index e378199..7287540 100644 --- a/templates/default/activity/event/torrent/approve/add.rss.twig +++ b/templates/default/activity/event/torrent/approve/add.rss.twig @@ -6,11 +6,7 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% if torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/approve/delete.html.twig b/templates/default/activity/event/torrent/approve/delete.html.twig index 50d6079..6051686 100644 --- a/templates/default/activity/event/torrent/approve/delete.html.twig +++ b/templates/default/activity/event/torrent/approve/delete.html.twig @@ -10,12 +10,13 @@ {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% endif %} + {% else %} + {% if torrent.approved == false %} + #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/approve/delete.rss.twig b/templates/default/activity/event/torrent/approve/delete.rss.twig index 7252d9f..d358829 100644 --- a/templates/default/activity/event/torrent/approve/delete.rss.twig +++ b/templates/default/activity/event/torrent/approve/delete.rss.twig @@ -6,11 +6,7 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% if torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/categories/add.html.twig b/templates/default/activity/event/torrent/categories/add.html.twig deleted file mode 100644 index 1d081c7..0000000 --- a/templates/default/activity/event/torrent/categories/add.html.twig +++ /dev/null @@ -1,39 +0,0 @@ -
-
- - {{ 'identicon' | trans }} - - {{ 'have added categories edition' | trans }} - {% if torrent.categories.exist %} - - #{{ torrent.categories.id }} - - {% else %} - #{{ torrent.categories.id }} - {% endif %} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - - {{ torrent.name }} - - {% if torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% endif %} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - - {{ torrent.name }} - - {% endif %} - {% endif %} -
-
- {{ added | format_ago }} -
-
\ No newline at end of file diff --git a/templates/default/activity/event/torrent/categories/add.rss.twig b/templates/default/activity/event/torrent/categories/add.rss.twig deleted file mode 100644 index 2262f72..0000000 --- a/templates/default/activity/event/torrent/categories/add.rss.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - {{ 'User' | trans }} - #{{ user.id }} - {{ 'have added categories edition' | trans }} - #{{ torrent.categories.id }} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - {{ torrent.name }} - {% endif %} - {% endif %} - - #{{ user.id }} - {{ added | date('D, d M Y h:i:s O') }} - {{ url('torrent_categories_edit', { torrentId : torrent.id, torrentCategoriesId : torrent.categories.id }) }}#activity-{{ id }} - {{ url('torrent_categories_edit', { torrentId : torrent.id, torrentCategoriesId : torrent.categories.id }) }}#activity - \ No newline at end of file diff --git a/templates/default/activity/event/torrent/categories/approve/add.html.twig b/templates/default/activity/event/torrent/categories/approve/add.html.twig deleted file mode 100644 index 19c4836..0000000 --- a/templates/default/activity/event/torrent/categories/approve/add.html.twig +++ /dev/null @@ -1,39 +0,0 @@ -
-
- - {{ 'identicon' | trans }} - - {{ 'have approved categories edition' | trans }} - {% if torrent.categories.exist %} - - #{{ torrent.categories.id }} - - {% else %} - #{{ torrent.categories.id }} - {% endif %} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - - {{ torrent.name }} - - {% if torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% endif %} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - - {{ torrent.name }} - - {% endif %} - {% endif %} -
-
- {{ added | format_ago }} -
-
\ No newline at end of file diff --git a/templates/default/activity/event/torrent/categories/approve/add.rss.twig b/templates/default/activity/event/torrent/categories/approve/add.rss.twig deleted file mode 100644 index 9395f46..0000000 --- a/templates/default/activity/event/torrent/categories/approve/add.rss.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - {{ 'User' | trans }} - #{{ user.id }} - {{ 'have approved categories edition' | trans }} - #{{ torrent.categories.id }} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - {{ torrent.name }} - {% endif %} - {% endif %} - - #{{ user.id }} - {{ added | date('D, d M Y h:i:s O') }} - {{ url('torrent_categories_edit', { torrentId : torrent.id, torrentCategoriesId : torrent.categories.id }) }}#activity-{{ id }} - {{ url('torrent_categories_edit', { torrentId : torrent.id, torrentCategoriesId : torrent.categories.id }) }}#activity - \ No newline at end of file diff --git a/templates/default/activity/event/torrent/categories/approve/delete.html.twig b/templates/default/activity/event/torrent/categories/approve/delete.html.twig deleted file mode 100644 index 2d9b682..0000000 --- a/templates/default/activity/event/torrent/categories/approve/delete.html.twig +++ /dev/null @@ -1,41 +0,0 @@ -
-
- - {{ 'identicon' | trans }} - - - {{ 'have disapproved categories edition' | trans }} - - {% if torrent.categories.exist %} - - #{{ torrent.categories.id }} - - {% else %} - #{{ torrent.categories.id }} - {% endif %} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - - {{ torrent.name }} - - {% if torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% endif %} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - - {{ torrent.name }} - - {% endif %} - {% endif %} -
-
- {{ added | format_ago }} -
-
\ No newline at end of file diff --git a/templates/default/activity/event/torrent/categories/approve/delete.rss.twig b/templates/default/activity/event/torrent/categories/approve/delete.rss.twig deleted file mode 100644 index a6a6970..0000000 --- a/templates/default/activity/event/torrent/categories/approve/delete.rss.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - {{ 'User' | trans }} - #{{ user.id }} - {{ 'have disapproved categories edition' | trans }} - #{{ torrent.categories.id }} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - {{ torrent.name }} - {% endif %} - {% endif %} - - #{{ user.id }} - {{ added | date('D, d M Y h:i:s O') }} - {{ url('torrent_categories_edit', { torrentId : torrent.id, torrentCategoriesId : torrent.categories.id }) }}#activity-{{ id }} - {{ url('torrent_categories_edit', { torrentId : torrent.id, torrentCategoriesId : torrent.categories.id }) }}#activity - \ No newline at end of file diff --git a/templates/default/activity/event/torrent/categories/delete.html.twig b/templates/default/activity/event/torrent/categories/delete.html.twig deleted file mode 100644 index 06b972b..0000000 --- a/templates/default/activity/event/torrent/categories/delete.html.twig +++ /dev/null @@ -1,39 +0,0 @@ -
-
- - {{ 'identicon' | trans }} - - {{ 'have deleted categories edition' | trans }} - {% if torrent.categories.exist %} - - #{{ torrent.categories.id }} - - {% else %} - #{{ torrent.categories.id }} - {% endif %} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - - {{ torrent.name }} - - {% if torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% endif %} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - - {{ torrent.name }} - - {% endif %} - {% endif %} -
-
- {{ added | format_ago }} -
-
\ No newline at end of file diff --git a/templates/default/activity/event/torrent/categories/delete.rss.twig b/templates/default/activity/event/torrent/categories/delete.rss.twig deleted file mode 100644 index 063750b..0000000 --- a/templates/default/activity/event/torrent/categories/delete.rss.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - {{ 'User' | trans }} - #{{ user.id }} - {{ 'have deleted categories edition' | trans }} - #{{ torrent.categories.id }} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - {{ torrent.name }} - {% endif %} - {% endif %} - - #{{ user.id }} - {{ added | date('D, d M Y h:i:s O') }} - {{ url('torrent_categories_edit', { torrentId : torrent.id }) }}#activity-{{ id }} - {{ url('torrent_categories_edit', { torrentId : torrent.id }) }}#activity - \ No newline at end of file diff --git a/templates/default/activity/event/torrent/download/file/add.html.twig b/templates/default/activity/event/torrent/download/file/add.html.twig index 1e0e5e3..057743f 100644 --- a/templates/default/activity/event/torrent/download/file/add.html.twig +++ b/templates/default/activity/event/torrent/download/file/add.html.twig @@ -3,7 +3,7 @@ {{ 'identicon' | trans }} - + {{ 'have downloaded torrent file' | trans }} {% if session.user.moderator or session.user.owner %} @@ -11,14 +11,12 @@ {{ torrent.name }} {% if torrent.approved == false %} - ({{ 'waiting for approve' | trans }}) + #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/download/file/add.rss.twig b/templates/default/activity/event/torrent/download/file/add.rss.twig index d9bee5b..ebeaf7c 100644 --- a/templates/default/activity/event/torrent/download/file/add.rss.twig +++ b/templates/default/activity/event/torrent/download/file/add.rss.twig @@ -6,11 +6,9 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/download/magnet/add.html.twig b/templates/default/activity/event/torrent/download/magnet/add.html.twig index edfc68c..a3aa52a 100644 --- a/templates/default/activity/event/torrent/download/magnet/add.html.twig +++ b/templates/default/activity/event/torrent/download/magnet/add.html.twig @@ -11,14 +11,12 @@ {{ torrent.name }} {% if torrent.approved == false %} - ({{ 'waiting for approve' | trans }}) + #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/download/magnet/add.rss.twig b/templates/default/activity/event/torrent/download/magnet/add.rss.twig index e29157f..6afad66 100644 --- a/templates/default/activity/event/torrent/download/magnet/add.rss.twig +++ b/templates/default/activity/event/torrent/download/magnet/add.rss.twig @@ -6,11 +6,9 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/locales/add.html.twig b/templates/default/activity/event/torrent/locales/add.html.twig index facd581..a5f8c37 100644 --- a/templates/default/activity/event/torrent/locales/add.html.twig +++ b/templates/default/activity/event/torrent/locales/add.html.twig @@ -20,11 +20,9 @@ #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/locales/add.rss.twig b/templates/default/activity/event/torrent/locales/add.rss.twig index 81ec578..20a65f5 100644 --- a/templates/default/activity/event/torrent/locales/add.rss.twig +++ b/templates/default/activity/event/torrent/locales/add.rss.twig @@ -8,11 +8,9 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/locales/approve/add.html.twig b/templates/default/activity/event/torrent/locales/approve/add.html.twig index 27ed85b..254e24b 100644 --- a/templates/default/activity/event/torrent/locales/approve/add.html.twig +++ b/templates/default/activity/event/torrent/locales/approve/add.html.twig @@ -20,11 +20,9 @@ #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/locales/approve/add.rss.twig b/templates/default/activity/event/torrent/locales/approve/add.rss.twig index 64dbcdd..fc86232 100644 --- a/templates/default/activity/event/torrent/locales/approve/add.rss.twig +++ b/templates/default/activity/event/torrent/locales/approve/add.rss.twig @@ -8,11 +8,9 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/locales/approve/delete.html.twig b/templates/default/activity/event/torrent/locales/approve/delete.html.twig index d49dcb1..020216c 100644 --- a/templates/default/activity/event/torrent/locales/approve/delete.html.twig +++ b/templates/default/activity/event/torrent/locales/approve/delete.html.twig @@ -22,11 +22,9 @@ #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/locales/approve/delete.rss.twig b/templates/default/activity/event/torrent/locales/approve/delete.rss.twig index b0cbada..de936f1 100644 --- a/templates/default/activity/event/torrent/locales/approve/delete.rss.twig +++ b/templates/default/activity/event/torrent/locales/approve/delete.rss.twig @@ -8,11 +8,9 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/locales/delete.html.twig b/templates/default/activity/event/torrent/locales/delete.html.twig index 4327e41..3794dc8 100644 --- a/templates/default/activity/event/torrent/locales/delete.html.twig +++ b/templates/default/activity/event/torrent/locales/delete.html.twig @@ -20,11 +20,9 @@ #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/locales/delete.rss.twig b/templates/default/activity/event/torrent/locales/delete.rss.twig index 1bb311d..2c26702 100644 --- a/templates/default/activity/event/torrent/locales/delete.rss.twig +++ b/templates/default/activity/event/torrent/locales/delete.rss.twig @@ -8,11 +8,9 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/poster/add.html.twig b/templates/default/activity/event/torrent/poster/add.html.twig deleted file mode 100644 index 519a6f0..0000000 --- a/templates/default/activity/event/torrent/poster/add.html.twig +++ /dev/null @@ -1,39 +0,0 @@ -
-
- - {{ 'identicon' | trans }} - - {{ 'have added poster edition' | trans }} - {% if torrent.poster.exist %} - - #{{ torrent.poster.id }} - - {% else %} - #{{ torrent.poster.id }} - {% endif %} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - - {{ torrent.name }} - - {% if torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% endif %} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} - {% else %} - - {{ torrent.name }} - - {% endif %} - {% endif %} -
-
- {{ added | format_ago }} -
-
\ No newline at end of file diff --git a/templates/default/activity/event/torrent/poster/add.rss.twig b/templates/default/activity/event/torrent/poster/add.rss.twig deleted file mode 100644 index 348e851..0000000 --- a/templates/default/activity/event/torrent/poster/add.rss.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - {{ 'User' | trans }} - #{{ user.id }} - {{ 'have added poster edition' | trans }} - #{{ torrent.poster.id }} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} - {% else %} - {{ torrent.name }} - {% endif %} - {% endif %} - - #{{ user.id }} - {{ added | date('D, d M Y h:i:s O') }} - {{ url('torrent_poster_edit', { torrentId : torrent.id, torrentPosterId : torrent.poster.id }) }}#activity-{{ id }} - {{ url('torrent_poster_edit', { torrentId : torrent.id, torrentPosterId : torrent.poster.id }) }}#activity - \ No newline at end of file diff --git a/templates/default/activity/event/torrent/poster/approve/add.html.twig b/templates/default/activity/event/torrent/poster/approve/add.html.twig deleted file mode 100644 index 35685c0..0000000 --- a/templates/default/activity/event/torrent/poster/approve/add.html.twig +++ /dev/null @@ -1,39 +0,0 @@ -
-
- - {{ 'identicon' | trans }} - - {{ 'have approved poster edition' | trans }} - {% if torrent.poster.exist %} - - #{{ torrent.poster.id }} - - {% else %} - #{{ torrent.poster.id }} - {% endif %} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - - {{ torrent.name }} - - {% if torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% endif %} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} - {% else %} - - {{ torrent.name }} - - {% endif %} - {% endif %} -
-
- {{ added | format_ago }} -
-
\ No newline at end of file diff --git a/templates/default/activity/event/torrent/poster/approve/add.rss.twig b/templates/default/activity/event/torrent/poster/approve/add.rss.twig deleted file mode 100644 index 3a75b3d..0000000 --- a/templates/default/activity/event/torrent/poster/approve/add.rss.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - {{ 'User' | trans }} - #{{ user.id }} - {{ 'have approved poster edition' | trans }} - #{{ torrent.poster.id }} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} - {% else %} - {{ torrent.name }} - {% endif %} - {% endif %} - - #{{ user.id }} - {{ added | date('D, d M Y h:i:s O') }} - {{ url('torrent_poster_edit', { torrentId : torrent.id, torrentPosterId : torrent.poster.id }) }}#activity-{{ id }} - {{ url('torrent_poster_edit', { torrentId : torrent.id, torrentPosterId : torrent.poster.id }) }}#activity - \ No newline at end of file diff --git a/templates/default/activity/event/torrent/poster/approve/delete.html.twig b/templates/default/activity/event/torrent/poster/approve/delete.html.twig deleted file mode 100644 index 483a79f..0000000 --- a/templates/default/activity/event/torrent/poster/approve/delete.html.twig +++ /dev/null @@ -1,39 +0,0 @@ -
-
- - {{ 'identicon' | trans }} - - {{ 'have disapproved poster edition' | trans }} - {% if torrent.poster.exist %} - - #{{ torrent.poster.id }} - - {% else %} - #{{ torrent.poster.id }} - {% endif %} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - - {{ torrent.name }} - - {% if torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% endif %} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} - {% else %} - - {{ torrent.name }} - - {% endif %} - {% endif %} -
-
- {{ added | format_ago }} -
-
\ No newline at end of file diff --git a/templates/default/activity/event/torrent/poster/approve/delete.rss.twig b/templates/default/activity/event/torrent/poster/approve/delete.rss.twig deleted file mode 100644 index 42d6527..0000000 --- a/templates/default/activity/event/torrent/poster/approve/delete.rss.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - {{ 'User' | trans }} - #{{ user.id }} - {{ 'have disapproved poster edition' | trans }} - #{{ torrent.poster.id }} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} - {% else %} - {{ torrent.name }} - {% endif %} - {% endif %} - - #{{ user.id }} - {{ added | date('D, d M Y h:i:s O') }} - {{ url('torrent_poster_edit', { torrentId : torrent.id, torrentPosterId : torrent.poster.id }) }}#activity-{{ id }} - {{ url('torrent_poster_edit', { torrentId : torrent.id, torrentPosterId : torrent.poster.id }) }}#activity - \ No newline at end of file diff --git a/templates/default/activity/event/torrent/poster/delete.html.twig b/templates/default/activity/event/torrent/poster/delete.html.twig deleted file mode 100644 index c3c7293..0000000 --- a/templates/default/activity/event/torrent/poster/delete.html.twig +++ /dev/null @@ -1,39 +0,0 @@ -
-
- - {{ 'identicon' | trans }} - - {{ 'have deleted poster edition' | trans }} - {% if torrent.poster.exist %} - - #{{ torrent.poster.id }} - - {% else %} - #{{ torrent.poster.id }} - {% endif %} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - - {{ torrent.name }} - - {% if torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% endif %} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} - {% else %} - - {{ torrent.name }} - - {% endif %} - {% endif %} -
-
- {{ added | format_ago }} -
-
\ No newline at end of file diff --git a/templates/default/activity/event/torrent/poster/delete.rss.twig b/templates/default/activity/event/torrent/poster/delete.rss.twig deleted file mode 100644 index 4b7bf6a..0000000 --- a/templates/default/activity/event/torrent/poster/delete.rss.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - {{ 'User' | trans }} - #{{ user.id }} - {{ 'have deleted poster edition' | trans }} - #{{ torrent.poster.id }} - {{ 'for torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} - {% else %} - {{ torrent.name }} - {% endif %} - {% endif %} - - #{{ user.id }} - {{ added | date('D, d M Y h:i:s O') }} - {{ url('torrent_poster_edit', { torrentId : torrent.id }) }}#activity-{{ id }} - {{ url('torrent_poster_edit', { torrentId : torrent.id }) }}#activity - \ No newline at end of file diff --git a/templates/default/activity/event/torrent/sensitive/add.html.twig b/templates/default/activity/event/torrent/sensitive/add.html.twig index e21705a..6165658 100644 --- a/templates/default/activity/event/torrent/sensitive/add.html.twig +++ b/templates/default/activity/event/torrent/sensitive/add.html.twig @@ -20,12 +20,10 @@ #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} + {% elseif torrent.sensitive == true %} + #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/sensitive/add.rss.twig b/templates/default/activity/event/torrent/sensitive/add.rss.twig index e1036bb..4280165 100644 --- a/templates/default/activity/event/torrent/sensitive/add.rss.twig +++ b/templates/default/activity/event/torrent/sensitive/add.rss.twig @@ -8,12 +8,10 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} + {% elseif torrent.sensitive == true %} + #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} {% endif %} diff --git a/templates/default/activity/event/torrent/sensitive/approve/add.html.twig b/templates/default/activity/event/torrent/sensitive/approve/add.html.twig index 4bad7b0..464bd9b 100644 --- a/templates/default/activity/event/torrent/sensitive/approve/add.html.twig +++ b/templates/default/activity/event/torrent/sensitive/approve/add.html.twig @@ -20,12 +20,10 @@ #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} + {% elseif torrent.sensitive == true %} + #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/sensitive/approve/add.rss.twig b/templates/default/activity/event/torrent/sensitive/approve/add.rss.twig index 583a42f..f8d029e 100644 --- a/templates/default/activity/event/torrent/sensitive/approve/add.rss.twig +++ b/templates/default/activity/event/torrent/sensitive/approve/add.rss.twig @@ -8,12 +8,10 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} + {% elseif torrent.sensitive == true %} + #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} {% endif %} diff --git a/templates/default/activity/event/torrent/sensitive/approve/delete.html.twig b/templates/default/activity/event/torrent/sensitive/approve/delete.html.twig index c02a804..9134a0f 100644 --- a/templates/default/activity/event/torrent/sensitive/approve/delete.html.twig +++ b/templates/default/activity/event/torrent/sensitive/approve/delete.html.twig @@ -20,12 +20,10 @@ #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} + {% elseif torrent.sensitive == true %} + #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/sensitive/approve/delete.rss.twig b/templates/default/activity/event/torrent/sensitive/approve/delete.rss.twig index f1a697f..da8ea11 100644 --- a/templates/default/activity/event/torrent/sensitive/approve/delete.rss.twig +++ b/templates/default/activity/event/torrent/sensitive/approve/delete.rss.twig @@ -8,12 +8,10 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} + {% elseif torrent.sensitive == true %} + #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} {% endif %} diff --git a/templates/default/activity/event/torrent/sensitive/delete.html.twig b/templates/default/activity/event/torrent/sensitive/delete.html.twig index a2640dc..9912cf3 100644 --- a/templates/default/activity/event/torrent/sensitive/delete.html.twig +++ b/templates/default/activity/event/torrent/sensitive/delete.html.twig @@ -20,12 +20,10 @@ #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} + {% elseif torrent.sensitive == true %} + #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/sensitive/delete.rss.twig b/templates/default/activity/event/torrent/sensitive/delete.rss.twig index 3c13424..d2254e8 100644 --- a/templates/default/activity/event/torrent/sensitive/delete.rss.twig +++ b/templates/default/activity/event/torrent/sensitive/delete.rss.twig @@ -8,12 +8,10 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} + {% elseif torrent.sensitive == true %} + #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} {% endif %} diff --git a/templates/default/activity/event/torrent/star/add.html.twig b/templates/default/activity/event/torrent/star/add.html.twig index 9d27547..16095fe 100644 --- a/templates/default/activity/event/torrent/star/add.html.twig +++ b/templates/default/activity/event/torrent/star/add.html.twig @@ -12,11 +12,9 @@ #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/star/add.rss.twig b/templates/default/activity/event/torrent/star/add.rss.twig index a5fb324..d56a7b5 100644 --- a/templates/default/activity/event/torrent/star/add.rss.twig +++ b/templates/default/activity/event/torrent/star/add.rss.twig @@ -6,11 +6,9 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/star/delete.html.twig b/templates/default/activity/event/torrent/star/delete.html.twig index a160792..fd8f6f7 100644 --- a/templates/default/activity/event/torrent/star/delete.html.twig +++ b/templates/default/activity/event/torrent/star/delete.html.twig @@ -13,11 +13,9 @@ #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) {% endif %} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/star/delete.rss.twig b/templates/default/activity/event/torrent/star/delete.rss.twig index 6c4c02c..e24ff3a 100644 --- a/templates/default/activity/event/torrent/star/delete.rss.twig +++ b/templates/default/activity/event/torrent/star/delete.rss.twig @@ -6,11 +6,9 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} + {% if torrent.approved == false %} #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% elseif torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/activity/event/torrent/status/add.html.twig b/templates/default/activity/event/torrent/status/add.html.twig deleted file mode 100644 index 0466adc..0000000 --- a/templates/default/activity/event/torrent/status/add.html.twig +++ /dev/null @@ -1,30 +0,0 @@ -
-
- - {{ 'identicon' | trans }} - - - {{ 'have enabled torrent' | trans }} - - {% if session.user.moderator or session.user.owner %} - - {{ torrent.name }} - - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - - {{ torrent.name }} - - {% endif %} - {% endif %} -
-
- {{ added | format_ago }} -
-
\ No newline at end of file diff --git a/templates/default/activity/event/torrent/status/add.rss.twig b/templates/default/activity/event/torrent/status/add.rss.twig deleted file mode 100644 index 1f21d67..0000000 --- a/templates/default/activity/event/torrent/status/add.rss.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - {{ 'User' | trans }} - #{{ user.id }} - {{ 'have enabled torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - <a href="{{ path('torrent_info', { torrentId : torrent.id }) }}"> - {{ torrent.name }} - </a> - {% endif %} - {% endif %} - - #{{ user.id }} - {{ added | date('D, d M Y h:i:s O') }} - {{ url('torrent_info', { torrentId : torrent.id }) }}#activity-{{ id }} - {{ url('torrent_info', { torrentId : torrent.id }) }}#activity - \ No newline at end of file diff --git a/templates/default/activity/event/torrent/status/delete.html.twig b/templates/default/activity/event/torrent/status/delete.html.twig deleted file mode 100644 index 3c5dea3..0000000 --- a/templates/default/activity/event/torrent/status/delete.html.twig +++ /dev/null @@ -1,30 +0,0 @@ -
-
- - {{ 'identicon' | trans }} - - - {{ 'have disabled torrent' | trans }} - - {% if session.user.moderator or session.user.owner %} - - {{ torrent.name }} - - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - - {{ torrent.name }} - - {% endif %} - {% endif %} -
-
- {{ added | format_ago }} -
-
\ No newline at end of file diff --git a/templates/default/activity/event/torrent/status/delete.rss.twig b/templates/default/activity/event/torrent/status/delete.rss.twig deleted file mode 100644 index f1ef108..0000000 --- a/templates/default/activity/event/torrent/status/delete.rss.twig +++ /dev/null @@ -1,26 +0,0 @@ - - - {{ 'User' | trans }} - #{{ user.id }} - {{ 'have disabled torrent' | trans }} - {% if session.user.moderator or session.user.owner %} - {{ torrent.name }} - {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} - #{{ torrent.id }} ({{ 'sensitive' | trans }}) - {% else %} - <a href="{{ path('torrent_info', { torrentId : torrent.id }) }}"> - {{ torrent.name }} - </a> - {% endif %} - {% endif %} - - #{{ user.id }} - {{ added | date('D, d M Y h:i:s O') }} - {{ url('torrent_info', { torrentId : torrent.id }) }}#activity-{{ id }} - {{ url('torrent_info', { torrentId : torrent.id }) }}#activity - \ No newline at end of file diff --git a/templates/default/activity/event/torrent/wanted/add.html.twig b/templates/default/activity/event/torrent/wanted/add.html.twig index 86a8744..92b6dbc 100644 --- a/templates/default/activity/event/torrent/wanted/add.html.twig +++ b/templates/default/activity/event/torrent/wanted/add.html.twig @@ -6,11 +6,7 @@ {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% if torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} diff --git a/templates/default/activity/event/torrent/wanted/add.rss.twig b/templates/default/activity/event/torrent/wanted/add.rss.twig index 9459b57..4c79afd 100644 --- a/templates/default/activity/event/torrent/wanted/add.rss.twig +++ b/templates/default/activity/event/torrent/wanted/add.rss.twig @@ -4,11 +4,7 @@ {% if session.user.moderator or session.user.owner %} {{ torrent.name }} {% else %} - {% if torrent.status == false %} - #{{ torrent.id }} ({{ 'disabled' | trans }}) - {% elseif torrent.approved == false %} - #{{ torrent.id }} ({{ 'waiting for approve' | trans }}) - {% elseif torrent.sensitive == true and session.user.sensitive == true %} + {% if torrent.sensitive == true %} #{{ torrent.id }} ({{ 'sensitive' | trans }}) {% else %} {{ torrent.name }} diff --git a/templates/default/layout.html.twig b/templates/default/layout.html.twig index 99c0eeb..2e25d05 100644 --- a/templates/default/layout.html.twig +++ b/templates/default/layout.html.twig @@ -16,19 +16,18 @@
- - {#32
{{ 'Upload any torrent - download with Yggdrasil' | trans | format(path('torrent_submit')) | raw }}
- #} {% block header_search %} {{ render(controller( 'App\\Controller\\SearchController::module', { - request: app.request + query : app.request.get('query'), + type : app.request.get('type') } )) }} {% endblock %} diff --git a/templates/default/search/module.html.twig b/templates/default/search/module.html.twig index 8b1b99b..6677ce5 100644 --- a/templates/default/search/module.html.twig +++ b/templates/default/search/module.html.twig @@ -1,69 +1,4 @@
- {% if filter %} - -
-
- {{ 'Locales' | trans }} -
-
- {% for locale in locales | sort %} - {#{% if locale.total %}#} -
- {% if locale.checked %} - - {% else %} - - {% endif %} - -
- {#{% endif %}#} - {% endfor %} -
-
- {{ 'Categories' | trans }} -
-
- {% for category in categories | sort %} - {#{% if category.total %}#} -
- {% if category.checked %} - - {% else %} - - {% endif %} - -
- {#{% endif %}#} - {% endfor %} -
-
- {{ 'other' | trans | u.title }} -
-
- {% if sensitive.checked %} - - {% else %} - - {% endif %} - -
-
- {% endif %}
\ No newline at end of file diff --git a/templates/default/torrent/edit/categories.html.twig b/templates/default/torrent/edit/categories.html.twig deleted file mode 100644 index 417828d..0000000 --- a/templates/default/torrent/edit/categories.html.twig +++ /dev/null @@ -1,109 +0,0 @@ -{% extends 'default/layout.html.twig' %} -{% block title %}{{'Edit categories'|trans }} - {{'Torrent'|trans }} #{{ torrentId }} - {{ name }}{% endblock %} -{% block main_content %} -
-
-

- {{'Edit categories for torrent' | trans }} - #{{ torrentId }} -

-
-
-
- - - - - - - {% for error in form.categories.error %} -
- {{ error }} -
- {% endfor %} -
- {% for category in categories | sort %} -
- {% if category in form.categories.attribute.value %} - - {% else %} - - {% endif %} - -
- {% endfor %} - {# - - #} -
-
-
-
- - {{'cancel'|trans }} - - -
-
-
- {% for edition in editions %} -
- {% if edition.active %} - {{ edition.added | format_ago }} - {% else %} - - {{ edition.added | format_ago }} - - {% endif %} - {{ 'by'|trans }} - - {{'identicon'|trans }} - -
- {% if session.moderator or session.owner %} - - - - - - - {% endif %} - {% if edition.approved %} - {% if session.moderator %} - - - - - - {% else %} - - - - - - {% endif %} - {% else %} - {% if session.moderator %} - - - - - - {% else %} - - - - - - {% endif %} - {% endif %} -
-
- {% endfor %} -{% endblock %} diff --git a/templates/default/torrent/edit/locales.html.twig b/templates/default/torrent/edit/locales.html.twig index dcab8db..1245721 100644 --- a/templates/default/torrent/edit/locales.html.twig +++ b/templates/default/torrent/edit/locales.html.twig @@ -24,7 +24,7 @@
{% endfor %}
- {% for locale in locales | sort %} + {% for locale in locales %}
{% if locale in form.locales.attribute.value %} diff --git a/templates/default/torrent/edit/poster.html.twig b/templates/default/torrent/edit/poster.html.twig deleted file mode 100644 index e4ed5e9..0000000 --- a/templates/default/torrent/edit/poster.html.twig +++ /dev/null @@ -1,121 +0,0 @@ -{% extends 'default/layout.html.twig' %} -{% block title %}{{ 'Edit torrent poster' | trans }} - {{ 'Torrent' | trans }} #{{ torrentId }} - {{ name }}{% endblock %} -{% block main_content %} -
-
-

- {{'Edit poster for torrent' | trans }} - #{{ torrentId }} -

-
-
-
- {% for error in form.poster.error %} -
- {{ error }} -
- {% endfor %} - -
-
- - - - - - -
-
-
- - {{ 'cancel' | trans }} - - -
-
-
- {% for edition in editions %} -
- {% if edition.active %} - {{ edition.added | format_ago }} - {% else %} - - {{ edition.added | format_ago }} - - {% endif %} - {{ 'by' | trans }} - - {{'identicon'|trans }} - -
- {% if session.moderator or session.owner %} - - - - - - - {% endif %} - {% if edition.approved %} - {% if session.moderator %} - - - - - - {% else %} - - - - - - {% endif %} - {% else %} - {% if session.moderator %} - - - - - - {% else %} - - - - - - {% endif %} - {% endif %} -
- {% if edition.active %} -
- -
- - - - - - -
-
-
- -
-
- {% endif %} -
- {% endfor %} -{% endblock %} diff --git a/templates/default/torrent/info.html.twig b/templates/default/torrent/info.html.twig index dda2a72..f59c5a4 100644 --- a/templates/default/torrent/info.html.twig +++ b/templates/default/torrent/info.html.twig @@ -2,18 +2,16 @@ {% import _self as self %} {% for key, value in tree %} {% if value is iterable %} -
- {{ key }} -
-
+
+
+ {{ key }} +
{{ self.recursive_file_tree(value) }}
{% else %} -
-
- {{ key }} -
-
+
+ {{ key }} +
{{ value | format_bytes }}
@@ -29,8 +27,7 @@ {% endif %} {% endblock %} {% block main_content %} -
+

{{ file.name }} {#{{ 'Torrent' | trans }} #{{ torrent.id }}#} @@ -81,7 +78,7 @@

- {% if session.moderator or session.owner %} + {% if session.moderator %} - {% if session.moderator %} - - - - - {% endif %} {% endif %} {% endif %} - - - - {% if file.source %} {% endif %} @@ -249,8 +209,7 @@ {{ 'Software' | trans }} {% endif %} @@ -260,8 +219,7 @@ {{ 'Comment' | trans }} {% endif %} @@ -332,7 +290,7 @@
{% for tracker, status in trackers %} -
+
{% if status %} {{ tracker }} {% else %} @@ -349,41 +307,23 @@ {% endfor %}
- + - {{ 'Locale' | trans }} + {{ 'Locales' | trans }}
{% if torrent.locales %}
- {% set i = 0 %} - {% for locale in torrent.locales | sort %}{% if i > 0 %},{% endif %} {{ locale | locale_name(locale) | u.title }}{% set i = i + 1 %}{% endfor %} + {% for i, locale in torrent.locales %}{% if i > 0 %},{% endif %} {{ locale|locale_name(locale)|u.title }}{% endfor %}
{% endif %}
- - - - - - {{ 'Category' | trans }} -
-
- {% if torrent.categories %} -
- {% set i = 0 %} - {% for category in torrent.categories | sort %}{% if i > 0 %},{% endif %} {{ category | trans_category | u.title }}{% set i = i + 1 %}{% endfor %} -
- {% endif %} -
-
-
- + @@ -398,22 +338,6 @@ {% endif %}
-
- - - - - - {{ 'Poster' | trans }} -
-
- {% if torrent.poster %} - {{ 'Yes' | trans }} - {% else %} - {{ 'No' | trans }} - {% endif %} -
-
diff --git a/templates/default/torrent/list.html.twig b/templates/default/torrent/list.html.twig index 93e27d1..b16b13a 100644 --- a/templates/default/torrent/list.html.twig +++ b/templates/default/torrent/list.html.twig @@ -5,33 +5,11 @@ {% if query %}

{{ 'Search results' | trans }}

- {% if app.request.get('filter') %} - - - - - - - - - - - {% else %} - - - - - - - - - - - {% endif %} + + + + + {% else %}

{{ 'Recent uploads' | trans }}

@@ -46,8 +24,7 @@
{% if torrents %} {% for torrent in torrents %} -
+

@@ -57,20 +34,11 @@

{% if torrent.scrape.leechers > 0 and torrent.scrape.seeders == 0 %} + class="label label-green margin-l-4-px font-size-10-px position-relative top--2" + title="{{ 'Active leechers waiting for seeders' | trans }}"> {{ 'wanted' | trans }} {% endif %} - {% if torrent.status == false %} - - - - - - - {% endif %} {% if torrent.approved == false %} @@ -79,7 +47,7 @@ {% endif %} {% if torrent.sensitive == true %} - + @@ -103,17 +71,22 @@ {% if torrent.keywords %}
{% for keyword, quantity in torrent.keywords %} - + #{{ keyword }} {% endfor %}
{% endif %}
+ {# + + {{ torrent.added | format_ago }} + {{ 'by' | trans }} + + {{ 'identicon' | trans }} + + + #} {{ torrent.file.size | format_bytes }} @@ -196,31 +169,17 @@ {% if query %} {% if pagination.page > 1 %} {% if pagination.page == 2 %} - + {{ 'Back' | trans | lower }} {% else %} - + {{ 'Back' | trans | lower }} {% endif %} {% endif %} {% if pagination.page < pagination.pages %} - + {{ 'Next' | trans | lower }} {% endif %} diff --git a/templates/default/torrent/submit.html.twig b/templates/default/torrent/submit.html.twig index c36da9a..27f6a14 100644 --- a/templates/default/torrent/submit.html.twig +++ b/templates/default/torrent/submit.html.twig @@ -31,7 +31,7 @@
{% endfor %}
- {% for locale in locales | sort %} + {% for locale in locales %}
{% if locale in form.locales.attribute.value %} @@ -48,42 +48,9 @@ #}
-
-
- - - - - - - {% for error in form.categories.error %} -
- {{ error }} -
- {% endfor %} -
- {% for category in categories | sort %} -
- {% if category in form.categories.attribute.value %} - - {% else %} - - {% endif %} - -
- {% endfor %} - {# - {{'Other...'|trans }} - #} -
-
-
- - - - - - - - diff --git a/templates/default/user/settings.html.twig b/templates/default/user/settings.html.twig index 49fcbed..606b3fb 100644 --- a/templates/default/user/settings.html.twig +++ b/templates/default/user/settings.html.twig @@ -58,23 +58,6 @@ - - - - - - - - - - - @@ -147,22 +104,20 @@ - {% set i = 0 %} {% for group, event in events %} - {% set i = i + 1 %} - - diff --git a/translations/messages+intl-icu.cs.xlf b/translations/messages+intl-icu.cs.xlf index e661df7..2340666 100644 --- a/translations/messages+intl-icu.cs.xlf +++ b/translations/messages+intl-icu.cs.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.de.xlf b/translations/messages+intl-icu.de.xlf index 754006d..924e72d 100644 --- a/translations/messages+intl-icu.de.xlf +++ b/translations/messages+intl-icu.de.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.en.xlf b/translations/messages+intl-icu.en.xlf index cbd0dc2..2dd2ad9 100644 --- a/translations/messages+intl-icu.en.xlf +++ b/translations/messages+intl-icu.en.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.eo.xlf b/translations/messages+intl-icu.eo.xlf index 5e611d1..c74329c 100644 --- a/translations/messages+intl-icu.eo.xlf +++ b/translations/messages+intl-icu.eo.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.es.xlf b/translations/messages+intl-icu.es.xlf index 9638ae5..8ff570b 100644 --- a/translations/messages+intl-icu.es.xlf +++ b/translations/messages+intl-icu.es.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.fr.xlf b/translations/messages+intl-icu.fr.xlf index daae954..d0ff05a 100644 --- a/translations/messages+intl-icu.fr.xlf +++ b/translations/messages+intl-icu.fr.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.he.xlf b/translations/messages+intl-icu.he.xlf index a324b84..7520e86 100644 --- a/translations/messages+intl-icu.he.xlf +++ b/translations/messages+intl-icu.he.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.it.xlf b/translations/messages+intl-icu.it.xlf index e31236c..ec02070 100644 --- a/translations/messages+intl-icu.it.xlf +++ b/translations/messages+intl-icu.it.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.ja.xlf b/translations/messages+intl-icu.ja.xlf deleted file mode 100644 index 56c715b..0000000 --- a/translations/messages+intl-icu.ja.xlf +++ /dev/null @@ -1,918 +0,0 @@ - - - -
- -
- - - Users - Users - - - Joined - Joined - - - Approved - Approved - - - Disapproved - Disapproved - - - User statuses - User statuses - - - Enabled - Enabled - - - Disabled - Disabled - - - User moderators - User moderators - - - Added - Added - - - Removed - Removed - - - User stars - User stars - - - Torrents - Torrents - - - Torrent locales - Torrent locales - - - Deleted - Deleted - - - Torrent sensitive - Torrent sensitive - - - Torrent stars - Torrent stars - - - Torrent downloads - Torrent downloads - - - Files - Files - - - Magnet links - Magnet links - - - Access denied - Access denied - - - At least one locale required - At least one locale required - - - Torrent file out of size limit - Torrent file out of size limit - - - Torrent file already exists - Torrent file already exists - - - Could not parse torrent file - Could not parse torrent file - - - Torrent file required - Torrent file required - - - B - B - - - Kb - Kb - - - Mb - Mb - - - Gb - Gb - - - Tb - Tb - - - Pb - Pb - - - Eb - Eb - - - Zb - Zb - - - Yb - Yb - - - now - now - - - Keyword, file, hash... - Keyword, file, hash... - - - Search - Search - - - Recent uploads - Recent uploads - - - Active leechers waiting for seeders - Active leechers waiting for seeders - - - wanted - wanted - - - Waiting for approve - Waiting for approve - - - Size - Size - - - Seeders - Seeders - - - Peers - Peers - - - Leechers - Leechers - - - Open magnet link - Open magnet link - - - Total - Total - - - Download torrent file - Download torrent file - - - Star - Star - - - Nothing found - Nothing found - - - * share new torrent file to change it - * share new torrent file to change it - - - Submit - Submit - - - Submit torrent - Submit torrent - - - Content language - Content language - - - This torrent contains selected languages - This torrent contains selected languages - - - Sensitive - Sensitive - - - Mark torrent content as sensitive - Mark torrent content as sensitive - - - Edit locales - Edit locales - - - Torrent - Torrent - - - Edit locales for torrent - Edit locales for torrent - - - cancel - cancel - - - by - by - - - identicon - identicon - - - Delete - Delete - - - Disapprove - Disapprove - - - Approve - Approve - - - Edit sensitive status - Edit sensitive status - - - Edit sensitive status for torrent - Edit sensitive status for torrent - - - Page - Page - - - Moderation - Moderation - - - Yes - Yes - - - Toggle - Toggle - - - No - No - - - Common - Common - - - ID - ID - - - MD5 - MD5 - - - Info hash v1 - Info hash v1 - - - Info hash v2 - Info hash v2 - - - Created - Created - - - Pieces - Pieces - - - Source - Source - - - Software - Software - - - Comment - Comment - - - Contributors - Contributors - - - Scrape - Scrape - - - Trackers - Trackers - - - Filtered by settings - Filtered by settings - - - Edit - Edit - - - Locales - Locales - - - Recent activity - Recent activity - - - Back - Back - - - Next - Next - - - Settings - Settings - - - Interface - Interface - - - Theme - Theme - - - Language - Language - - - Join translation - Join translation - - - Activity - Activity - - - Downloads - Downloads - - - Yggdrasil only - Yggdrasil only - - - Save - Save - - - Home - Home - - - Profile - Profile - - - User - User - - - Bookmark - Bookmark - - - Address - Address - - - Address hidden for others - Address hidden for others - - - Access - Access - - - Status - Status - - - Active - Active - - - Moderator - Moderator - - - Languages - Languages - - - Events subscribed - Events subscribed - - - undefined event - undefined event - - - have downloaded torrent file - have downloaded torrent file - - - waiting for approve - waiting for approve - - - sensitive - sensitive - - - have downloaded magnet link - have downloaded magnet link - - - have disapproved torrent - have disapproved torrent - - - have approved torrent - have approved torrent - - - have added torrent - have added torrent - - - have deleted locales edition - have deleted locales edition - - - for torrent - for torrent - - - have disapproved locales edition - have disapproved locales edition - - - have approved locales edition - have approved locales edition - - - have added locales edition - have added locales edition - - - have removed star from torrent - have removed star from torrent - - - have added star for torrent - have added star for torrent - - - have deleted sensitive edition - have deleted sensitive edition - - - have disapproved sensitive edition - have disapproved sensitive edition - - - have approved sensitive edition - have approved sensitive edition - - - have added sensitive edition - have added sensitive edition - - - have disabled - have disabled - - - have disabled user - have disabled user - - - have enabled - have enabled - - - have enabled user - have enabled user - - - have disapproved - have disapproved - - - have disapproved user - have disapproved user - - - have approved - have approved - - - have approved user - have approved user - - - have joined - have joined - - - have removed moderator permissions from - have removed moderator permissions from - - - have removed moderator permissions from user - have removed moderator permissions from user - - - have granted moderator permissions to - have granted moderator permissions to - - - have granted moderator permissions to user - have granted moderator permissions to user - - - have removed star from - have removed star from - - - have removed star from user - have removed star from user - - - have added star for - have added star for - - - have added star for user - have added star for user - - - Error - Error - - - Oops! - Oops! - - - Internal server error - Internal server error - - - Report - Report - - - Not found - Not found - - - Page not found! - Page not found! - - - BitTorrent protocol version 2 - BitTorrent protocol version 2 - - - BitTorrent protocol version 1 - BitTorrent protocol version 1 - - - year ago - year ago - - - month ago - month ago - - - day ago - day ago - - - hour ago - hour ago - - - minute ago - minute ago - - - second ago - second ago - - - years ago - years ago - - - months ago - months ago - - - days ago - days ago - - - hours ago - hours ago - - - minutes ago - minutes ago - - - seconds ago - seconds ago - - - years ago - years ago - - - months ago - months ago - - - days ago - days ago - - - hours ago - hours ago - - - minutes ago - minutes ago - - - seconds ago - seconds ago - - - Search results - Search results - - - <a href="%s">Upload</a> any torrent - download with Yggdrasil - Upload any torrent - download with Yggdrasil]]> - - - Wanted - Wanted - - - Seeders wanted for torrent - Seeders wanted for torrent - - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - - - - diff --git a/translations/messages+intl-icu.ka.xlf b/translations/messages+intl-icu.ka.xlf index 944c10a..3cf3e4e 100644 --- a/translations/messages+intl-icu.ka.xlf +++ b/translations/messages+intl-icu.ka.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.lv.xlf b/translations/messages+intl-icu.lv.xlf index 814cec1..24257ae 100644 --- a/translations/messages+intl-icu.lv.xlf +++ b/translations/messages+intl-icu.lv.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.nl.xlf b/translations/messages+intl-icu.nl.xlf deleted file mode 100644 index cb827de..0000000 --- a/translations/messages+intl-icu.nl.xlf +++ /dev/null @@ -1,918 +0,0 @@ - - - -
- -
- - - Users - Users - - - Joined - Joined - - - Approved - Approved - - - Disapproved - Disapproved - - - User statuses - User statuses - - - Enabled - Enabled - - - Disabled - Disabled - - - User moderators - User moderators - - - Added - Added - - - Removed - Removed - - - User stars - User stars - - - Torrents - Torrents - - - Torrent locales - Torrent locales - - - Deleted - Deleted - - - Torrent sensitive - Torrent sensitive - - - Torrent stars - Torrent stars - - - Torrent downloads - Torrent downloads - - - Files - Files - - - Magnet links - Magnet links - - - Access denied - Access denied - - - At least one locale required - At least one locale required - - - Torrent file out of size limit - Torrent file out of size limit - - - Torrent file already exists - Torrent file already exists - - - Could not parse torrent file - Could not parse torrent file - - - Torrent file required - Torrent file required - - - B - B - - - Kb - Kb - - - Mb - Mb - - - Gb - Gb - - - Tb - Tb - - - Pb - Pb - - - Eb - Eb - - - Zb - Zb - - - Yb - Yb - - - now - now - - - Keyword, file, hash... - Keyword, file, hash... - - - Search - Search - - - Recent uploads - Recent uploads - - - Active leechers waiting for seeders - Active leechers waiting for seeders - - - wanted - wanted - - - Waiting for approve - Waiting for approve - - - Size - Size - - - Seeders - Seeders - - - Peers - Peers - - - Leechers - Leechers - - - Open magnet link - Open magnet link - - - Total - Total - - - Download torrent file - Download torrent file - - - Star - Star - - - Nothing found - Nothing found - - - * share new torrent file to change it - * share new torrent file to change it - - - Submit - Submit - - - Submit torrent - Submit torrent - - - Content language - Content language - - - This torrent contains selected languages - This torrent contains selected languages - - - Sensitive - Sensitive - - - Mark torrent content as sensitive - Mark torrent content as sensitive - - - Edit locales - Edit locales - - - Torrent - Torrent - - - Edit locales for torrent - Edit locales for torrent - - - cancel - cancel - - - by - by - - - identicon - identicon - - - Delete - Delete - - - Disapprove - Disapprove - - - Approve - Approve - - - Edit sensitive status - Edit sensitive status - - - Edit sensitive status for torrent - Edit sensitive status for torrent - - - Page - Page - - - Moderation - Moderation - - - Yes - Yes - - - Toggle - Toggle - - - No - No - - - Common - Common - - - ID - ID - - - MD5 - MD5 - - - Info hash v1 - Info hash v1 - - - Info hash v2 - Info hash v2 - - - Created - Created - - - Pieces - Pieces - - - Source - Source - - - Software - Software - - - Comment - Comment - - - Contributors - Contributors - - - Scrape - Scrape - - - Trackers - Trackers - - - Filtered by settings - Filtered by settings - - - Edit - Edit - - - Locales - Locales - - - Recent activity - Recent activity - - - Back - Back - - - Next - Next - - - Settings - Settings - - - Interface - Interface - - - Theme - Theme - - - Language - Language - - - Join translation - Join translation - - - Activity - Activity - - - Downloads - Downloads - - - Yggdrasil only - Yggdrasil only - - - Save - Save - - - Home - Home - - - Profile - Profile - - - User - User - - - Bookmark - Bookmark - - - Address - Address - - - Address hidden for others - Address hidden for others - - - Access - Access - - - Status - Status - - - Active - Active - - - Moderator - Moderator - - - Languages - Languages - - - Events subscribed - Events subscribed - - - undefined event - undefined event - - - have downloaded torrent file - have downloaded torrent file - - - waiting for approve - waiting for approve - - - sensitive - sensitive - - - have downloaded magnet link - have downloaded magnet link - - - have disapproved torrent - have disapproved torrent - - - have approved torrent - have approved torrent - - - have added torrent - have added torrent - - - have deleted locales edition - have deleted locales edition - - - for torrent - for torrent - - - have disapproved locales edition - have disapproved locales edition - - - have approved locales edition - have approved locales edition - - - have added locales edition - have added locales edition - - - have removed star from torrent - have removed star from torrent - - - have added star for torrent - have added star for torrent - - - have deleted sensitive edition - have deleted sensitive edition - - - have disapproved sensitive edition - have disapproved sensitive edition - - - have approved sensitive edition - have approved sensitive edition - - - have added sensitive edition - have added sensitive edition - - - have disabled - have disabled - - - have disabled user - have disabled user - - - have enabled - have enabled - - - have enabled user - have enabled user - - - have disapproved - have disapproved - - - have disapproved user - have disapproved user - - - have approved - have approved - - - have approved user - have approved user - - - have joined - have joined - - - have removed moderator permissions from - have removed moderator permissions from - - - have removed moderator permissions from user - have removed moderator permissions from user - - - have granted moderator permissions to - have granted moderator permissions to - - - have granted moderator permissions to user - have granted moderator permissions to user - - - have removed star from - have removed star from - - - have removed star from user - have removed star from user - - - have added star for - have added star for - - - have added star for user - have added star for user - - - Error - Error - - - Oops! - Oops! - - - Internal server error - Internal server error - - - Report - Report - - - Not found - Not found - - - Page not found! - Page not found! - - - BitTorrent protocol version 2 - BitTorrent protocol version 2 - - - BitTorrent protocol version 1 - BitTorrent protocol version 1 - - - year ago - year ago - - - month ago - month ago - - - day ago - day ago - - - hour ago - hour ago - - - minute ago - minute ago - - - second ago - second ago - - - years ago - years ago - - - months ago - months ago - - - days ago - days ago - - - hours ago - hours ago - - - minutes ago - minutes ago - - - seconds ago - seconds ago - - - years ago - years ago - - - months ago - months ago - - - days ago - days ago - - - hours ago - hours ago - - - minutes ago - minutes ago - - - seconds ago - seconds ago - - - Search results - Search results - - - <a href="%s">Upload</a> any torrent - download with Yggdrasil - Upload any torrent - download with Yggdrasil]]> - - - Wanted - Wanted - - - Seeders wanted for torrent - Seeders wanted for torrent - - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - - - - diff --git a/translations/messages+intl-icu.pl.xlf b/translations/messages+intl-icu.pl.xlf index b9debc7..03a35fc 100644 --- a/translations/messages+intl-icu.pl.xlf +++ b/translations/messages+intl-icu.pl.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.pt.xlf b/translations/messages+intl-icu.pt.xlf index bc8dc0f..c962f6a 100644 --- a/translations/messages+intl-icu.pt.xlf +++ b/translations/messages+intl-icu.pt.xlf @@ -169,6 +169,10 @@ Waiting for approve Waiting for approve + + Content visible for non sensitive users only + Content visible for non sensitive users only + Size Size @@ -393,6 +397,10 @@ Join translation Join translation + + Content + Content + Activity Activity @@ -721,198 +729,6 @@ Seeders wanted for torrent Seeders wanted for torrent - - Hide - Hide - - - have disabled torrent - have disabled torrent - - - have enabled torrent - have enabled torrent - - - disabled - disabled - - - Poster file out of size limit - Poster file out of size limit - - - Image file not supported - Image file not supported - - - Poster file required - Poster file required - - - Edit torrent poster - Edit torrent poster - - - Edit poster for torrent - Edit poster for torrent - - - Poster - Poster - - - Posters - Posters - - - have deleted poster edition - have deleted poster edition - - - have disapproved poster edition - have disapproved poster edition - - - have approved poster edition - have approved poster edition - - - have added poster edition - have added poster edition - - - Torrent posters - Torrent posters - - - Center - Center - - - Top - Top - - - Bottom - Bottom - - - Categories - Categories - - - At least one category required - At least one category required - - - Content category - Content category - - - This torrent have selected categories - This torrent have selected categories - - - Edit categories - Edit categories - - - Edit categories for torrent - Edit categories for torrent - - - Locale - Locale - - - Category - Category - - - Torrent categories - Torrent categories - - - have deleted categories edition - have deleted categories edition - - - have disapproved categories edition - have disapproved categories edition - - - have approved categories edition - have approved categories edition - - - have added categories edition - have added categories edition - - - movie - movie - - - series - series - - - tv - tv - - - animation - animation - - - music - music - - - game - game - - - audiobook - audiobook - - - podcast - podcast - - - book - book - - - archive - archive - - - picture - picture - - - software - software - - - other - other - - - Hide filter - Hide filter - - - Show filter - Show filter - - - Private - Private - diff --git a/translations/messages+intl-icu.ru.xlf b/translations/messages+intl-icu.ru.xlf index a452819..1805bfb 100644 --- a/translations/messages+intl-icu.ru.xlf +++ b/translations/messages+intl-icu.ru.xlf @@ -169,6 +169,10 @@ Waiting for approve На рассмотрении + + Content visible for non sensitive users only + Содержимое видимо только для нечувствительных пользователей + Size Размер @@ -393,6 +397,10 @@ Join translation Присоединиться к переводам + + Content + Содержимое + Activity Активность @@ -721,198 +729,6 @@ Seeders wanted for torrent Требуется раздача для торрента - - Hide - Скрыть - - - have disabled torrent - отключил торрент - - - have enabled torrent - включил торрент - - - disabled - отключено - - - Poster file out of size limit - Размер файла постера превышает максимальный размер - - - Image file not supported - Формат изображения не поддерживается - - - Poster file required - Требуется указать файл постера - - - Edit torrent poster - Редактировать постер торрента - - - Edit poster for torrent - Редактировать постер для торрента - - - Poster - Постер - - - Posters - Постеры - - - have deleted poster edition - удалил редакцию постера - - - have disapproved poster edition - отклонил редакцию постера - - - have approved poster edition - утвердил редакцию постера - - - have added poster edition - добавил редакцию постера - - - Torrent posters - Постеры торрентов - - - Center - Центр - - - Top - Верх - - - Bottom - Низ - - - Categories - Категории - - - At least one category required - Необходимо указать минимум одну категорию - - - Content category - Категория содержимого - - - This torrent have selected categories - Этот торрент содержит выбранные категории - - - Edit categories - Редактировать категории - - - Edit categories for torrent - Редактировать категории для торрента - - - Locale - Локаль - - - Category - Категория - - - Torrent categories - Категории торрента - - - have deleted categories edition - удалил редакцию категорий - - - have disapproved categories edition - отклонил редакцию категорий - - - have approved categories edition - утвердил редакцию категорий - - - have added categories edition - добавил редакцию категорий - - - movie - фильм - - - series - сериал - - - tv - ТВ шоу - - - animation - анимация - - - music - музыка - - - game - игра - - - audiobook - аудиокнига - - - podcast - подкаст - - - book - книга - - - archive - архив - - - picture - изображение - - - software - программа - - - other - другое - - - Hide filter - Скрыть фильтр - - - Show filter - Показать фильтр - - - Private - Приватный - diff --git a/translations/messages+intl-icu.uk.xlf b/translations/messages+intl-icu.uk.xlf index ffea2ef..f4cae61 100644 --- a/translations/messages+intl-icu.uk.xlf +++ b/translations/messages+intl-icu.uk.xlf @@ -169,6 +169,10 @@ Waiting for approve Очікує на підтвердження + + Content visible for non sensitive users only + Контент видимий лише для нечутливих користувачів + Size Розмір @@ -393,6 +397,10 @@ Join translation Приєднатись до перекладу + + Content + Контент + Activity Активність @@ -721,198 +729,6 @@ Seeders wanted for torrent Розшукуються роздачі для торенту - - Hide - Приховати - - - have disabled torrent - вимкнув торент - - - have enabled torrent - увімкнув торент - - - disabled - вимкнено - - - Poster file out of size limit - Розмір файлу постера перевищує ліміти - - - Image file not supported - Формат зображення не підтримується - - - Poster file required - Необхідно вказати файл постера - - - Edit torrent poster - Редагувати постер торента - - - Edit poster for torrent - Редагувати постер для торента - - - Poster - Постер - - - Posters - Постери - - - have deleted poster edition - видалив редакцію постера - - - have disapproved poster edition - відхилив редакцію постера - - - have approved poster edition - додав редакцію постера - - - have added poster edition - додав редакцію постера - - - Torrent posters - Постери торентів - - - Center - Центр - - - Top - Верх - - - Bottom - Низ - - - Categories - Категорії - - - At least one category required - Потрібно вказати щонайменше одну категорію - - - Content category - Категорія вмісту - - - This torrent have selected categories - Цей торрент має виділені категорії - - - Edit categories - Змінити категорії - - - Edit categories for torrent - Редагувати категорії для торенту - - - Locale - Локаль - - - Category - Категорія - - - Torrent categories - Категорії торенту - - - have deleted categories edition - видалив редакцію категорій - - - have disapproved categories edition - відхилив редакцію категорій - - - have approved categories edition - затвердив редакцію категорій - - - have added categories edition - додав редакцію категорій - - - movie - кіно - - - series - серіал - - - tv - ТБ шоу - - - animation - анімація - - - music - музика - - - game - гра - - - audiobook - аудіокнига - - - podcast - подкаст - - - book - книга - - - archive - архів - - - picture - зображення - - - software - програма - - - other - інше - - - Hide filter - Приховати фільтр - - - Show filter - Показати фільтр - - - Private - Приватний -
@@ -91,19 +88,19 @@
- {{ 'Enabled' | trans }} + {{ 'Approved' | trans }} - {% if torrent.status %} + {% if torrent.approved %} {{ 'Yes' | trans }} - + {% else %} {{ 'No' | trans }} - + @@ -111,30 +108,6 @@ {% endif %}
- {{ 'Approved' | trans }} - - {% if torrent.approved %} - {{ 'Yes' | trans }} - - - - - - {% else %} - {{ 'No' | trans }} - - - - - - {% endif %} -
@@ -220,26 +193,13 @@
- {{ 'Private' | trans }} - - {% if file.private %} - {{ 'Yes' | trans }} - {% else %} - {{ 'No' | trans }} - {% endif %} -
{{ 'Source' | trans }} - {# strip all tags then apply whitelist markdown filters to prevent ping from remote #} - {{ file.source | trim | striptags | url_to_markdown | markdown_to_html | nl2br }} + {{ file.source }}
- {# strip all tags then apply whitelist markdown filters to prevent ping from remote #} - {{ file.software | trim | striptags | url_to_markdown | markdown_to_html | nl2br }} + {{ file.software }}
- {# strip all tags then apply whitelist markdown filters to prevent ping from remote #} - {{ file.comment | trim | striptags | url_to_markdown | markdown_to_html | nl2br }} + {{ file.comment }}
- {% set i = 0 %} - {% for locale in user.locales | sort %}{% if i > 0 %},{% endif %} {{ locale | locale_name(locale) | u.title }}{% set i = i + 1 %}{% endfor %} -
- {{ 'Categories' | trans }} - - {% set i = 0 %} - {% for category in user.categories | sort %}{% if i > 0 %},{% endif %} {{ category | trans_category | u.title }}{% set i = i + 1 %}{% endfor %} -
- {{ 'Posters' | trans }} - - {% if user.posters %} - {{ 'Yes' | trans }} - {% else %} - {{ 'No' | trans }} - {% endif %} + {% for i, locale in user.locales %}{% if i > 0 %},{% endif %} {{ locale|locale_name(locale)|u.title }}{% endfor %}
- {{ 'Posters' | trans }} - -
- {% if user.posters %} - - {% else %} - - {% endif %} - -
-
{{ 'Search' | trans }} @@ -82,60 +65,34 @@
-
- {{ 'Locales' | trans }} -
+ {{ 'Content' | trans }} 		- {% for locale in locales | sort %} -
+
+ {% for locale in locales %} +
{% if locale in user.locales %} {% else %} {% endif %} -
{% endfor %}
-
- {{ 'Categories' | trans }} -
- 		- {% for category in categories | sort %} -
- {% if category in user.categories %} - - {% else %} - - {% endif %} - -
- {% endfor %} -
+ {{ 'Sensitive' | trans }} -
+
+
{% if user.sensitive %} - + {% else %} - + {% endif %} -
+ {{ group }} + {% for key, value in event %} - + {% if value in user.events %} {% else %} {% endif %} - @@ -181,13 +136,10 @@ {% if user.yggdrasil %} - + {% else %} - + {% endif %} -