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

Merge branch 'custom_ratings' into develop

Browse source
This commit is contained in:
Shish 2019-09-29 14:41:14 +01:00
commit e6a402cd4e
16 changed files with 444 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/imageboard/image.php
View file

@ -302,6 +302,9 @@ class Image
["tag"=>$tags[0]]
);
} else {
if (ext_is_live("Ratings")) {
$tags[] = "rating:*";
}
list($tag_conditions, $img_conditions) = self::terms_to_conditions($tags);
$total = Image::get_accelerated_count($tag_conditions, $img_conditions);
if (is_null($total)) {

1
core/polyfills.php
View file

@ -803,7 +803,6 @@ function iterator_map_to_array(callable $callback, iterator $iter): array
return iterator_to_array(iterator_map($callback, $iter));
}
function get_class_from_file(string $file): string
{
$fp = fopen($file, 'r');

2
ext/comment/main.php
View file

@ -405,7 +405,7 @@ class CommentList extends Extension
$image = Image::by_id($row["image_id"]);
if (
Extension::is_enabled(RatingsInfo::KEY) && !is_null($image) &&
strpos($user_ratings, $image->rating) === false
!in_array($image->rating, $user_ratings)
) {
$image = null; // this is "clever", I may live to regret it
}

2
ext/danbooru_api/main.php
View file

@ -200,7 +200,7 @@ class DanbooruApi extends Extension
"preview_url" => $img->get_thumb_link(),
"preview_height" => $previewsize[1],
"preview_width" => $previewsize[0],
"rating" => "u",
"rating" => "?",
"date" => $img->posted,
"is_warehoused" => false,
"tags" => $taglist,

2
ext/featured/main.php
View file

@ -55,7 +55,7 @@ class Featured extends Extension
}
if (!is_null($image)) {
if (Extension::is_enabled(RatingsInfo::KEY)) {
if (strpos(Ratings::get_user_privs($user), $image->rating) === false) {
if (!in_array($image->rating, Ratings::get_user_class_privs($user))) {
return;
}
}

2
ext/pools/main.php
View file

@ -798,7 +798,7 @@ class Pools extends Extension
// WE CHECK IF THE EXTENSION RATING IS INSTALLED, WHICH VERSION AND IF IT
// WORKS TO SHOW/HIDE SAFE, QUESTIONABLE, EXPLICIT AND UNRATED IMAGES FROM USER
if (Extension::is_enabled(RatingsInfo::KEY)) {
$query .= "AND i.rating IN (".Ratings::privs_to_sql(Ratings::get_user_privs($user)).")";
$query .= "AND i.rating IN (".Ratings::privs_to_sql(Ratings::get_user_class_privs($user)).")";
}
if (Extension::is_enabled(TrashInfo::KEY)) {
$query .= $database->scoreql_to_sql(" AND trash = SCORE_BOOL_N ");

420
ext/rating/main.php
View file

@ -1,5 +1,80 @@
<?php
/**
* @global ImageRating[] $_shm_ratings
*/
global $_shm_ratings;
$_shm_ratings = [];
class ImageRating
{
/**
* @var string
*/
public $name = null;
/**
* @var string
*/
public $code = null;
/**
* @var string
*/
public $search_term = null;
/**
* @var int
*/
public $order = 0;
public function __construct(string $code, string $name, string $search_term, int $order)
{
if (strlen($code)!=1) {
throw new Exception("Rating code must be exactly one character");
}
$this->name = $name;
$this->code = $code;
$this->search_term = $search_term;
$this->order = $order;
}
}
function clear_ratings()
{
global $_shm_ratings;
$keys = array_keys($_shm_ratings);
foreach ($keys as $key) {
if ($key=="?") {
continue;
}
unset($_shm_ratings[$key]);
}
}
function add_rating(ImageRating $rating)
{
global $_shm_ratings;
if ($rating->code=="?"&&array_key_exists("?", $_shm_ratings)) {
throw new Exception("? is a reserved rating code that cannot be overridden");
}
if ($rating->code!="?"&&in_array(strtolower($rating->search_term), Ratings::UNRATED_KEYWORDS)) {
throw new Exception("$rating->search_term is a reserved search term");
}
$_shm_ratings[$rating->code] = $rating;
}
add_rating(new ImageRating("?", "Unrated", "unrated", 99999));
add_rating(new ImageRating("s", "Safe", "safe", 0));
add_rating(new ImageRating("q", "Questionable", "questionable", 500));
add_rating(new ImageRating("e", "Explicit", "explicit", 1000));
@include_once "data/config/ratings.conf.php";
class RatingSetEvent extends Event
{
/** @var Image */
@ -9,15 +84,45 @@ class RatingSetEvent extends Event
public function __construct(Image $image, string $rating)
{
assert(in_array($rating, ["s", "q", "e", "u"]));
global $_shm_ratings;
assert(in_array($rating, array_keys($_shm_ratings)));
$this->image = $image;
$this->rating = $rating;
}
}
abstract class RatingsConfig
{
const VERSION = "ext_ratings2_version";
const USER_DEFAULTS = "ratings_default";
}
class Ratings extends Extension
{
protected $db_support = [DatabaseDriver::MYSQL, DatabaseDriver::PGSQL];
public const UNRATED_KEYWORDS = ["unknown","unrated"];
private $search_regexp;
public function __construct()
{
parent::__construct();
global $_shm_ratings;
$codes = implode("", array_keys($_shm_ratings));
$search_terms = [];
foreach ($_shm_ratings as $key => $rating) {
array_push($search_terms, $rating->search_term);
}
$this->search_regexp = "/^rating[=|:](?:(\*|[" . $codes . "]+)|(" .
implode("|", $search_terms) . "|".implode("|", self::UNRATED_KEYWORDS)."))$/D";
}
public function get_priority(): int
{
return 50;
@ -25,33 +130,62 @@ class Ratings extends Extension
public function onInitExt(InitExtEvent $event)
{
global $config;
if ($config->get_int("ext_ratings2_version") < 2) {
global $user, $config, $_shm_user_classes, $_shm_ratings;
if ($config->get_int(RatingsConfig::VERSION) < 4) {
$this->install();
}
$config->set_default_string("ext_rating_anon_privs", 'squ');
$config->set_default_string("ext_rating_user_privs", 'sqeu');
$config->set_default_string("ext_rating_admin_privs", 'sqeu');
foreach (array_keys($_shm_user_classes) as $key) {
if ($key == "base" || $key == "hellbanned") {
continue;
}
$config->set_default_array("ext_rating_" . $key . "_privs", array_keys($_shm_ratings));
}
}
public function onInitUserConfig(InitUserConfigEvent $event)
{
$event->user_config->set_default_array(RatingsConfig::USER_DEFAULTS, self::get_user_class_privs($event->user));
}
public function onUserOptionsBuilding(UserOptionsBuildingEvent $event)
{
global $user, $user_config;
$event->add__html(
$this->theme->get_user_options(
$user,
self::get_user_default_ratings($user),
self::get_user_class_privs($user)
)
);
}
public function onSetupBuilding(SetupBuildingEvent $event)
{
$privs = [];
$privs['Safe Only'] = 's';
$privs['Safe and Unknown'] = 'su';
$privs['Safe and Questionable'] = 'sq';
$privs['Safe, Questionable, Unknown'] = 'squ';
$privs['All'] = 'sqeu';
global $config, $_shm_user_classes, $_shm_ratings;
$ratings = self::get_sorted_ratings();
$options = [];
foreach ($ratings as $key => $rating) {
$options[$rating->name] = $rating->code;
}
$sb = new SetupBlock("Image Ratings");
$sb->add_choice_option("ext_rating_anon_privs", $privs, "Anonymous: ");
$sb->add_choice_option("ext_rating_user_privs", $privs, "<br>Users: ");
$sb->add_choice_option("ext_rating_admin_privs", $privs, "<br>Admins: ");
$sb->start_table();
foreach (array_keys($_shm_user_classes) as $key) {
if ($key == "base" || $key == "hellbanned") {
continue;
}
$sb->add_multichoice_option("ext_rating_" . $key . "_privs", $options, $key, true);
}
$sb->end_table();
$event->panel->add_block($sb);
}
// public function onPostListBuilding(PostListBuildingEvent $event)
// {
// global $user;
@ -60,21 +194,20 @@ class Ratings extends Extension
// }
// }
public function onDisplayingImage(DisplayingImageEvent $event)
{
global $user, $page;
/**
* Deny images upon insufficient permissions.
**/
$user_view_level = Ratings::get_user_privs($user);
$user_view_level = preg_split('//', $user_view_level, -1);
$user_view_level = Ratings::get_user_class_privs($user);
if (!in_array($event->image->rating, $user_view_level)) {
$page->set_mode(PageMode::REDIRECT);
$page->set_redirect(make_link("post/list"));
}
}
public function onRatingSet(RatingSetEvent $event)
{
if (empty($event->image->rating)) {
@ -84,12 +217,12 @@ class Ratings extends Extension
}
$this->set_rating($event->image->id, $event->rating, $old_rating);
}
public function onImageInfoBoxBuilding(ImageInfoBoxBuildingEvent $event)
{
$event->add_part($this->theme->get_rater_html($event->image->id, $event->image->rating, $this->can_rate()), 80);
}
public function onImageInfoSet(ImageInfoSetEvent $event)
{
if ($this->can_rate() && isset($_POST["rating"])) {
@ -123,15 +256,27 @@ class Ratings extends Extension
public function onSearchTermParse(SearchTermParseEvent $event)
{
global $user;
$matches = [];
if (is_null($event->term) && $this->no_rating_query($event->context)) {
$set = Ratings::privs_to_sql(Ratings::get_user_privs($user));
$set = Ratings::privs_to_sql(Ratings::get_user_default_ratings($user));
$event->add_querylet(new Querylet("rating IN ($set)"));
}
if (preg_match("/^rating[=|:](?:([sqeu]+)|(safe|questionable|explicit|unknown))$/D", strtolower($event->term), $matches)) {
if (preg_match($this->search_regexp, strtolower($event->term), $matches)) {
$ratings = $matches[1] ? $matches[1] : $matches[2][0];
$ratings = array_intersect(str_split($ratings), str_split(Ratings::get_user_privs($user)));
if (count($matches)>2&&in_array($matches[2], self::UNRATED_KEYWORDS)) {
$ratings = "?";
}
if ($ratings == '*') {
$ratings = Ratings::get_user_class_privs($user);
} else {
$ratings = array_intersect(str_split($ratings), Ratings::get_user_class_privs($user));
}
$set = "'" . join("', '", $ratings) . "'";
$event->add_querylet(new Querylet("rating IN ($set)"));
}
@ -139,14 +284,20 @@ class Ratings extends Extension
public function onTagTermParse(TagTermParseEvent $event)
{
global $user;
$matches = [];
if (preg_match("/^rating[=|:](?:([sqeu]+)|(safe|questionable|explicit|unknown))$/D", strtolower($event->term), $matches) && $event->parse) {
if (preg_match($this->search_regexp, strtolower($event->term), $matches) && $event->parse) {
$ratings = $matches[1] ? $matches[1] : $matches[2][0];
$ratings = array_intersect(str_split($ratings), str_split(Ratings::get_user_privs($user)));
if (count($matches)>2&&in_array($matches[2], self::UNRATED_KEYWORDS)) {
$ratings = "?";
}
$ratings = array_intersect(str_split($ratings), Ratings::get_user_class_privs($user));
$rating = $ratings[0];
$image = Image::by_id($event->id);
$re = new RatingSetEvent($image, $rating);
@ -158,13 +309,57 @@ class Ratings extends Extension
$event->metatag = true;
}
}
public function onAdminBuilding(AdminBuildingEvent $event)
{
global $database, $_shm_ratings;
$results = $database->get_col("SELECT DISTINCT rating FROM images ORDER BY rating");
$original_values = [];
foreach ($results as $result) {
if (array_key_exists($result, $_shm_ratings)) {
$original_values[$result] = $_shm_ratings[$result]->name;
} else {
$original_values[$result] = $result;
}
}
$this->theme->display_form($original_values, self::get_sorted_ratings());
}
public function onAdminAction(AdminActionEvent $event)
{
global $database, $user;
$action = $event->action;
switch ($action) {
case "update_ratings":
$event->redirect = true;
if (!array_key_exists("rating_old", $_POST) || empty($_POST["rating_old"])) {
return;
}
if (!array_key_exists("rating_new", $_POST) || empty($_POST["rating_new"])) {
return;
}
$old = $_POST["rating_old"];
$new = $_POST["rating_new"];
if ($user->can("bulk_edit_image_rating")) {
$database->execute("UPDATE images SET rating = :new WHERE rating = :old", ["new"=>$new, "old"=>$old ]);
}
break;
}
}
public function onBulkActionBlockBuilding(BulkActionBlockBuildingEvent $event)
{
global $user;
if ($user->can(Permissions::BULK_EDIT_IMAGE_RATING)) {
$event->add_action("bulk_rate", "Set (R)ating", "r", "", $this->theme->get_selection_rater_html("u", "bulk_rating"));
$event->add_action("bulk_rate", "Set (R)ating", "r", "", $this->theme->get_selection_rater_html(["?"]));
}
}
@ -174,11 +369,11 @@ class Ratings extends Extension
switch ($event->action) {
case "bulk_rate":
if (!isset($_POST['bulk_rating'])) {
if (!isset($_POST['rating'])) {
return;
}
if ($user->can(Permissions::BULK_EDIT_IMAGE_RATING)) {
$rating = $_POST['bulk_rating'];
$rating = $_POST['rating'];
$total = 0;
foreach ($event->items as $image) {
send_event(new RatingSetEvent($image, $rating));
@ -192,8 +387,8 @@ class Ratings extends Extension
public function onPageRequest(PageRequestEvent $event)
{
global $user, $page;
global $user, $page, $user_config;
if ($event->page_matches("admin/bulk_rate")) {
if (!$user->can(Permissions::BULK_EDIT_IMAGE_RATING)) {
throw new PermissionDeniedException();
@ -204,9 +399,9 @@ class Ratings extends Extension
if (count($images) == 0) {
break;
}
reset($images); // rewind to first element in array.
foreach ($images as $image) {
send_event(new RatingSetEvent($image, $_POST['rating']));
}
@ -221,28 +416,72 @@ class Ratings extends Extension
$page->set_redirect(make_link("post/list"));
}
}
if ($event->page_matches("user_admin")) {
if (!$user->check_auth_token()) {
return;
}
switch ($event->get_arg(0)) {
case "default_ratings":
if (!array_key_exists("id", $_POST) || empty($_POST["id"])) {
return;
}
if (!array_key_exists("rating", $_POST) || empty($_POST["rating"])) {
return;
}
$id = intval($_POST["id"]);
if ($id != $user->id) {
throw new SCoreException("Cannot change another user's settings");
}
$ratings = $_POST["rating"];
$user_config->set_array(RatingsConfig::USER_DEFAULTS, $ratings);
$page->set_mode(PageMode::REDIRECT);
$page->set_redirect(make_link("user"));
break;
}
}
}
public static function get_user_privs(User $user): string
public static function get_sorted_ratings(): array
{
global $_shm_ratings;
$ratings = array_values($_shm_ratings);
usort($ratings, function ($a, $b) {
return $a->order <=> $b->order;
});
return $ratings;
}
public static function get_user_class_privs(User $user): array
{
global $config;
if ($user->is_anonymous()) {
$sqes = $config->get_string("ext_rating_anon_privs");
} elseif ($user->is_admin()) {
$sqes = $config->get_string("ext_rating_admin_privs");
} else {
$sqes = $config->get_string("ext_rating_user_privs");
}
return $sqes ?? "";
return $config->get_array("ext_rating_".$user->class->name."_privs");
}
public static function privs_to_sql(string $sqes): string
public static function get_user_default_ratings(User $user): array
{
global $user_config;
$available = self::get_user_class_privs($user);
$selected = $user_config->get_array(RatingsConfig::USER_DEFAULTS);
return array_intersect($available, $selected);
}
public static function privs_to_sql(array $privs): string
{
$arr = [];
$length = strlen($sqes);
for ($i=0; $i<$length; $i++) {
$arr[] = "'" . $sqes[$i] . "'";
foreach ($privs as $i) {
$arr[] = "'" . $i . "'";
}
if (sizeof($arr)==0) {
return "' '";
}
$set = join(', ', $arr);
return $set;
@ -250,25 +489,19 @@ class Ratings extends Extension
public static function rating_to_human(string $rating): string
{
switch ($rating) {
case "s": return "Safe";
case "q": return "Questionable";
case "e": return "Explicit";
default: return "Unknown";
global $_shm_ratings;
if (array_key_exists($rating, $_shm_ratings)) {
return $_shm_ratings[$rating]->name;
}
return "Unknown";
}
public static function rating_is_valid(string $rating): bool
{
switch ($rating) {
case "s":
case "q":
case "e":
case "u":
return true;
default:
return false;
}
global $_shm_ratings;
return in_array($rating, array_keys($_shm_ratings));
}
/**
@ -277,13 +510,7 @@ class Ratings extends Extension
private function can_rate(): bool
{
global $config, $user;
if ($user->is_anonymous() && $config->get_string("ext_rating_anon_privs") == "sqeu") {
return false;
}
if ($user->is_admin()) {
return true;
}
if (!$user->is_anonymous() && $config->get_string("ext_rating_user_privs") == "sqeu") {
if ($user->can("edit_image_rating")) {
return true;
}
return false;
@ -306,18 +533,18 @@ class Ratings extends Extension
{
global $database, $config;
if ($config->get_int("ext_ratings2_version") < 1) {
$database->Execute("ALTER TABLE images ADD COLUMN rating CHAR(1) NOT NULL DEFAULT 'u'");
if ($config->get_int(RatingsConfig::VERSION) < 1) {
$database->Execute("ALTER TABLE images ADD COLUMN rating CHAR(1) NOT NULL DEFAULT '?'");
$database->Execute("CREATE INDEX images__rating ON images(rating)");
$config->set_int("ext_ratings2_version", 3);
$config->set_int(RatingsConfig::VERSION, 3);
}
if ($config->get_int("ext_ratings2_version") < 2) {
if ($config->get_int(RatingsConfig::VERSION) < 2) {
$database->Execute("CREATE INDEX images__rating ON images(rating)");
$config->set_int("ext_ratings2_version", 2);
$config->set_int(RatingsConfig::VERSION, 2);
}
if ($config->get_int("ext_ratings2_version") < 3) {
if ($config->get_int(RatingsConfig::VERSION) < 3) {
$database->Execute("UPDATE images SET rating = 'u' WHERE rating is null");
switch ($database->get_driver_name()) {
case DatabaseDriver::MYSQL:
@ -328,7 +555,40 @@ class Ratings extends Extension
$database->Execute("ALTER TABLE images ALTER COLUMN rating SET NOT NULL");
break;
}
$config->set_int("ext_ratings2_version", 3);
$config->set_int(RatingsConfig::VERSION, 3);
}
if ($config->get_int(RatingsConfig::VERSION) < 4) {
$value = $config->get_string("ext_rating_anon_privs");
if (!empty($value)) {
$config->set_array("ext_rating_anonymous_privs", str_split($value));
}
$value = $config->get_string("ext_rating_user_privs");
if (!empty($value)) {
$config->set_array("ext_rating_user_privs", str_split($value));
}
$value = $config->get_string("ext_rating_admin_privs");
if (!empty($value)) {
$config->set_array("ext_rating_admin_privs", str_split($value));
}
switch ($database->get_driver_name()) {
case DatabaseDriver::MYSQL:
$database->Execute("ALTER TABLE images CHANGE rating rating CHAR(1) NOT NULL DEFAULT '?'");
break;
case DatabaseDriver::PGSQL:
$database->Execute("ALTER TABLE images ALTER COLUMN rating SET DEFAULT '?'");
break;
}
if ($database->get_driver_name()==DatabaseDriver::PGSQL) { // These updates can take a little bit
$database->execute("SET statement_timeout TO 300000;");
}
$database->execute("UPDATE images SET rating = :new WHERE rating = :old", ["new"=>'?', "old"=>'u' ]);
$config->set_int(RatingsConfig::VERSION, 4);
}
}

108
ext/rating/theme.php
View file

@ -4,9 +4,6 @@ class RatingsTheme extends Themelet
{
public function get_rater_html(int $image_id, string $rating, bool $can_rate): string
{
$s_checked = $rating == 's' ? " checked" : "";
$q_checked = $rating == 'q' ? " checked" : "";
$e_checked = $rating == 'e' ? " checked" : "";
$human_rating = Ratings::rating_to_human($rating);
$html = "
<tr>
@ -15,9 +12,7 @@ class RatingsTheme extends Themelet
".($can_rate ? "
<span class='view'>$human_rating</span>
<span class='edit'>
<input type='radio' name='rating' value='s' id='s'$s_checked><label for='s'>Safe</label>
<input type='radio' name='rating' value='q' id='q'$q_checked><label for='q'>Questionable</label>
<input type='radio' name='rating' value='e' id='e'$e_checked><label for='e'>Explicit</label>
".$this->get_selection_rater_html([$rating])."
</span>
" : "
$human_rating
@ -28,32 +23,65 @@ class RatingsTheme extends Themelet
return $html;
}
public function display_bulk_rater(string $terms)
public function display_form(array $current_ratings, array $available_ratings)
{
global $page;
$html = "
".make_form(make_link("admin/bulk_rate"))."
<input type='hidden' name='query' value='".html_escape($terms)."'>
<select name='rating'>
<option value='s'>Safe</option>
<option value='q'>Questionable</option>
<option value='e'>Explicit</option>
<option value='u'>Unrated</option>
</select>
<input type='submit' value='Go'>
</form>
";
$page->add_block(new Block("List Controls", $html, "left"));
global $page, $database;
$html = make_form(make_link("admin/update_ratings"))."<table class='form'><tr>
<th>Change</th><td><select name='rating_old' required='required'><option></option>";
foreach ($current_ratings as $key=>$value) {
$html .= "<option value='$key'>$value</option>";
}
$html .= "</select></td></tr>
<tr><th>To</th><td><select name='rating_new' required='required'><option></option>";
foreach ($available_ratings as $value) {
$html .= "<option value='$value->code'>$value->name</option>";
}
$html .= "</select></td></tr>
<tr><td colspan='2'><input type='submit' value='Update'></td></tr></table>
</form>\n";
$page->add_block(new Block("Update Ratings", $html));
}
public function get_selection_rater_html(String $id = "select_rating")
// public function display_bulk_rater(string $terms)
// {
// global $page;
// $html = "
// ".make_form(make_link("admin/bulk_rate"))."
// <input type='hidden' name='query' value='".html_escape($terms)."'>
// <select name='rating'>
// <option value='s'>Safe</option>
// <option value='q'>Questionable</option>
// <option value='e'>Explicit</option>
// <option value='u'>Unrated</option>
// </select>
// <input type='submit' value='Go'>
// </form>
// ";
// $page->add_block(new Block("List Controls", $html, "left"));
// }
public function get_selection_rater_html(array $selected_options, bool $multiple = false, array $available_options = null)
{
return "<select name='".$id."'>
<option value='s'>Safe</option>
<option value='q'>Questionable</option>
<option value='e'>Explicit</option>
<option value='u'>Unrated</option>
</select>";
global $_shm_ratings;
$output = "<select name='rating".($multiple ? "[]' multiple='multiple'" : "' ")." >";
$options = Ratings::get_sorted_ratings();
foreach ($options as $option) {
if ($available_options!=null && !in_array($option->code, $available_options)) {
continue;
}
$output .= "<option value='".$option->code."' ".
(in_array($option->code, $selected_options) ? "selected='selected'": "")
.">".$option->name."</option>";
}
return $output."</select>";
}
public function get_help_html(array $ratings)
@ -83,4 +111,28 @@ class RatingsTheme extends Themelet
$output .= "</table>";
return $output;
}
public function get_user_options(User $user, array $selected_ratings, array $available_ratings): string
{
$html = "
<p>".make_form(make_link("user_admin/default_ratings"))."
<input type='hidden' name='id' value='$user->id'>
<table style='width: 300px;'>
<thead>
<tr><th colspan='2'>Default Rating Filter</th></tr>
</thead>
<tbody>
<tr><td>This controls the default rating search results will be filtered by, and nothing else. To override in your search results, add rating:* to your search.</td></tr>
<tr><td>
".$this->get_selection_rater_html($selected_ratings, true, $available_ratings)."
</td></tr>
</tbody>
<tfoot>
<tr><td><input type='submit' value='Save'></td></tr>
</tfoot>
</table>
</form>
";
return $html;
}
}

4
ext/tag_list/main.php
View file

@ -602,12 +602,10 @@ class TagList extends Extension
$starting_tags = [];
$tags_ok = true;
foreach ($wild_tags as $tag) {
if ($tag[0] == "-") {
if ($tag[0] == "-" || strpos($tag, "tagme")===0) {
continue;
}
$tag = Tag::sqlify($tag);
$tag_ids = $database->get_col("SELECT id FROM tags WHERE tag LIKE :tag AND count < 25000", ["tag" => $tag]);
// $search_tags = array_merge($search_tags,
// $database->get_col("SELECT tag FROM tags WHERE tag LIKE :tag", array("tag"=>$tag)));

2
ext/trash/main.php
View file

@ -7,6 +7,8 @@ abstract class TrashConfig
class Trash extends Extension
{
protected $db_support = [DatabaseDriver::MYSQL, DatabaseDriver::PGSQL];
public function get_priority(): int
{
// Needs to be early to intercept delete events

4
ext/user_config/main.php
View file

@ -31,12 +31,12 @@ class UserConfig extends Extension
}
}
public function onUserLogin(UserLoginEvent $event)
public function onInitUserConfig(InitUserConfigEvent $event)
{
global $database, $user_config;
$user_config = new DatabaseConfig($database, "user_config", "user_id", $event->user->id);
send_event(new InitUserConfigEvent($event->user, $user_config));
$event->user_config = $user_config;
}
private function install(): void

3
index.php
View file

@ -88,11 +88,10 @@ require_once "core/_bootstrap.php";
$_tracer->begin($_SERVER["REQUEST_URI"] ?? "No Request");
try {
// start the page generation waterfall
$user = _get_user();
send_event(new UserLoginEvent($user));
send_event(new InitUserConfigEvent($user));
if (PHP_SAPI === 'cli' || PHP_SAPI == 'phpdbg') {
send_event(new CommandEvent($argv));
} else {

3
tests/bootstrap.php
View file

@ -134,6 +134,7 @@ abstract class ShimmiePHPUnitTestCase extends \PHPUnit\Framework\TestCase
$user = User::by_name('demo');
$this->assertNotNull($user);
send_event(new UserLoginEvent($user));
send_event(new InitUserConfigEvent($user));
}
protected function log_in_as_user()
@ -142,6 +143,7 @@ abstract class ShimmiePHPUnitTestCase extends \PHPUnit\Framework\TestCase
$user = User::by_name('test');
$this->assertNotNull($user);
send_event(new UserLoginEvent($user));
send_event(new InitUserConfigEvent($user));
}
protected function log_out()
@ -150,6 +152,7 @@ abstract class ShimmiePHPUnitTestCase extends \PHPUnit\Framework\TestCase
$user = User::by_id($config->get_int("anon_id", 0));
$this->assertNotNull($user);
send_event(new UserLoginEvent($user));
send_event(new InitUserConfigEvent($user));
}
// post things

4
themes/danbooru/view.theme.php
View file

@ -47,8 +47,8 @@ class CustomViewImageTheme extends ViewImageTheme
}
if (Extension::is_enabled(RatingsInfo::KEY)) {
if ($image->rating == null || $image->rating == "u") {
$image->rating = "u";
if ($image->rating == null || $image->rating == "?") {
$image->rating = "?";
}
$h_rating = Ratings::rating_to_human($image->rating);
$html .= "<br>Rating: $h_rating";

10
themes/danbooru2/view.theme.php
View file

@ -48,13 +48,11 @@ class CustomViewImageTheme extends ViewImageTheme
}
if (Extension::is_enabled(RatingsInfo::KEY)) {
if ($image->rating == null || $image->rating == "u") {
$image->rating = "u";
}
if (Extension::is_enabled(RatingsInfo::KEY)) {
$h_rating = Ratings::rating_to_human($image->rating);
$html .= "<br>Rating: $h_rating";
if ($image->rating == null || $image->rating == "?") {
$image->rating = "?";
}
$h_rating = Ratings::rating_to_human($image->rating);
$html .= "<br>Rating: $h_rating";
}
return $html;

4
themes/lite/view.theme.php
View file

@ -48,8 +48,8 @@ class CustomViewImageTheme extends ViewImageTheme
}
if (Extension::is_enabled(RatingsInfo::KEY)) {
if ($image->rating == null || $image->rating == "u") {
$image->rating = "u";
if ($image->rating == null || $image->rating == "?") {
$image->rating = "?";
}
$h_rating = Ratings::rating_to_human($image->rating);
$html .= "<br>Rating: $h_rating";