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

Fix #4038: Attempting to create an IP-ban bans the creator.

Browse Source 
* Rename comments.ip_addr to comments.creator_ip_addr.
* Fix belongs_to_creator to not clobber ip_addr field.
This commit is contained in:
evazion
2019-01-09 15:15:57 -06:00
parent fa6d86e882
commit 80f43f9a7c
7 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/moderator/ip_addr_search.rb
View File

@@ -26,7 +26,7 @@ module Moderator
add_row(sums, ArtistVersion.where(updater_ip_addr: ip_addrs).group(:updater).count)
add_row(sums, NoteVersion.where(updater_ip_addr: ip_addrs).group(:updater).count)
add_row(sums, WikiPageVersion.where(updater_ip_addr: ip_addrs).group(:updater).count)
add_row(sums, Comment.where(ip_addr: ip_addrs).group(:creator).count)
add_row(sums, Comment.where(creator_ip_addr: ip_addrs).group(:creator).count)
add_row(sums, Dmail.where(creator_ip_addr: ip_addrs).group(:from).count)
add_row(sums, PostAppeal.where(creator_ip_addr: ip_addrs).group(:creator).count)
add_row(sums, PostFlag.where(creator_ip_addr: ip_addrs).group(:creator).count)
@@ -55,7 +55,7 @@ module Moderator
add_row(sums, PoolArchive.where(updater_id: users.map(&:id)).group(:updater_ip_addr).count) if PoolArchive.enabled?
add_row(sums, PostArchive.where(updater_id: users.map(&:id)).group(:updater_ip_addr).count) if PostArchive.enabled?
add_row(sums, WikiPageVersion.where(updater: users).group(:updater_ip_addr).count)
add_row(sums, Comment.where(creator: users).group(:ip_addr).count)
add_row(sums, Comment.where(creator: users).group(:creator_ip_addr).count)
add_row(sums, Dmail.where(from: users).group(:creator_ip_addr).count)
add_row(sums, PostAppeal.where(creator: users).where.not(creator_ip_addr: nil).group(:creator_ip_addr).count)
add_row(sums, PostFlag.where(creator: users).group(:creator_ip_addr).count)

3
app/models/application_record.rb
View File

@@ -178,7 +178,7 @@ class ApplicationRecord < ActiveRecord::Base
protected
def hidden_attributes
[:uploader_ip_addr, :updater_ip_addr, :creator_ip_addr, :ip_addr]
[:uploader_ip_addr, :updater_ip_addr, :creator_ip_addr]
end
def method_attributes
@@ -243,7 +243,6 @@ class ApplicationRecord < ActiveRecord::Base
if rec.creator_id.nil?
rec.creator_id = CurrentUser.id
rec.creator_ip_addr = CurrentUser.ip_addr if rec.respond_to?(:creator_ip_addr=)
rec.ip_addr = CurrentUser.ip_addr if rec.respond_to?(:ip_addr=)
end
end

2
app/models/ip_ban.rb
View File

@@ -26,7 +26,7 @@ class IpBan < ApplicationRecord
end
def self.query(user_ids)
comments = count_by_ip_addr("comments", user_ids, "creator_id", "ip_addr")
comments = count_by_ip_addr("comments", user_ids, "creator_id", "creator_ip_addr")
notes = count_by_ip_addr("note_versions", user_ids, "updater_id", "updater_ip_addr")
# pools = count_by_ip_addr("pool_versions", user_ids, "updater_id", "updater_ip_addr")
wiki_pages = count_by_ip_addr("wiki_page_versions", user_ids, "updater_id", "updater_ip_addr")

2
app/views/comments/partials/show/_comment.html.erb
View File

@@ -38,7 +38,7 @@
<li>|</li>
<li>
<strong>IP</strong>
<span><%= link_to_ip comment.ip_addr %></span>
<span><%= link_to_ip comment.creator_ip_addr %></span>
</li>
<% end %>
<% end %>