LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'release/1.21.0' into develop

Browse Source
This commit is contained in:
Sojan
2021-10-16 00:13:23 +05:30
parent cd5c2c51d9 3b53ca157c
commit a2ffcc4502
6 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/jobs/webhooks/instagram_events_job.rb
View File

@@ -38,7 +38,9 @@ class Webhooks::InstagramEventsJob < ApplicationJob
def create_test_text def create_test_text
messenger_channel = Channel::FacebookPage.last messenger_channel = Channel::FacebookPage.last
@inbox = ::Inbox.find_by!(channel: messenger_channel) @inbox = ::Inbox.find_by(channel: messenger_channel)
return unless @inbox
@contact_inbox = @inbox.contact_inboxes.where(source_id: 'sender_username').first @contact_inbox = @inbox.contact_inboxes.where(source_id: 'sender_username').first
unless @contact_inbox unless @contact_inbox
@contact_inbox ||= @inbox.channel.create_contact_inbox( @contact_inbox ||= @inbox.channel.create_contact_inbox(

2
app/models/user.rb
View File

@@ -78,7 +78,7 @@ class User < ApplicationRecord
has_many :inbox_members, dependent: :destroy has_many :inbox_members, dependent: :destroy
has_many :inboxes, through: :inbox_members, source: :inbox has_many :inboxes, through: :inbox_members, source: :inbox
has_many :messages, as: :sender has_many :messages, as: :sender
has_many :invitees, through: :account_users, class_name: 'User', foreign_key: 'inviter_id', dependent: :nullify has_many :invitees, through: :account_users, class_name: 'User', foreign_key: 'inviter_id', source: :inviter, dependent: :nullify
has_many :notifications, dependent: :destroy has_many :notifications, dependent: :destroy
has_many :notification_settings, dependent: :destroy has_many :notification_settings, dependent: :destroy

3
app/services/instagram/message_text.rb
View File

@@ -17,6 +17,9 @@ class Instagram::MessageText < Instagram::WebhooksBaseService
[@messaging[:recipient][:id], @messaging[:sender][:id]] [@messaging[:recipient][:id], @messaging[:sender][:id]]
end end
inbox_channel(instagram_id) inbox_channel(instagram_id)
# person can connect the channel and then delete the inbox
return if @inbox.blank?
ensure_contact(contact_id) ensure_contact(contact_id)
create_message create_message

2
app/services/instagram/webhooks_base_service.rb
View File

@@ -3,7 +3,7 @@ class Instagram::WebhooksBaseService
def inbox_channel(instagram_id) def inbox_channel(instagram_id)
messenger_channel = Channel::FacebookPage.where(instagram_id: instagram_id) messenger_channel = Channel::FacebookPage.where(instagram_id: instagram_id)
@inbox = ::Inbox.find_by!(channel: messenger_channel) @inbox = ::Inbox.find_by(channel: messenger_channel)
end end
def find_or_create_contact(user) def find_or_create_contact(user)

2
config/app.yml
View File

@@ -1,5 +1,5 @@
shared: &shared shared: &shared
version: '1.20.0' version: '1.21.0'
development: development:
<<: *shared <<: *shared

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "@chatwoot/chatwoot", "name": "@chatwoot/chatwoot",
"version": "1.20.0", "version": "1.21.0",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"eslint": "eslint app/javascript --fix", "eslint": "eslint app/javascript --fix",