diff --git a/app/models/messenger.rb b/app/models/messenger.rb index 42e263c..c9e192a 100644 --- a/app/models/messenger.rb +++ b/app/models/messenger.rb @@ -3,6 +3,11 @@ require 'net/http' class Messenger include Redmine::I18n + def self.markup_format(text) + # Redmine::WikiFormatting.html_parser.to_text(text) + ERB::Util.html_escape(text) + end + def self.default_url_options { only_path: true, script_name: Redmine::Utils.relative_url_root } end diff --git a/lib/redmine_messenger/patches/issue_patch.rb b/lib/redmine_messenger/patches/issue_patch.rb index bf1fb95..c4f90ca 100644 --- a/lib/redmine_messenger/patches/issue_patch.rb +++ b/lib/redmine_messenger/patches/issue_patch.rb @@ -21,7 +21,7 @@ module RedmineMessenger attachment = {} if description.present? && Messenger.setting_for_project(project, :new_include_description) - attachment[:text] = ERB::Util.html_escape(description) + attachment[:text] = Messenger.markup_format(description) end attachment[:fields] = [{ title: I18n.t(:field_status), value: ERB::Util.html_escape(status.to_s), @@ -64,7 +64,7 @@ module RedmineMessenger attachment = {} if current_journal.notes.present? && Messenger.setting_for_project(project, :updated_include_description) - attachment[:text] = ERB::Util.html_escape(current_journal.notes) + attachment[:text] = Messenger.markup_format(current_journal.notes) end fields = current_journal.details.map { |d| Messenger.detail_to_field d } diff --git a/lib/redmine_messenger/patches/wiki_page_patch.rb b/lib/redmine_messenger/patches/wiki_page_patch.rb index 009c6a6..40eefff 100644 --- a/lib/redmine_messenger/patches/wiki_page_patch.rb +++ b/lib/redmine_messenger/patches/wiki_page_patch.rb @@ -37,7 +37,7 @@ module RedmineMessenger attachment = nil unless content.comments.empty? attachment = {} - attachment[:text] = ERB::Util.html_escape(content.comments.to_s) + attachment[:text] = Messenger.markup_format(content.comments.to_s) end Messenger.speak(l(:label_messenger_wiki_updated,