From c7492343ce5a572c68a994a82e2d02d53d9647ca Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Thu, 3 May 2018 18:53:35 -0500
Subject: [PATCH] String: add truthy? & falsy? core extensions.

* Add `truthy?` and `falsy?` core extensions to String.

* Use `truthy?` and `falsy?` to replace ad-hoc parsing of boolean
  parameters in various places.
---
 app/logical/tag_alias_request.rb       |  6 +---
 app/logical/tag_implication_request.rb |  6 +---
 app/models/artist.rb                   |  6 ++--
 app/models/artist_commentary.rb        | 44 +++++++-------------------
 app/models/ban.rb                      |  6 ++--
 app/models/bulk_update_request.rb      |  6 +---
 app/models/dmail.rb                    | 11 ++++---
 app/models/post.rb                     | 26 ++++++---------
 app/models/post_appeal.rb              |  7 ++--
 app/models/saved_search.rb             |  6 +---
 app/models/tag.rb                      | 10 +++---
 app/models/upload.rb                   |  8 ++---
 app/models/user.rb                     |  6 ++--
 app/models/wiki_page.rb                |  8 ++---
 config/initializers/core_extensions.rb |  8 +++++
 15 files changed, 62 insertions(+), 102 deletions(-)

diff --git a/app/logical/tag_alias_request.rb b/app/logical/tag_alias_request.rb
index 394c79c8c..3b369cea2 100644
--- a/app/logical/tag_alias_request.rb
+++ b/app/logical/tag_alias_request.rb
@@ -75,10 +75,6 @@ class TagAliasRequest
   end
 
   def skip_secondary_validations=(v)
-    if v == "1" or v == true or v =~ /t/
-      @skip_secondary_validations = true
-    else
-      @skip_secondary_validations = false
-    end
+    @skip_secondary_validations = v.to_s.truthy?
   end
 end
diff --git a/app/logical/tag_implication_request.rb b/app/logical/tag_implication_request.rb
index 6262a85c0..ddfd984af 100644
--- a/app/logical/tag_implication_request.rb
+++ b/app/logical/tag_implication_request.rb
@@ -75,10 +75,6 @@ class TagImplicationRequest
   end
 
   def skip_secondary_validations=(v)
-    if v == "1" or v == true or v =~ /t/
-      @skip_secondary_validations = true
-    else
-      @skip_secondary_validations = false
-    end
+    @skip_secondary_validations = v.to_s.truthy?
   end
 end
diff --git a/app/models/artist.rb b/app/models/artist.rb
index bab1e0c39..2bdc9922c 100644
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -587,13 +587,13 @@ class Artist < ApplicationRecord
       end
 
       # XXX deprecated, remove at some point.
-      if params[:empty_only] == "true"
+      if params[:empty_only].to_s.truthy?
         params[:has_tag] = "false"
       end
 
-      if params[:has_tag] == "true"
+      if params[:has_tag].to_s.truthy?
         q = q.joins(:tag).where("tags.post_count > 0")
-      elsif params[:has_tag] == "false"
+      elsif params[:has_tag].to_s.falsy?
         q = q.includes(:tag).where("tags.name IS NULL OR tags.post_count <= 0").references(:tags)
       end
 
diff --git a/app/models/artist_commentary.rb b/app/models/artist_commentary.rb
index 39fd8f607..16547ae77 100644
--- a/app/models/artist_commentary.rb
+++ b/app/models/artist_commentary.rb
@@ -41,15 +41,15 @@ class ArtistCommentary < ApplicationRecord
         q = q.where(post_id: params[:post_id].split(",").map(&:to_i))
       end
 
-      if params[:original_present] == "yes"
+      if params[:original_present].to_s.truthy?
         q = q.where("(original_title != '') or (original_description != '')")
-      elsif params[:original_present] == "no"
+      elsif params[:original_present].to_s.falsy?
         q = q.where("(original_title = '') and (original_description = '')")
       end
 
-      if params[:translated_present] == "yes"
+      if params[:translated_present].to_s.truthy?
         q = q.where("(translated_title != '') or (translated_description != '')")
-      elsif params[:translated_present] == "no"
+      elsif params[:translated_present].to_s.falsy?
         q = q.where("(translated_title = '') and (translated_description = '')")
       end
 
@@ -84,37 +84,17 @@ class ArtistCommentary < ApplicationRecord
   end
 
   def tag_post
-    if remove_commentary_tag == "1"
-      post.remove_tag("commentary")
-    end
+    post.remove_tag("commentary") if remove_commentary_tag.to_s.truthy?
+    post.add_tag("commentary") if add_commentary_tag.to_s.truthy?
 
-    if add_commentary_tag == "1"
-      post.add_tag("commentary")
-    end
+    post.remove_tag("commentary_request") if remove_commentary_request_tag.to_s.truthy?
+    post.add_tag("commentary_request") if add_commentary_request_tag.to_s.truthy?
 
-    if remove_commentary_request_tag == "1"
-      post.remove_tag("commentary_request")
-    end
+    post.remove_tag("check_commentary") if remove_commentary_check_tag.to_s.truthy?
+    post.add_tag("check_commentary") if add_commentary_check_tag.to_s.truthy?
 
-    if add_commentary_request_tag == "1"
-      post.add_tag("commentary_request")
-    end
-
-    if remove_commentary_check_tag == "1"
-      post.remove_tag("check_commentary")
-    end
-
-    if add_commentary_check_tag == "1"
-      post.add_tag("check_commentary")
-    end
-
-    if remove_partial_commentary_tag == "1"
-      post.remove_tag("partial_commentary")
-    end
-
-    if add_partial_commentary_tag == "1"
-      post.add_tag("partial_commentary")
-    end
+    post.remove_tag("partial_commentary") if remove_partial_commentary_tag.to_s.truthy?
+    post.add_tag("partial_commentary") if add_partial_commentary_tag.to_s.truthy?
 
     post.save if post.tag_string_changed?
   end
diff --git a/app/models/ban.rb b/app/models/ban.rb
index fc141a479..387bd1d4c 100644
--- a/app/models/ban.rb
+++ b/app/models/ban.rb
@@ -47,10 +47,8 @@ class Ban < ApplicationRecord
       q = q.reason_matches(params[:reason_matches])
     end
 
-    case params[:expired]
-    when "true"  then q = q.expired
-    when "false" then q = q.unexpired
-    end
+    q = q.expired if params[:expired].to_s.truthy?
+    q = q.unexpired if params[:expired].to_s.falsy?
 
     case params[:order]
     when "expires_at_desc"
diff --git a/app/models/bulk_update_request.rb b/app/models/bulk_update_request.rb
index f0afbc405..60af20c07 100644
--- a/app/models/bulk_update_request.rb
+++ b/app/models/bulk_update_request.rb
@@ -205,10 +205,6 @@ class BulkUpdateRequest < ApplicationRecord
   end
 
   def skip_secondary_validations=(v)
-    if v == "1" or v == true
-      @skip_secondary_validations = true
-    else
-      @skip_secondary_validations = false
-    end
+    @skip_secondary_validations = v.to_s.truthy?
   end
 end
diff --git a/app/models/dmail.rb b/app/models/dmail.rb
index bd17e0091..ee09f8c83 100644
--- a/app/models/dmail.rb
+++ b/app/models/dmail.rb
@@ -171,6 +171,10 @@ class Dmail < ApplicationRecord
       end
     end
 
+    def read
+      where(is_read: true)
+    end
+
     def unread
       where("is_read = false and is_deleted = false")
     end
@@ -220,11 +224,8 @@ class Dmail < ApplicationRecord
         q = q.where("is_spam = ?", false)
       end
 
