chatgpt_assistant 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18ba3cf9f452f76a08c75f2e0dfd406ed8c7fe5bd35ac530abce0217ed91c02c
-  data.tar.gz: 34f3574731f3ffe82469b49c41e27f531f2d1f75f83989327ee46d3e700f5501
+  metadata.gz: 9317ab1f4742c358a91f3e8ec363d8ed72147c2a31e0a312ec6c5ad54215c8db
+  data.tar.gz: e3a6a3f6099a4dcb47b262fb388f5f783a2f48466b1946f2e140e1a1b4c25767
 SHA512:
-  metadata.gz: 5d4cafcef50cef6a15fcd3d50ed9f98ef77f65f1b2c6611887f27a33a423498f6258dbad2b1352ff0ee5f6b59a8995ba3e062a0ff01185b6a8b8e5ec464deaed
-  data.tar.gz: 7081185b589e2ef8566a76e43d513fba382549a577d08f9384315e92601341bf35df1311c6da65b0588d8cf62b53db8c6e7c1e29f52ad2fe7990976397b16a33
+  metadata.gz: 3ea5f6b13b7db43f7261d9a726257bdf9e37a45bda2d34149bf7c35c659eee8092aec29a3dc7db8dc3222c005c65941f10f6b24f589f20ab0786a91e69290f27
+  data.tar.gz: 46e7e83be3e53a7ece0fbaf0c59d67054270e05e0d6fad8b4fb09194f57a2de82d136203110fb9de20d11a1160c8b29dd2be19a026567528c898224a08452f67

data/.env_sample

@@ -1,7 +1,7 @@
 ENV_TYPE=development
 LANGUAGE=en # or pt currently
 MODE=aws # or ibm
-DISCORD_PREFIX=dgpt!
+DISCORD_PREFIX=!!
 
 POSTGRES_DB=chatgpt_assistant_development # or your database
 POSTGRES_USER=postgres # or your user

data/.rubocop.yml

@@ -11,22 +11,22 @@ Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
 Layout/LineLength:
-  Max: 160
+  Max: 200
 
 Metrics/ModuleLength:
   Max: 120
 
 Metrics/MethodLength:
-  Max: 200
+  Max: 250
 
 Metrics/BlockLength:
-  Max: 200
+  Max: 250
 
 Metrics/ClassLength:
   Max: 300
 
 Metrics/AbcSize:
-  Max: 28
+  Max: 35
 
 Layout/AccessModifierIndentation:
   EnforcedStyle: indent

data/Gemfile

@@ -6,15 +6,27 @@ gem "bcrypt"
 
 gem "rake", "~> 13.0"
 
-gem "rspec", "~> 3.0", group: :test
+gem "rspec", "~> 3.12", group: :test
+
+gem "rspec-rails", "~> 6.0", group: :test
 
 gem "simplecov", "~> 0.21", group: :test
 
 gem "vcr", "~> 6.0", group: :test
 
-gem "rubocop", "~> 1.49"
+gem "shoulda-matchers", "~> 5.3", group: :test
+
+gem "factory_bot_rails", "~> 6.0", group: :test
+
+gem "faker", "~> 2.0", group: :test
+
+gem "database_cleaner", "~> 2.0", group: :test
 
-gem "rubocop-rspec", "~> 2.4"
+gem "dotenv", "~> 2.0", group: :test
+
+gem "rubocop", "~> 1.50"
+
+gem "rubocop-rspec", "~> 2.20"
 
 gem "telegram-bot-ruby", "~> 0.16"
 
@@ -28,8 +40,6 @@ gem "activerecord"
 
 gem "activesupport"
 
-gem "actionmailer"
-
 gem "redis"
 
 gem "sidekiq"
@@ -48,4 +58,6 @@ gem "ibm_watson"
 
 gem "aws-sdk-polly"
 
-gem "awesome_chatgpt_actors"
+gem "awesome_chatgpt_actors"
+
+gem "sidekiq-expiring-jobs"

data/Gemfile.lock

@@ -1,16 +1,6 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.0)
     actionpack (7.0.4.3)
       actionview (= 7.0.4.3)
       activesupport (= 7.0.4.3)
