Render format dependent links
This commit is contained in:
parent
dc995daf90
commit
cc83aded33
|
@ -33,10 +33,11 @@ class ChatSlashCommandsService < Service
|
|||
user = find_chat_user(params)
|
||||
unless user
|
||||
url = authorize_chat_name_url(params)
|
||||
return Gitlab::ChatCommands::Presenter.authorize_chat_name(url)
|
||||
return presenter.authorize_chat_name(url)
|
||||
end
|
||||
|
||||
Gitlab::ChatCommands::Command.new(project, user, params).execute
|
||||
Gitlab::ChatCommands::Command.new(project, user,
|
||||
params.merge(presenter_format: presenter_format)).execute
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -48,4 +49,12 @@ class ChatSlashCommandsService < Service
|
|||
def authorize_chat_name_url(params)
|
||||
ChatNames::AuthorizeUserService.new(self, params).execute
|
||||
end
|
||||
|
||||
def presenter
|
||||
Gitlab::ChatCommands::Presenter.new(presenter_format)
|
||||
end
|
||||
|
||||
def presenter_format
|
||||
throw NotImplementedError
|
||||
end
|
||||
end
|
||||
|
|
|
@ -18,4 +18,8 @@ class MattermostSlashCommandsService < ChatService
|
|||
def to_param
|
||||
'mattermost_slash_commands'
|
||||
end
|
||||
|
||||
def presenter_format
|
||||
'mattermost'
|
||||
end
|
||||
end
|
||||
|
|
|
@ -12,4 +12,8 @@ class SlackSlashCommandsService < ChatSlashCommandsService
|
|||
def to_param
|
||||
'slack_slash_commands'
|
||||
end
|
||||
|
||||
def presenter_format
|
||||
'slack'
|
||||
end
|
||||
end
|
||||
|
|
|
@ -42,6 +42,10 @@ module Gitlab
|
|||
def find_by_iid(iid)
|
||||
collection.find_by(iid: iid)
|
||||
end
|
||||
|
||||
def presenter
|
||||
Gitlab::ChatCommands::Presenter.new(params[:presenter_format])
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -48,15 +48,15 @@ module Gitlab
|
|||
end
|
||||
|
||||
def help(messages)
|
||||
Mattermost::Presenter.help(messages, params[:command])
|
||||
presenter.help(messages, params[:command])
|
||||
end
|
||||
|
||||
def access_denied
|
||||
Mattermost::Presenter.access_denied
|
||||
presenter.access_denied
|
||||
end
|
||||
|
||||
def present(resource)
|
||||
Mattermost::Presenter.present(resource)
|
||||
presenter.present(resource)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,12 +1,17 @@
|
|||
module Gitlab
|
||||
class ChatCommands
|
||||
class Presenter
|
||||
class << self
|
||||
include Gitlab::Routing.url_helpers
|
||||
|
||||
attr_reader :format
|
||||
|
||||
def initialize(format)
|
||||
@format = format
|
||||
end
|
||||
|
||||
def authorize_chat_name(url)
|
||||
message = if url
|
||||
":wave: Hi there! Before I do anything for you, please <#{url}|connect your GitLab account>."
|
||||
":wave: Hi there! Before I do anything for you, please #{link(url, 'connect your GitLab account')}."
|
||||
else
|
||||
":sweat_smile: Couldn't identify you, nor can I autorize you!"
|
||||
end
|
||||
|
@ -44,7 +49,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def access_denied
|
||||
ephemeral_response("Whoops! That action is not allowed. This incident will be <https://xkcd.com/838/|reported>.")
|
||||
ephemeral_response("Whoops! That action is not allowed. This incident will be #{link('https://xkcd.com/838/', 'reported')}.")
|
||||
end
|
||||
|
||||
private
|
||||
|
@ -89,7 +94,7 @@ module Gitlab
|
|||
reference = resource.try(:to_reference) || resource.try(:id)
|
||||
title = resource.try(:title) || resource.try(:name)
|
||||
|
||||
"<#{url(resource)}|#{reference} #{title}>"
|
||||
link(url(resource), "#{reference} #{title}")
|
||||
end
|
||||
|
||||
def header_with_list(header, items)
|
||||
|
@ -127,6 +132,13 @@ module Gitlab
|
|||
status: 200
|
||||
}
|
||||
end
|
||||
|
||||
def link(url, title)
|
||||
case format
|
||||
when 'slack' then "<#{url}|#{title}>"
|
||||
when 'mattermost' then "[#{title}](#{url})"
|
||||
else then title
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue