diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-12-19 13:32:37 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-12-19 13:32:37 +0100 |
commit | e6842ff5643c7fc88a65af24b56682f47f4be2de (patch) | |
tree | 53dc2d43c1a9c39613ed0359e7a1121bc1e83103 | |
parent | f5ff372140d066d7bcedc0ad0799c723a9012bb0 (diff) | |
download | gitlab-ce-e6842ff5643c7fc88a65af24b56682f47f4be2de.tar.gz |
Improve code design
-rw-r--r-- | app/models/project_services/chat_slash_commands_service.rb | 2 | ||||
-rw-r--r-- | app/models/project_services/slack_slash_commands_service.rb | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/models/project_services/chat_slash_commands_service.rb b/app/models/project_services/chat_slash_commands_service.rb index 12261e9821e..0bc160af604 100644 --- a/app/models/project_services/chat_slash_commands_service.rb +++ b/app/models/project_services/chat_slash_commands_service.rb @@ -28,7 +28,7 @@ class ChatSlashCommandsService < Service end def trigger(params) - return nil unless valid_token?(params[:token]) + return unless valid_token?(params[:token]) user = find_chat_user(params) unless user diff --git a/app/models/project_services/slack_slash_commands_service.rb b/app/models/project_services/slack_slash_commands_service.rb index 6782ba5ad0a..cb19ebf4cad 100644 --- a/app/models/project_services/slack_slash_commands_service.rb +++ b/app/models/project_services/slack_slash_commands_service.rb @@ -14,13 +14,15 @@ class SlackSlashCommandsService < ChatSlashCommandsService end def trigger(params) - result = super - # Format messages to be Slack-compatible - if result && result[:text] - result[:text] = Slack::Notifier::LinkFormatter.format(result[:text]) + super.tap do |result| + result[:text] = format(result[:text]) end + end + + private - result + def format(text) + Slack::Notifier::LinkFormatter.format(text) if text end end |