Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding copyright to albums #1838 #1880

Merged
merged 17 commits into from
Apr 28, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/Contracts/Http/Requests/HasCopyright.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace App\Contracts\Http\Requests;

interface HasCopyright
{
/**
* @return string|null
*/
public function copyright(): ?string;
}
2 changes: 2 additions & 0 deletions app/Contracts/Http/Requests/RequestAttribute.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,6 @@ class RequestAttribute
public const RESYNC_METADATA_ATTRIBUTE = 'resync_metadata';

public const FILE_LAST_MODIFIED_TIME = 'fileLastModifiedTime';

public const COPYRIGHT_ATTRIBUTE = 'copyright';
}
16 changes: 16 additions & 0 deletions app/Http/Controllers/AlbumController.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
use App\Http\Requests\Album\GetAlbumRequest;
use App\Http\Requests\Album\MergeAlbumsRequest;
use App\Http\Requests\Album\MoveAlbumsRequest;
use App\Http\Requests\Album\SetAlbumCopyrightRequest;
use App\Http\Requests\Album\SetAlbumCoverRequest;
use App\Http\Requests\Album\SetAlbumDescriptionRequest;
use App\Http\Requests\Album\SetAlbumLicenseRequest;
Expand Down Expand Up @@ -186,6 +187,21 @@ public function setDescription(SetAlbumDescriptionRequest $request): void
$request->album()->save();
}

/**
* Change the copyright of the album.
*
* @param SetAlbumCopyrightRequest $request
*
* @return void
*
* @throws ModelDBException
*/
public function setCopyright(SetAlbumCopyrightRequest $request): void
{
$request->album()->copyright = $request->copyright();
ildyria marked this conversation as resolved.
Show resolved Hide resolved
$request->album()->save();
}

/**
* Change show tags of the tag album.
*
Expand Down
38 changes: 38 additions & 0 deletions app/Http/Requests/Album/SetAlbumCopyrightRequest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?php

namespace App\Http\Requests\Album;

use App\Contracts\Http\Requests\HasBaseAlbum;
use App\Contracts\Http\Requests\HasCopyright;
use App\Contracts\Http\Requests\RequestAttribute;
use App\Http\Requests\BaseApiRequest;
use App\Http\Requests\Traits\Authorize\AuthorizeCanEditAlbumTrait;
use App\Http\Requests\Traits\HasBaseAlbumTrait;
use App\Http\Requests\Traits\HasCopyrightTrait;
use App\Http\RuleSets\Album\SetAlbumCopyrightRuleSet;

class SetAlbumCopyrightRequest extends BaseApiRequest implements HasBaseAlbum, HasCopyright
{
use HasBaseAlbumTrait;
use HasCopyrightTrait;
use AuthorizeCanEditAlbumTrait;

/**
* {@inheritDoc}
*/
public function rules(): array
{
return SetAlbumCopyrightRuleSet::rules();
}

/**
* {@inheritDoc}
*/
protected function processValidatedValues(array $values, array $files): void
{
$this->album = $this->albumFactory->findBaseAlbumsOrFail(
ThanasisMpalatsoukas marked this conversation as resolved.
Show resolved Hide resolved
$values[RequestAttribute::ALBUM_IDS_ATTRIBUTE], false
);
$this->copyright = $values[RequestAttribute::COPYRIGHT_ATTRIBUTE];
}
}
16 changes: 16 additions & 0 deletions app/Http/Requests/Traits/HasCopyrightTrait.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace App\Http\Requests\Traits;

trait HasCopyrightTrait
{
protected ?string $copyright = null;

/**
* @return string|null
*/
public function copyright(): ?string
{
return $this->copyright;
}
}
1 change: 1 addition & 0 deletions app/Http/Resources/Models/AlbumResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public function toArray($request)
'id' => $this->resource->id,
'title' => $this->resource->title,
'owner_name' => $this->when(Auth::check(), $this->resource->owner->name),
'copyright' => $this->resource->copyright,

// attributes
'description' => $this->resource->description,
Expand Down
25 changes: 25 additions & 0 deletions app/Http/RuleSets/Album/SetAlbumCopyrightRuleSet.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

namespace App\Http\RuleSets\Album;

use App\Contracts\Http\Requests\RequestAttribute;
use App\Contracts\Http\RuleSet;
use App\Rules\CopyrightRule;
use App\Rules\RandomIDRule;

/**
* Rules applied when updating the copyright of an album.
*/
class SetAlbumCopyrightRuleSet implements RuleSet
{
/**
* {@inheritDoc}
*/
public static function rules(): array
{
return [
RequestAttribute::ALBUM_ID_ATTRIBUTE => ['required', new RandomIDRule(false)],
RequestAttribute::COPYRIGHT_ATTRIBUTE => ['required', new CopyrightRule()],
];
}
}
11 changes: 11 additions & 0 deletions app/Rules/CopyrightRule.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace App\Rules;

class CopyrightRule extends StringRule
{
public function __construct()
{
parent::__construct(false, 300);
}
}
1 change: 1 addition & 0 deletions database/migrations/2021_12_04_181200_refactor_models.php
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ private function createBaseAlbumTable(): void
$table->string('password', 100)->nullable()->default(null);
$table->string('sorting_col', 30)->nullable()->default(null);
$table->string('sorting_order', 4)->nullable()->default(null);
$table->string('copyright', 300)->nullable()->default(null);
// Indices and constraint definitions
$table->primary('id');
$table->unique('legacy_id');
Expand Down
1 change: 1 addition & 0 deletions routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
Route::post('/Album::setTitle', [AlbumController::class, 'setTitle']);
Route::post('/Album::setNSFW', [AlbumController::class, 'setNSFW']);
Route::post('/Album::setDescription', [AlbumController::class, 'setDescription']);
Route::post('/Album::setCopyright', [AlbumController::class, 'setCopyright']);
Route::post('/Album::setCover', [AlbumController::class, 'setCover']);
Route::post('/Album::setShowTags', [AlbumController::class, 'setShowTags']);
Route::post('/Album::setProtectionPolicy', [AlbumController::class, 'setProtectionPolicy']);
Expand Down