Merge branch 'hotfix/1.5.2'
This commit is contained in:
commit
991648edcf
2 changed files with 2 additions and 2 deletions
|
@ -64,7 +64,7 @@ class Twitter::DirectMessageParserService < Twitter::WebhooksBaseService
|
|||
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)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
shared: &shared
|
||||
version: '1.4.0'
|
||||
version: '1.5.2'
|
||||
|
||||
development:
|
||||
<<: *shared
|
||||
|
|
Loading…
Reference in a new issue