зеркало из
https://github.com/glebtv/telegram-bot.git
synced 2026-08-28 15:26:18 +03:00
Сравнить коммиты
4 Коммитов
| Автор | SHA1 | Дата | |
|---|---|---|---|
|
|
2a511abe16 | ||
|
|
0f5f426d55 | ||
|
|
e6dea5096f | ||
|
|
c06ba2af5c |
@@ -12,9 +12,10 @@ namespace :telegram do
|
||||
routes = Rails.application.routes.url_helpers
|
||||
cert_file = ENV['CERT']
|
||||
cert = File.open(cert_file) if cert_file
|
||||
Telegram.bots.each_value do |bot|
|
||||
route_name = Telegram::RoutesHelper.route_name_for_bot(bot)
|
||||
Telegram.bots.each do |key, bot|
|
||||
route_name = Telegram::Bot::RoutesHelper.route_name_for_bot(bot)
|
||||
url = routes.send("#{route_name}_url")
|
||||
puts "Setting webhook for #{key}..."
|
||||
bot.set_webhook(url: url, certificate: cert)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -15,7 +15,7 @@ module Telegram
|
||||
def call(env)
|
||||
update = env['action_dispatch.request.request_parameters']
|
||||
controller.dispatch(bot, update)
|
||||
[200, {}, '']
|
||||
[200, {}, ['']]
|
||||
end
|
||||
|
||||
def inspect
|
||||
|
||||
@@ -25,7 +25,8 @@ module Telegram
|
||||
initializer 'telegram.bot.updates_controller.add_ar_runtime' do
|
||||
ActiveSupport.on_load('telegram.bot.updates_controller') do
|
||||
if defined?(ActiveRecord::Railties::ControllerRuntime)
|
||||
include ActiveRecord::Railties::ControllerRuntime
|
||||
prepend ActiveRecord::Railties::ControllerRuntime
|
||||
extend ActiveRecord::Railties::ControllerRuntime::ClassMethods
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -16,6 +16,12 @@ module Telegram
|
||||
name && "#{name}_telegram_webhook"
|
||||
end || 'telegram_webhook'
|
||||
end
|
||||
|
||||
# Replaces colon with underscore so rails don't treat it as
|
||||
# route parameter.
|
||||
def escape_token(token)
|
||||
token.tr(':', '_')
|
||||
end
|
||||
end
|
||||
|
||||
# # Create routes for all Telegram.bots to use same controller:
|
||||
@@ -50,7 +56,7 @@ module Telegram
|
||||
as: RoutesHelper.route_name_for_bot(bot),
|
||||
format: false,
|
||||
}.merge!(options).merge!(bot_options || {})
|
||||
post("telegram/#{bot.token}", params)
|
||||
post("telegram/#{RoutesHelper.escape_token bot.token}", params)
|
||||
UpdatesPoller.add(bot, controller) if Telegram.bot_poller_mode?
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
module Telegram
|
||||
module Bot
|
||||
VERSION = '0.4.0'.freeze
|
||||
VERSION = '0.4.2'.freeze
|
||||
|
||||
def self.gem_version
|
||||
Gem::Version.new VERSION
|
||||
|
||||
@@ -13,6 +13,6 @@ RSpec.describe Telegram::Bot::Middleware do
|
||||
subject
|
||||
end
|
||||
|
||||
it { should eq [200, {}, ''] }
|
||||
it { should eq [200, {}, ['']] }
|
||||
end
|
||||
end
|
||||
|
||||
Ссылка в новой задаче
Block a user