icqbot 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743e5831359d79b519c7c2919eef74941af16c2d6e5a2724ee950842617a6c77
-  data.tar.gz: 664454f4c6e2e82696f0a9be6a191476a9cae82cf585b3b863c3144ace066649
+  metadata.gz: 26bf462455d95a0c0600e9ed437593f5c485c639de150ffff76e61cf2ba7aea0
+  data.tar.gz: 34c3ba04a5eb8acb1ec7ba17e04e29e9515802c21650451be8b00afe9ff9a816
 SHA512:
-  metadata.gz: 0e0a7cb347ca9dbe5c8d735ddf3deea5c08b3f94c710c09b2a7808ae6ccb7f70afaf373ea44270b15f677624026fd954b870bb6ed0c14e8b59ab645143012fd2
-  data.tar.gz: 7583cf6516fc863fe0de6744ee95d0ed676748fbf63b9c3bdbf7945b8e916cfc66e62c2ab79ad39b63f6d067572d5bba6d197fdee85ed16c18db2f48234bbbd9
+  metadata.gz: 404007e2c5bfb54e00ac84d4f4fed67ea79d0f764a007209110e58cc42198ebfc6daa32bd439496090ead2fee0f700886fb12971c57f77121f9fcb04b6642dc1
+  data.tar.gz: f5c46e086eb0289f47e38dc584375c6a654c1fde431aaac12de6027acb5560059dc6377c75c726f904e384c669f4d24c350e977dd0d5668ff6271169eb2a5e02

data/doc/bot.md

@@ -93,4 +93,18 @@ def set_about chat_id, about # -> Hash
 def set_rules chat_id, rules # -> Hash
 ```
 1. `chat_id` - ID чата.
-2. `rules` - правила чата.
+2. `rules` - правила чата.
+
+## Закрепить сообщение
+```ruby
+def pin_msg msg_id, chat_id # -> Hash
+```
+1. `msg_id` - ID сообщения, что нужно закрепить.
+2. `chat_id` - ID чата.
+
+## Открепить сообщение
+```ruby
+def unpin_msg msg_id, chat_id # -> Hash
+```
+1. `msg_id` - ID сообщения, что нужно открепить.
+2. `chat_id` - ID чата.

data/doc/event.md

@@ -15,19 +15,27 @@ def initialize event_h
 
 ## Аттрибуты
 ```ruby
-attr_reader :type, :text, :msg_id, :chat_id, :from
+attr_reader :type, :text, :msg_id, :chat_id, :from,
+            :data, :query_id
+```
+```ruby
 event.type    # Тип события.
 event.text    # текст приходящего события(обычно текст сообщения от юзера).
 event.msg_id  # ID пришедшего сообщения.
 event.chat_id # ID чата, в который пришло сообщения.
 event.from    # Hash | Информация от кого пришло сообщение. 
+# -- Аттрибуты для callback event --
+event.data
+event.query_id 
 ```
 
+
 ## Типы событий
 ```ruby
 module TypeEvent
     NEW_MSG     = 'newMessage'
     EDITED_MSG  = 'editedMessage'
     DELETED_MSG = 'deletedMessage'
