-*Chatwoot* © 2017-2023, Chatwoot Inc - Released under the MIT License.
+*Chatwoot* © 2017-2024, Chatwoot Inc - Released under the MIT License.
diff --git a/app/builders/messages/instagram/message_builder.rb b/app/builders/messages/instagram/message_builder.rb
index 5610e0671..e9debb767 100644
--- a/app/builders/messages/instagram/message_builder.rb
+++ b/app/builders/messages/instagram/message_builder.rb
@@ -48,6 +48,10 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
@outgoing_echo ? recipient_id : sender_id
end
+ def message_is_unsupported?
+ message[:is_unsupported].present? && @messaging[:message][:is_unsupported] == true
+ end
+
def sender_id
@messaging[:sender][:id]
end
@@ -118,7 +122,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
end
def message_params
- {
+ params = {
account_id: conversation.account_id,
inbox_id: conversation.inbox_id,
message_type: message_type,
@@ -129,6 +133,9 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
in_reply_to_external_id: message_reply_attributes
}
}
+
+ params[:content_attributes][:is_unsupported] = true if message_is_unsupported?
+ params
end
def already_sent_from_chatwoot?
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index a3d3ad645..281ff95de 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -60,13 +60,26 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
end
def toggle_status
- if params[:status].present?
+ # FIXME: move this logic into a service object
+ if pending_to_open_by_bot?
+ @conversation.bot_handoff!
+ elsif params[:status].present?
set_conversation_status
@status = @conversation.save!
else
@status = @conversation.toggle_status
end
- assign_conversation if @conversation.status == 'open' && Current.user.is_a?(User) && Current.user&.agent?
+ assign_conversation if should_assign_conversation?
+ end
+
+ def pending_to_open_by_bot?
+ return false unless Current.user.is_a?(AgentBot)
+
+ @conversation.status == 'pending' && params[:status] == 'open'
+ end
+
+ def should_assign_conversation?
+ @conversation.status == 'open' && Current.user.is_a?(User) && Current.user&.agent?
end
def toggle_priority
diff --git a/app/controllers/concerns/access_token_auth_helper.rb b/app/controllers/concerns/access_token_auth_helper.rb
index 2f4dc4337..c35a28d7d 100644
--- a/app/controllers/concerns/access_token_auth_helper.rb
+++ b/app/controllers/concerns/access_token_auth_helper.rb
@@ -14,7 +14,7 @@ module AccessTokenAuthHelper
render_unauthorized('Invalid Access Token') && return if @access_token.blank?
@resource = @access_token.owner
- Current.user = @resource if current_user.is_a?(User)
+ Current.user = @resource if [User, AgentBot].include?(@resource.class)
end
def validate_bot_access_token!
diff --git a/app/controllers/super_admin/app_configs_controller.rb b/app/controllers/super_admin/app_configs_controller.rb
index ce06879c5..97caad42c 100644
--- a/app/controllers/super_admin/app_configs_controller.rb
+++ b/app/controllers/super_admin/app_configs_controller.rb
@@ -9,6 +9,9 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
.map { |name, serialized_value| [name, serialized_value['value']] }
.to_h
# rubocop:enable Style/HashTransformValues
+ @installation_configs = ConfigLoader.new.general_configs.each_with_object({}) do |config_hash, result|
+ result[config_hash['name']] = config_hash.except('name')
+ end
end
def create
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index e538299aa..5cc3caa27 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -76,7 +76,11 @@
&.left {
.bubble {
- @apply border border-slate-50 dark:border-slate-700 bg-white dark:bg-slate-700 text-black-900 dark:text-slate-50 rounded-r-lg rounded-l mr-auto break-words;
+ @apply rounded-r-lg rounded-l mr-auto break-words;
+
+ &:not(.is-unsupported) {
+ @apply border border-slate-50 dark:border-slate-700 bg-white dark:bg-slate-700 text-black-900 dark:text-slate-50
+ }
&.is-image {
@apply rounded-lg;
diff --git a/app/javascript/dashboard/components/NetworkNotification.vue b/app/javascript/dashboard/components/NetworkNotification.vue
index 6d142b1cd..2f3b02826 100644
--- a/app/javascript/dashboard/components/NetworkNotification.vue
+++ b/app/javascript/dashboard/components/NetworkNotification.vue
@@ -1,24 +1,33 @@
- {{ - useInstallationName( - $t('NETWORK.NOTIFICATION.TEXT'), - globalConfig.installationName - ) - }} -
-