Browse Source

修改文字,解决previewcard被反爬虫的问题,增长Timeout

pull/4/head
欧醚 5 years ago
parent
commit
0dbbca12c0
2 changed files with 8 additions and 6 deletions
  1. +7
    -5
      app/lib/request.rb
  2. +1
    -1
      config/locales/zh-CN.yml

+ 7
- 5
app/lib/request.rb View File

@ -17,10 +17,10 @@ end
class Request
REQUEST_TARGET = '(request-target)'
# We enforce a 5s timeout on DNS resolving, 5s timeout on socket opening
# and 5s timeout on the TLS handshake, meaning the worst case should take
# about 15s in total
TIMEOUT = { connect: 5, read: 10, write: 10 }.freeze
# We enforce a 15s timeout on DNS resolving, 15s timeout on socket opening
# and 15s timeout on the TLS handshake, meaning the worst case should take
# about 45s in total
TIMEOUT = { connect: 15, read: 30, write: 30 }.freeze
include RoutingHelper
@ -32,7 +32,9 @@ class Request
@http_client = options.delete(:http_client)
@options = options.merge(socket_class: use_proxy? ? ProxySocket : Socket)
@options = @options.merge(Rails.configuration.x.http_client_proxy) if use_proxy?
@headers = {}
@headers = {
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.167 Safari/537.36',
}
raise Mastodon::HostValidationError, 'Instance does not support hidden service connections' if block_hidden_service?

+ 1
- 1
config/locales/zh-CN.yml View File

@ -16,7 +16,7 @@ zh-CN:
contact_missing: 未设定
contact_unavailable: 未公开
discover_users: 发现用户
documentation: 指南
documentation: 文档
federation_hint_html: 在%{instance} 上拥有账户后,你可以关注其他闭社站点的人。
get_apps: 尝试移动应用
hosted_on: 一个在 %{domain} 上运行的闭社实例

Loading…
Cancel
Save