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

rubocop: fix various Rubocop warnings.

Browse Source
This commit is contained in:
evazion
2021-06-16 18:24:42 -05:00
parent cfe471e0b5
commit 07e23204b6
99 changed files with 412 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/artist_version.rb
View File

@@ -32,22 +32,18 @@ class ArtistVersion < ApplicationRecord
extend SearchMethods
def previous
@previous ||= begin
ArtistVersion.where("artist_id = ? and created_at < ?", artist_id, created_at).order("created_at desc").limit(1).to_a
end
@previous ||= ArtistVersion.where("artist_id = ? and created_at < ?", artist_id, created_at).order("created_at desc").limit(1).to_a
@previous.first
end
def subsequent
@subsequent ||= begin
ArtistVersion.where("artist_id = ? and created_at > ?", artist_id, created_at).order("created_at asc").limit(1).to_a
end
@subsequent ||= ArtistVersion.where("artist_id = ? and created_at > ?", artist_id, created_at).order("created_at asc").limit(1).to_a
@subsequent.first
end
def current
@previous ||= begin
ArtistVersion.where("artist_id = ?", artist_id).order("created_at desc").limit(1).to_a
ArtistVersion.where(artist_id: artist_id).order("created_at desc").limit(1).to_a
end
@previous.first
end
@@ -66,17 +62,17 @@ class ArtistVersion < ApplicationRecord
end
def other_names_changed(type)
other = self.send(type)
other = send(type)
((other_names - other.other_names) | (other.other_names - other_names)).length.positive?
end
def urls_changed(type)
other = self.send(type)
other = send(type)
((urls - other.urls) | (other.urls - urls)).length.positive?
end
def was_deleted(type)
other = self.send(type)
other = send(type)
if type == "previous"
is_deleted && !other.is_deleted
else
@@ -85,7 +81,7 @@ class ArtistVersion < ApplicationRecord
end
def was_undeleted(type)
other = self.send(type)
other = send(type)
if type == "previous"
!is_deleted && other.is_deleted
else
@@ -94,7 +90,7 @@ class ArtistVersion < ApplicationRecord
end
def was_banned(type)
other = self.send(type)
other = send(type)
if type == "previous"
is_banned && !other.is_banned
else
@@ -103,7 +99,7 @@ class ArtistVersion < ApplicationRecord
end
def was_unbanned(type)
other = self.send(type)
other = send(type)
if type == "previous"
!is_banned && other.is_banned
else

8
app/models/ban.rb
View File

@@ -12,8 +12,8 @@ class Ban < ApplicationRecord
validates :reason, presence: true
validate :user, :validate_user_is_bannable, on: :create
scope :unexpired, -> { where("bans.created_at + bans.duration > ?", Time.now) }
scope :expired, -> { where("bans.created_at + bans.duration <= ?", Time.now) }
scope :unexpired, -> { where("bans.created_at + bans.duration > ?", Time.zone.now) }
scope :expired, -> { where("bans.created_at + bans.duration <= ?", Time.zone.now) }
scope :active, -> { unexpired }
def self.search(params)
@@ -48,7 +48,7 @@ class Ban < ApplicationRecord
end
def update_user_on_destroy
user.update_attribute(:is_banned, false)
user.update!(is_banned: false)
end
def user_name
@@ -68,7 +68,7 @@ class Ban < ApplicationRecord
end
def expired?
persisted? && expires_at < Time.now
persisted? && expires_at < Time.zone.now
end
def create_feedback

13
app/models/bulk_update_request.rb
View File

@@ -1,17 +1,16 @@
class BulkUpdateRequest < ApplicationRecord
attr_accessor :title
attr_accessor :reason
attr_accessor :title, :reason
belongs_to :user
belongs_to :forum_topic, optional: true
belongs_to :forum_post, optional: true
belongs_to :approver, optional: true, class_name: "User"
validates_presence_of :reason, on: :create
validates_presence_of :script
validates_presence_of :title, if: ->(rec) {rec.forum_topic_id.blank?}
validates_presence_of :forum_topic, if: ->(rec) {rec.forum_topic_id.present?}
validates_inclusion_of :status, :in => %w(pending approved rejected)
validates :reason, presence: true, on: :create
validates :script, presence: true
validates :title, presence: true, if: ->(rec) { rec.forum_topic_id.blank? }
validates :forum_topic, presence: true, if: ->(rec) { rec.forum_topic_id.present? }
validates :status, inclusion: { in: %w[pending approved rejected] }
validate :validate_script, if: :script_changed?
before_save :update_tags, if: :script_changed?

12
app/models/comment.rb
View File

