V3.13.0 dev

Makefile

@@ -49,7 +49,10 @@ debug:
 debug_worker:
 	overmind connect worker
 
-docker: 
+docker:
 	docker build -t $(APP_NAME) -f ./docker/Dockerfile .
 
+docker-amd64:
+	docker build --platform linux/amd64 -t $(APP_NAME) -f ./docker/Dockerfile .
+
 .PHONY: setup db_create db_migrate db_seed db_reset db console server burn docker run force_run debug debug_worker

app/javascript/shared/constants/countries.js

@@ -365,6 +365,18 @@ const countries = [
     emoji: '🇩🇴',
     id: 'DO',
   },
+  {
+    name: 'Dominican Republic',
+    dial_code: '+1809',
+    emoji: '🇩🇴',
+    id: 'DO',
+  },
+  {
+    name: 'Dominican Republic',
+    dial_code: '+1829',
+    emoji: '🇩🇴',
+    id: 'DO',
+  },
   {
     name: 'Ecuador',
     dial_code: '+593',

app/models/concerns/content_attribute_validator.rb

@@ -1,5 +1,5 @@
 class ContentAttributeValidator < ActiveModel::Validator
-  ALLOWED_SELECT_ITEM_KEYS = [:title, :value].freeze
+  ALLOWED_SELECT_ITEM_KEYS = [:title, :value, :description].freeze
   ALLOWED_CARD_ITEM_KEYS = [:title, :description, :media_url, :actions].freeze
   ALLOWED_CARD_ITEM_ACTION_KEYS = [:text, :type, :payload, :uri].freeze
   ALLOWED_FORM_ITEM_KEYS = [:type, :placeholder, :label, :name, :options, :default, :required, :pattern, :title, :pattern_error].freeze

app/models/conversation.rb

@@ -74,7 +74,7 @@ class Conversation < ApplicationRecord
   scope :unassigned, -> { where(assignee_id: nil) }
   scope :assigned, -> { where.not(assignee_id: nil) }
   scope :assigned_to, ->(agent) { where(assignee_id: agent.id) }
-  scope :unattended, -> { where(first_reply_created_at: nil).or(where.not(waiting_since: nil)) }
+  scope :unattended, -> { where(first_reply_created_at: nil).or(where.not(waiting_since: nil)).where('waiting_since < ?', 10.minutes.ago) }
   scope :resolvable, lambda { |auto_resolve_duration|
     return none if auto_resolve_duration.to_i.zero?
 

app/models/message.rb

@@ -103,7 +103,7 @@ class Message < ApplicationRecord
   # [:external_error : Can specify if the message creation failed due to an error at external API
   store :content_attributes, accessors: [:submitted_email, :items, :submitted_values, :email, :in_reply_to, :deleted,
                                          :external_created_at, :story_sender, :story_id, :external_error,
-                                         :translations, :in_reply_to_external_id, :is_unsupported], coder: JSON
+                                         :translations, :in_reply_to_external_id, :in_reply_to_interactive_id, :is_unsupported], coder: JSON
 
   store :external_source_ids, accessors: [:slack], coder: JSON, prefix: :external_source_id
 
@@ -253,11 +253,13 @@ def ensure_processed_message_content
   def ensure_in_reply_to
     in_reply_to = content_attributes[:in_reply_to]
     in_reply_to_external_id = content_attributes[:in_reply_to_external_id]
+    in_reply_to_interactive_id = content_attributes[:in_reply_to_interactive_id]
 
     Messages::InReplyToMessageBuilder.new(
       message: self,
       in_reply_to: in_reply_to,
-      in_reply_to_external_id: in_reply_to_external_id
+      in_reply_to_external_id: in_reply_to_external_id,
+      in_reply_to_interactive_id: in_reply_to_interactive_id
     ).perform
   end
 

app/presenters/reports/time_format_presenter.rb

@@ -8,7 +8,7 @@ def initialize(seconds)
   end
 
   def format
-    return '--' if seconds.nil? || seconds.zero?
+    return ' ' if seconds.nil? || seconds.zero?
 
     days, remainder = seconds.divmod(86_400)
     hours, remainder = remainder.divmod(3600)

app/services/messages/in_reply_to_message_builder.rb

@@ -1,5 +1,5 @@
 class Messages::InReplyToMessageBuilder
-  pattr_initialize [:message!, :in_reply_to!, :in_reply_to_external_id!]
+  pattr_initialize [:message!, :in_reply_to!, :in_reply_to_external_id!, :in_reply_to_interactive_id!]
 
   delegate :conversation, to: :message
 

app/services/whatsapp/incoming_message_base_service.rb

@@ -148,7 +148,8 @@ def create_message(message)
       message_type: :incoming,
       sender: @contact,
       source_id: message[:id].to_s,
-      in_reply_to_external_id: @in_reply_to_external_id
+      in_reply_to_external_id: @in_reply_to_external_id,
+      in_reply_to_interactive_id: @in_reply_to_interactive_id
     )
   end
 

app/services/whatsapp/incoming_message_service_helpers.rb

@@ -89,6 +89,7 @@ def log_error(message)
 
   def process_in_reply_to(message)
     @in_reply_to_external_id = message['context']&.[]('id')
+    @in_reply_to_interactive_id = message['interactive']&.[]('list_reply')&.[]('id') || message['interactive']&.[]('button_reply')&.[]('id')
   end
 
   def find_message_by_source_id(source_id)

app/services/whatsapp/providers/base_service.rb

@@ -40,6 +40,9 @@ def create_rows(items)
     rows = []
     items.each do |item|
       row = { 'id' => item['value'], 'title' => item['title'] }
+      if item.has_key?("description")
+        row['description'] = item['description']
+      end
       rows << row
     end
     rows

docker-compose.production.yaml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   base: &base
     image: chatwoot/chatwoot:latest
@@ -35,7 +33,7 @@ services:
     restart: always
 
   postgres:
-    image: postgres:12
+    image: postgres:15
     restart: always
     ports:
       - '127.0.0.1:5432:5432'

docker-compose.test.yaml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   base: &base
     build:
@@ -39,7 +37,7 @@ services:
     command: ['bundle', 'exec', 'sidekiq', '-C', 'config/sidekiq.yml']
 
   postgres:
-    image: postgres:12
+    image: postgres:15
     restart: always
     ports:
       - '5432:5432'

docker-compose.yaml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   base: &base
     build:
@@ -84,7 +82,7 @@ services:
     command: bin/webpack-dev-server
 
   postgres:
-    image: postgres:12
+    image: postgres:15
     restart: always
     ports:
       - '5432:5432'