diff --git a/.env b/.env index a59ee2e..b9936ac 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.6.1 # Application name APP_NAME=YGGtracker @@ -88,7 +88,7 @@ APP_POSTERS=1 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|202:f2bc:f800:7cc4:c109:7857:5cae:6630 # Max torrent filesize for uploads (check upload_max_filesize in the php.ini) APP_TORRENT_FILE_SIZE_MAX=1024000 diff --git a/README.md b/README.md index 6ab362a..5246d41 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/` | [tracker.ygg](http://tracker.ygg) + + `ftp://[201:23b4:991a:634d:8359:4521:5576:15b7]:21/yggtracker/` - wanted torrents + #### Installation ``` @@ -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) diff --git a/src/Controller/SearchController.php b/src/Controller/SearchController.php index 8cb63bc..caa3848 100644 --- a/src/Controller/SearchController.php +++ b/src/Controller/SearchController.php @@ -24,7 +24,6 @@ class SearchController extends AbstractController // Defaults $locales = []; $categories = []; - $sensitive = []; // Request $query = $request->get('query') ? urldecode($request->get('query')) : ''; @@ -66,7 +65,7 @@ class SearchController extends AbstractController $keywords, [$locale], $request->get('categories') ? $request->get('categories') : $user->getCategories(), - $request->get('sensitive') ? null : false, + $sensitive, !$user->isModerator() ? true : null, !$user->isModerator() ? true : null, ) @@ -95,7 +94,7 @@ class SearchController extends AbstractController $keywords, $request->get('locales') ? $request->get('locales') : $user->getLocales(), [$category], - $request->get('sensitive') ? null : false, + $sensitive, !$user->isModerator() ? true : null, !$user->isModerator() ? true : null, ) diff --git a/templates/default/layout.html.twig b/templates/default/layout.html.twig index 99c0eeb..b4c9100 100644 --- a/templates/default/layout.html.twig +++ b/templates/default/layout.html.twig @@ -16,14 +16,12 @@
- - {#32
{{ 'Upload any torrent - download with Yggdrasil' | trans | format(path('torrent_submit')) | raw }}
- #} {% block header_search %} {{ render(controller( 'App\\Controller\\SearchController::module', diff --git a/templates/default/torrent/info.html.twig b/templates/default/torrent/info.html.twig index dda2a72..a7aadd9 100644 --- a/templates/default/torrent/info.html.twig +++ b/templates/default/torrent/info.html.twig @@ -238,8 +238,9 @@ {{ '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 }} + {# disable markdown as unsafe for unfiltered content #} + {#{{ file.source | url_to_markdown | markdown_to_html }}#} + {{ file.source }} {% endif %} @@ -249,8 +250,9 @@ {{ 'Software' | trans }} - {# strip all tags then apply whitelist markdown filters to prevent ping from remote #} - {{ file.software | trim | striptags | url_to_markdown | markdown_to_html | nl2br }} + {# disable markdown as unsafe for unfiltered content #} + {#{{ file.software | url_to_markdown | markdown_to_html }}#} + {{ file.software }} {% endif %} @@ -260,8 +262,9 @@ {{ 'Comment' | trans }} - {# strip all tags then apply whitelist markdown filters to prevent ping from remote #} - {{ file.comment | trim | striptags | url_to_markdown | markdown_to_html | nl2br }} + {# disable markdown as unsafe for unfiltered content #} + {#{{ file.comment | url_to_markdown | markdown_to_html }}#} + {{ file.comment }} {% endif %}