@@ -24,9 +14,6 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4.3)
-      activesupport (= 7.0.4.3)
-      globalid (>= 0.3.6)
     activemodel (7.0.4.3)
       activesupport (= 7.0.4.3)
     activerecord (7.0.4.3)
@@ -39,14 +26,13 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    awesome_chatgpt_actors (0.1.2)
-      csv
-      ruby-openai
+    awesome_chatgpt_actors (0.1.3)
+      csv (~> 3.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.735.0)
+    aws-partitions (1.748.0)
     aws-sdk-core (3.171.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
@@ -69,7 +55,12 @@ GEM
     connection_pool (2.4.0)
     crass (1.0.6)
     csv (3.2.6)
-    date (3.3.3)
+    database_cleaner (2.0.2)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.1.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.0)
@@ -84,19 +75,27 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.8.1)
     dry-inflector (1.0.0)
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
     event_emitter (0.2.6)
     eventmachine (1.2.7)
+    factory_bot (6.2.1)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.2.0)
+      factory_bot (~> 6.2.0)
+      railties (>= 5.0.0)
+    faker (2.23.0)
+      i18n (>= 1.8.11, < 2)
     faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
-    faye-websocket (0.11.1)
+    faye-websocket (0.11.2)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     ffi (1.15.5)
@@ -106,8 +105,6 @@ GEM
     fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
     http (4.4.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -119,9 +116,6 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
-    httparty (0.21.0)
-      mini_mime (>= 1.0.0)
-      multi_xml (>= 0.5.2)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     ibm_cloud_sdk_core (1.1.3)
@@ -139,42 +133,27 @@ GEM
     jmespath (1.6.2)
     json (2.6.3)
     jwt (2.2.3)
-    loofah (2.19.1)
+    loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lucy_dockerunner (0.1.9)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
+    method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
-    mini_mime (1.1.2)
     mini_portile2 (2.8.1)
     minitest (5.18.0)
     multi_json (1.15.0)
-    multi_xml (0.6.0)
     multipart-post (2.3.0)
-    net-imap (0.3.4)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.1)
-      timeout
-    net-smtp (0.3.3)
-      net-protocol
     netrc (0.11.0)
-    nokogiri (1.14.2)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
     opus-ruby (1.0.1)
       ffi
-    parallel (1.22.1)
+    parallel (1.23.0)
     parser (3.2.2.0)
       ast (~> 2.4.1)
     pg (1.4.6)
@@ -189,13 +168,20 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
     redis (5.0.6)
       redis-client (>= 0.9.0)
-    redis-client (0.14.0)
+    redis-client (0.14.1)
       connection_pool
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -211,11 +197,19 @@ GEM
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
+    rspec-rails (6.0.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.11)
+      rspec-expectations (~> 3.11)
+      rspec-mocks (~> 3.11)
+      rspec-support (~> 3.11)
     rspec-support (3.12.0)
-    rubocop (1.49.0)
+    rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
@@ -229,20 +223,22 @@ GEM
       parser (>= 3.2.1.0)
     rubocop-capybara (2.17.1)
       rubocop (~> 1.41)
