From 49c9f42343fad412296aeca83bc061be609d80e6 Mon Sep 17 00:00:00 2001 From: Alexander Meindl Date: Sat, 22 Aug 2020 18:56:45 +0200 Subject: [PATCH] fix coding standards and bump version --- CHANGELOG.md | 4 +++ init.rb | 2 +- lib/redmine_messenger/helpers.rb | 4 +-- lib/redmine_messenger/hooks.rb | 2 +- .../patches/contact_patch.rb | 12 ++++---- .../patches/db_entry_patch.rb | 12 ++++---- lib/redmine_messenger/patches/issue_patch.rb | 30 ++++++++----------- .../patches/password_patch.rb | 12 ++++---- .../patches/wiki_page_patch.rb | 14 ++++----- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 614d939..dcdbfc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +1.0.7 +----- +- Added feature to send messages directly to users to be notified - thanks to @Ujifman + 1.0.6 ----- diff --git a/init.rb b/init.rb index b54ae4c..a29d2d3 100644 --- a/init.rb +++ b/init.rb @@ -6,7 +6,7 @@ Redmine::Plugin.register :redmine_messenger do url 'https://github.com/alphanodes/redmine_messenger' author_url 'https://alphanodes.com/' description 'Messenger integration for Slack, Discord, Rocketchat and Mattermost support' - version '1.0.6' + version '1.0.7' requires_redmine version_or_higher: '4.0.0' diff --git a/lib/redmine_messenger/helpers.rb b/lib/redmine_messenger/helpers.rb index 6e0eed5..c3a3e54 100644 --- a/lib/redmine_messenger/helpers.rb +++ b/lib/redmine_messenger/helpers.rb @@ -8,9 +8,9 @@ module RedmineMessenger def project_setting_messenger_default_value(value) if Messenger.default_project_setting(@project, value) - l(:label_messenger_settings_enabled) + l :label_messenger_settings_enabled else - l(:label_messenger_settings_disabled) + l :label_messenger_settings_disabled end end end diff --git a/lib/redmine_messenger/hooks.rb b/lib/redmine_messenger/hooks.rb index b3cf584..686973f 100644 --- a/lib/redmine_messenger/hooks.rb +++ b/lib/redmine_messenger/hooks.rb @@ -49,7 +49,7 @@ module RedmineMessenger "<#{revision_url}|#{Messenger.markup_format changeset.comments}>") attachment[:fields] = journal.details.map { |d| Messenger.detail_to_field d } - Messenger.speak(msg, channels, url, attachment: attachment, project: repository.project) + Messenger.speak msg, channels, url, attachment: attachment, project: repository.project end end end diff --git a/lib/redmine_messenger/patches/contact_patch.rb b/lib/redmine_messenger/patches/contact_patch.rb index 815e218..6462ffb 100644 --- a/lib/redmine_messenger/patches/contact_patch.rb +++ b/lib/redmine_messenger/patches/contact_patch.rb @@ -12,7 +12,7 @@ module RedmineMessenger module InstanceMethods def send_messenger_create - return unless Messenger.setting_for_project(project, :post_contact) + return unless Messenger.setting_for_project project, :post_contact return if is_private? && !Messenger.setting_for_project(project, :post_private_contacts) set_language_if_valid Setting.default_language @@ -22,15 +22,15 @@ module RedmineMessenger return unless channels.present? && url - Messenger.speak(l(:label_messenger_contact_created, + Messenger.speak l(:label_messenger_contact_created, project_url: Messenger.project_url_markdown(project), url: Messenger.url_markdown(self, name), user: User.current), - channels, url, project: project) + channels, url, project: project end def send_messenger_update - return unless Messenger.setting_for_project(project, :post_contact_updates) + return unless Messenger.setting_for_project project, :post_contact_updates return if is_private? && !Messenger.setting_for_project(project, :post_private_contacts) set_language_if_valid Setting.default_language @@ -40,11 +40,11 @@ module RedmineMessenger return unless channels.present? && url - Messenger.speak(l(:label_messenger_contact_updated, + Messenger.speak l(:label_messenger_contact_updated, project_url: Messenger.project_url_markdown(project), url: Messenger.url_markdown(self, name), user: User.current), - channels, url, project: project) + channels, url, project: project end end end diff --git a/lib/redmine_messenger/patches/db_entry_patch.rb b/lib/redmine_messenger/patches/db_entry_patch.rb index 776c2f2..372fd64 100644 --- a/lib/redmine_messenger/patches/db_entry_patch.rb +++ b/lib/redmine_messenger/patches/db_entry_patch.rb @@ -12,7 +12,7 @@ module RedmineMessenger module InstanceMethods def send_messenger_create - return unless Messenger.setting_for_project(project, :post_db) + return unless Messenger.setting_for_project project, :post_db return if is_private? && !Messenger.setting_for_project(project, :post_private_db) set_language_if_valid Setting.default_language @@ -22,15 +22,15 @@ module RedmineMessenger return unless channels.present? && url - Messenger.speak(l(:label_messenger_db_entry_created, + Messenger.speak l(:label_messenger_db_entry_created, project_url: Messenger.project_url_markdown(project), url: Messenger.url_markdown(self, name), user: User.current), - channels, url, project: project) + channels, url, project: project end def send_messenger_update - return unless Messenger.setting_for_project(project, :post_db_updates) + return unless Messenger.setting_for_project project, :post_db_updates return if is_private? && !Messenger.setting_for_project(project, :post_private_db) set_language_if_valid Setting.default_language @@ -40,11 +40,11 @@ module RedmineMessenger return unless channels.present? && url - Messenger.speak(l(:label_messenger_db_entry_updated, + Messenger.speak l(:label_messenger_db_entry_updated, project_url: Messenger.project_url_markdown(project), url: Messenger.url_markdown(self, name), user: User.current), - channels, url, project: project) + channels, url, project: project end end end diff --git a/lib/redmine_messenger/patches/issue_patch.rb b/lib/redmine_messenger/patches/issue_patch.rb index fc43764..8ee047e 100644 --- a/lib/redmine_messenger/patches/issue_patch.rb +++ b/lib/redmine_messenger/patches/issue_patch.rb @@ -17,12 +17,10 @@ module RedmineMessenger if Messenger.setting_for_project(project, :messenger_direct_users_messages) notified_users.each do |user| - if user.login != author.login - channels.append('@' + user.login) - end + channels.append "@#{user.login}" if user.login != author.login end - end - + end + return unless channels.present? && url return if is_private? && !Messenger.setting_for_project(project, :post_private_issues) @@ -30,7 +28,7 @@ module RedmineMessenger attachment = {} if description.present? && Messenger.setting_for_project(project, :new_include_description) - attachment[:text] = Messenger.markup_format(description) + attachment[:text] = Messenger.markup_format description end attachment[:fields] = [{ title: I18n.t(:field_status), value: Messenger.markup_format(status.to_s), @@ -58,11 +56,11 @@ module RedmineMessenger } end - Messenger.speak(l(:label_messenger_issue_created, + Messenger.speak l(:label_messenger_issue_created, project_url: Messenger.project_url_markdown(project), url: send_messenger_mention_url(project, description), user: author), - channels, url, attachment: attachment, project: project) + channels, url, attachment: attachment, project: project end def send_messenger_update @@ -70,14 +68,12 @@ module RedmineMessenger channels = Messenger.channels_for_project project url = Messenger.url_for_project project - + if Messenger.setting_for_project(project, :messenger_direct_users_messages) notified_users.each do |user| - if user.login != current_journal.user.login - channels.append('@' + user.login) - end + channels.append "@#{user.login}" if user.login != current_journal.user.login end - end + end return unless channels.present? && url && Messenger.setting_for_project(project, :post_updates) return if is_private? && !Messenger.setting_for_project(project, :post_private_issues) @@ -87,7 +83,7 @@ module RedmineMessenger attachment = {} if Messenger.setting_for_project(project, :updated_include_description) - attachment_text = Messenger.attachment_text_from_journal(current_journal) + attachment_text = Messenger.attachment_text_from_journal current_journal attachment[:text] = attachment_text if attachment_text.present? end @@ -96,11 +92,11 @@ module RedmineMessenger fields.compact! attachment[:fields] = fields if fields.any? - Messenger.speak(l(:label_messenger_issue_updated, + Messenger.speak l(:label_messenger_issue_updated, project_url: Messenger.project_url_markdown(project), url: send_messenger_mention_url(project, description), user: current_journal.user), - channels, url, attachment: attachment, project: project) + channels, url, attachment: attachment, project: project end private @@ -109,7 +105,7 @@ module RedmineMessenger mention_to = '' if Messenger.setting_for_project(project, :auto_mentions) || Messenger.textfield_for_project(project, :default_mentions).present? - mention_to = Messenger.mentions(project, text) + mention_to = Messenger.mentions project, text end "<#{Messenger.object_url self}|#{Messenger.markup_format self}>#{mention_to}" end diff --git a/lib/redmine_messenger/patches/password_patch.rb b/lib/redmine_messenger/patches/password_patch.rb index 08bffb2..f1d3971 100644 --- a/lib/redmine_messenger/patches/password_patch.rb +++ b/lib/redmine_messenger/patches/password_patch.rb @@ -12,7 +12,7 @@ module RedmineMessenger module InstanceMethods def send_messenger_create - return unless Messenger.setting_for_project(project, :post_password) + return unless Messenger.setting_for_project project, :post_password return if is_private? set_language_if_valid Setting.default_language @@ -22,15 +22,15 @@ module RedmineMessenger return unless channels.present? && url - Messenger.speak(l(:label_messenger_password_created, + Messenger.speak l(:label_messenger_password_created, project_url: Messenger.project_url_markdown(project), url: Messenger.url_markdown(self, name), user: User.current), - channels, url, project: project) + channels, url, project: project end def send_messenger_update - return unless Messenger.setting_for_project(project, :post_password_updates) + return unless Messenger.setting_for_project project, :post_password_updates return if is_private? set_language_if_valid Setting.default_language @@ -40,11 +40,11 @@ module RedmineMessenger return unless channels.present? && url - Messenger.speak(l(:label_messenger_password_updated, + Messenger.speak l(:label_messenger_password_updated, project_url: Messenger.project_url_markdown(project), url: Messenger.url_markdown(self, name), user: User.current), - channels, url, project: project) + channels, url, project: project end end end diff --git a/lib/redmine_messenger/patches/wiki_page_patch.rb b/lib/redmine_messenger/patches/wiki_page_patch.rb index e277be8..1c02791 100644 --- a/lib/redmine_messenger/patches/wiki_page_patch.rb +++ b/lib/redmine_messenger/patches/wiki_page_patch.rb @@ -12,7 +12,7 @@ module RedmineMessenger module InstanceMethods def send_messenger_create - return unless Messenger.setting_for_project(project, :post_wiki) + return unless Messenger.setting_for_project project, :post_wiki set_language_if_valid Setting.default_language @@ -21,15 +21,15 @@ module RedmineMessenger return unless channels.present? && url - Messenger.speak(l(:label_messenger_wiki_created, + Messenger.speak l(:label_messenger_wiki_created, project_url: Messenger.project_url_markdown(project), url: Messenger.url_markdown(self, title), user: User.current), - channels, url, project: project) + channels, url, project: project end def send_messenger_update - return unless Messenger.setting_for_project(project, :post_wiki_updates) + return unless Messenger.setting_for_project project, :post_wiki_updates set_language_if_valid Setting.default_language @@ -41,14 +41,14 @@ module RedmineMessenger attachment = nil if !content.nil? && content.comments.present? attachment = {} - attachment[:text] = Messenger.markup_format(content.comments.to_s) + attachment[:text] = Messenger.markup_format content.comments.to_s end - Messenger.speak(l(:label_messenger_wiki_updated, + Messenger.speak l(:label_messenger_wiki_updated, project_url: Messenger.project_url_markdown(project), url: Messenger.url_markdown(self, title), user: content.author), - channels, url, project: project, attachment: attachment) + channels, url, project: project, attachment: attachment end end end