Discource-C/discourse-chat-integration
1
0
Fork 0
mirror of https://github.com/discourse/discourse-chat-integration.git synced 2025-02-16 16:34:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow selecting first transcript message using a URL

Browse Source
This commit is contained in:
David Taylor 2017-08-04 13:06:57 +01:00
parent e470c7dc29
commit 9604edaf88
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/discourse_chat/provider/slack/slack_command_controller.rb
View File

@ -54,7 +54,11 @@ module DiscourseChat::Provider::SlackProvider
requested_messages = 10 requested_messages = 10
if tokens.size > 1 first_message_ts = nil
slack_url_regex = /^https:\/\/\S+\.slack\.com\/archives\/\S+\/p([0-9]{16})\/?$/
if tokens.size > 1 && match = slack_url_regex.match(tokens[1])
first_message_ts = match.captures[0].insert(10, '.')
elsif tokens.size > 1
begin begin
requested_messages = Integer(tokens[1], 10) requested_messages = Integer(tokens[1], 10)
rescue ArgumentError rescue ArgumentError
@ -64,7 +68,8 @@ module DiscourseChat::Provider::SlackProvider
transcript = SlackTranscript.load_transcript(slack_channel_id: slack_channel_id, transcript = SlackTranscript.load_transcript(slack_channel_id: slack_channel_id,
channel_name: channel_name, channel_name: channel_name,
requested_messages: requested_messages) requested_messages: requested_messages,
first_message_ts: first_message_ts)
return { text: I18n.t("chat_integration.provider.slack.transcript.error") } unless transcript return { text: I18n.t("chat_integration.provider.slack.transcript.error") } unless transcript

6
lib/discourse_chat/provider/slack/slack_transcript_helper.rb
View File

@ -101,10 +101,8 @@ module DiscourseChat::Provider::SlackProvider
@last_message = this_message if index == raw_messages.length - 1 @last_message = this_message if index == raw_messages.length - 1
end end
if first_message_ts && last_message_ts @first_message = @messages.find { |m| m.ts == first_message_ts } || @first_message if first_message_ts
@first_message = @messages.find { |m| m.ts == first_message_ts } @last_message = @messages.find { |m| m.ts == last_message_ts } || @last_message if last_message_ts
@last_message = @messages.find { |m| m.ts == last_message_ts }
end
@first_message_index = @messages.index(@first_message) @first_message_index = @messages.index(@first_message)
@last_message_index = @messages.index(@last_message) @last_message_index = @messages.index(@last_message)