vk_cozy 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f8d21019678635297581f40f48e83e71cc79bfe2db701cd3c6b6815df8c5d0
-  data.tar.gz: 2a3e5cfce38ec22b4d20f36b3f50e6c2d5b508a09e854186c5aeb90fa858ff80
+  metadata.gz: 3f3e335ff0f9eb232d5a3f259a79592723ee5d5cb785bfb619cd4eb81be11f5a
+  data.tar.gz: 6c95df5ab9e7c6bd4ae7dd672786526bbfa4d8aa974ecea4cf564caa6859f627
 SHA512:
-  metadata.gz: b02bf27e35dd324d7497ff0d2bd7f4a952b313cb94fc897c3e190b510881d870efe4e17c1c912dcdf5a596aaf2842608d94d44f6b6432c8cbae7778cb38340e9
-  data.tar.gz: f2b9dbac5adb7488dcf8db32189ab9d80c514ed8acefc20782ba9ded4275ea6214c8023747e0d5dee8bef70f9bdb804911a31c58f856d8ffce100a4d2160401e
+  metadata.gz: b7305aa9a7a4da1fb754d4115d6087274e11e7139b56a4028cb557fbc9a98e89b5fc78aad0ab55522094cba6125c18a9865a72728b6509891e3324227b5a9cc3
+  data.tar.gz: e3b6b8a3ce259097d50c3fce526474f6564dae1c74c25803903b68759643b12a81669ffc6c5fd5ac6e89bbfc8ebbc1517632743f632434b95b36067ff9562905

data/lib/vk_cozy/framework/labeler/bot.rb

@@ -44,7 +44,7 @@ module VkCozy
     end
 
     def filter(event)
-      for handler in get_handlers(event.type) + @handlers['*']
+      for handler in get_handlers(event.type) + get_handlers('*')
         if handler.check(event)
           return true
         end
@@ -55,9 +55,11 @@ module VkCozy
       if func.is_a?(Symbol)
         func = method(func)
       end
+
       if @handlers[type].nil?
         @handlers[type] = []
       end
+
       @handlers[type] << Bothandler.new(filter, func)
     end
 

data/lib/vk_cozy/framework/labeler/user.rb

@@ -1,40 +1,74 @@
 module VkCozy
+
+  class UserHandler
+    def initialize(filter, func, stop: true)
+      @filter = filter
+      @func = func
+      @stop = stop
+    end
+
+    def check(event)
+      check_user = @filter.check_user(event)
+      if check_user
+        if check_user.is_a?(Symbol)
+          return true
+        elsif check_user.is_a?(Hash)
+          @func.call(event, check_user)
+        else
+          @func.call(event)
+        end
+
+        if @stop
+          return true
+        end
+      end
+    end
+  end
+
   class UserLabeler
     attr_reader :api
 
     def initialize(api)
       @api = api
-      @rules = []
+      @handlers = {'*' => []}
+    end
+
+    def get_handlers(type)
+      if @handlers[type].nil?
+        return []
+      else
+        return @handlers[type]
+      end
     end
 
     def filter(event_raw)
       event = VkCozy::UserEvent.new(@api, event_raw)
-      for i in @rules
-        f = i[:filter]
-        check = f.check_user(event)
-        if check
-          if check.is_a?(Symbol)
-            check = [Symbol]
-          elsif check.is_a?(Array)
-            i[:func].call(event, *check)
-          elsif check.is_a?(Hash)
-            i[:func].call(event, **check)
-          else
-            i[:func].call(event)
-          end
+      puts event
+      for handler in get_handlers(event.type) + get_handlers('*')
+        if handler.check(event)
           return true
         end
     	end
     end
 
-    def message_handler(filter, func)
+    def add_handler(filter, func, type: '*')
       if func.is_a?(Symbol)
         func = method(func)
       end
-      @rules << { 
-        :func => func,
-        :filter => filter
-      }
+
+      if @handlers[type].nil?
+        @handlers[type] = []
+      end
+
+      @handlers[type] << UserHandler.new(filter, func)
+    end
+
+    def message_handler(filter, func)
+      add_handler(filter, func, type: VkCozy::UserEventType::MESSAGE_NEW)
+    end
+
+    def handler(filter, func)
+      add_handler(filter, func)
     end
 	end
 end

data/lib/vk_cozy/types/events/user_events.rb

@@ -53,12 +53,22 @@ module VkCozy
     VkCozy::UserEventType::RESET_MESSAGE_FLAGS => [MSGID, 'mask'] + MESSAGE_EXTRA_FIELDS,
     VkCozy::UserEventType::MESSAGE_NEW => [MSGID, 'flags'] + MESSAGE_EXTRA_FIELDS,
     VkCozy::UserEventType::MESSAGE_EDIT => [MSGID, 'mask'] + MESSAGE_EXTRA_FIELDS,
+
     VkCozy::UserEventType::IN_READ => ['peer_id', 'local_id'],
     VkCozy::UserEventType::OUT_READ => ['peer_id', 'local_id'],
+
     VkCozy::UserEventType::FRIEND_ONLINE => ['user_id', 'extra', 'timestamp'],
     VkCozy::UserEventType::FRIEND_OFFLINE => ['user_id', 'flags', 'timestamp'],
-    VkCozy::UserEventType::DIALOG_TYPING_STATE => ['user_id', 'flags']
+
+    VkCozy::UserEventType::CHAT_EDIT => ['chat_id', 'self'],
+    VkCozy::UserEventType::CHAT_INFO_EDIT => ['type_id', 'peer_id', 'info'],
+
+    VkCozy::UserEventType::DIALOG_TYPING_STATE => ['user_id', 'flags'],
+    VkCozy::UserEventType::CHAT_TYPING_STATE => ['user_id', 'chat_id'],
+
+    VkCozy::UserEventType::COUNTER => ['count']
   }
+
   PARSE_PEER_ID_EVENTS = EVENT_ATTRS_MAPPING.map{|k, v| if v.include?('peer_id') then k end}.select{ |i| not i.nil? }
   PARSE_MESSAGE_FLAGS_EVENTS = [
     VkCozy::UserEventType::REPLACE_MESSAGE_FLAGS,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vk_cozy
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Danil Konenko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inum