GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[Media] File quota should be triggered by the Core

This commit is contained in:
Diogo Peralta Cordeiro 2021-07-22 20:57:03 +01:00 committed by Hugo Sales
parent 488e700fab
commit 481e953cde
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/FileQuota/FileQuota.php
View File

@ -45,7 +45,7 @@ class FileQuota extends Plugin
* quotas. Handles per file, per user and per user-month quotas. * quotas. Handles per file, per user and per user-month quotas.
* Throws on quota violations * Throws on quota violations
*/ */
public function onEnforceQuota(int $filesize) public function onEnforceQuota(int $user_id, int $filesize)
{ {
$file_quota = Common::config('attachments', 'file_quota'); $file_quota = Common::config('attachments', 'file_quota');
if ($filesize > $file_quota) { if ($filesize > $file_quota) {
@ -54,7 +54,6 @@ class FileQuota extends Plugin
'Try to upload a smaller version.', ['quota' => $file_quota, 'size' => $filesize])); 'Try to upload a smaller version.', ['quota' => $file_quota, 'size' => $filesize]));
} }
$user = Common::user();
$query = <<<END $query = <<<END
select sum(at.size) as total select sum(at.size) as total
from attachment at from attachment at
@ -65,8 +64,8 @@ END;
$user_quota = Common::config('attachments', 'user_quota'); $user_quota = Common::config('attachments', 'user_quota');
if ($user_quota != false) { if ($user_quota != false) {
$cache_key_user_total = 'user-' . $user->getId() . 'file-quota'; $cache_key_user_total = 'user-' . $user_id . 'file-quota';
$user_total = Cache::get($cache_key_user_total, fn () => DB::dql($query, ['actor_id' => $user->getId()])[0]['total']); $user_total = Cache::get($cache_key_user_total, fn () => DB::dql($query, ['actor_id' => $user_id])[0]['total']);
Cache::set($cache_key_user_total, $user_total + $filesize); Cache::set($cache_key_user_total, $user_total + $filesize);
if ($user_total + $filesize > $user_quota) { if ($user_total + $filesize > $user_quota) {
@ -80,8 +79,8 @@ END;
$monthly_quota = Common::config('attachments', 'monthly_quota'); $monthly_quota = Common::config('attachments', 'monthly_quota');
if ($monthly_quota != false) { if ($monthly_quota != false) {
$cache_key_user_monthly = 'user-' . $user->getId() . 'monthly-file-quota'; $cache_key_user_monthly = 'user-' . $user_id . 'monthly-file-quota';
$monthly_total = Cache::get($cache_key_user_monthly, fn () => DB::dql($query, ['actor_id' => $user->getId()])[0]['total']); $monthly_total = Cache::get($cache_key_user_monthly, fn () => DB::dql($query, ['actor_id' => $user_id])[0]['total']);
Cache::set($cache_key_user_monthly, $monthly_total + $filesize); Cache::set($cache_key_user_monthly, $monthly_total + $filesize);
if ($monthly_total + $filesize > $monthly_quota) { if ($monthly_total + $filesize > $monthly_quota) {

13
src/Entity/Attachment.php
View File

@ -23,6 +23,7 @@ namespace App\Entity;
use App\Core\DB\DB; use App\Core\DB\DB;
use App\Core\Entity; use App\Core\Entity;
use App\Core\GSFile;
use App\Util\Common; use App\Util\Common;
use DateTimeInterface; use DateTimeInterface;
@ -126,6 +127,18 @@ class Attachment extends Entity
return $this->mimetype; return $this->mimetype;
} }
public function getMimetypeMajor(): ?string
{
$mime = $this->getMimetype();
return is_null($mime) ? $mime : GSFile::mimetypeMajor($mime);
}
public function getMimetypeMinor(): ?string
{
$mime = $this->getMimetype();
return is_null($mime) ? $mime : GSFile::mimetypeMinor($mime);
}
public function setTitle(?string $title): self public function setTitle(?string $title): self
{ {
$this->title = $title; $this->title = $title;