-    rubocop-rspec (2.19.0)
+    rubocop-rspec (2.20.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
-    ruby-openai (3.7.0)
-      httparty (>= 0.18.1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
-    sidekiq (7.0.7)
+    shoulda-matchers (5.3.0)
+      activesupport (>= 5.2.0)
+    sidekiq (7.0.8)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
       redis-client (>= 0.11.0)
+    sidekiq-expiring-jobs (0.1.0)
+      sidekiq (>= 6.0)
     sidekiq-scheduler (5.0.2)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
@@ -260,9 +256,9 @@ GEM
       faraday (~> 2.0)
       faraday-multipart (~> 1.0)
       virtus (~> 2.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.1.0)
-    timeout (0.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
@@ -281,13 +277,13 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby
   x86_64-linux
 
 DEPENDENCIES
-  actionmailer
   activemodel
   activerecord
   activerecord-import
@@ -295,17 +291,24 @@ DEPENDENCIES
   awesome_chatgpt_actors
   aws-sdk-polly
   bcrypt
+  database_cleaner (~> 2.0)
   discordrb (~> 3.4)
+  dotenv (~> 2.0)
+  factory_bot_rails (~> 6.0)
+  faker (~> 2.0)
   faraday
   ibm_watson
   lucy_dockerunner
   pg
   rake (~> 13.0)
   redis
-  rspec (~> 3.0)
-  rubocop (~> 1.49)
-  rubocop-rspec (~> 2.4)
+  rspec (~> 3.12)
+  rspec-rails (~> 6.0)
+  rubocop (~> 1.50)
+  rubocop-rspec (~> 2.20)
+  shoulda-matchers (~> 5.3)
   sidekiq
+  sidekiq-expiring-jobs
   sidekiq-scheduler
   simplecov (~> 0.21)
   streamio-ffmpeg
@@ -313,4 +316,4 @@ DEPENDENCIES
   vcr (~> 6.0)
 
 BUNDLED WITH
-   2.2.32
+   2.4.10

data/README.md

@@ -6,15 +6,14 @@
 
 This Ruby gem provides an easy way to initialize a client for Telegram and Discord bots using the ChatGPT API, audio transcription, IBM Cloud Text to Speech, and AWS Polly, creating an assistant that can answer questions in text and voice and have a conversation with the user.
 
-#### Languages supported currently: en, pt - contributions are welcome!
-You can contribute by adding your language to the DefaultMessages class in lib/chatgpt_assistant/default_messages.rb. You can also add your language to the list of languages in the README.md file.
-Pull request from language/YOUR_LANGUAGE to main, remember to name your pull request as "Add YOUR_LANGUAGE support".
+#### Languages supported currently: en, pt
 
 Other contributions are welcome too!
 Remember to give a star to this repo if you like it!
 ## Requirements
 
-- Ruby > 2.6.0
+- Ruby > 2.6.0 - for the gem who can create bots projects in your machine
+- Ruby 3.2.2 - inside the docker contianer or for run the bots in your machine
 - Docker
 - Docker Compose
 - PostgreSQL
@@ -63,6 +62,11 @@ Remember to edit docker-compose.prod.yml when deploying to production.
 rake compose:up && sudo docker compose run --rm telegram exe/chatgpt_bot migrate
 ```
 
+## Install [Awesome Chatgpt Actors](https://github.com/JesusGautamah/awesome-chatgpt-actors)
+```bash
+rake chatgpt_actors:install
+```
+
 ## Usage
 
 You can start the Docker Compose services required for the gem using the rake tasks provided by the Lucy Dockerunner gem. These tasks include compose:up, compose:down, compose:status, compose:shell, compose:restart, and others listed previously.
@@ -87,26 +91,23 @@ After starting the Docker Compose services, you can use the features of the gem
 ## Discord Bot Commands
 
 The discord commands prefix can be changed in the .env file.
-The default prefix is dgpt!
+The default prefix is !!
 
 - dgpt!start - shows the welcome message
 - dgpt!help - shows the help message
-- dgpt!login email:password - logs in the user
-- dgpt!register email:password - registers a new user
+- dgpt!login email:password - logs in the user. Remember to use private messages to register or login and share a server with right permissions with the bot to message it.
+- dgpt!register email:password - registers a new user, email is not verfied yet, so you can use any email, the password is encrypted with bcrypt and stored in the database with salt.
 - dgpt!list - lists the user created chatbots
 - dgpt!sl_chat CHAT TITLE - starts a chat with the chatbot with the given title
 - dgpt!new_chat CHAT TITLE - creates a new chatbot with the given title
 - dgpt!ask TEXT - sends a text to the chatbot
-- dgpt!connect - connects the chat bot to the current channel
-- dgpt!disconnect - disconnects the chat bot from the current channel
-- dgpt!speak TEXT - sends a text to the chatbot and gets the response in voice
 
 ## Telegram Bot Commands
 
 - /start - shows the welcome message
 - /help - shows the help message
-- login/email:password - logs in the user
-- register/email:password - registers a new user
+- login/email:password - logs in the user. Remember to use private messages to register or login.
+- register/email:password - registers a new user, email is not verfied yet, so you can use any email, the password is encrypted with bcrypt and stored in the database with salt. Remember to use private messages to register or login.
 - list - lists the user created chatbots
 - sl_chat/CHAT TITLE - starts a chat with the chatbot with the given title
 - new_chat/CHAT TITLE - creates a new chatbot with the given title
@@ -146,4 +147,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the ChatgptAssistant project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/JesusGautamah/chatgpt_assistant/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the ChatgptAssistant project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/JesusGautamah/chatgpt_assistant/blob/master/CODE_OF_CONDUCT.md).

data/docker-compose.prod.yml

@@ -7,7 +7,7 @@ services:
     volumes:
       - ./db_data:/var/lib/postgresql/data
     env_file:
-      - .env
+      - .env_prod
   telegram:
     build: .
     command: bash -c "exe/chatgpt_bot telegram"

data/docker-compose.yml

@@ -1,5 +1,11 @@
 version: "3.3"
 services:
+  redis:
+    image: redis:6-alpine
+    ports:
+      - "6379:6379"
+    volumes:
+      - ./redis_data:/data
   db:
     image: postgres:12.2
     ports:
@@ -30,5 +36,17 @@ services:
       - .env
     depends_on:
       - db
+  sidekiq:
+    build: .
+    command: bash -c "exe/chatgpt_bot sidekiq"
+    volumes:
+      - .:/chatgpt_assistant
+    environment:
+      POSTGRES_HOST: db
+    env_file:
+      - .env
+    depends_on:
+      - db
+      - redis
 volumes:
   postgres:

data/exe/chatgpt_bot

@@ -11,6 +11,9 @@ when "telegram"
   ChatgptAssistant::Main.new("telegram").start
 when "discord"
   ChatgptAssistant::Main.new("discord").start
+when "sidekiq"
+  # start sidekiq with the lib/chatgpt_assistant/sidekiq.rb
+  system "bundle exec sidekiq -r ./lib/chatgpt_assistant/sidekiq.rb -C ./lib/chatgpt_assistant/sidekiq.yml"
 when "migrate"
   ChatgptAssistant::Config.new.migrate
 end

data/lib/bots/application_bot.rb

@@ -1,21 +1,31 @@
 # frozen_string_literal: true
 
+# helpers
 require_relative "helpers/messenger_helper"
 require_relative "helpers/authentication_helper"
 require_relative "helpers/visit_helper"
 require_relative "helpers/audio_helper"
-require_relative "helpers/logger_action_helper"
 require_relative "helpers/search_helper"
 require_relative "helpers/validation_helper"
 require_relative "helpers/file_helper"
+
+# jobs
+require_relative "jobs/register_job"
+require_relative "jobs/new_chat_job"
+require_relative "jobs/voice_connect_job"
+
+# services
+require_relative "services/register_service"
+require_relative "services/new_chat_service"
+require_relative "services/voice_connect_service"
+
 module ChatgptAssistant
-  # This class is responsible to contain the shared variables between the bot classes
+  # This class is responsible to contain the shared attributes and methods
   class ApplicationBot
     include MessengerHelper
     include AuthenticationHelper
     include VisitHelper
     include AudioHelper
-    include LoggerActionHelper
     include SearchHelper
     include ValidationHelper
     include FileHelper
@@ -30,7 +40,7 @@ module ChatgptAssistant
       @discord_prefix = @config.discord_prefix
       @database = @config.db_connection
       @mode = @config.mode
-      @commom_messages = default_msg.commom_messages
+      @common_messages = default_msg.common_messages
       @error_messages = default_msg.error_messages
       @success_messages = default_msg.success_messages
       @help_messages = default_msg.help_messages
@@ -38,7 +48,7 @@ module ChatgptAssistant
 
     attr_reader :openai_api_key, :telegram_token, :database, :default_msg,
                 :mode, :config, :discord_token, :discord_client_id,
-                :discord_prefix, :commom_messages, :error_messages, :success_messages,
+                :discord_prefix, :common_messages, :error_messages, :success_messages,
                 :help_messages
     attr_accessor :msg, :evnt, :bot, :audio_url, :visitor, :user, :chat, :chat_id
 

data/lib/bots/discord_bot.rb

@@ -16,9 +16,6 @@ module ChatgptAssistant
       new_chat_event
       sl_chat_event
       ask_event
-      voice_connect_event
-      disconnect_event
-      speak_event
       private_message_event
       bot_init
     end
@@ -44,7 +41,7 @@ module ChatgptAssistant
         bot.command :login do |event|
           @message = event.message.content.split[1]
           @evnt = event
-          message.nil? ? event.respond(commom_messages[:login]) : login_action
+          message.nil? ? event.respond(common_messages[:login]) : login_action
           "OK"
         end
       end
@@ -53,7 +50,7 @@ module ChatgptAssistant
         bot.command :register do |event|
           @message = event.message.content.split[1]
           @evnt = event
-          message.nil? ? event.respond(commom_messages[:register]) : register_action
+          message.nil? ? event.respond(common_messages[:register]) : register_action
           "OK"
         end
       end
@@ -70,9 +67,8 @@ module ChatgptAssistant
       def hist_event
         bot.command :hist do |event|
           @evnt = event
-          event.respond error_messages[:user_not_logged_in] if user.nil?
-          title = event.message.content.split[1..].join(" ")
-          @chat = user.chat_by_title(title)
+          @user = find_user(discord_id: event.user.id)
+          @chat = user.current_chat
           event.respond error_messages[:chat_not_found] if chat.nil? && user
           hist_action if user && chat
           "OK"
@@ -130,7 +126,7 @@ module ChatgptAssistant
             @chat = Chat.where(id: user.current_chat_id).last
             voice_connect_checker_action
             voice_connection_checker_action
-            discord_voice_bot_connect
+            VoiceConnectJob.perform_async(event.user.voice_channel.id)
           else
             event.respond error_messages[:user_not_logged_in]
           end
@@ -164,6 +160,7 @@ module ChatgptAssistant
       def private_message_event
         bot.message do |event|
           @evnt = event
+          @visitor = discord_visited?(@evnt.user.id)
           next if discord_next_action?
 
           @message = event.message.content

data/lib/bots/helpers/authentication_helper.rb

@@ -18,12 +18,13 @@ module ChatgptAssistant
 
       hash = new_access.password_hash
       salt = new_access.password_salt
-      valid_password?(password, hash, salt) ? telegram_user_access(_access, new_access) : "wrong password"
+      valid_password?(password, hash, salt) ? telegram_user_access(visitor_access, new_access) : "wrong password"
     end
 
     def telegram_user_access(visitor, new_access)
       other_access = where_user(telegram_id: visitor.telegram_id)
-      other_access&.each { |access| access.update(telegram_id: nil) }
+      other_access&.each { |access| access.update(telegram_id: nil) } if other_access&.class == Array
+      other_access&.update(telegram_id: nil) if other_access&.class == User
       new_access.update(telegram_id: visitor.telegram_id)
       new_access.email
     end

data/lib/bots/helpers/discord_helper.rb

@@ -12,8 +12,8 @@ module ChatgptAssistant
     end
 
     def start_action
-      send_message commom_messages[:start_helper].gsub("register/", "gpt!register ")
-      send_message commom_messages[:start_sec_helper].gsub("login/", "gpt!login ")
+      send_message common_messages[:start_helper].gsub("register/", "gpt!register ")
+      send_message common_messages[:start_sec_helper].gsub("login/", "gpt!login ")
     end
 
     def login_action
@@ -46,7 +46,7 @@ module ChatgptAssistant
 
     def list_action
       chats_title = user.chats.map(&:title)
-      send_message commom_messages[:chat_list]
+      send_message common_messages[:chat_list]
       send_message chats_title.join("\n")
     end
 
@@ -95,7 +95,7 @@ module ChatgptAssistant
       return send_message "chat title already exists" if user.chat_by_title(title)
 
       actor_name = actors[mode.to_i - 1] if mode
-      actor = AwesomeChatgptActors::Actor.new(prompt_type: actor_name) if actor_name
+      actor = AwesomeChatgptActors::Actor.new(role: actor_name, language: config.language) if actor_name
       chat = Chat.new(user_id: user.id, status: 0, title: title, actor: actor_name, prompt: actor.prompt) if actor
       chat = Chat.new(user_id: user.id, status: 0, title: title) unless actor
       return send_message "Something went wrong", msg.chat.id unless chat