mirror of https://github.com/Siphonay/mastodon
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
|
end
|
||||||
|
|
||||||
def media_requested?
|
def media_requested?
|
||||||
request.path.split('.').first.ends_with?('/media') && !tag_requested?
|
request.path.split('.').first.end_with?('/media') && !tag_requested?
|
||||||
end
|
end
|
||||||
|
|
||||||
def replies_requested?
|
def replies_requested?
|
||||||
request.path.split('.').first.ends_with?('/with_replies') && !tag_requested?
|
request.path.split('.').first.end_with?('/with_replies') && !tag_requested?
|
||||||
end
|
end
|
||||||
|
|
||||||
def tag_requested?
|
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
|
end
|
||||||
|
|
||||||
def cached_filtered_status_page
|
def cached_filtered_status_page
|
||||||
|
|
|
@ -43,7 +43,7 @@ class ApplicationController < ActionController::Base
|
||||||
private
|
private
|
||||||
|
|
||||||
def https_enabled?
|
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
|
end
|
||||||
|
|
||||||
def authorized_fetch_mode?
|
def authorized_fetch_mode?
|
||||||
|
|
|
@ -37,7 +37,7 @@ class MediaProxyController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def version
|
def version
|
||||||
if request.path.ends_with?('/small')
|
if request.path.end_with?('/small')
|
||||||
:small
|
:small
|
||||||
else
|
else
|
||||||
:original
|
:original
|
||||||
|
|
|
@ -88,7 +88,7 @@ class Webfinger
|
||||||
end
|
end
|
||||||
|
|
||||||
def standard_url
|
def standard_url
|
||||||
if @domain.ends_with? ".onion"
|
if @domain.end_with? ".onion"
|
||||||
"http://#{@domain}/.well-known/webfinger?resource=#{@uri}"
|
"http://#{@domain}/.well-known/webfinger?resource=#{@uri}"
|
||||||
else
|
else
|
||||||
"https://#{@domain}/.well-known/webfinger?resource=#{@uri}"
|
"https://#{@domain}/.well-known/webfinger?resource=#{@uri}"
|
||||||
|
@ -96,7 +96,7 @@ class Webfinger
|
||||||
end
|
end
|
||||||
|
|
||||||
def host_meta_url
|
def host_meta_url
|
||||||
if @domain.ends_with? ".onion"
|
if @domain.end_with? ".onion"
|
||||||
"http://#{@domain}/.well-known/host-meta"
|
"http://#{@domain}/.well-known/host-meta"
|
||||||
else
|
else
|
||||||
"https://#{@domain}/.well-known/host-meta"
|
"https://#{@domain}/.well-known/host-meta"
|
||||||
|
|
|
@ -7,7 +7,7 @@ module ActionDispatch
|
||||||
# Monkey-patch ActionDispatch to serve secure cookies to Tor Hidden Service
|
# Monkey-patch ActionDispatch to serve secure cookies to Tor Hidden Service
|
||||||
# users. Otherwise, ActionDispatch would drop the cookie over HTTP.
|
# users. Otherwise, ActionDispatch would drop the cookie over HTTP.
|
||||||
def write_cookie?(*)
|
def write_cookie?(*)
|
||||||
request.host.ends_with?('.onion') || super
|
request.host.end_with?('.onion') || super
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -17,7 +17,7 @@ ActionDispatch::Cookies::CookieJar.prepend(ActionDispatch::CookieJarExtensions)
|
||||||
module Rack
|
module Rack
|
||||||
module SessionPersistedExtensions
|
module SessionPersistedExtensions
|
||||||
def security_matches?(request, options)
|
def security_matches?(request, options)
|
||||||
request.host.ends_with?('.onion') || super
|
request.host.end_with?('.onion') || super
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue