jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3703 from r888888888/favorites-meta-privacy

Browse Source 
Fix #3633: Remove favorites meta tag
This commit is contained in:
Albert Yi
2018-05-07 17:36:55 -07:00
committed by GitHub
parent 3b8a1703ff 6caa9f594a
commit 79a93f0198
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/favorites.js
View File

@@ -8,7 +8,6 @@
} }
Danbooru.Favorite.hide_or_show_add_to_favorites_link = function() { Danbooru.Favorite.hide_or_show_add_to_favorites_link = function() {
var favorites = Danbooru.meta("favorites");
var current_user_id = Danbooru.meta("current-user-id"); var current_user_id = Danbooru.meta("current-user-id");
if (current_user_id == "") { if (current_user_id == "") {
$("#add-to-favorites").hide(); $("#add-to-favorites").hide();
@@ -17,8 +16,7 @@
$("#remove-fav-button").hide(); $("#remove-fav-button").hide();
return; return;
} }
var regexp = new RegExp("\\bfav:" + current_user_id + "\\b"); if ($("#image-container").length && $("#image-container").data("is-favorited") == true) {
if ((favorites != undefined) && (favorites.match(regexp))) {
$("#add-to-favorites").hide(); $("#add-to-favorites").hide();
$("#add-fav-button").hide(); $("#add-fav-button").hide();
} else { } else {

1
app/views/posts/show.html.erb
View File

@@ -155,7 +155,6 @@
<% content_for(:html_header) do %> <% content_for(:html_header) do %>
<meta name="description" content="<%= @post.presenter.humanized_tag_string %>"> <meta name="description" content="<%= @post.presenter.humanized_tag_string %>">
<meta name="tags" content="<%= @post.tag_string %>"> <meta name="tags" content="<%= @post.tag_string %>">
<meta name="favorites" content="<%= @post.fav_string %>">
<meta name="pools" content="<%= @post.pool_string %>"> <meta name="pools" content="<%= @post.pool_string %>">
<meta name="post-id" content="<%= @post.id %>"> <meta name="post-id" content="<%= @post.id %>">
<% if CurrentUser.can_approve_posts? %> <% if CurrentUser.can_approve_posts? %>