Merge branch 'master' of github.com:r888888888/danbooru

This commit is contained in:
Albert Yi
2018-04-05 12:51:36 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -147,7 +147,7 @@
var tags = String($post.attr("data-tags")).match(/\S+/g) || []; var tags = String($post.attr("data-tags")).match(/\S+/g) || [];
tags = tags.concat(String($post.attr("data-pools")).match(/\S+/g) || []); tags = tags.concat(String($post.attr("data-pools")).match(/\S+/g) || []);
tags.push("rating:" + $post.data("rating")); tags.push("rating:" + $post.data("rating"));
tags.push("user:" + $post.attr("data-uploader").toLowerCase()); // tags.push("user:" + $post.attr("data-uploader").toLowerCase());
$.each(String($post.data("flags")).match(/\S+/g) || [], function(i, v) { $.each(String($post.data("flags")).match(/\S+/g) || [], function(i, v) {
tags.push("status:" + v); tags.push("status:" + v);
}); });

View File

@@ -554,7 +554,7 @@ class Post < ApplicationRecord
PostKeeperManager.check_and_update(self, CurrentUser.id, increment_tags) PostKeeperManager.check_and_update(self, CurrentUser.id, increment_tags)
# run this again async to check for race conditions # run this again async to check for race conditions
PostKeeperManager.queue_check(self) PostKeeperManager.queue_check(self, CurrentUser.id)
end end
end end