Add proxy support for bot

app/views/settings/_telegram_common.html.erb

@@ -84,6 +84,37 @@
 
 <hr>
 
+<h3>Bot proxy</h3>
+
+<p>
+  <label>
+    <%= t 'telegram_common.settings.use_proxy' %>
+  </label>
+  <%= check_box_tag 'settings[bot_use_proxy]', '1', @settings['bot_use_proxy'] %>
+</p>
+
+<p>
+  <label for="settings_telegram_proxy_server">Server</label>
+  <%= text_field_tag 'settings[bot_proxy_server]', @settings['bot_proxy_server'], size: 50 %>
+</p>
+
+<p>
+  <label for="settings_telegram_proxy_port">Proxy port</label>
+  <%= text_field_tag 'settings[bot_proxy_port]', @settings['bot_proxy_port'], size: 50 %>
+</p>
+
+<p>
+  <label for="settings_telegram_proxy_user">Proxy user</label>
+  <%= text_field_tag 'settings[bot_proxy_user]', @settings['bot_proxy_user'], size: 50 %>
+</p>
+
+<p>
+  <label for="settings_telegram_proxy_password">Proxy password</label>
+  <%= text_field_tag 'settings[bot_proxy_password]', @settings['bot_proxy_password'], size: 50 %>
+</p>
+
+<hr>
+
 <div style="display: flex; align-items: center;">
   <div style="flex: 1; padding: 0.5em;">
     <h3>WebHooks</h3>

init.rb

@@ -2,9 +2,6 @@
 
 FileUtils.mkdir_p(log_dir) unless Dir.exist?(log_dir)
 
-PHANTOMJS_CONFIG = File.expand_path('../config/phantom-proxy.js', __FILE__)
-TELEGRAM_CLI_LOG = Logger.new(Rails.root.join(log_dir, 'telegram-cli.log'))
-
 require 'telegram/bot'
 
 # Rails 5.1/Rails 4
@@ -16,6 +13,12 @@
   Dir.glob(File.dirname(__FILE__) + paths).each do |file|
     require_dependency file
   end
+
+  Faraday::Adapter.register_middleware redmine_telegram_common: TelegramCommon::Bot::FaradayAdapter
+
+  Telegram::Bot.configure do |config|
+    config.adapter = :redmine_telegram_common
+  end
 end
 
 Rails.application.config.eager_load_paths += Dir.glob("#{Rails.application.config.root}/plugins/redmine_telegram_common/{lib,app/workers,app/models,app/controllers}")

lib/telegram_common/bot/faraday_adapter.rb

@@ -0,0 +1,24 @@
+module TelegramCommon
+  class Bot::FaradayAdapter < Faraday::Adapter::NetHttp
+    def net_http_connection(env)
+      if proxy = fetch_proxy_from_settings
+        Net::HTTP::Proxy(proxy[:server], proxy[:port], proxy[:user], proxy[:password])
+      else
+        Net::HTTP
+      end.new(env[:url].hostname, env[:url].port || (env[:url].scheme == 'https' ? 443 : 80))
+    end
+
+    private
+
+    def fetch_proxy_from_settings
+      settings = Setting.plugin_redmine_telegram_common
+      return unless settings['bot_use_proxy']
+      {
+          server: settings['bot_proxy_server'],
+          port: settings['bot_proxy_port'],
+          user: settings['bot_proxy_user'],
+          password: settings['bot_proxy_password']
+      }
+    end
+  end
+end