Merge branch 'hotfix/1.5.2'

joshmn · Jun 9, 2020 · 991648e · 991648e
2 parents e783c3a + bfe1061
commit 991648e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/services/twitter/direct_message_parser_service.rb b/app/services/twitter/direct_message_parser_service.rb
@@ -64,7 +64,7 @@ def conversation_params
  end
 
  def set_conversation
- @conversation = @contact_inbox.conversations.first
+ @conversation = @contact_inbox.conversations.where("additional_attributes ->> 'type' = 'direct_message'").first
  return if @conversation
 
  @conversation = ::Conversation.create!(conversation_params)

diff --git a/config/app.yml b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
- version: '1.4.0'
+ version: '1.5.2'
 
 development:
  <<: *shared