From 6ce3b9d25873cc5a6c4f5bdc1b89a51d71af0a35 Mon Sep 17 00:00:00 2001
From: Justin Tracey <j2tracey@gmail.com>
Date: Fri, 19 Feb 2021 08:56:14 +0000
Subject: [PATCH] replace all instances of "ends_with?" with "end_with?"
 (#15745)

The "ends_with?" method is just a Rails alias of Ruby's "end_with?" method.
Using the latter makes the code less brittle.
---
 app/controllers/accounts_controller.rb       | 6 +++---
 app/controllers/application_controller.rb    | 2 +-
 app/controllers/media_proxy_controller.rb    | 2 +-
 app/lib/webfinger.rb                         | 4 ++--
 lib/action_dispatch/cookie_jar_extensions.rb | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index b902ada090ae02..7753ebccc67f80 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -135,15 +135,15 @@ def pagination_url(max_id: nil, min_id: nil)
   end
 
   def media_requested?
-    request.path.split('.').first.ends_with?('/media') && !tag_requested?
+    request.path.split('.').first.end_with?('/media') && !tag_requested?
   end
 
   def replies_requested?
-    request.path.split('.').first.ends_with?('/with_replies') && !tag_requested?
+    request.path.split('.').first.end_with?('/with_replies') && !tag_requested?
   end
 
   def tag_requested?
-    request.path.split('.').first.ends_with?(Addressable::URI.parse("/tagged/#{params[:tag]}").normalize)
+    request.path.split('.').first.end_with?(Addressable::URI.parse("/tagged/#{params[:tag]}").normalize)
   end
 
   def cached_filtered_status_page
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c9311c1b6c5ec2..5b7eec94f759f2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -43,7 +43,7 @@ def raise_not_found
   private
 
   def https_enabled?
-    Rails.env.production? && !request.path.start_with?('/health') && !request.headers["Host"].ends_with?(".onion")
+    Rails.env.production? && !request.path.start_with?('/health') && !request.headers["Host"].end_with?(".onion")
   end
 
   def authorized_fetch_mode?
diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb
index 0b1d09de935c3c..1b610318d377a4 100644
--- a/app/controllers/media_proxy_controller.rb
+++ b/app/controllers/media_proxy_controller.rb
@@ -37,7 +37,7 @@ def redownload!
   end
 
   def version
-    if request.path.ends_with?('/small')
+    if request.path.end_with?('/small')
       :small
     else
       :original
diff --git a/app/lib/webfinger.rb b/app/lib/webfinger.rb
index 40795a7aa91e7f..e0e022cea0dd92 100644
--- a/app/lib/webfinger.rb
+++ b/app/lib/webfinger.rb
@@ -88,7 +88,7 @@ def webfinger_request(url)
   end
 
   def standard_url
-    if @domain.ends_with? ".onion"
+    if @domain.end_with? ".onion"
       "http://#{@domain}/.well-known/webfinger?resource=#{@uri}"
     else
       "https://#{@domain}/.well-known/webfinger?resource=#{@uri}"
@@ -96,7 +96,7 @@ def standard_url
   end
 
   def host_meta_url
-    if @domain.ends_with? ".onion"
+    if @domain.end_with? ".onion"
       "http://#{@domain}/.well-known/host-meta"
     else
       "https://#{@domain}/.well-known/host-meta"
diff --git a/lib/action_dispatch/cookie_jar_extensions.rb b/lib/action_dispatch/cookie_jar_extensions.rb
index 492c04065d7f8e..1be9053ba6b168 100644
--- a/lib/action_dispatch/cookie_jar_extensions.rb
+++ b/lib/action_dispatch/cookie_jar_extensions.rb
@@ -7,7 +7,7 @@ module CookieJarExtensions
     # Monkey-patch ActionDispatch to serve secure cookies to Tor Hidden Service
     # users. Otherwise, ActionDispatch would drop the cookie over HTTP.
     def write_cookie?(*)
-      request.host.ends_with?('.onion') || super
+      request.host.end_with?('.onion') || super
     end
   end
 end
@@ -17,7 +17,7 @@ def write_cookie?(*)
 module Rack
   module SessionPersistedExtensions
     def security_matches?(request, options)
-      request.host.ends_with?('.onion') || super
+      request.host.end_with?('.onion') || super
     end
   end
 end