Merge pull request #69 from centosadmin/develop

Develop

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.0.2
+
+* Fix circular dependency issues
+* Add bot collision check
+* Don't send notifications to non-active users
+* Fix status update message
+
 # 1.0.1
 
 * Add Rails 5.1 support

README-RU.md

@@ -34,6 +34,10 @@ bundle exec rake redmine:plugins:migrate RAILS_ENV=production
 
 Примеры конфигурационного файла и скрипта для `init.d` находятся в папке `extras`
 
+Нужно инициализировать бота на странице настроек плагина (вкладка Telegram).
+
+*Примечание: каждый из наших плагинов требует наличие отдельного бота.*
+
 ### Обновление с 0.3 на 1.0.0+
 
 Начиная с версии 1.0.0 этот плагин использует [redmine_telegram_common](https://github.com/centosadmin/redmine_telegram_common)

README.md

@@ -33,6 +33,10 @@ bundle exec rake redmine:plugins:migrate RAILS_ENV=production
 
 The `extras` folder has the examples of the plugin config files and the `init.d` startup script
 
+You need to initialize bot on plugin settings page (tab Telegram).
+
+*Note: each of our plugins requires separate bot. It won't work if you use the same bot for several plugins.*
+
 ### Upgrade from 0.3 to 1.0.0+
 
 Since version 1.0.0 this plugin uses [redmine_telegram_common](https://github.com/centosadmin/redmine_telegram_common)

app/views/settings/_telegram.html.erb

@@ -2,6 +2,16 @@
   <label for="settings_telegram_bot_token">Bot Token</label>
   <%= text_field_tag 'settings[telegram_bot_token]', @settings['telegram_bot_token'], size: 50 %>
 
+  <% if (bot_collisions = TelegramCommon.bot_collisions).present? %>
+    <br>
+    <strong style="color: red"><%= t 'telegram_common.settings.bot_collision' %></strong>
+    <% bot_collisions.each do |collision| %>
+      <p>
+        <strong><%= collision.join(', ') %><strong>
+      </p>
+    <% end %>
+  <% end %>
+
   <div style="display: flex; align-items: center;">
     <div style="flex: 1; padding: 0.5em;">
       <h3>WebHooks</h3>

app/workers/telegram_group_sender_worker.rb

@@ -30,7 +30,7 @@ def notificable?
   end
 
   def groups
-    @groups ||= TelegramGroupChat.where(id: group_ids).uniq
+    @groups ||= ::TelegramGroupChat.where(id: group_ids).uniq
   end
 
   def send_message(group)

app/workers/telegram_sender_worker.rb

@@ -1,7 +1,3 @@
-require_relative '../../lib/intouch/regular/checker/base'
-require_relative '../../lib/intouch/regular/recipients_list'
-require_relative '../../lib/intouch/regular/message/private'
-
 class TelegramSenderWorker
   include Sidekiq::Worker
 

init.rb

@@ -12,11 +12,13 @@
   end
 end
 
+Rails.application.config.eager_load_paths += Dir.glob("#{Rails.application.config.root}/plugins/redmine_intouch/{lib,app/workers,app/models,app/controllers}")
+
 Redmine::Plugin.register :redmine_intouch do
   name 'Redmine Intouch plugin'
   url 'https://github.com/centosadmin/redmine_intouch'
   description 'This is a plugin for Redmine which sends a reminder email and Telegram messages to the assignee workign on a task, whose status is not updated with-in allowed duration'
-  version '1.0.1'
+  version '1.0.2'
   author 'Southbridge'
   author_url 'https://github.com/centosadmin'
 

lib/intouch/live/handler/new_issue.rb

@@ -1,7 +1,3 @@
-require_relative '../checker/base'
-require_relative '../message/private'
-require_relative '../message/group'
-
 module Intouch::Live::Handler
   class NewIssue
     def initialize(issue)

lib/intouch/live/handler/updated_issue.rb

@@ -1,7 +1,3 @@
-require_relative '../checker/base'
-require_relative '../message/private'
-require_relative '../message/group'
-
 module Intouch::Live::Handler
   class UpdatedIssue
     def initialize(journal)

lib/intouch/live/message/private.rb

@@ -27,13 +27,13 @@ def required_recipients
     def send_telegram_private_messages
       return unless telegram_enabled?
 
-      IntouchSender.send_live_telegram_message(issue.id, required_recipients)
+      ::IntouchSender.send_live_telegram_message(issue.id, required_recipients)
     end
 
     def send_email_messages
       return unless email_enabled?
 
-      IntouchSender.send_live_email_message(issue.id, required_recipients)
+      ::IntouchSender.send_live_email_message(issue.id, required_recipients)
     end
 
     def telegram_enabled?

lib/intouch/patches/issue_patch.rb

@@ -208,7 +208,7 @@ def telegram_live_message
 
             message += bold_for_alarm(updated_priority_text) if updated_details.include?('priority')
 
-            message += "\n#{I18n.t('field_status')}: #{updated_status_text}" if updated_details.include?('status')
+            message += "\n#{I18n.t('field_status')}: #{updated_status_text}" if updated_details.include?('status_id')
 
             message += "\n#{I18n.t('intouch.telegram_message.issue.updated_details')}: #{updated_details_text}" if updated_details_text.present?
 

lib/intouch/patches/project_patch.rb

@@ -35,7 +35,7 @@ def active_intouch_settings
           end
 
           def settings_template
-            @settings_template ||= SettingsTemplate.find_by(id: settings_template_id)
+            @settings_template ||= ::SettingsTemplate.find_by(id: settings_template_id)
           end
 
           def title

lib/intouch/regular/recipients_list.rb

@@ -11,7 +11,7 @@ def initialize(issue:, protocol:, state:)
     def call
       return [] unless recipient_ids.present?
 
-      User.where(id: recipient_ids)
+      User.where(id: recipient_ids).status(User::STATUS_ACTIVE)
     end
 
     def recipient_ids