YGGverse
/
YGGtracker
mirror of https://github.com/YGGverse/YGGtracker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

add torrent approved moderation tools

main
ghost 1 year ago
parent
92c2a56bbf
commit
ed6c4ea415
8 changed files with 493 additions and 187 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      src/Controller/ActivityController.php
  2. 85
      src/Controller/TorrentController.php
  3. 27
      src/Entity/Activity.php
  4. 87
      src/Service/ActivityService.php
  5. 24
      src/Service/TorrentService.php
  6. 16
      templates/default/activity/event/torrent/approve/add.html.twig
  7. 16
      templates/default/activity/event/torrent/approve/delete.html.twig
  8. 87
      templates/default/torrent/info.html.twig

54
src/Controller/ActivityController.php
Unescape View File

@ -372,6 +372,60 @@ class ActivityController extends AbstractController @@ -372,6 +372,60 @@ class ActivityController extends AbstractController
break;
case $activity::EVENT_TORRENT_APPROVE_ADD:
return $this->render(
'default/activity/event/torrent/approve/add.html.twig',
[
'added' => $activity->getAdded(),
'user' =>
[
'id' => $activity->getUserId(),
'identicon' => $userService->identicon(
$userService->getUser(
$activity->getUserId()
)->getAddress()
)
],
'torrent' =>
[
'id' => $activity->getTorrentId(),
'name' => $torrentService->readTorrentFileByTorrentId(
$activity->getTorrentId()
)->getName()
]
]
);
break;
case $activity::EVENT_TORRENT_APPROVE_DELETE:
return $this->render(
'default/activity/event/torrent/approve/delete.html.twig',
[
'added' => $activity->getAdded(),
'user' =>
[
'id' => $activity->getUserId(),
'identicon' => $userService->identicon(
$userService->getUser(
$activity->getUserId()
)->getAddress()
)
],
'torrent' =>
[
'id' => $activity->getTorrentId(),
'name' => $torrentService->readTorrentFileByTorrentId(
$activity->getTorrentId()
)->getName()
]
]
);
break;
// Torrent Download
case $activity::EVENT_TORRENT_DOWNLOAD_FILE_ADD:

85
src/Controller/TorrentController.php
Unescape View File

@ -76,7 +76,13 @@ class TorrentController extends AbstractController @@ -76,7 +76,13 @@ class TorrentController extends AbstractController
$page = $request->get('page') ? (int) $request->get('page') : 1;
// Render template
return $this->render('default/torrent/info.html.twig', [
return $this->render('default/torrent/info.html.twig',
[
'user' =>
[
'id' => $user->getId(),
'moderator' => $user->isModerator()
],
'torrent' =>
[
'id' => $torrent->getId(),
@ -90,6 +96,7 @@ class TorrentController extends AbstractController @@ -90,6 +96,7 @@ class TorrentController extends AbstractController
],
'locales' => $torrent->getLocales(),
'sensitive' => $torrent->isSensitive(),
'approved' => $torrent->isApproved(),
'download' =>
[
'file' =>
@ -564,6 +571,82 @@ class TorrentController extends AbstractController @@ -564,6 +571,82 @@ class TorrentController extends AbstractController
);
}
#[Route(
'/{_locale}/torrent/{torrentId}/approve/toggle',
name: 'torrent_approve_toggle',
requirements:
[
'torrentId' => '\d+',
],
methods:
[
'GET'
]
)]
public function approve(
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())
{
// @TODO
throw new \Exception(
$translator->trans('Access denied')
);
}
// Register activity event
if (!$torrent->isApproved())
{
$activityService->addEventTorrentApproveAdd(
$user->getId(),
$torrent->getId(),
time()
);
}
else
{
$activityService->addEventTorrentApproveDelete(
$user->getId(),
$torrent->getId(),
time()
);
}
// Update approved
$torrentService->toggleTorrentApproved(
$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}',

27
src/Entity/Activity.php
Unescape View File

@ -37,22 +37,25 @@ class Activity @@ -37,22 +37,25 @@ class Activity
/// Torrent
public const EVENT_TORRENT_ADD = 2000;
public const EVENT_TORRENT_LOCALES_ADD = 2100;
public const EVENT_TORRENT_LOCALES_DELETE = 2101;
public const EVENT_TORRENT_LOCALES_APPROVE_ADD = 2110;
public const EVENT_TORRENT_LOCALES_APPROVE_DELETE = 2111;
public const EVENT_TORRENT_APPROVE_ADD = 1100;
public const EVENT_TORRENT_APPROVE_DELETE = 1101;
public const EVENT_TORRENT_SENSITIVE_ADD = 2200;
public const EVENT_TORRENT_SENSITIVE_DELETE = 2201;
public const EVENT_TORRENT_SENSITIVE_APPROVE_ADD = 2210;
public const EVENT_TORRENT_SENSITIVE_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_STAR_ADD = 2300;
public const EVENT_TORRENT_STAR_DELETE = 2301;
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_DOWNLOAD_FILE_ADD = 2400;
public const EVENT_TORRENT_STAR_ADD = 2400;
public const EVENT_TORRENT_STAR_DELETE = 2401;
public const EVENT_TORRENT_DOWNLOAD_MAGNET_ADD = 2500;
public const EVENT_TORRENT_DOWNLOAD_FILE_ADD = 2500;
public const EVENT_TORRENT_DOWNLOAD_MAGNET_ADD = 2600;
// ...

87
src/Service/ActivityService.php
Unescape View File

@ -43,6 +43,9 @@ class ActivityService @@ -43,6 +43,9 @@ class ActivityService
// Torrents
Activity::EVENT_TORRENT_ADD,
Activity::EVENT_TORRENT_APPROVE_ADD,
Activity::EVENT_TORRENT_APPROVE_DELETE,
Activity::EVENT_TORRENT_LOCALES_ADD,
Activity::EVENT_TORRENT_LOCALES_DELETE,
Activity::EVENT_TORRENT_LOCALES_APPROVE_ADD,
@ -191,6 +194,30 @@ class ActivityService @@ -191,6 +194,30 @@ class ActivityService
break;
case Activity::EVENT_TORRENT_APPROVE_ADD:
$events
[
$this->translatorInterface->trans('Torrents')
]
[
$this->translatorInterface->trans('Approved')
] = $code;
break;
case Activity::EVENT_TORRENT_APPROVE_DELETE:
$events
[
$this->translatorInterface->trans('Torrents')
]
[
$this->translatorInterface->trans('Disapproved')
] = $code;
break;
/// Torrent locales
case Activity::EVENT_TORRENT_LOCALES_ADD:
@ -760,6 +787,66 @@ class ActivityService @@ -760,6 +787,66 @@ class ActivityService
return $activity;
}
public function addEventTorrentApproveAdd(
int $userId,
int $torrentId,
int $added
): ?Activity
{
$activity = new Activity();
$activity->setEvent(
Activity::EVENT_TORRENT_APPROVE_ADD
);
$activity->setUserId(
$userId
);
$activity->setTorrentId(
$torrentId
);
$activity->setAdded(
$added
);
$this->entityManagerInterface->persist($activity);
$this->entityManagerInterface->flush();
return $activity;
}
public function addEventTorrentApproveDelete(
int $userId,
int $torrentId,
int $added
): ?Activity
{
$activity = new Activity();
$activity->setEvent(
Activity::EVENT_TORRENT_APPROVE_DELETE
);
$activity->setUserId(
$userId
);
$activity->setTorrentId(
$torrentId
);
$activity->setAdded(
$added
);
$this->entityManagerInterface->persist($activity);
$this->entityManagerInterface->flush();
return $activity;
}
/// Torrent Download
public function addEventTorrentDownloadFileAdd(
int $userId,

24
src/Service/TorrentService.php
Unescape View File

@ -298,6 +298,30 @@ class TorrentService @@ -298,6 +298,30 @@ class TorrentService
return $torrent;
}
public function toggleTorrentApproved(
int $torrentId
): ?Torrent
{
$torrent = $this->getTorrent($torrentId);
$torrent->setApproved(
!$torrent->isApproved() // 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

16
templates/default/activity/event/torrent/approve/add.html.twig
Unescape View File

@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
<div class="row">
<div class="column width-80">
<a href="{{ path('user_info', { userId : user.id }) }}">
<img class="border-radius-50 border-color-default vertical-align-middle" src="{{ user.identicon }}" alt="{{ 'identicon' | trans }}" />
</a>
<span class="margin-l-4-px">
{{ 'approved torrent' | trans }}
</span>
<a href="{{ path('torrent_info', { torrentId : torrent.id }) }}">
{{ torrent.name }}
</a>
</div>
<div class="column width-20 text-right">
{{ added | format_ago }}
</div>
</div>

16
templates/default/activity/event/torrent/approve/delete.html.twig
Unescape View File

@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
<div class="row">
<div class="column width-80">
<a href="{{ path('user_info', { userId : user.id }) }}">
<img class="border-radius-50 border-color-default vertical-align-middle" src="{{ user.identicon }}" alt="{{ 'identicon' | trans }}" />
</a>
<span class="margin-l-4-px">
{{ 'disapproved torrent' | trans }}
</span>
<a href="{{ path('torrent_info', { torrentId : torrent.id }) }}">
{{ torrent.name }}
</a>
</div>
<div class="column width-20 text-right">
{{ added | format_ago }}
</div>
</div>

87
templates/default/torrent/info.html.twig
Unescape View File

@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
{% block title %}{{ file.name }} - {{ 'Torrent' | trans }} #{{ torrent.id }}{% if pagination.page > 1 %} - {{ 'Page' | trans }} {{ pagination.page }}{% endif %} - {{ name }}{% endblock %}
{% block main_content %}
<div class="padding-24-px margin-y-8-px border-radius-3-px background-color-night">
<div class="padding-b-16-px">
<h1 class="display-block text-center margin-b-16-px">
{{ file.name }}
{#{{ 'Torrent' | trans }} #{{ torrent.id }}#}
@ -72,32 +71,57 @@ @@ -72,32 +71,57 @@
{{ torrent.star.total }}
</sup>
</div>
{#
<a class="float-right margin-l-8-px" href="#" title="{{ 'Magnet'|trans }}">
<table class="width-100">
<tbody>
{% if user.moderator %}
<tr>
<td colspan="2">
<div class="padding-y-8-px border-bottom-default text-right">
{{ 'Moderation' | trans }}
</div>
</td>
</tr>
<tr>
<td class="padding-t-16-px">
{{ 'Approved' | trans }}
</td>
<td class="padding-t-16-px">
{% if torrent.approved %}
{{ 'Yes' | trans }}
<a class="float-right" href="{{ path('torrent_approve_toggle', { torrentId : torrent.id }) }}" title="{{ 'Toggle' | trans }}">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
<path d="M8 1a7 7 0 0 0-7 7v3h4V8a3 3 0 0 1 6 0v3h4V8a7 7 0 0 0-7-7Zm7 11h-4v3h4v-3ZM5 12H1v3h4v-3ZM0 8a8 8 0 1 1 16 0v8h-6V8a2 2 0 1 0-4 0v8H0V8Z"/>
<path d="M5 3a5 5 0 0 0 0 10h6a5 5 0 0 0 0-10H5zm6 9a4 4 0 1 1 0-8 4 4 0 0 1 0 8z"/>
</svg>
</a>
#}
</div>
{% else %}
{{ 'No' | trans }}
<a class="float-right text-color-red" href="{{ path('torrent_approve_toggle', { torrentId : torrent.id }) }}" title="{{ 'Toggle' | trans }}">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
<path d="M11 4a4 4 0 0 1 0 8H8a4.992 4.992 0 0 0 2-4 4.992 4.992 0 0 0-2-4h3zm-6 8a4 4 0 1 1 0-8 4 4 0 0 1 0 8zM0 8a5 5 0 0 0 5 5h6a5 5 0 0 0 0-10H5a5 5 0 0 0-5 5z"/>
</svg>
</a>
{% endif %}
</td>
</tr>
{% endif %}
<tr>
<td colspan="2">
<div class="padding-y-8-px border-bottom-default text-right">
{{ 'Common'|trans }}
{{ 'Common' | trans }}
</div>
<div class="padding-t-16-px">
<table class="width-100">
<tbody>
</td>
</tr>
<tr>
<td>
{{ 'ID'|trans }}
<td class="padding-t-16-px">
{{ 'ID' | trans }}
</td>
<td>
<td class="padding-t-16-px">
#{{ torrent.id }}
</td>
</tr>
<tr>
<td>
{{ 'MD5'|trans }}
{{ 'MD5' | trans }}
</td>
<td>
{{ torrent.md5file }}
@ -106,7 +130,7 @@ @@ -106,7 +130,7 @@
{% if file.hash.v1 %}
<tr>
<td>
{{ 'Info hash v1'|trans }}
{{ 'Info hash v1' | trans }}
</td>
<td>
{{ file.hash.v1 }}
@ -116,7 +140,7 @@ @@ -116,7 +140,7 @@
{% if file.hash.v2 %}
<tr>
<td>
{{ 'Info hash v2'|trans }}
{{ 'Info hash v2' | trans }}
</td>
<td>
{{ file.hash.v2 }}
@ -136,7 +160,7 @@ @@ -136,7 +160,7 @@
{% if file.created %}
<tr>
<td>
{{ 'Created'|trans }}
{{ 'Created' | trans }}
</td>
<td>
{{ file.created | format_date }}
@ -147,7 +171,7 @@ @@ -147,7 +171,7 @@
{% if file.size %}
<tr>
<td>
{{ 'Size'|trans }}
{{ 'Size' | trans }}
</td>
<td>
{{ file.size | format_bytes }}
@ -157,7 +181,7 @@ @@ -157,7 +181,7 @@
{% if file.pieces %}
<tr>
<td>
{{ 'Pieces'|trans }}
{{ 'Pieces' | trans }}
</td>
<td>
{{ file.pieces | format_number }}
@ -167,7 +191,7 @@ @@ -167,7 +191,7 @@
{% if file.source %}
<tr>
<td>
{{ 'Source'|trans }}
{{ 'Source' | trans }}
</td>
<td>
{{ file.source }}
@ -177,7 +201,7 @@ @@ -177,7 +201,7 @@
{% if file.software %}
<tr>
<td>
{{ 'Software'|trans }}
{{ 'Software' | trans }}
</td>
<td>
{{ file.software }}
@ -187,7 +211,7 @@ @@ -187,7 +211,7 @@
{% if file.comment %}
<tr>
<td>
{{ 'Comment'|trans }}
{{ 'Comment' | trans }}
</td>
<td>
{{ file.comment }}
@ -196,7 +220,7 @@ @@ -196,7 +220,7 @@
{% endif %}
<tr>
<td>
{{ 'Contributors'|trans }}
{{ 'Contributors' | trans }}
</td>
<td>
{% for id, identicon in torrent.contributors %}
@ -209,13 +233,13 @@ @@ -209,13 +233,13 @@
<tr>
<td colspan="2">
<div class="padding-y-8-px border-bottom-default text-right">
{{ 'Scrape'|trans }}
{{ 'Scrape' | trans }}
</div>
</td>
</tr>
<tr>
<td class="padding-t-16-px">
{{ 'Seeders'|trans }}
{{ 'Seeders' | trans }}
</td>
<td class="padding-t-16-px">
{{ torrent.scrape.seeders }}
@ -223,7 +247,7 @@ @@ -223,7 +247,7 @@
</tr>
<tr>
<td>
{{ 'Peers'|trans }}
{{ 'Peers' | trans }}
</td>
<td>
{{ torrent.scrape.peers }}
@ -231,7 +255,7 @@ @@ -231,7 +255,7 @@
</tr>
<tr>
<td>
{{ 'Leechers'|trans }}
{{ 'Leechers' | trans }}
</td>
<td>
{{ torrent.scrape.leechers }}
@ -239,9 +263,8 @@ @@ -239,9 +263,8 @@
</tr>
</tbody>
</table>
</div>
<div class="padding-y-8-px border-bottom-default text-right">
{{ 'Files'|trans }}
{{ 'Files' | trans }}
</div>
<div class="padding-y-16-px">
{% for key, value in file.tree %}
@ -258,7 +281,7 @@ @@ -258,7 +281,7 @@
{% endfor %}
</div>
<div class="padding-y-8-px border-bottom-default text-right">
{{ 'Trackers'|trans }}
{{ 'Trackers' | trans }}
</div>
<div class="padding-t-16-px">
{% for tracker in trackers %}
@ -303,7 +326,7 @@ @@ -303,7 +326,7 @@
<path d="M12.854.146a.5.5 0 0 0-.707 0L10.5 1.793 14.207 5.5l1.647-1.646a.5.5 0 0 0 0-.708l-3-3zm.646 6.061L9.793 2.5 3.293 9H3.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.207l6.5-6.5zm-7.468 7.468A.5.5 0 0 1 6 13.5V13h-.5a.5.5 0 0 1-.5-.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.5-.5V10h-.5a.499.499 0 0 1-.175-.032l-.179.178a.5.5 0 0 0-.11.168l-2 5a.5.5 0 0 0 .65.65l5-2a.5.5 0 0 0 .168-.11l.178-.178z"/>
</svg>
</a>
{{ 'Sensitive'|trans }}
{{ 'Sensitive' | trans }}
<div class="padding-b-8-px border-bottom-default"></div>
<div class="padding-t-16-px text-left">
{% if torrent.sensitive %}

Write Preview
Loading…
Cancel
Save