telegram_chatbot 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf944123265ec4629b1d31d92d739c0c127f632e4ec0d78cabb4f6eae41931c
-  data.tar.gz: 8bc181f944b381fe4e3c62a09be1327e766c0b214629b4b68c6d00d54c74d821
+  metadata.gz: 79b122d7f5355236543557588ee7a2e237e5426610c30e80a1419b0e2d16ed54
+  data.tar.gz: fd423ca255d15f31a23c71fdd5706dd1ac8836199ddeb9dab3c2a1cfde7be4df
 SHA512:
-  metadata.gz: 771b4b94e55762242261cbfa0f7e6e387e8168914b7909b0765d0fefa679f43966c7ea146b5f9d6d1521b5900bd7b9286be8bb5a0ca855352c7d93735ac8bc6f
-  data.tar.gz: d3aac21df88d133e78c78f4ab5460cf26589c601e5baef5f65fc3c7da9b9eccb84a4841efccc3f6da923a579fa8be4685ce25469743d710ac51a0bb420727455
+  metadata.gz: a4f1274062183c37ef1da36c90a6a09c14507e24478637a69d52b1399e9882beb43f4a918b9971bca61b2f8f2b9de5cb0be1d4fbb3ab5442cee59954fb04195f
+  data.tar.gz: 4a3c4fffab70750dcea399e4c9d8f1101bf03269ec64a37498b831f4107aa389a65b61779666717c52ca16b2d1da86d2894929af236479db88f84037c34bed6f

data/app/models/telegram_chatbot/notification.rb

@@ -1,14 +1,27 @@
 module TelegramChatbot
   class Notification
-    def self.notify_async(message, groups=[])
+    def self.bulk_notify_async(message, groups = [])
       return unless bot.present? && bot.actived?
 
-      NotificationWorker.perform_async(message, groups)
+      groups.each do |group|
+        notify_async(message, group)
+      end
     end
 
-    def self.notify(message, groups=[])
-      groups.each do |group|
-        client.send_message(chat_id: group.chat_id, text: message, parse_mode: :HTML)
+    def self.notify_async(message, group = nil)
+      return if group.nil? && !group.actived?
+
+      NotificationWorker.perform_async(message, group.id)
+    end
+
+    def self.notify(message, group_id = nil)
+      return if group_id.nil?
+
+      begin
+        group = ::TelegramChatbot::ChatGroup.find(group_id)
+        client.send_message(chat_id: group.chat_id, text: message, parse_mode: :HTML) if group.actived?
+      rescue ActiveRecord::RecordNotFound => e
+        logger.info "Find not found chat_group ID: #{group_id}"
       rescue ::Telegram::Bot::Forbidden => e
         group.update(actived: false, reason: e)
       end

data/app/workers/telegram_chatbot/notification_worker.rb

@@ -4,10 +4,10 @@ module TelegramChatbot
   class NotificationWorker
     include Sidekiq::Worker
 
-    def perform(message, groups)
-      return unless message.present? && groups.present?
+    def perform(message, group_id = nil)
+      return if !(group_id.present? && message.present?)
 
-      Notification.notify(message, groups)
+      Notification.notify(message, group_id)
     end
   end
 end

data/lib/telegram_chatbot/engine.rb

@@ -4,6 +4,9 @@ module TelegramChatbot
 
     config.generators do |g|
       g.test_framework :rspec
+      g.fixture_replacement :factory_bot #newly added code
+      g.factory_bot dir: 'spec/factories' #newly added code
     end
+
   end
 end

data/lib/telegram_chatbot/version.rb

@@ -1,3 +1,3 @@
 module TelegramChatbot
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram_chatbot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Sokly
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -170,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement