From 2d976cf5574297ca4e6c0aa3e68521fb94429577 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 15 Mar 2021 02:20:13 -0500
Subject: [PATCH] posts: remove `has_dimensions?` method.

All posts have non-null width and height now that unsupported filetypes
have been purged.

https://danbooru.donmai.us/forum_topics/18027
---
 app/models/post.rb                            | 42 ++++++++-----------
 .../posts/partials/show/_information.html.erb |  4 +-
 app/views/uploads/index.html.erb              |  4 +-
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 499b73a8e..c578326ae 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -214,10 +214,6 @@ class Post < ApplicationRecord
     def has_preview?
       is_image? || is_video? || is_ugoira?
     end
-
-    def has_dimensions?
-      image_width.present? && image_height.present?
-    end
   end
 
   module ImageMethods
@@ -502,27 +498,25 @@ class Post < ApplicationRecord
     def add_automatic_tags(tags)
       tags -= %w[incredibly_absurdres absurdres highres lowres huge_filesize flash]
 
-      if has_dimensions?
-        if image_width >= 10_000 || image_height >= 10_000
-          tags << "incredibly_absurdres"
-        end
-        if image_width >= 3200 || image_height >= 2400
-          tags << "absurdres"
-        end
-        if image_width >= 1600 || image_height >= 1200
-          tags << "highres"
-        end
-        if image_width <= 500 && image_height <= 500
-          tags << "lowres"
-        end
+      if image_width >= 10_000 || image_height >= 10_000
+        tags << "incredibly_absurdres"
+      end
+      if image_width >= 3200 || image_height >= 2400
+        tags << "absurdres"
+      end
+      if image_width >= 1600 || image_height >= 1200
+        tags << "highres"
+      end
+      if image_width <= 500 && image_height <= 500
+        tags << "lowres"
+      end
 
-        if image_width >= 1024 && image_width.to_f / image_height >= 4
-          tags << "wide_image"
-          tags << "long_image"
-        elsif image_height >= 1024 && image_height.to_f / image_width >= 4
-          tags << "tall_image"
-          tags << "long_image"
-        end
+      if image_width >= 1024 && image_width.to_f / image_height >= 4
+        tags << "wide_image"
+        tags << "long_image"
+      elsif image_height >= 1024 && image_height.to_f / image_width >= 4
+        tags << "tall_image"
+        tags << "long_image"
       end
 
       if file_size >= 10.megabytes
diff --git a/app/views/posts/partials/show/_information.html.erb b/app/views/posts/partials/show/_information.html.erb
index ff295bfc2..33cf1d7d7 100644
--- a/app/views/posts/partials/show/_information.html.erb
+++ b/app/views/posts/partials/show/_information.html.erb
@@ -15,9 +15,7 @@
   <% end %>
   <li id="post-info-size">
     Size: <%= link_to_if policy(post).visible?, "#{number_to_human_size(post.file_size)} .#{post.file_ext}", post.tagged_file_url %>
-    <% if post.has_dimensions? %>
-      (<%= post.image_width %>x<%= post.image_height %>)
-    <% end %>
+    (<%= post.image_width %>x<%= post.image_height %>)
   </li>
   <li id="post-info-source">Source: <%= post_source_tag(post.source, post.normalized_source) %></li>
   <li id="post-info-rating">Rating: <%= post.pretty_rating %></li>
diff --git a/app/views/uploads/index.html.erb b/app/views/uploads/index.html.erb
index 3a85f5888..7effc3ccb 100644
--- a/app/views/uploads/index.html.erb
+++ b/app/views/uploads/index.html.erb
@@ -22,9 +22,7 @@
           <span class="info">
             <strong>Size</strong>
             <%= link_to "#{upload.post.file_size.to_s(:human_size, precision: 4)} #{upload.post.file_ext}", upload.post.file_url %>
-            <% if upload.post.has_dimensions? %>
-              (<%= upload.post.image_width %>x<%= upload.post.image_height %>)
-            <% end %>
+            (<%= upload.post.image_width %>x<%= upload.post.image_height %>)
           </span>
         <% end %>
         <br>