mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-18 07:38:42 +00:00
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.
This commit is contained in:
parent
fc145de238
commit
c9e8e1739c
|
@ -135,15 +135,15 @@ class AccountsController < ApplicationController
|
|||
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
|
||||
|
|
|
@ -43,7 +43,7 @@ class ApplicationController < ActionController::Base
|
|||
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?
|
||||
|
|
|
@ -37,7 +37,7 @@ class MediaProxyController < ApplicationController
|
|||
end
|
||||
|
||||
def version
|
||||
if request.path.ends_with?('/small')
|
||||
if request.path.end_with?('/small')
|
||||
:small
|
||||
else
|
||||
:original
|
||||
|
|
|
@ -88,7 +88,7 @@ class Webfinger
|
|||
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 @@ class Webfinger
|
|||
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"
|
||||
|
|
|
@ -7,7 +7,7 @@ module ActionDispatch
|
|||
# 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 @@ ActionDispatch::Cookies::CookieJar.prepend(ActionDispatch::CookieJarExtensions)
|
|||
module Rack
|
||||
module SessionPersistedExtensions
|
||||
def security_matches?(request, options)
|
||||
request.host.ends_with?('.onion') || super
|
||||
request.host.end_with?('.onion') || super
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue