SW/redmine
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix coding standards and bump version

Browse Source
This commit is contained in:
Alexander Meindl
2020-08-22 18:56:45 +02:00
parent 4a2d652163
commit 49c9f42343
9 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -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
-----

2
init.rb
View File

@@ -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'

4
lib/redmine_messenger/helpers.rb
View File

@@ -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

2
lib/redmine_messenger/hooks.rb
View File

@@ -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

12
lib/redmine_messenger/patches/contact_patch.rb
View File

@@ -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

12
lib/redmine_messenger/patches/db_entry_patch.rb
View File

@@ -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

30
lib/redmine_messenger/patches/issue_patch.rb
View File

@@ -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

12
lib/redmine_messenger/patches/password_patch.rb
View File

@@ -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

14
lib/redmine_messenger/patches/wiki_page_patch.rb
View File

@@ -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