Discource-C
/
discourse-chat-integration
mirror of https://github.com/discourse/discourse-chat-integration.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: You can't return from a block, especially an async one

This commit is contained in:
Robin Ward 2020-06-26 11:52:00 -04:00
parent ecaec7b33e
commit 509360e190
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,18 +75,18 @@ module DiscourseChat::Provider::SlackProvider
begin begin
requested_messages = Integer(tokens[1], 10) requested_messages = Integer(tokens[1], 10)
rescue ArgumentError rescue ArgumentError
return { text: I18n.t("chat_integration.provider.slack.parse_error") } break { text: I18n.t("chat_integration.provider.slack.parse_error") }
end end
end end
error_message = { text: I18n.t("chat_integration.provider.slack.transcript.error") } error_message = { text: I18n.t("chat_integration.provider.slack.transcript.error") }
return error_message unless transcript = SlackTranscript.new(channel_name: channel_name, channel_id: slack_channel_id, requested_thread_ts: requested_thread_ts) break error_message unless transcript = SlackTranscript.new(channel_name: channel_name, channel_id: slack_channel_id, requested_thread_ts: requested_thread_ts)
return error_message unless transcript.load_user_data break error_message unless transcript.load_user_data
return error_message unless transcript.load_chat_history break error_message unless transcript.load_chat_history
if first_message_ts if first_message_ts
return error_message unless transcript.set_first_message_by_ts(first_message_ts) break error_message unless transcript.set_first_message_by_ts(first_message_ts)
elsif requested_messages elsif requested_messages
transcript.set_first_message_by_index(-requested_messages) transcript.set_first_message_by_index(-requested_messages)
else else
@ -122,12 +122,12 @@ module DiscourseChat::Provider::SlackProvider
error_message = { text: I18n.t("chat_integration.provider.slack.transcript.error") } error_message = { text: I18n.t("chat_integration.provider.slack.transcript.error") }
Scheduler::Defer.later "Processing slack transcript update" do Scheduler::Defer.later "Processing slack transcript update" do
return error_message unless transcript = SlackTranscript.new(channel_name: "##{json[:channel][:name]}", channel_id: json[:channel][:id]) break error_message unless transcript = SlackTranscript.new(channel_name: "##{json[:channel][:name]}", channel_id: json[:channel][:id])
return error_message unless transcript.load_user_data break error_message unless transcript.load_user_data
return error_message unless transcript.load_chat_history break error_message unless transcript.load_chat_history
return error_message unless transcript.set_first_message_by_ts(first_message) break error_message unless transcript.set_first_message_by_ts(first_message)
return error_message unless transcript.set_last_message_by_ts(last_message) break error_message unless transcript.set_last_message_by_ts(last_message)
http = Net::HTTP.new("slack.com", 443) http = Net::HTTP.new("slack.com", 443)
http.use_ssl = true http.use_ssl = true

2
spec/lib/discourse_chat/provider/slack/slack_command_controller_spec.rb
View File

@ -319,7 +319,7 @@ describe 'Slack Command Controller', type: :request do
json = JSON.parse(response.body) json = JSON.parse(response.body)
expect(json["text"]).to include(I18n.t("chat_integration.provider.slack.transcript.error")) expect(json["text"]).to include(I18n.t("chat_integration.provider.slack.transcript.loading"))
end end
it 'errors correctly if there is no api key' do it 'errors correctly if there is no api key' do