summaryrefslogtreecommitdiff
path: root/app/models/project_services/hangouts_chat_service.rb
diff options
context:
space:
mode:
authorKukovskii Vladimir <ura@dgtakano.co.jp>2018-07-14 19:19:04 +0900
committerKukovskii Vladimir <ura@dgtakano.co.jp>2018-07-14 20:45:53 +0900
commitd64196ddb3336bd435c5756407cabc162f9acc6c (patch)
tree6b222ee19c0709d95d18dc022e442101fdb87bf9 /app/models/project_services/hangouts_chat_service.rb
parent6cfb0a9e9463d54f7ad74d5ee79af36ba08be186 (diff)
downloadgitlab-ce-d64196ddb3336bd435c5756407cabc162f9acc6c.tar.gz
Fix couple of moments in HangoutsChatService and its spec
Diffstat (limited to 'app/models/project_services/hangouts_chat_service.rb')
-rw-r--r--app/models/project_services/hangouts_chat_service.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/app/models/project_services/hangouts_chat_service.rb b/app/models/project_services/hangouts_chat_service.rb
index 53f11c424e3..a8512c5f57c 100644
--- a/app/models/project_services/hangouts_chat_service.rb
+++ b/app/models/project_services/hangouts_chat_service.rb
@@ -44,20 +44,22 @@ class HangoutsChatService < ChatNotificationService
private
def notify(message, opts)
- simple_text = compose_simple_message(message)
+ simple_text = parse_simple_text_message(message)
HangoutsChat::Sender.new(webhook).simple(simple_text)
end
- def compose_simple_message(message)
+ def parse_simple_text_message(message)
header = message.pretext
return header if message.attachments.empty?
- title = fetch_attachment_title(message.attachments.first)
- body = message.attachments.first[:text]
+ attachment = message.attachments.first
+ title = format_attachment_title(attachment)
+ body = attachment[:text]
+
[header, title, body].compact.join("\n")
end
- def fetch_attachment_title(attachment)
+ def format_attachment_title(attachment)
return attachment[:title] unless attachment[:title_link]
"<#{attachment[:title_link]}|#{attachment[:title]}>"