@@ -3,8 +3,8 @@ class Comment < ApplicationRecord
belongs_to :creator, class_name: "User"
belongs_to_updater
has_many :moderation_reports, as: :model
has_many :votes, :class_name => "CommentVote", :dependent => :destroy
has_many :moderation_reports, as: :model, dependent: :destroy
has_many :votes, class_name: "CommentVote", dependent: :destroy
validates :body, presence: true, length: { maximum: 15_000 }, if: :body_changed?
@@ -20,9 +20,9 @@ class Comment < ApplicationRecord
deletable
mentionable(
:message_field => :body,
:title => ->(user_name) {"#{creator.name} mentioned you in a comment on post ##{post_id}"},
:body => ->(user_name) {"@#{creator.name} mentioned you in comment ##{id} on post ##{post_id}:\n\n[quote]\n#{DText.extract_mention(body, "@" + user_name)}\n[/quote]\n"}
message_field: :body,
title: ->(_user_name) {"#{creator.name} mentioned you in a comment on post ##{post_id}"},
body: ->(user_name) {"@#{creator.name} mentioned you in comment ##{id} on post ##{post_id}:\n\n[quote]\n#{DText.extract_mention(body, "@#{user_name}")}\n[/quote]\n"}
)
module SearchMethods
@@ -55,7 +55,7 @@ class Comment < ApplicationRecord
def update_last_commented_at_on_create
Post.where(:id => post_id).update_all(:last_commented_at => created_at)
if Comment.where("post_id = ?", post_id).count <= Danbooru.config.comment_threshold && !do_not_bump_post?
if Comment.where(post_id: post_id).count <= Danbooru.config.comment_threshold && !do_not_bump_post?
Post.where(:id => post_id).update_all(:last_comment_bumped_at => created_at)
end
end

2
app/models/comment_vote.rb
View File

@@ -7,8 +7,8 @@ class CommentVote < ApplicationRecord
validate :validate_vote_is_unique, if: :is_deleted_changed?
validates :score, inclusion: { in: [-1, 1], message: "must be 1 or -1" }
before_create :update_score_on_create
before_save :update_score_on_delete_or_undelete, if: -> { !new_record? && is_deleted_changed? }
before_create :update_score_on_create
deletable

2
app/models/dmail.rb
View File

@@ -1,5 +1,3 @@
require 'digest/sha1'
class Dmail < ApplicationRecord
validate :validate_sender_is_not_limited, on: :create
validates :title, presence: true, length: { maximum: 200 }, if: :title_changed?

10
app/models/forum_post.rb
View File

@@ -30,9 +30,9 @@ class ForumPost < ApplicationRecord
deletable
mentionable(
:message_field => :body,
:title => ->(user_name) {%{#{creator.name} mentioned you in topic ##{topic_id} (#{topic.title})}},
:body => ->(user_name) {%{@#{creator.name} mentioned you in topic ##{topic_id} ("#{topic.title}":[#{Routes.forum_topic_path(topic, page: forum_topic_page)}]):\n\n[quote]\n#{DText.extract_mention(body, "@" + user_name)}\n[/quote]\n}}
message_field: :body,
title: ->(_user_name) {%{#{creator.name} mentioned you in topic ##{topic_id} (#{topic.title})}},
body: ->(user_name) {%{@#{creator.name} mentioned you in topic ##{topic_id} ("#{topic.title}":[#{Routes.forum_topic_path(topic, page: forum_topic_page)}]):\n\n[quote]\n#{DText.extract_mention(body, "@#{user_name}")}\n[/quote]\n}}
)
module SearchMethods
@@ -74,7 +74,7 @@ class ForumPost < ApplicationRecord
end
def voted?(user, score)
votes.where(creator_id: user.id, score: score).exists?
votes.exists?(creator_id: user.id, score: score)
end
def autoreport_spam
@@ -149,7 +149,7 @@ class ForumPost < ApplicationRecord
def is_original_post?(original_post_id = nil)
if original_post_id
return id == original_post_id
id == original_post_id
else
ForumPost.exists?(["id = ? and id = (select _.id from forum_posts _ where _.topic_id = ? order by _.id asc limit 1)", id, topic_id])
end

17
app/models/forum_post_vote.rb
View File

@@ -7,7 +7,7 @@ class ForumPostVote < ApplicationRecord
scope :up, -> {where(score: 1)}
scope :down, -> {where(score: -1)}
scope :by, ->(user_id) {where(creator_id: user_id)}
scope :excluding_user, ->(user_id) {where("creator_id <> ?", user_id)}
scope :excluding_user, ->(user_id) { where.not(creator_id: user_id) }
def self.visible(user)
where(forum_post: ForumPost.visible(user))
@@ -37,14 +37,13 @@ class ForumPostVote < ApplicationRecord
end
def vote_type
if score == 1
return "up"
elsif score == -1
return "down"
elsif score == 0
return "meh"
else
raise
case score
when 1
"up"
when -1
"down"
when 0
"meh"
end
end

20
app/models/forum_topic.rb
View File

@@ -2,13 +2,13 @@ class ForumTopic < ApplicationRecord
CATEGORIES = {
0 => "General",
1 => "Tags",
2 => "Bugs & Features"
2 => "Bugs & Features",
}
MIN_LEVELS = {
None: 0,
Moderator: User::Levels::MODERATOR,
Admin: User::Levels::ADMIN
Admin: User::Levels::ADMIN,
}
belongs_to :creator, class_name: "User"
@@ -17,14 +17,14 @@ class ForumTopic < ApplicationRecord
has_many :forum_topic_visits
has_one :forum_topic_visit_by_current_user, -> { where(user_id: CurrentUser.id) }, class_name: "ForumTopicVisit"
has_one :original_post, -> { order(id: :asc) }, class_name: "ForumPost", foreign_key: "topic_id", inverse_of: :topic
has_many :bulk_update_requests, :foreign_key => "forum_topic_id"
has_many :tag_aliases, :foreign_key => "forum_topic_id"
has_many :tag_implications, :foreign_key => "forum_topic_id"
has_many :bulk_update_requests
has_many :tag_aliases
has_many :tag_implications
validates :title, presence: true, length: { maximum: 200 }, if: :title_changed?
validates_associated :original_post
validates_inclusion_of :category_id, :in => CATEGORIES.keys
validates_inclusion_of :min_level, :in => MIN_LEVELS.values
validates :category_id, inclusion: { in: CATEGORIES.keys }
validates :min_level, inclusion: { in: MIN_LEVELS.values }
accepts_nested_attributes_for :original_post
after_update :update_orignal_post
@@ -129,9 +129,9 @@ class ForumTopic < ApplicationRecord
def mark_as_read!(user = CurrentUser.user)
return if user.is_anonymous?
match = ForumTopicVisit.where(:user_id => user.id, :forum_topic_id => id).first
if match
match.update_attribute(:last_read_at, updated_at)
visit = ForumTopicVisit.find_by(user_id: user.id, forum_topic_id: id)
if visit
visit.update!(last_read_at: updated_at)
else
ForumTopicVisit.create(:user_id => user.id, :forum_topic_id => id, :last_read_at => updated_at)
end

2
app/models/ip_ban.rb
View File

@@ -9,7 +9,7 @@ class IpBan < ApplicationRecord
deletable
enum category: {
full: 0,
partial: 100
partial: 100,
}, _suffix: "ban"
def self.visible(user)

2
app/models/mod_action.rb
View File

@@ -53,7 +53,7 @@ class ModAction < ApplicationRecord
ip_ban_undelete: 163,
mass_update: 1000, # XXX unused
bulk_revert: 1001, # XXX unused
other: 2000
other: 2000,
}
def self.visible(user)

9
app/models/note.rb
View File

@@ -2,9 +2,14 @@ class Note < ApplicationRecord
class RevertError < StandardError; end
attr_accessor :html_id
belongs_to :post
has_many :versions, -> {order("note_versions.id ASC")}, :class_name => "NoteVersion", :dependent => :destroy
validates_presence_of :x, :y, :width, :height, :body
validates :x, presence: true
validates :y, presence: true
validates :width, presence: true
validates :height, presence: true
validates :body, presence: true
validate :note_within_image
after_save :update_post
after_save :create_version
@@ -95,7 +100,7 @@ class Note < ApplicationRecord
def revert_to(version)
if id != version.note_id
raise RevertError.new("You cannot revert to a previous version of another note.")
raise RevertError, "You cannot revert to a previous version of another note."
end
self.x = version.x

20
app/models/note_version.rb
View File

@@ -11,23 +11,17 @@ class NoteVersion < ApplicationRecord
end
def previous
@previous ||= begin
NoteVersion.where("note_id = ? and version < ?", note_id, version).order("updated_at desc").limit(1).to_a
end
@previous ||= NoteVersion.where("note_id = ? and version < ?", note_id, version).order("updated_at desc").limit(1).to_a
@previous.first
end
def subsequent
@subsequent ||= begin
NoteVersion.where("note_id = ? and version > ?", note_id, version).order("updated_at asc").limit(1).to_a
end
@subsequent ||= NoteVersion.where("note_id = ? and version > ?", note_id, version).order("updated_at asc").limit(1).to_a
@subsequent.first
end
def current
@current ||= begin
NoteVersion.where("note_id = ?", note_id).order("updated_at desc").limit(1).to_a
end
@current ||= NoteVersion.where(note_id: note_id).order("updated_at desc").limit(1).to_a
@current.first
end
@@ -42,17 +36,17 @@ class NoteVersion < ApplicationRecord
end
def was_moved(type)
other = self.send(type)
other = send(type)
x != other.x || y != other.y
end
def was_resized(type)
other = self.send(type)
other = send(type)
width != other.width || height != other.height
end
def was_deleted(type)
other = self.send(type)
other = send(type)
if type == "previous"
!is_active && other.is_active
else
@@ -61,7 +55,7 @@ class NoteVersion < ApplicationRecord
end
def was_undeleted(type)
other = self.send(type)
other = send(type)
if type == "previous"
is_active && !other.is_active
else

22
app/models/pool.rb
View File

@@ -4,14 +4,14 @@ class Pool < ApplicationRecord
array_attribute :post_ids, parse: /\d+/, cast: :to_i
validates_uniqueness_of :name, case_sensitive: false, if: :name_changed?
validates :name, uniqueness: { case_sensitive: false }, if: :name_changed?
validate :validate_name, if: :name_changed?
validates_inclusion_of :category, :in => %w(series collection)
validates :category, inclusion: { in: %w[series collection] }
validate :updater_can_edit_deleted
before_validation :normalize_post_ids
before_validation :normalize_name
after_save :create_version
after_create :synchronize!
after_save :create_version
deletable
@@ -47,9 +47,10 @@ class Pool < ApplicationRecord
q = q.name_matches(params[:name_matches])
end
if params[:category] == "series"
case params[:category]
when "series"
q = q.series
elsif params[:category] == "collection"
when "collection"
q = q.collection
end
@@ -80,7 +81,7 @@ class Pool < ApplicationRecord
def self.named(name)
if name =~ /^\d+$/
where("pools.id = ?", name.to_i)
where(id: name.to_i)
elsif name
where_ilike(:name, normalize_name_for_search(name))
else
@@ -93,11 +94,8 @@ class Pool < ApplicationRecord
end
def versions
if PoolVersion.enabled?
PoolVersion.where("pool_id = ?", id).order("id asc")
else
raise "Archive service not configured"
end
raise NotImplementedError, "Archive service not configured" unless PoolVersion.enabled?
PoolVersion.where(pool_id: id).order("id asc")
end
def is_series?
@@ -126,7 +124,7 @@ class Pool < ApplicationRecord
def revert_to!(version)
if id != version.pool_id
raise RevertError.new("You cannot revert to a previous version of another pool.")
raise RevertError, "You cannot revert to a previous version of another pool."
end
self.post_ids = version.post_ids

26
app/models/pool_version.rb
View File

@@ -18,7 +18,7 @@ class PoolVersion < ApplicationRecord
end
def for_user(user_id)
where("updater_id = ?", user_id)
where(updater_id: user_id)
end
def for_post_id(post_id)
@@ -65,7 +65,7 @@ class PoolVersion < ApplicationRecord
def self.queue(pool, updater, updater_ip_addr)
# queue updates to sqs so that if archives goes down for whatever reason it won't
# block pool updates
raise NotImplementedError.new("Archive service is not configured.") if !enabled?
raise NotImplementedError, "Archive service is not configured." if !enabled?
json = {
pool_id: pool.id,
@@ -93,23 +93,17 @@ class PoolVersion < ApplicationRecord
end
def previous
@previous ||= begin
PoolVersion.where("pool_id = ? and version < ?", pool_id, version).order("version desc").limit(1).to_a
end
@previous ||= PoolVersion.where("pool_id = ? and version < ?", pool_id, version).order("version desc").limit(1).to_a
@previous.first
end
def subsequent
@subsequent ||= begin
PoolVersion.where("pool_id = ? and version > ?", pool_id, version).order("version asc").limit(1).to_a
end
@subsequent ||= PoolVersion.where("pool_id = ? and version > ?", pool_id, version).order("version asc").limit(1).to_a
@subsequent.first
end
def current
@current ||= begin
PoolVersion.where("pool_id = ?", pool_id).order("version desc").limit(1).to_a
end
@current ||= PoolVersion.where(pool_id: pool_id).order("version desc").limit(1).to_a
@current.first
end
@@ -126,12 +120,12 @@ class PoolVersion < ApplicationRecord
end
def posts_changed(type)
other = self.send(type)
other = send(type)
((post_ids - other.post_ids) | (other.post_ids - post_ids)).length.positive?
end
def was_deleted(type)
other = self.send(type)
other = send(type)
if type == "previous"
is_deleted && !other.is_deleted
else
@@ -140,7 +134,7 @@ class PoolVersion < ApplicationRecord
end
def was_undeleted(type)
other = self.send(type)
other = send(type)
if type == "previous"
!is_deleted && other.is_deleted
else
@@ -149,7 +143,7 @@ class PoolVersion < ApplicationRecord
end
def was_activated(type)
other = self.send(type)
other = send(type)
if type == "previous"
is_active && !other.is_active
else
@@ -158,7 +152,7 @@ class PoolVersion < ApplicationRecord
end
def was_deactivated(type)
other = self.send(type)
other = send(type)
if type == "previous"
!is_active && other.is_active
else

43
app/models/post.rb
View File

@@ -18,8 +18,8 @@ class Post < ApplicationRecord
before_validation :parse_pixiv_id
before_validation :blank_out_nonexistent_parents
before_validation :remove_parent_loops
validates_uniqueness_of :md5, :on => :create, message: ->(obj, data) { "duplicate: #{Post.find_by_md5(obj.md5).id}"}
validates_inclusion_of :rating, in: %w(s q e), message: "rating must be s, q, or e"
validates :md5, uniqueness: { message: ->(post, _data) { "duplicate: #{Post.find_by_md5(post.md5).id}" }}, on: :create
validates :rating, inclusion: { in: %w[s q e], message: "rating must be s, q, or e" }
validates :source, length: { maximum: 1200 }
validate :added_tags_are_valid
validate :removed_tags_are_valid
@@ -79,8 +79,8 @@ class Post < ApplicationRecord
module ClassMethods
def delete_files(post_id, md5, file_ext, force: false)
if Post.where(md5: md5).exists? && !force
raise DeletionError.new("Files still in use; skipping deletion.")
if Post.exists?(md5: md5) && !force
raise DeletionError, "Files still in use; skipping deletion."
end
Danbooru.config.storage_manager.delete_file(post_id, md5, file_ext, :original)
@@ -302,7 +302,7 @@ class Post < ApplicationRecord
flag = flags.create(reason: reason, is_deletion: is_deletion, creator: CurrentUser.user)
if flag.errors.any?
raise PostFlag::Error.new(flag.errors.full_messages.join("; "))
raise PostFlag::Error, flag.errors.full_messages.join("; ")
end
end
@@ -311,7 +311,7 @@ class Post < ApplicationRecord
end
def disapproved_by?(user)
PostDisapproval.where(:user_id => user.id, :post_id => id).exists?
PostDisapproval.exists?(user_id: user.id, post_id: id)
end
def autoban
@@ -353,7 +353,7 @@ class Post < ApplicationRecord
end
def source_domain
return "" unless source =~ %r!\Ahttps?://!i
return "" unless source =~ %r{\Ahttps?://}i
url = Addressable::URI.parse(normalized_source)
url.domain
@@ -400,11 +400,11 @@ class Post < ApplicationRecord
end
def set_tag_count(category, tagcount)
self.send("tag_count_#{category}=", tagcount)
send("tag_count_#{category}=", tagcount)
end
def inc_tag_count(category)
set_tag_count(category, self.send("tag_count_#{category}") + 1)
set_tag_count(category, send("tag_count_#{category}") + 1)
end
def set_tag_counts
@@ -469,7 +469,7 @@ class Post < ApplicationRecord
normalized_tags = filter_metatags(normalized_tags)
normalized_tags = TagAlias.to_aliased(normalized_tags)
normalized_tags = remove_negated_tags(normalized_tags)
normalized_tags = %w(tagme) if normalized_tags.empty?
normalized_tags = %w[tagme] if normalized_tags.empty?
normalized_tags = add_automatic_tags(normalized_tags)
normalized_tags = remove_invalid_tags(normalized_tags)
normalized_tags = Tag.convert_cosplay_tags(normalized_tags)
@@ -496,11 +496,11 @@ class Post < ApplicationRecord
@negated_tags, tags = tags.partition {|x| x =~ /\A-/i}
@negated_tags = @negated_tags.map {|x| x[1..-1]}
@negated_tags = TagAlias.to_aliased(@negated_tags)
return tags - @negated_tags
tags - @negated_tags
end
def add_automatic_tags(tags)
tags -= %w(incredibly_absurdres absurdres highres lowres huge_filesize flash)
tags -= %w[incredibly_absurdres absurdres highres lowres huge_filesize flash]
if has_dimensions?
if image_width >= 10_000 || image_height >= 10_000
@@ -549,7 +549,7 @@ class Post < ApplicationRecord
tags -= ["animated_png"]
end
return tags
tags
end
def apply_casesensitive_metatags(tags)
@@ -574,7 +574,8 @@ class Post < ApplicationRecord
end
end
end
return tags
tags
end
def filter_metatags(tags)
@@ -582,7 +583,7 @@ class Post < ApplicationRecord
tags = apply_categorization_metatags(tags)
@post_metatags, tags = tags.partition {|x| x =~ /\A(?:-pool|pool|newpool|fav|-fav|child|-child|-favgroup|favgroup|upvote|downvote|status|-status|disapproved):/i}
apply_pre_metatags
return tags
tags
end
def apply_categorization_metatags(tags)
@@ -1043,7 +1044,7 @@ class Post < ApplicationRecord
def revert_to(target)
if id != target.post_id
raise RevertError.new("You cannot revert to a previous version of another post.")
raise RevertError, "You cannot revert to a previous version of another post."
end
self.tag_string = target.tags
@@ -1359,11 +1360,9 @@ class Post < ApplicationRecord
end
def updater_can_change_rating
if rating_changed? && is_rating_locked?
# Don't forbid changes if the rating lock was just now set in the same update.
if !is_rating_locked_changed?
errors.add(:rating, "is locked and cannot be changed. Unlock the post first.")
end
# Don't forbid changes if the rating lock was just now set in the same update.
if rating_changed? && is_rating_locked? && !is_rating_locked_changed?
errors.add(:rating, "is locked and cannot be changed. Unlock the post first.")
end
end
@@ -1401,7 +1400,7 @@ class Post < ApplicationRecord
def has_artist_tag
return if !new_record?
return if source !~ %r!\Ahttps?://!
return if source !~ %r{\Ahttps?://}
return if has_tag?("artist_request") || has_tag?("official_art")
return if tags.any?(&:artist?)
return if Sources::Strategies.find(source).is_a?(Sources::Strategies::Null)

2
app/models/post_appeal.rb
View File

@@ -10,7 +10,7 @@ class PostAppeal < ApplicationRecord
enum status: {
pending: 0,
succeeded: 1,
rejected: 2
rejected: 2,
}
scope :expired, -> { pending.where("post_appeals.created_at < ?", Danbooru.config.moderation_period.ago) }

2
app/models/post_approval.rb
View File

@@ -20,7 +20,7 @@ class PostApproval < ApplicationRecord
errors.add(:base, "You cannot approve a post you uploaded")
end
if post.approver == user || post.approvals.where(user: user).exists?
if post.approver == user || post.approvals.exists?(user: user)
errors.add(:base, "You have previously approved this post and cannot approve it again")
end
end

2
app/models/post_disapproval.rb
View File

@@ -5,7 +5,7 @@ class PostDisapproval < ApplicationRecord
belongs_to :post
belongs_to :user
validates :user, uniqueness: { scope: :post, message: "have already hidden this post" }
validates_inclusion_of :reason, in: REASONS
validates :reason, inclusion: { in: REASONS }
validate :validate_disapproval
scope :with_message, -> { where.not(message: nil) }

11
app/models/post_event.rb
View File

@@ -4,6 +4,7 @@ class PostEvent
include ActiveModel::Serializers::Xml
attr_accessor :event
delegate :created_at, to: :event
def self.find_for_post(post_id)
@@ -62,11 +63,11 @@ class PostEvent
def attributes
{
"creator_id": nil,
"created_at": nil,
"reason": nil,
"status": nil,
"type": nil
creator_id: nil,
created_at: nil,
reason: nil,
status: nil,
type: nil,
}
end

2
app/models/post_flag.rb
View File

@@ -18,7 +18,7 @@ class PostFlag < ApplicationRecord
enum status: {
pending: 0,
succeeded: 1,
rejected: 2
rejected: 2,
}
scope :by_users, -> { where.not(creator: User.system) }

2
app/models/post_replacement.rb
View File

@@ -9,7 +9,7 @@ class PostReplacement < ApplicationRecord
def initialize_fields
self.creator = CurrentUser.user
self.original_url = post.source
self.tags = post.tag_string + " " + self.tags.to_s
self.tags = "#{post.tag_string} #{tags}"
self.old_file_ext = post.file_ext
self.old_file_size = post.file_size

31
app/models/post_version.rb
View File

@@ -81,7 +81,7 @@ class PostVersion < ApplicationRecord
def queue(post)
# queue updates to sqs so that if archives goes down for whatever reason it won't
# block post updates
raise NotImplementedError.new("Archive service is not configured") if !enabled?
raise NotImplementedError, "Archive service is not configured" if !enabled?
json = {
"post_id" => post.id,
@@ -92,7 +92,7 @@ class PostVersion < ApplicationRecord
"updater_ip_addr" => CurrentUser.ip_addr.to_s,
"updated_at" => post.updated_at.try(:iso8601),
"created_at" => post.created_at.try(:iso8601),
"tags" => post.tag_string
"tags" => post.tag_string,
}
msg = "add post version\n#{json.to_json}"
sqs_service.send_message(msg, message_group_id: "post:#{post.id}")
@@ -117,25 +117,21 @@ class PostVersion < ApplicationRecord
# HACK: if all the post versions for this post have already been preloaded,
# we can use that to avoid a SQL query.
if association(:post).loaded? && post && post.association(:versions).loaded?
ver = [post.versions.sort_by(&:version).reverse.find { |v| v.version < version }]
[post.versions.sort_by(&:version).reverse.find { |v| v.version < version }]
else
ver = PostVersion.where("post_id = ? and version < ?", post_id, version).order("version desc").limit(1).to_a
PostVersion.where("post_id = ? and version < ?", post_id, version).order("version desc").limit(1).to_a
end
end
@previous.first
end
def subsequent
@subsequent ||= begin
PostVersion.where("post_id = ? and version > ?", post_id, version).order("version asc").limit(1).to_a
end
@subsequent ||= PostVersion.where("post_id = ? and version > ?", post_id, version).order("version asc").limit(1).to_a
@subsequent.first
end
def current
@current ||= begin
PostVersion.where("post_id = ?", post_id).order("version desc").limit(1).to_a
end
@current ||= PostVersion.where(post_id: post_id).order("version desc").limit(1).to_a
@current.first
end
@@ -167,11 +163,11 @@ class PostVersion < ApplicationRecord
def changes
delta = {
:added_tags => added_tags,
:removed_tags => removed_tags,
:obsolete_removed_tags => [],
:obsolete_added_tags => [],
:unchanged_tags => []
added_tags: added_tags,
removed_tags: removed_tags,
obsolete_removed_tags: [],
obsolete_added_tags: [],
unchanged_tags: [],
}
return delta if post.nil?
@@ -252,9 +248,10 @@ class PostVersion < ApplicationRecord
removed = changes[:removed_tags] - changes[:obsolete_removed_tags]
added.each do |tag|
if tag =~ /^source:/
case tag
when /^source:/
post.source = ""
elsif tag =~ /^parent:/
when /^parent:/
post.parent_id = nil
else
escaped_tag = Regexp.escape(tag)

7
app/models/saved_search.rb
View File

@@ -3,6 +3,7 @@ class SavedSearch < ApplicationRecord
QUERY_LIMIT = 1000
attr_reader :disable_labels
belongs_to :user
normalize :query, :normalize_query
@@ -146,7 +147,7 @@ class SavedSearch < ApplicationRecord
PostQueryBuilder.new(query.to_s).normalized_query(sort: false).to_s
end
def queries_for(user_id, label: nil, options: {})
def queries_for(user_id, label: nil)
searches = SavedSearch.where(user_id: user_id)
searches = searches.labeled(label) if label.present?
queries = searches.map(&:normalized_query)
@@ -167,8 +168,8 @@ class SavedSearch < ApplicationRecord
end
def rewrite_query(old_name, new_name)
self.query.gsub!(/(?:\A| )([-~])?#{Regexp.escape(old_name)}(?: |\z)/i) { " #{$1}#{new_name} " }
self.query.strip!
query.gsub!(/(?:\A| )([-~])?#{Regexp.escape(old_name)}(?: |\z)/i) { " #{$1}#{new_name} " }
query.strip!
end
end

20
app/models/tag.rb
View File

@@ -11,7 +11,7 @@ class Tag < ApplicationRecord
validates :name, tag_name: true, uniqueness: true, on: :create
validates :name, tag_name: true, on: :name
validates_inclusion_of :category, in: TagCategory.category_ids
validates :category, inclusion: { in: TagCategory.category_ids }
after_save :update_category_cache, if: :saved_change_to_category?
after_save :update_category_post_counts, if: :saved_change_to_category?
@@ -21,13 +21,13 @@ class Tag < ApplicationRecord
module ApiMethods
def to_legacy_json
return {
"name" => name,
"id" => id,
"created_at" => created_at.try(:strftime, "%Y-%m-%d %H:%M"),
"count" => post_count,
"type" => category,
"ambiguous" => false
{
name: name,
id: id,
created_at: created_at.try(:strftime, "%Y-%m-%d %H:%M"),
count: post_count,
type: category,
ambiguous: false,
}.to_json
end
end
@@ -255,7 +255,7 @@ class Tag < ApplicationRecord
def abbreviation_matches(abbrev)
abbrev = abbrev.downcase.delete_prefix("/")
return none if abbrev !~ /\A[a-z0-9\*]*\z/
return none if abbrev !~ /\A[a-z0-9*]*\z/
where("regexp_replace(tags.name, ?, '\\1', 'g') LIKE ?", ABBREVIATION_REGEXP.source, abbrev.to_escaped_for_sql_like)
end
@@ -309,7 +309,7 @@ class Tag < ApplicationRecord
def names_matches_with_aliases(name, limit)
name = normalize_name(name)
wildcard_name = name + '*'
wildcard_name = "#{name}*"
query1 =
Tag

5
app/models/tag_relationship.rb
View File

@@ -21,7 +21,8 @@ class TagRelationship < ApplicationRecord
before_validation :normalize_names
validates :status, inclusion: { in: %w[active deleted retired] }
validates_presence_of :antecedent_name, :consequent_name
validates :antecedent_name, presence: true
validates :consequent_name, presence: true
validates :approver, presence: { message: "must exist" }, if: -> { approver_id.present? }
validates :forum_topic, presence: { message: "must exist" }, if: -> { forum_topic_id.present? }
validate :antecedent_and_consequent_are_different
@@ -110,7 +111,7 @@ class TagRelationship < ApplicationRecord
end
def self.approve!(antecedent_name:, consequent_name:, approver:, forum_topic: nil)
ProcessTagRelationshipJob.perform_later(class_name: self.name, approver: approver, antecedent_name: antecedent_name, consequent_name: consequent_name, forum_topic: forum_topic)
ProcessTagRelationshipJob.perform_later(class_name: name, approver: approver, antecedent_name: antecedent_name, consequent_name: consequent_name, forum_topic: forum_topic)
end
def self.model_restriction(table)

9
app/models/upload.rb
View File

@@ -62,13 +62,14 @@ class Upload < ApplicationRecord
end
attr_accessor :as_pending, :replaced_post, :file
belongs_to :uploader, :class_name => "User"
belongs_to :post, optional: true
before_validation :initialize_attributes, on: :create
before_validation :assign_rating_from_tags
# validates :source, format: { with: /\Ahttps?/ }, if: ->(record) {record.file.blank?}, on: :create
validates :rating, inclusion: { in: %w(q e s) }, allow_nil: true
validates :rating, inclusion: { in: %w[q e s] }, allow_nil: true
validates :md5, confirmation: true, if: ->(rec) { rec.md5_confirmation.present? }
validates_with FileValidator, on: :file
serialize :context, JSON
@@ -109,7 +110,7 @@ class Upload < ApplicationRecord
def delete_files
# md5 is blank if the upload errored out before downloading the file.
if is_completed? || md5.blank? || Upload.where(md5: md5).exists? || Post.where(md5: md5).exists?
if is_completed? || md5.blank? || Upload.exists?(md5: md5) || Post.exists?(md5: md5)
return
end
@@ -170,7 +171,7 @@ class Upload < ApplicationRecord
source = source.unicode_normalize(:nfc)
# percent encode unicode characters in urls
if source =~ %r!\Ahttps?://!i
if source =~ %r{\Ahttps?://}i
source = Addressable::URI.normalized_encode(source) rescue source
end
@@ -178,7 +179,7 @@ class Upload < ApplicationRecord
end
def source_url
return nil unless source =~ %r!\Ahttps?://!i
return nil unless source =~ %r{\Ahttps?://}i
Addressable::URI.heuristic_parse(source) rescue nil
end
end

34
app/models/user.rb
View File

@@ -1,5 +1,3 @@
require 'digest/sha1'
class User < ApplicationRecord
class Error < StandardError; end
class PrivilegeError < StandardError; end
@@ -17,10 +15,7 @@ class User < ApplicationRecord
end
# Used for `before_action :<role>_only`. Must have a corresponding `is_<role>?` method.
Roles = Levels.constants.map(&:downcase) + [
:banned,
:approver
]
Roles = Levels.constants.map(&:downcase) + %i[banned approver]
# candidates for removal:
# - enable_post_navigation (disabled by 700)
@@ -36,7 +31,7 @@ class User < ApplicationRecord
# - enable_recommended_posts
# - has_mail
# - is_super_voter
BOOLEAN_ATTRIBUTES = %w(
BOOLEAN_ATTRIBUTES = %w[
is_banned
has_mail
receive_email_notifications
@@ -67,7 +62,7 @@ class User < ApplicationRecord
no_feedback
requires_verification
is_verified
)
]
DEFAULT_BLACKLIST = ["spoilers", "guro", "scat", "furry -rating:s"].join("\n")
@@ -104,10 +99,10 @@ class User < ApplicationRecord
after_initialize :initialize_attributes, if: :new_record?
validates :name, user_name: true, on: :create
validates_length_of :password, :minimum => 5, :if => ->(rec) { rec.new_record? || rec.password.present?}
validates_inclusion_of :default_image_size, :in => %w(large original)
validates_inclusion_of :per_page, in: (1..PostSets::Post::MAX_PER_PAGE)
validates_confirmation_of :password
validates :password, length: { minimum: 5 }, if: ->(rec) { rec.new_record? || rec.password.present? }
validates :default_image_size, inclusion: { in: %w[large original] }
validates :per_page, inclusion: { in: (1..PostSets::Post::MAX_PER_PAGE) }
validates :password, confirmation: true
validates :comment_threshold, inclusion: { in: (-100..5) }
before_validation :normalize_blacklisted_tags
before_create :promote_to_owner_if_first_user
@@ -233,13 +228,13 @@ class User < ApplicationRecord
end
def anonymous
user = User.new(name: "Anonymous", level: Levels::ANONYMOUS, created_at: Time.now)
user = User.new(name: "Anonymous", level: Levels::ANONYMOUS, created_at: Time.zone.now)
user.freeze.readonly!
user
end
def level_hash
return {
{
"Restricted" => Levels::RESTRICTED,
"Member" => Levels::MEMBER,
"Gold" => Levels::GOLD,
@@ -247,7 +242,7 @@ class User < ApplicationRecord
"Builder" => Levels::BUILDER,
"Moderator" => Levels::MODERATOR,
"Admin" => Levels::ADMIN,
"Owner" => Levels::OWNER
"Owner" => Levels::OWNER,
}
end
@@ -293,7 +288,7 @@ class User < ApplicationRecord
def promote_to_owner_if_first_user
return if Rails.env.test?
if name != Danbooru.config.system_user && !User.where(level: Levels::OWNER).exists?
if name != Danbooru.config.system_user && !User.exists?(level: Levels::OWNER)
self.level = Levels::OWNER
self.can_approve_posts = true
self.can_upload_free = true
@@ -386,12 +381,12 @@ class User < ApplicationRecord
end
def rewrite_blacklist(old_name, new_name)
self.blacklisted_tags.gsub!(/(?:^| )([-~])?#{Regexp.escape(old_name)}(?: |$)/i) { " #{$1}#{new_name} " }
blacklisted_tags.gsub!(/(?:^| )([-~])?#{Regexp.escape(old_name)}(?: |$)/i) { " #{$1}#{new_name} " }
end
def normalize_blacklisted_tags
return unless blacklisted_tags.present?
self.blacklisted_tags = self.blacklisted_tags.lines.map(&:strip).join("\n")
self.blacklisted_tags = blacklisted_tags.lines.map(&:strip).join("\n")
end
end
@@ -615,7 +610,8 @@ class User < ApplicationRecord
params = params.dup
params[:name_matches] = params.delete(:name) if params[:name].present?
q = search_attributes(params,
q = search_attributes(
params,
:id, :created_at, :updated_at, :name, :level, :post_upload_count,
:post_update_count, :note_update_count, :favorite_count, :posts,
:note_versions, :artist_commentary_versions, :post_appeals,

7
app/models/user_feedback.rb
View File

@@ -1,11 +1,12 @@
class UserFeedback < ApplicationRecord
self.table_name = "user_feedback"
attr_accessor :disable_dmail_notification
belongs_to :user
belongs_to :creator, class_name: "User"
attr_accessor :disable_dmail_notification
validates_presence_of :body, :category
validates_inclusion_of :category, :in => %w(positive negative neutral)
validates :body, presence: true
validates :category, presence: true, inclusion: { in: %w[positive negative neutral] }
after_create :create_dmail, unless: :disable_dmail_notification
after_update(:if => ->(rec) { CurrentUser.id != rec.creator_id}) do |rec|
ModAction.log(%{#{CurrentUser.user.name} updated user feedback for "#{rec.user.name}":#{Routes.user_path(rec.user)}}, :user_feedback_update)

5
app/models/user_name_change_request.rb
View File

@@ -4,7 +4,8 @@ class UserNameChangeRequest < ApplicationRecord
validate :not_limited, on: :create
validates :desired_name, user_name: true, confirmation: true, on: :create
validates_presence_of :original_name, :desired_name
validates :original_name, presence: true
validates :desired_name, presence: true
after_create :update_name!
@@ -28,7 +29,7 @@ class UserNameChangeRequest < ApplicationRecord
end
def not_limited
if UserNameChangeRequest.unscoped.where(user: user).where("created_at >= ?", 1.week.ago).exists?
if UserNameChangeRequest.unscoped.where(user: user).exists?(["created_at >= ?", 1.week.ago])
errors.add(:base, "You can only submit one name change request per week")
end
end

4
app/models/user_upgrade.rb
View File

@@ -5,7 +5,7 @@ class UserUpgrade < ApplicationRecord
enum upgrade_type: {
gold: 0,
platinum: 10,
gold_to_platinum: 20
gold_to_platinum: 20,
}, _suffix: "upgrade"
enum status: {
@@ -175,7 +175,7 @@ class UserUpgrade < ApplicationRecord
country: country,
is_gift: is_gift?,
level: level,
},
}
)
update!(stripe_id: checkout.id)

6
app/models/wiki_page.rb
View File

@@ -118,13 +118,13 @@ class WikiPage < ApplicationRecord
tag_was = Tag.find_by_name(Tag.normalize_name(title_was))
if tag_was.present? && !tag_was.empty?
warnings.add(:base, %!Warning: {{#{title_was}}} still has #{tag_was.post_count} #{"post".pluralize(tag_was.post_count)}. Be sure to move the posts!)
warnings.add(:base, %{Warning: {{#{title_was}}} still has #{tag_was.post_count} #{"post".pluralize(tag_was.post_count)}. Be sure to move the posts})
end
broken_wikis = WikiPage.linked_to(title_was)
if broken_wikis.count > 0
broken_wiki_search = Routes.wiki_pages_path(search: { linked_to: title_was })
warnings.add(:base, %!Warning: [[#{title_was}]] is still linked from "#{broken_wikis.count} #{"other wiki page".pluralize(broken_wikis.count)}":[#{broken_wiki_search}]. Update #{(broken_wikis.count > 1) ? "these wikis" : "this wiki"} to link to [[#{title}]] instead!)
warnings.add(:base, %{Warning: [[#{title_was}]] is still linked from "#{broken_wikis.count} #{"other wiki page".pluralize(broken_wikis.count)}":[#{broken_wiki_search}]. Update #{(broken_wikis.count > 1) ? "these wikis" : "this wiki"} to link to [[#{title}]] instead})
end
end
@@ -136,7 +136,7 @@ class WikiPage < ApplicationRecord
def revert_to(version)
if id != version.wiki_page_id
raise RevertError.new("You cannot revert to a previous version of another wiki page.")
raise RevertError, "You cannot revert to a previous version of another wiki page."
end
self.title = version.title

18
app/models/wiki_page_version.rb
View File

@@ -21,23 +21,17 @@ class WikiPageVersion < ApplicationRecord
end
def previous
@previous ||= begin
WikiPageVersion.where("wiki_page_id = ? and id < ?", wiki_page_id, id).order("id desc").limit(1).to_a
end
@previous ||= WikiPageVersion.where("wiki_page_id = ? and id < ?", wiki_page_id, id).order("id desc").limit(1).to_a
@previous.first
end
def subsequent
@subsequent ||= begin
WikiPageVersion.where("wiki_page_id = ? and id > ?", wiki_page_id, id).order("id asc").limit(1).to_a
end
@subsequent ||= WikiPageVersion.where("wiki_page_id = ? and id > ?", wiki_page_id, id).order("id asc").limit(1).to_a
@subsequent.first
end
def current
@current ||= begin
WikiPageVersion.where("wiki_page_id = ?", wiki_page_id).order("id desc").limit(1).to_a
end
@current ||= WikiPageVersion.where(wiki_page_id: wiki_page_id).order("id desc").limit(1).to_a
@current.first
end
@@ -52,12 +46,12 @@ class WikiPageVersion < ApplicationRecord
end
def other_names_changed(type)
other = self.send(type)
other = send(type)
((other_names - other.other_names) | (other.other_names - other_names)).length.positive?
end
def was_deleted(type)
other = self.send(type)
other = send(type)
if type == "previous"
is_deleted && !other.is_deleted
else
@@ -66,7 +60,7 @@ class WikiPageVersion < ApplicationRecord
end
def was_undeleted(type)
other = self.send(type)
other = send(type)
if type == "previous"
!is_deleted && other.is_deleted
else