-      if params[:read] == "true"
-        q = q.where("is_read = true")
-      elsif params[:read] == "false"
-        q = q.unread
-      end
+      q = q.read if params[:read].to_s.truthy?
+      q = q.unread if params[:read].to_s.falsy?
 
       q.apply_default_order(params)
     end
diff --git a/app/models/post.rb b/app/models/post.rb
index e538e4439..8dd66a535 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1820,28 +1820,20 @@ class Post < ApplicationRecord
   end
 
   def mark_as_translated(params)
-    tags = self.tag_array.dup
+    add_tag("check_translation") if params["check_translation"].to_s.truthy?
+    remove_tag("check_translation") if params["check_translation"].to_s.falsy?
 
-    if params["check_translation"] == "1"
-      tags << "check_translation"
-    elsif params["check_translation"] == "0"
-      tags -= ["check_translation"]
-    end
-    if params["partially_translated"] == "1"
-      tags << "partially_translated"
-    elsif params["partially_translated"] == "0"
-      tags -= ["partially_translated"]
-    end
+    add_tag("partially_translated") if params["partially_translated"].to_s.truthy?
+    remove_tag("partially_translated") if params["partially_translated"].to_s.falsy?
 
-    if params["check_translation"] == "1" || params["partially_translated"] == "1"
-      tags << "translation_request"
-      tags -= ["translated"]
+    if has_tag?("check_translation") || has_tag?("partially_translated")
+      add_tag("translation_request")
+      remove_tag("translated")
     else
-      tags << "translated"
-      tags -= ["translation_request"]
+      add_tag("translated")
+      remove_tag("translation_request")
     end
 
-    self.tag_string = tags.join(" ")
     save
   end
 
diff --git a/app/models/post_appeal.rb b/app/models/post_appeal.rb
index 13a1eb1c1..458c32a0b 100644
--- a/app/models/post_appeal.rb
+++ b/app/models/post_appeal.rb
@@ -65,11 +65,8 @@ class PostAppeal < ApplicationRecord
         q = q.post_tags_match(params[:post_tags_match])
       end
 
-      if params[:is_resolved] == "true"
-        q = q.resolved
-      elsif params[:is_resolved] == "false"
-        q = q.unresolved
-      end
+      q = q.resolved if params[:is_resolved].to_s.truthy?
+      q = q.unresolved if params[:is_resolved].to_s.falsy?
 
       q.apply_default_order(params)
     end
diff --git a/app/models/saved_search.rb b/app/models/saved_search.rb
index d57951a05..23006c721 100644
--- a/app/models/saved_search.rb
+++ b/app/models/saved_search.rb
@@ -130,10 +130,6 @@ class SavedSearch < ApplicationRecord
   end
 
   def disable_labels=(value)
-    CurrentUser.update(disable_categorized_saved_searches: true) if value == "1"
-  end
-
-  def disable_labels=(value)
-    CurrentUser.update(disable_categorized_saved_searches: true) if value == "1"
+    CurrentUser.update(disable_categorized_saved_searches: true) if value.to_s.truthy?
   end
 end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 3d2291c5a..deaeab9ce 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -887,19 +887,19 @@ class Tag < ApplicationRecord
         q = q.where("category = ?", params[:category])
       end
 
-      if params[:hide_empty].blank? || params[:hide_empty] != "no"
+      if params[:hide_empty].blank? || params[:hide_empty].to_s.truthy?
         q = q.where("post_count > 0")
       end
 
-      if params[:has_wiki] == "yes"
+      if params[:has_wiki].to_s.truthy?
         q = q.joins(:wiki_page).where("wiki_pages.is_deleted = false")
-      elsif params[:has_wiki] == "no"
+      elsif params[:has_wiki].to_s.falsy?
         q = q.joins("LEFT JOIN wiki_pages ON tags.name = wiki_pages.title").where("wiki_pages.title IS NULL OR wiki_pages.is_deleted = true")
       end
 
-      if params[:has_artist] == "yes"
+      if params[:has_artist].to_s.truthy?
         q = q.joins("INNER JOIN artists ON tags.name = artists.name").where("artists.is_active = true")
