diff options
author | ThibG <thib@sitedethib.com> | 2018-05-18 17:20:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-18 17:20:32 +0200 |
commit | 625c4f36ef394215e65e19157bfaf60e7de94b5f (patch) | |
tree | 72560d046b60c8478d10f26c212a70870e50eb2d /app/lib/request.rb | |
parent | 023dfa119ed43fe35188e560c24cd3091c14ad0b (diff) | |
parent | 765fc6700cefcf326e8e4104f7f82ac5ed9b9bea (diff) |
Merge pull request #490 from glitch-soc/merge-upstream
Merge with tootsuite @ 57b503d4ef0754e4651eae26b628cba60e1ab4e9
Diffstat (limited to 'app/lib/request.rb')
-rw-r--r-- | app/lib/request.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/lib/request.rb b/app/lib/request.rb index 731bf7687..397614fac 100644 --- a/app/lib/request.rb +++ b/app/lib/request.rb @@ -58,7 +58,7 @@ class Request def set_common_headers! @headers[REQUEST_TARGET] = "#{@verb} #{@url.path}" - @headers['User-Agent'] = user_agent + @headers['User-Agent'] = Mastodon::Version.user_agent @headers['Host'] = @url.host @headers['Date'] = Time.now.utc.httpdate @headers['Accept-Encoding'] = 'gzip' if @verb != :head @@ -83,10 +83,6 @@ class Request @headers.keys.join(' ').downcase end - def user_agent - @user_agent ||= "#{HTTP::Request::USER_AGENT} (Mastodon/#{Mastodon::Version}; +#{root_url})" - end - def key_id case @key_id_format when :acct |