+    CALLBACK    = 'callbackQuery'
     ... # in working
 ```

data/doc/message.md

@@ -17,4 +17,13 @@ def initialize text, *keyboard
 attr_reader :text, :keyboard
 msg.text     # текст сообщения(String)
 msg.keyboard # массив объектов [Button](./button.md)
-```
+```
+
+## Добавить кнопку
+```ruby
+def << btn
+```
+```ruby
+alias_method :append, :<<
+```
+1. `btn` - объект типа [Button](./button.md)

data/lib/icqbot.rb

@@ -6,5 +6,5 @@ require_relative './icqbot/user.rb'
 require_relative './icqbot/message.rb'
 
 module ICQ
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/icqbot/bot.rb

@@ -12,6 +12,7 @@ require_relative './functional/chats/get_members.rb'
 require_relative './functional/chats/administration/set_title.rb'
 require_relative './functional/chats/administration/set_about.rb'
 require_relative './functional/chats/administration/set_rules.rb'
+require_relative './functional/chats/administration/pin_unpin_msg.rb'
 
 
 module ICQ
@@ -47,15 +48,6 @@ module ICQ
       end
     end
 
-    def last_event # FIXME: its can delete
-      events = JSON::load(get_events.body)
-      if events and events['events'] and events['events'] != []
-        last_event = events['events'].last
-        @last_event_id = last_event['eventId']
-        yield ICQ::Event.new last_event
-      end
-    end
-
     private
       def base_req chat_id
         {

data/lib/icqbot/event.rb

@@ -8,25 +8,35 @@ module ICQ
     NEW_MSG     = 'newMessage'
     EDITED_MSG  = 'editedMessage'
     DELETED_MSG = 'deletedMessage'
+    CALLBACK    = 'callbackQuery'
   end
 
   class Event
-    attr_reader :type, :text, :msg_id, :chat_id, :from
+    attr_reader :type, :text, :msg_id, :chat_id, :from,
+                :data, :query_id
 
     def initialize event_h
+      # TODO: больше информации
       @event_h = event_h
       @type = event_h['type']
-      @text = event_h['payload']['text']
-      @msg_id = event_h['payload']['msgId']
-      @chat_id = event_h['payload']['chat']['chatId']
       @from = event_h['payload']['from']
+      if @type != ICQ::TypeEvent::CALLBACK
+        @text = event_h['payload']['text']
+        @msg_id = event_h['payload']['msgId']
+        @chat_id = event_h['payload']['chat']['chatId']
+      else
+        @data = event_h['payload']['callbackData']
+        @query_id = event_h['payload']['queryId']
+        @chat_id = event_h['message']['chat']['chatId']
+      end
     end
 
     def prefix?
-      @text[0] == ICQ::BOT_PREFIX
+      @text[0] == ICQ::BOT_PREFIX if @text
     end
 
     def to_h; @event_h end
+    def to_s; "Event(#{@type}" + (@text ? ", #{@text}" : '') + ')' end
   end
 
 end

data/lib/icqbot/functional/chats/administration/pin_unpin_msg.rb

@@ -0,0 +1,21 @@
+require_relative '../../../bot.rb'
+
+module ICQ
+
+  class Bot
+    def pin_msg msg_id, chat_id
+      params = base_req chat_id
+      params['msgId'] = msg_id
+      JSON::load Requests.get(
+        URLS_API::PIN_MSG, params: params).body
+    end
+
+    def unpin_msg msg_id, chat_id
+      params = base_req chat_id
+      params['msgId'] = msg_id
+      JSON::load Requests.get(
+        URLS_API::UNPIN_MSG, params: params).body
+    end
+  end
+
+end

data/lib/icqbot/message.rb

@@ -9,6 +9,13 @@ module ICQ
       @text = obj
       @keyboard = keyboard
     end
+
+    def << btn
+      return @keyboard << btn if btn.is_a? ICQ::Button
+      raise ArgumentError.new 'btn must be a Button'
+    end
+
+    alias_method :append, :<<
   end
 
   class Button

data/lib/icqbot/urls_api.rb

@@ -11,4 +11,6 @@ module URLS_API
   SET_TITLE         = 'https://api.icq.net/bot/v1/chats/setTitle'
   SET_ABOUT         = 'https://api.icq.net/bot/v1/chats/setAbout'
   SET_RULES         = 'https://api.icq.net/bot/v1/chats/setRules'
+  PIN_MSG           = 'https://api.icq.net/bot/v1​/chats​/pinMessage'
+  UNPIN_MSG           = 'https://api.icq.net/bot/v1​/chats​/unpinMessage'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icqbot
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - sheyber
@@ -53,6 +53,7 @@ files:
 - lib/icqbot.rb
 - lib/icqbot/bot.rb
 - lib/icqbot/event.rb
+- lib/icqbot/functional/chats/administration/pin_unpin_msg.rb
 - lib/icqbot/functional/chats/administration/set_about.rb
 - lib/icqbot/functional/chats/administration/set_rules.rb
 - lib/icqbot/functional/chats/administration/set_title.rb