-      elsif params[:has_artist] == "no"
+      elsif params[:has_artist].to_s.falsy?
         q = q.joins("LEFT JOIN artists ON tags.name = artists.name").where("artists.name IS NULL OR artists.is_active = false")
       end
 
diff --git a/app/models/upload.rb b/app/models/upload.rb
index 6a4a9a18b..cb98e7ef5 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -426,9 +426,9 @@ class Upload < ApplicationRecord
         q = q.attribute_matches(:post_id, params[:post_id])
       end
 
-      if params[:has_post] == "yes"
+      if params[:has_post].to_s.truthy?
         q = q.where.not(post_id: nil)
-      elsif params[:has_post] == "no"
+      elsif params[:has_post].to_s.falsy?
         q = q.where(post_id: nil)
       end
 
@@ -490,10 +490,10 @@ class Upload < ApplicationRecord
   end
 
   def upload_as_pending?
-    as_pending == "1"
+    as_pending.to_s.truthy?
   end
 
   def include_artist_commentary?
-    include_artist_commentary == "1"
+    include_artist_commentary.to_s.truthy?
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index c80895cd5..053199c9c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -843,10 +843,10 @@ class User < ApplicationRecord
       [:can_approve_posts, :can_upload_free, :is_super_voter].each do |x|
         if params[x].present?
           attr_idx = BOOLEAN_ATTRIBUTES.index(x.to_s)
-          if params[x] == "true"
+          if params[x].to_s.truthy?
             bitprefs_include ||= "0"*bitprefs_length
             bitprefs_include[attr_idx] = '1'
-          elsif params[x] == "false"
+          elsif params[x].to_s.falsy?
             bitprefs_exclude ||= "0"*bitprefs_length
             bitprefs_exclude[attr_idx] = '1'
           end
@@ -865,7 +865,7 @@ class User < ApplicationRecord
                     {:len => bitprefs_length, :bits => bitprefs_exclude})
       end
 
-      if params[:current_user_first] == "true" && !CurrentUser.is_anonymous?
+      if params[:current_user_first].to_s.truthy? && !CurrentUser.is_anonymous?
         q = q.order("id = #{CurrentUser.user.id.to_i} desc")
       end
       
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 016d4d70a..733adabdc 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -82,13 +82,13 @@ class WikiPage < ApplicationRecord
         q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].tr(" ", "_").mb_chars.downcase)
       end
 
-      if params[:hide_deleted] =~ /y/i
+      if params[:hide_deleted].to_s.truthy?
         q = q.where("is_deleted = false")
       end
 
-      if params[:other_names_present] == "yes"
+      if params[:other_names_present].to_s.truthy?
         q = q.where("other_names is not null and other_names != ''")
-      elsif params[:other_names_present] == "no"
+      elsif params[:other_names_present].to_s.falsy?
         q = q.where("other_names is null or other_names = ''")
       end
 
@@ -165,7 +165,7 @@ class WikiPage < ApplicationRecord
   end
 
   def skip_secondary_validations=(value)
-    @skip_secondary_validations = (value == true || value == "1")
+    @skip_secondary_validations = value.to_s.truthy?
   end
 
   def category_name
diff --git a/config/initializers/core_extensions.rb b/config/initializers/core_extensions.rb
index cc990577f..37d839e6d 100644
--- a/config/initializers/core_extensions.rb
+++ b/config/initializers/core_extensions.rb
@@ -23,6 +23,14 @@ module Danbooru
       def to_escaped_for_tsquery
         "'#{gsub(/\0/, '').gsub(/'/, '\0\0').gsub(/\\/, '\0\0\0\0')}'"
       end
+
+      def truthy?
+        self.match?(/\A(true|t|yes|y|on|1)\z/i)
+      end
+
+      def falsy?
+        self.match?(/\A(false|f|no|n|off|0)\z/i)
+      end
     end
   end
 end