badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[tag_edit] abort on error rather than only applying some tags

Browse source
This commit is contained in:
Shish 2024-01-11 10:28:41 +00:00
parent acd3abcc77
commit 4b8bc82ee4
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/imageboard/image.php
View file

@ -524,24 +524,21 @@ class Image
{
global $cache, $database, $page;
$unfiltered_tags = array_unique($unfiltered_tags);
$tags = array_unique($unfiltered_tags);
$tags = [];
foreach ($unfiltered_tags as $tag) {
foreach ($tags as $tag) {
if (mb_strlen($tag, 'UTF-8') > 255) {
$page->flash("Can't set a tag longer than 255 characters");
continue;
throw new TagSetException("Can't set a tag longer than 255 characters");
}
if (str_starts_with($tag, "-")) {
$page->flash("Can't set a tag which starts with a minus");
continue;
throw new TagSetException("Can't set a tag which starts with a minus");
}
if (str_contains($tag, "*")) {
throw new TagSetException("Can't set a tag which contains a wildcard (*)");
}
$tags[] = $tag;
}
if (count($tags) <= 0) {
throw new SCoreException('Tried to set zero tags');
throw new TagSetException('Tried to set zero tags');
}
if (strtolower(Tag::implode($tags)) != strtolower($this->get_tag_list())) {

13
ext/tag_edit/test.php
View file

@ -28,12 +28,15 @@ class TagEditTest extends ShimmiePHPUnitTestCase
$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx");
$image = Image::by_id($image_id);
try {
$e = $this->assertException(TagSetException::class, function () use ($image) {
send_event(new TagSetEvent($image, []));
$this->fail();
} catch (SCoreException $e) {
$this->assertEquals("Tried to set zero tags", $e->error);
}
});
$this->assertEquals("Tried to set zero tags", $e->getMessage());
$e = $this->assertException(TagSetException::class, function () use ($image) {
send_event(new TagSetEvent($image, ["*test*"]));
});
$this->assertEquals("Can't set a tag which contains a wildcard (*)", $e->getMessage());
}
public function testTagEdit_tooLong()