Merge pull request #75 from southbridgeio/fix-set-bot-permissions

fix set bot permissions and remove Sidekiq Cron job

Author: nevrfl

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.5.4
+
+* Fix set bot permissions
+* Remove Sidekiq Cron job for Telegram proxy worker
+
 # 0.5.3
 
 * Add step 3 to Telegram client authorization

Gemfile

@@ -5,7 +5,7 @@ gem 'sidekiq-rate-limiter', '0.1.3', require: 'sidekiq-rate-limiter/server'
 gem 'telegram-bot-ruby', '>= 0.11', '< 1.0'
 gem 'slack-ruby-bot'
 gem 'celluloid-io'
-gem 'tdlib-ruby', git: 'https://github.com/southbridgeio/tdlib-ruby', tag: "v3.0.3"
+gem 'tdlib-ruby', git: 'https://github.com/southbridgeio/tdlib-ruby', tag: "v3.0.4"
 gem 'tdlib-schema', git: 'https://github.com/southbridgeio/tdlib-schema'
 gem 'jwt'
 gem 'filelock'

init.rb

@@ -21,9 +21,6 @@
 Rails.application.config.eager_load_paths += Dir.glob("#{Rails.application.config.root}/plugins/redmine_bots/{lib,app/workers,app/models,app/controllers,lib/redmine_bots/telegram/{patches/*_patch,hooks/*_hook}}")
 
 Sidekiq::Logging.logger = Logger.new(Rails.root.join('log', 'sidekiq.log'))
-Sidekiq::Cron::Job.create(name:  'Telegram proxy monitoring',
-                          cron:  '*/3 * * * *',
-                          class: 'TelegramProxyMonitoringWorker')
 
 Redmine::Plugin.register :redmine_bots do
   name 'Redmine Bots'

lib/redmine_bots/telegram/tdlib/toggle_chat_admin.rb

@@ -11,7 +11,7 @@ def call(chat_id, user_id, admin = true)
         else
           TD::Types::ChatMemberStatus::Member.new
         end
-      client.get_user(user_id: user_id).then { client.set_chat_member_status(chat_id: chat_id, member_id: user_id, status: status) }.flat
+      client.get_user(user_id: user_id).then { client.set_chat_member_status(chat_id: chat_id, member_id: message_sender(user_id), status: status) }.flat
     end
 
     private
@@ -35,5 +35,9 @@ def rights
         is_anonymous: false
       )
     end
+
+    def message_sender(user_id)
+      TD::Types::MessageSender::User.new(user_id: user_id)
+    end
   end
 end