telegram_meetup_bot 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deffbfe6227e772be37c15193f278374203f84da
-  data.tar.gz: 63b4b27adfa76e905afc9cb8722a33864ae6adfc
+  metadata.gz: 2a70a4786eba6f750122f9b66d8370467d3948b2
+  data.tar.gz: 43ff1de5598d0597640cac69431b8e2c3c3503be
 SHA512:
-  metadata.gz: 2191c4b91fb5c481df6df5e81bf23e404e47944631af29dd6a336078522710c41b5729919142245572d98030a1a8e35437c1ccb74c0933af478fef30de6dc21d
-  data.tar.gz: 35f0d9970ef29706e19d62dd811efa2f9f88521e926661ef8ba00c40b54f68defaf6b73e9ee39d24da503532d51129e53e26e458911d05c3d05c8b27cf2ca4e4
+  metadata.gz: 02236da88268b705bfcc6a7a190b894ae87a45f5e35393671fa509e7b60c0fd8a10c7c11ebd91399eb6342e78d8570842541704ac2ed0b43b636821bf9f33c8e
+  data.tar.gz: f60d3a8bf23cf9e1853097132523cf0c9c2c6af3066e0b9e6c0cef241dc4aa7608f6513398eac3689d5cffa5399293e59541b342f532b99437232f98a03d0318

data/lib/telegram_meetup_bot/callback_query_parser.rb

@@ -0,0 +1,11 @@
+module TelegramMeetupBot
+  class CallbackQueryParser < MessageParser
+    private
+
+    def parse_message(&block)
+      if message.data && message.data[0] == '/' && message.data.length > 1
+        yield message.data[1..-1].split(' ')
+      end
+    end
+  end
+end

data/lib/telegram_meetup_bot/client.rb

@@ -12,7 +12,12 @@ module TelegramMeetupBot
       Telegram::Bot::Client.run(token) do |bot|
         bot.enable_botan!(botan_key) if botan_key
         bot.listen do |message|
-          process_message(bot, message) if message.text
+          case message
+          when Telegram::Bot::Types::Message
+            process_message(bot, message) if message.text
+          when Telegram::Bot::Types::CallbackQuery
+            process_callback_query(bot, message) if message.data
+          end
         end
       end
     rescue Telegram::Bot::Exceptions::ResponseError => e
@@ -33,6 +38,17 @@ module TelegramMeetupBot
       ).process
     end
 
+    def process_callback_query(bot, callback_query)
+      messenger = Messenger.new(api: bot.api,
+        chat_id: callback_query.message.chat.id,
+        message_id: callback_query.message.message_id)
+
+      CommandsHandler.new(
+        callback_query: callback_query,
+        messenger: messenger
+      ).process
+    end
+
     def botan_key
       Initializers::ConfigLoader.botan_key
     end

data/lib/telegram_meetup_bot/commands/list_command.rb

@@ -2,10 +2,12 @@ module TelegramMeetupBot
   module Commands
     class ListCommand < Base
       def exec
-        handle_date(date) do
+        response = handle_date(date) do
           users = Calendar.formated_users_for_date(date)
           list_response(list: users, date: date)
         end
+
+        [response, build_reply_markup]
       end
 
       private
@@ -15,6 +17,28 @@ module TelegramMeetupBot
         @parsed_date ||= Date.today if params.empty?
         @parsed_date
       end
+
+      def build_reply_markup
+        keys = [[previous_day_key, next_day_key].compact]
+
+        Telegram::Bot::Types::InlineKeyboardMarkup.new(inline_keyboard: keys)
+      end
+
+      def previous_day_key
+        return nil if date == Date.today
+
+        Telegram::Bot::Types::InlineKeyboardButton.new(
+          text: '⬅️',
+          callback_data: "/list #{(date - 1).strftime('%d.%m.%y')}"
+        ) rescue nil
+      end
+
+      def next_day_key
+        Telegram::Bot::Types::InlineKeyboardButton.new(
+          text: '➡️',
+          callback_data: "/list #{(date + 1).strftime('%d.%m.%y')}"
+        ) rescue nil
+      end
     end
   end
 end

data/lib/telegram_meetup_bot/commands_handler.rb

@@ -1,18 +1,32 @@
 module TelegramMeetupBot
   class CommandsHandler
-    attr_reader :command, :botan, :messenger
+    attr_reader :command, :botan, :messenger, :mode
 
     def initialize(args)
-      parser = MessageParser.new(args.fetch(:message))
+      parser = build_parser(args)
       @command = TelegramMeetupBot::Commands::Factory.build(parser)
       @messenger = args.fetch(:messenger)
       @botan = args[:botan]
     end
 
     def process
-      if command
-        messenger.send_text(command.exec)
+      if command && mode == :send
+        messenger.send_text(*command.exec)
         botan.track(command.command) if botan
+      elsif command && mode == :edit
+        messenger.edit_text(*command.exec)
+      end
+    end
+
+    private
+
+    def build_parser(args)
+      if args[:message]
+        @mode = :send
+        MessageParser.new(args[:message])
+      elsif args[:callback_query]
+        @mode = :edit
+        CallbackQueryParser.new(args[:callback_query])
       end
     end
   end

data/lib/telegram_meetup_bot/messenger.rb

@@ -1,22 +1,24 @@
 module TelegramMeetupBot
   class Messenger
-    attr_reader :api, :chat_id
+    attr_reader :api, :chat_id, :message_id
 
     def initialize(args)
       @api = args.fetch(:api)
       @chat_id = args.fetch(:chat_id)
+      @message_id = args[:message_id]
     end
 
-    def send_text(text)
-      api.send_message(chat_id: chat_id, text: text, reply_markup: keyboard)
+    def send_text(text, markup = nil)
+      return if chat_id.nil?
+
+      api.send_message(chat_id: chat_id, text: text, reply_markup: markup)
     end
 
-    private
+    def edit_text(text, markup = nil)
+      return if chat_id.nil? || message_id.nil?
 
-    def keyboard
-      Telegram::Bot::Types::ReplyKeyboardHide.new(
-        hide_keyboard: true
-      )
+      api.edit_message_text(chat_id: chat_id, message_id: message_id,
+        text: text, reply_markup: markup) rescue nil
     end
   end
 end

data/lib/telegram_meetup_bot/version.rb

@@ -1,3 +1,3 @@
 module TelegramMeetupBot
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/lib/telegram_meetup_bot.rb

@@ -7,6 +7,7 @@ require 'telegram_meetup_bot/initializers'
 require 'telegram_meetup_bot/client'
 require 'telegram_meetup_bot/messenger'
 require 'telegram_meetup_bot/message_parser'
+require 'telegram_meetup_bot/callback_query_parser'
 require 'telegram_meetup_bot/storage'
 require 'telegram_meetup_bot/calendar'
 require 'telegram_meetup_bot/commands_handler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram_meetup_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Timur Yanberdin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,7 @@ files:
 - lib/telegram_meetup_bot.rb
 - lib/telegram_meetup_bot/botan.rb
 - lib/telegram_meetup_bot/calendar.rb
+- lib/telegram_meetup_bot/callback_query_parser.rb
 - lib/telegram_meetup_bot/client.rb
 - lib/telegram_meetup_bot/commands.rb
 - lib/telegram_meetup_bot/commands/base.rb