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

[core] don't take shortcuts when going next/prev, as some extensions (eg ratings) might want to alter search results (fixes #984)

Browse source
This commit is contained in:
Shish 2023-12-31 18:48:49 +00:00
parent fcdddd6f96
commit fb49b785ef
2 changed files with 53 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/imageboard/image.php
View file

@ -166,22 +166,11 @@ class Image
$dir = "ASC"; $dir = "ASC";
} }
if (count($tags) === 0) {
$row = $database->get_row('
SELECT images.*
FROM images
WHERE images.id '.$gtlt.' '.$this->id.'
ORDER BY images.id '.$dir.'
LIMIT 1
');
return ($row ? new Image($row) : null);
} else {
$tags[] = 'id'. $gtlt . $this->id; $tags[] = 'id'. $gtlt . $this->id;
$tags[] = 'order:id_'. strtolower($dir); $tags[] = 'order:id_'. strtolower($dir);
$images = Search::find_images(0, 1, $tags); $images = Search::find_images(0, 1, $tags);
return (count($images) > 0) ? $images[0] : null; return (count($images) > 0) ? $images[0] : null;
} }
}
/** /**
* The reverse of get_next * The reverse of get_next

49
ext/rating/test.php
View file

@ -38,4 +38,53 @@ class RatingsTest extends ShimmiePHPUnitTestCase
$this->log_out(); $this->log_out();
$this->assert_search_results(["pbx"], []); $this->assert_search_results(["pbx"], []);
} }
public function testUserConfig()
{
global $config, $user_config;
// post a safe image and an explicit image
$this->log_in_as_user();
$image_id_e = $this->post_image("tests/bedroom_workshop.jpg", "pbx");
$image_e = Image::by_id($image_id_e);
send_event(new RatingSetEvent($image_e, "e"));
$image_id_s = $this->post_image("tests/pbx_screenshot.jpg", "pbx");
$image_s = Image::by_id($image_id_s);
send_event(new RatingSetEvent($image_s, "s"));
// user is allowed to see all
$config->set_array("ext_rating_user_privs", ["s", "q", "e"]);
// user prefers safe-only by default
$user_config->set_array(RatingsConfig::USER_DEFAULTS, ["s"]);
// search with no tags should return only safe image
$this->assert_search_results([], [$image_id_s]);
// specifying a rating should return only that rating
$this->assert_search_results(["rating=e"], [$image_id_e]);
$this->assert_search_results(["rating=s"], [$image_id_s]);
// If user prefers to see all images, going to the safe image
// and clicking next should show the explicit image
$user_config->set_array(RatingsConfig::USER_DEFAULTS, ["s", "q", "e"]);
$this->assertEquals($image_s->get_next()->id, $image_id_e);
// If the user prefers to see only safe images by default, then
// going to the safe image and clicking next should not show
// the explicit image (See bug #984)
$user_config->set_array(RatingsConfig::USER_DEFAULTS, ["s"]);
$this->assertEquals($image_s->get_next(), null);
}
// reset the user config to defaults at the end of every test so
// that it doesn't mess with other unrelated tests
public function tearDown(): void
{
global $config, $user_config;
$config->set_array("ext_rating_user_privs", ["?", "s", "q", "e"]);
$this->log_in_as_user();
$user_config->set_array(RatingsConfig::USER_DEFAULTS, ["?", "s", "q", "e"]);
}
} }