Uno clairton v3.13.4 uno 05102024

.github/workflows/publish_foss_docker.yml

@@ -9,7 +9,7 @@ on:
   push:
     branches:
       - develop
-      - master
+      - uno
     tags:
       - v*
   workflow_dispatch:
@@ -27,37 +27,53 @@ jobs:
         uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
-      - name: Strip enterprise code
-        run: |
-          rm -rf enterprise
-          rm -rf spec/enterprise
+      # - name: Strip enterprise code
+      #   run: |
+      #     rm -rf enterprise
+      #     rm -rf spec/enterprise
 
-      - name: Set Chatwoot edition
-        run: |
-          echo -en '\nENV CW_EDITION="ce"' >> docker/Dockerfile
+      # - name: Set Chatwoot edition
+      #   run: |
+      #     echo -en '\nENV CW_EDITION="ce"' >> docker/Dockerfile
 
       - name: set docker tag
         run: |
-          echo "DOCKER_TAG=chatwoot/chatwoot:$GIT_REF-ce" >> $GITHUB_ENV
+          echo "DOCKER_TAG=clairton/chatwoot:$GIT_REF" >> $GITHUB_ENV
+          echo "DOCKER_ARM_TAG=clairton/chatwoot-arm:$GIT_REF" >> $GITHUB_ENV
 
       - name: replace docker tag if master
         if: github.ref_name == 'master'
         run: |
-          echo "DOCKER_TAG=chatwoot/chatwoot:latest-ce" >> $GITHUB_ENV
+          echo "DOCKER_TAG=clairton/chatwoot:latest" >> $GITHUB_ENV
+          echo "DOCKER_ARM_TAG=clairton/chatwoot-arm:latest" >> $GITHUB_ENV
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      # https://github.com/docker/buildx/discussions/1382 cache build
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/Dockerfile
           platforms: linux/amd64
           push: true
           tags: ${{ env.DOCKER_TAG }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Build and push arm64
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: docker/Dockerfile
+          platforms: linux/arm64
+          push: true
+          tags: ${{ env.DOCKER_ARM_TAG }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/run_foss_spec.yml

@@ -10,6 +10,7 @@ on:
     branches:
       - develop
       - master
+      - uno
   pull_request:
   workflow_dispatch:
 

Gemfile

@@ -155,6 +155,8 @@ gem 'stripe'
 ## to populate db with sample data
 gem 'faker'
 
+gem 'phonelib'
+
 # Include logrange conditionally in intializer using env variable
 gem 'lograge', '~> 0.14.0', require: false
 

Gemfile.lock

@@ -543,7 +543,10 @@ GEM
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
-    pgvector (0.1.1)
+    pgvector (0.2.2)
+    phonelib (0.7.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     procore-sift (1.0.0)
       activerecord (>= 6.1)
     pry (0.14.2)
@@ -916,6 +919,7 @@ DEPENDENCIES
   pg
   pg_search
   pgvector
+  phonelib
   procore-sift
   pry-rails
   puma

Procfile

@@ -1,3 +1,3 @@
 release: POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rails db:chatwoot_prepare && echo $SOURCE_VERSION > .git_sha
-web: bundle exec rails ip_lookup:setup && bin/rails server -p $PORT -e $RAILS_ENV
-worker: bundle exec rails ip_lookup:setup && bundle exec sidekiq -C config/sidekiq.yml
+web: bundle exec rails server -p $PORT -e $RAILS_ENV
+worker: bundle exec sidekiq -C config/sidekiq.yml

README.md

@@ -3,7 +3,24 @@
 
 ___
 
-# Chatwoot 
+# Chatwoot Uno
+  - essa versão do chatwoot que esta sendo usada aqui tem algumas customizações que ainda não foram aceitas pelo time do chatwoot e para um melhor uso com a unoapi(http://github.com/clairton/unoapi-cloud):
+    - funciona as conversas em grupo
+    - trata a mensagem enviadas por outras conexões, inclusive o aplicativo
+    - desabilita a janela de 24 horas do whatsapp cloud oficial
+    - sincroniza as imagens de perfil dos grupos e usuarios
+    - possibilidade de editar o endereço da caixa de entrada do whatsapp, assim pode usar a oficial e a unoapi na mesma instalação(não usar a env WHATSAPP_CLOUD_BASE_URL)
+    - opção no superadmin de habilitar para colocar o nome do agente na mensagem
+    - opção no superadmin de habilitar para marcar as mensagem no whatsapp como lido quando o agente visualiza a conversa
+    - opção no superadmin de esconder para a aba de todas as conversas
+    - opção no superadmin de esconder para o filtro de conversas
+    - opção no superadmin de esconder a parte de contatos
+    - da opção de alterar logo e nome da empresa
+  Exemplo de stack com os dois projetos integrados: https://github.com/clairton/unoapi-cloud/tree/main/examples/unochat
+
+
+
+# Chatwoot
 
 Customer engagement suite, an open-source alternative to Intercom, Zendesk, Salesforce Service Cloud etc.
 <p>
@@ -98,7 +115,7 @@ Chatwoot now supports 1-Click deployment to DigitalOcean as a kubernetes app.
 
 ### Other deployment options
 
-For other supported options, checkout our [deployment page](https://chatwoot.com/deploy). 
+For other supported options, checkout our [deployment page](https://chatwoot.com/deploy).
 
 ## Security
 

app/builders/contact_inbox_builder.rb

@@ -23,11 +23,21 @@ def generate_source_id
       phone_source_id
     when 'Channel::Api', 'Channel::WebWidget'
       SecureRandom.uuid
+    when 'Channel::NotificaMe'
+      notifica_me_source_id
     else
       raise "Unsupported operation for this channel: #{@inbox.channel_type}"
     end
   end
 
+  def notifica_me_source_id
+    if ['telegram', 'whatsapp', 'sms'].include?(@inbox.channel.notifica_me_type)
+      return  @contact.phone_number
+    end
+    raise ActionController::ParameterMissing, 'contact email' unless @contact.source_id
+    return @contact.source_id
+  end
+
   def email_source_id
     raise ActionController::ParameterMissing, 'contact email' unless @contact.email
 

app/builders/contact_inbox_with_contact_builder.rb

@@ -15,12 +15,16 @@ def perform
 
   def find_or_create_contact_and_contact_inbox
     @contact_inbox = inbox.contact_inboxes.find_by(source_id: source_id) if source_id.present?
-    return @contact_inbox if @contact_inbox
+    if @contact_inbox
+      update_contact_avatar(@contact_inbox.contact) unless @contact_inbox.contact.avatar.attached?
+      return @contact_inbox
+    end
 
     ActiveRecord::Base.transaction(requires_new: true) do
       build_contact_with_contact_inbox
+      update_contact_avatar(@contact) unless @contact.avatar.attached?
     end
-    update_contact_avatar(@contact) unless @contact.avatar.attached?
+
     @contact_inbox
   end
 

app/builders/messages/message_builder.rb

@@ -105,7 +105,7 @@ def validate_email_addresses(all_emails)
   end
 
   def message_type
-    if @conversation.inbox.channel_type != 'Channel::Api' && @message_type == 'incoming'
+    if @conversation.inbox.channel_type != 'Channel::Api' && @message_type == 'incoming' && !@private
       raise StandardError, 'Incoming messages are only allowed in Api inboxes'
     end
 
@@ -138,6 +138,15 @@ def message_sender
     AgentBot.where(account_id: [nil, @conversation.account.id]).find_by(id: @params[:sender_id])
   end
 
+  def status_param
+    @params[:status] = :progress if params_status_progress?
+    @params[:status].present? ? { status: @params[:status] } : {}
+  end
+
+  def source_id_param
+    @params[:source_id].present? ? { source_id: @params[:source_id] } : {}
+  end
+
   def message_params
     {
       account_id: @conversation.account_id,
@@ -150,7 +159,15 @@ def message_params
       items: @items,
       in_reply_to: @in_reply_to,
       echo_id: @params[:echo_id],
-      source_id: @params[:source_id]
-    }.merge(external_created_at).merge(automation_rule_id).merge(campaign_id).merge(template_params)
+    }.merge(external_created_at)
+      .merge(automation_rule_id)
+      .merge(campaign_id)
+      .merge(template_params)
+      .merge(status_param)
+      .merge(source_id_param)
+  end
+
+  def params_status_progress?
+    @params[:status].blank? && @message_type == 'outgoing' && !@private && @params[:action] == 'create' && (@conversation.inbox&.whatsapp? || @conversation.inbox&.notifica_me?)
   end
 end

app/controllers/api/v1/accounts/campaigns_controller.rb

@@ -3,7 +3,7 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
   before_action :check_authorization
 
   def index
-    @campaigns = Current.account.campaigns
+    @campaigns = Current.account.campaigns.limit(200).order(created_at: :desc)
   end
 
   def show; end
@@ -28,7 +28,13 @@ def campaign
   end
 
   def campaign_params
-    params.require(:campaign).permit(:title, :description, :message, :enabled, :trigger_only_during_business_hours, :inbox_id, :sender_id,
-                                     :scheduled_at, audience: [:type, :id], trigger_rules: {})
+    fields = [:title, :description, :message, :enabled, :trigger_only_during_business_hours, :inbox_id, :sender_id, :scheduled_at]
+    fields << { trigger_rules: {} }
+    fields << if Inbox.find(params[:inbox_id])&.channel.try(:provider) == 'unoapi'
+                { audience: [:name, :phone_number, :identifier, :due_at, :value, :scheduled_at, :email, :wait_for_seconds] }
+              else
+                { audience: [:type, :id] }
+              end
+    params.require(:campaign).permit(fields)
   end
 end

app/controllers/api/v1/accounts/channels/notifica_me_channels_controller.rb

@@ -0,0 +1,63 @@
+
+class Api::V1::Accounts::Channels::NotificaMeChannelsController < Api::V1::Accounts::BaseController
+  before_action :authorize_request
+
+
+  def index
+    unless request.query_parameters["token"]
+      return render :json => { error: "Put the NotificaMe Token" }, status: 422
+    end
+    url = URI("https://hub.notificame.com.br/v1/channels")
+    response = HTTParty.get(
+      url,
+      headers: {
+        'X-API-Token' => request.query_parameters["token"],
+        'Content-Type' => 'application/json'
+      },
+      format: :json
+    )
+    if response.success?
+      render json: { data: { channels: response.parsed_response }}, status: 200
+    else
+      render json: { error: response.parsed_response }, status: 422
+    end
+  end
+
+  def create
+    ActiveRecord::Base.transaction do
+      build_inbox
+      setup_webhooks
+      render json: @inbox, status: 200
+    rescue StandardError => e
+      Rails.logger.error("NotificaMe channel create error #{e}, #{e.backtrace}")
+      render_could_not_create_error(e.message)
+      raise ActiveRecord::Rollback
+    end
+  end
+
+  private
+
+  def authorize_request
+    authorize ::Inbox
+  end
+
+  def setup_webhooks
+    ::NotificaMe::WebhookSetupService.new(inbox: @inbox).perform
+  end
+
+  def build_inbox
+    @notifica_me_channel = Current.account.notifica_me_channels.create!(
+      notifica_me_id: permitted_params[:notifica_me_id],
+      notifica_me_token: permitted_params[:notifica_me_token],
+      notifica_me_type: permitted_params[:notifica_me_type],
+    )
+    @inbox = Current.account.inboxes.create!(
+      name: permitted_params[:name],
+      channel: @notifica_me_channel
+    )
+  end
+
+  def permitted_params
+    params.require(:notifica_me_channel).permit(:notifica_me_id, :notifica_me_token, :notifica_me_type, :name)
+  end
+end

app/controllers/api/v1/accounts/contacts_controller.rb

@@ -94,7 +94,13 @@ def create
 
   def update
     @contact.assign_attributes(contact_update_params)
-    @contact.save!
+    # 'Channel::TwilioSms', 'Channel::Whatsapp', 'Channel::Sms'
+    Contact.transaction do
+      @contact.contact_inboxes
+        .select{ |ci| ['Channel::Whatsapp'].include?(ci.inbox.channel_type) }
+        .each{ |ci| ci.update_attribute(:source_id, @contact.phone_number.delete('+').to_s) }
+      @contact.save!
+    end
     process_avatar_from_url
   end
 

app/controllers/api/v1/accounts/conversations_controller.rb

@@ -125,7 +125,7 @@ def permitted_update_params
 
   def update_last_seen_on_conversation(last_seen_at, update_assignee)
     # rubocop:disable Rails/SkipsModelValidations
-    @conversation.update_column(:agent_last_seen_at, last_seen_at)
+    @conversation.update_column(:agent_last_seen_at, last_seen_at) && UpdateLastSeenJob.perform_later(@conversation.id, current_user, last_seen_at)
     @conversation.update_column(:assignee_last_seen_at, last_seen_at) if update_assignee.present?
     # rubocop:enable Rails/SkipsModelValidations
   end

app/controllers/dashboard_controller.rb

@@ -32,7 +32,7 @@ def set_global_config
       'LOGOUT_REDIRECT_LINK',
       'DISABLE_USER_PROFILE_UPDATE',
       'DEPLOYMENT_ENV',
-      'CSML_EDITOR_HOST'
+      'CSML_EDITOR_HOST', 'CONVERSATION_STYLE_CSS'
     ).merge(app_config)
   end
 
@@ -64,6 +64,7 @@ def app_config
       FACEBOOK_API_VERSION: GlobalConfigService.load('FACEBOOK_API_VERSION', 'v17.0'),
       IS_ENTERPRISE: ChatwootApp.enterprise?,
       AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),
+      UNOAPI_AUTH_TOKEN: GlobalConfigService.load('UNOAPI_AUTH_TOKEN', ''),
       GIT_SHA: GIT_HASH
     }
   end

app/controllers/super_admin/app_configs_controller.rb

@@ -37,6 +37,8 @@ def allowed_configs
                          %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET IG_VERIFY_TOKEN FACEBOOK_API_VERSION ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT]
                        when 'microsoft'
                          %w[AZURE_APP_ID AZURE_APP_SECRET]
+                       when 'unoapi'
+                         %w[UNOAPI_AUTH_TOKEN]
                        when 'email'
                          ['MAILER_INBOUND_EMAIL_DOMAIN']
                        else

app/controllers/webhooks/notifica_me_controller.rb

@@ -0,0 +1,6 @@
+class Webhooks::NotificaMeController < ActionController::API
+  def process_payload
+    Webhooks::NotificaMeEventsJob.perform_later(params.to_unsafe_hash)
+    head :ok
+  end
+end