+
+ <%= postEditTemplate({post: post, privileges: editPrivileges}) %>
+
+
<%= postContentTemplate({post: post}) %>
diff --git a/src/Controllers/PostController.php b/src/Controllers/PostController.php
index c2a6a14d..44b30df0 100644
--- a/src/Controllers/PostController.php
+++ b/src/Controllers/PostController.php
@@ -26,6 +26,7 @@ final class PostController extends AbstractController
$router->get('/api/posts', [$this, 'getFiltered']);
$router->get('/api/posts/featured', [$this, 'getFeatured']);
$router->get('/api/posts/:postNameOrId', [$this, 'getByNameOrId']);
+ $router->put('/api/posts/:postNameOrId', [$this, 'updatePost']);
$router->delete('/api/posts/:postNameOrId', [$this, 'deletePost']);
$router->post('/api/posts/:postNameOrId/feature', [$this, 'featurePost']);
$router->put('/api/posts/:postNameOrId/feature', [$this, 'featurePost']);
@@ -68,6 +69,31 @@ final class PostController extends AbstractController
return $this->postViewProxy->fromEntity($post);
}
+ public function updatePost($postNameOrId)
+ {
+ $post = $this->postService->getByNameOrId($postNameOrId);
+ $formData = new \Szurubooru\FormData\PostEditFormData($this->inputReader);
+
+ if ($formData->content !== null)
+ $this->privilegeService->assertPrivilege(\Szurubooru\Privilege::CHANGE_POST_CONTENT);
+
+ if ($formData->thumbnail !== null)
+ $this->privilegeService->assertPrivilege(\Szurubooru\Privilege::CHANGE_POST_THUMBNAIL);
+
+ if ($formData->safety !== null)
+ $this->privilegeService->assertPrivilege(\Szurubooru\Privilege::CHANGE_POST_SAFETY);
+
+ if ($formData->source !== null)
+ $this->privilegeService->assertPrivilege(\Szurubooru\Privilege::CHANGE_POST_SOURCE);
+
+ if ($formData->tags !== null)
+ $this->privilegeService->assertPrivilege(\Szurubooru\Privilege::CHANGE_POST_TAGS);
+
+ $this->postService->updatePost($post, $formData);
+ $post = $this->postService->getByNameOrId($postNameOrId);
+ return $this->postViewProxy->fromEntity($post);
+ }
+
public function deletePost($postNameOrId)
{
$post = $this->postService->getByNameOrId($postNameOrId);
diff --git a/src/Dao/PostDao.php b/src/Dao/PostDao.php
index 676448ee..c9622c8a 100644
--- a/src/Dao/PostDao.php
+++ b/src/Dao/PostDao.php
@@ -151,7 +151,7 @@ class PostDao extends AbstractDao implements ICrudDao
}
foreach ($tagRelationsToDelete as $tagId)
{
- $this->fpdo->deleteFrom('postTags')->where('postId', $post->getId())->and('tagId', $tagId)->execute();
+ $this->fpdo->deleteFrom('postTags')->where('postId', $post->getId())->where('tagId', $tagId)->execute();
}
}
}
diff --git a/src/FormData/PostEditFormData.php b/src/FormData/PostEditFormData.php
new file mode 100644
index 00000000..a91e4a03
--- /dev/null
+++ b/src/FormData/PostEditFormData.php
@@ -0,0 +1,31 @@
+content = $inputReader->decodeBase64($inputReader->content);
+ $this->thumbnail = $inputReader->decodebase64($inputReader->thumbnail);
+ $this->safety = \Szurubooru\Helpers\EnumHelper::postSafetyFromString($inputReader->safety);
+ $this->source = $inputReader->source;
+ $this->tags = preg_split('/[\s+]/', $inputReader->tags);
+ }
+ }
+
+ public function validate(\Szurubooru\Validator $validator)
+ {
+ $validator->validatePostTags($this->tags);
+
+ if ($this->source !== null)
+ $validator->validatePostSource($this->source);
+ }
+}
diff --git a/src/FormData/UploadFormData.php b/src/FormData/UploadFormData.php
index 3b1b5a48..63319bbd 100644
--- a/src/FormData/UploadFormData.php
+++ b/src/FormData/UploadFormData.php
@@ -33,7 +33,7 @@ class UploadFormData implements \Szurubooru\IValidatable
$validator->validatePostTags($this->tags);
if ($this->source !== null)
- $validator->validateMaxLength($this->source, 200, 'Source');
+ $validator->validatePostSource($this->source);
}
}
diff --git a/src/Privilege.php b/src/Privilege.php
index b2b63033..7116ffec 100644
--- a/src/Privilege.php
+++ b/src/Privilege.php
@@ -25,6 +25,11 @@ class Privilege
const UPLOAD_POSTS_ANONYMOUSLY = 'uploadPostsAnonymously';
const DELETE_POSTS = 'deletePosts';
const FEATURE_POSTS = 'featurePosts';
+ const CHANGE_POST_SAFETY = 'changePostSafety';
+ const CHANGE_POST_SOURCE = 'changePostSource';
+ const CHANGE_POST_TAGS = 'changePostTags';
+ const CHANGE_POST_CONTENT = 'changePostContent';
+ const CHANGE_POST_THUMBNAIL = 'changePostThumbnail';
const LIST_TAGS = 'listTags';
}
diff --git a/src/Services/PostService.php b/src/Services/PostService.php
index 8f028b4f..ccaf5df4 100644
--- a/src/Services/PostService.php
+++ b/src/Services/PostService.php
@@ -110,6 +110,32 @@ class PostService
return $this->transactionManager->commit($transactionFunc);
}
+ public function updatePost(\Szurubooru\Entities\Post $post, \Szurubooru\FormData\PostEditFormData $formData)
+ {
+ $transactionFunc = function() use ($post, $formData)
+ {
+ $this->validator->validate($formData);
+
+ if ($formData->content !== null)
+ $this->updatePostContentFromString($post, $formData->content);
+
+ if ($formData->thumbnail !== null)
+ $this->updatePostThumbnailFromString($post, $formData->thumbnail);
+
+ if ($formData->safety !== null)
+ $this->updatePostSafety($post, $formData->safety);
+
+ if ($formData->source !== null)
+ $this->updatePostSource($post, $formData->source);
+
+ if ($formData->tags !== null)
+ $this->updatePostTags($post, $formData->tags);
+
+ return $this->postDao->save($post);
+ };
+ return $this->transactionManager->commit($transactionFunc);
+ }
+
private function updatePostSafety(\Szurubooru\Entities\Post $post, $newSafety)
{
$post->setSafety($newSafety);
@@ -193,6 +219,14 @@ class PostService
}
}
+ private function updatePostThumbnailFromString(\Szurubooru\Entities\Post $post, $newThumbnail)
+ {
+ if (strlen($newThumbnail) > $this->config->database->maxCustomThumbnailSize)
+ throw new \DomainException('Thumbnail is too big.');
+
+ $post->setThumbnailSourceContent($newThumbnail);
+ }
+
private function updatePostTags(\Szurubooru\Entities\Post $post, array $newTagNames)
{
$tags = [];
diff --git a/src/Services/UserService.php b/src/Services/UserService.php
index 50f6084a..3efe412e 100644
--- a/src/Services/UserService.php
+++ b/src/Services/UserService.php
@@ -215,6 +215,13 @@ class UserService
private function updateUserAvatarContent(\Szurubooru\Entities\User $user, $newAvatarContent)
{
+ $mime = \Szurubooru\Helpers\MimeHelper::getMimeTypeFromBuffer($newAvatarContent);
+ if (!\Szurubooru\Helpers\MimeHelper::isImage($mime))
+ throw new \DomainException('Avatar must be an image.');
+
+ if (strlen($newAvatarContent) > $this->config->database->maxCustomThumbnailSize)
+ throw new \DomainException('Upload is too big.');
+
$user->setCustomAvatarSourceContent($newAvatarContent);
}
diff --git a/src/Validator.php b/src/Validator.php
index 92ad86dc..26e14c65 100644
--- a/src/Validator.php
+++ b/src/Validator.php
@@ -104,6 +104,11 @@ class Validator
}
}
+ public function validatePostSource($source)
+ {
+ $this->validateMaxLength($source, 200, 'Source');
+ }
+
public function validateToken($token)
{
$this->validateNonEmpty($token, 'Token');