edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

[Cleanup] Avoid nested methods

Browse Source 
These are redefined every time the enclosing method is called
This commit is contained in:
Earlopain 2024-01-21 17:55:11 +01:00
parent dd7106ed2d
commit ae96db548e
No known key found for this signature in database
GPG Key ID: 48860312319ADF61
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,14 +27,6 @@ module Moderator
private
def search_by_ip_addr(ip_addrs, with_history)
def add_by_ip_addr(target, name, ips, klass, ip_field, id_field)
if ips.size == 1
target.merge!({name => klass.where("#{ip_field} <<= ?", ips[0]).group(id_field).count})
else
target.merge!({name => klass.where(ip_field => ips).group(id_field).count})
end
end
sums = {}
add_by_ip_addr(sums, :comment, ip_addrs, ::Comment, :creator_ip_addr, :creator_id)
add_by_ip_addr(sums, :dmail, ip_addrs, ::Dmail, :creator_ip_addr, :from_id)
@ -62,10 +54,6 @@ module Moderator
end
def search_by_user_id(user_ids, with_history)
def add_by_user_id(target, name, ids, klass, ip_field, id_field)
target.merge!({name => klass.where(id_field => ids).where.not(ip_field => nil).group(ip_field).count})
end
sums = {}
add_by_user_id(sums, :comment, user_ids, ::Comment, :creator_ip_addr, :creator_id)
add_by_user_id(sums, :dmail, user_ids, ::Dmail, :creator_ip_addr, :from_id)
@ -85,5 +73,17 @@ module Moderator
ip_addrs = sums.map { |_, v| v.map { |k, _| k } }.reduce([]) { |ids, id| ids + id }.uniq
{sums: sums, ip_addrs: ip_addrs}
end
def add_by_user_id(target, name, ids, klass, ip_field, id_field)
target.merge!({ name => klass.where(id_field => ids).where.not(ip_field => nil).group(ip_field).count })
end
def add_by_ip_addr(target, name, ips, klass, ip_field, id_field)
if ips.size == 1
target.merge!({ name => klass.where("#{ip_field} <<= ?", ips[0]).group(id_field).count })
else
target.merge!({ name => klass.where(ip_field => ips).group(id_field).count })
end
end
end
end

34
app/models/post_version.rb
View File

@ -16,24 +16,28 @@ class PostVersion < ApplicationRecord
end
end
def should(*args)
{ bool: { should: args } }
end
def split_to_terms(field, input)
input.split(",").map(&:to_i).map { |x| { term: { field => x } } }
end
def tag_list(field, input, target)
if input.present?
target += TagQuery.scan(input).map { |x| { term: { field => x } } }
end
target
end
def to_rating(input)
input.to_s.downcase[0]
end
def build_query(params)
must = []
must_not = []
def should(*args)
{bool: {should: args}}
end
def split_to_terms(field, input)
input.split(',').map(&:to_i).map {|x| {term: {field => x}}}
end
def tag_list(field, input, target)
if input.present?
target += TagQuery.scan(input).map { |x| { term: { field => x } } }
end
target
end
def to_rating(input)
input.to_s.downcase[0]
end
if params[:updater_name].present?
user_id = User.name_to_id(params[:updater_name])