telbe 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c710a1a3419afc4a5068d6b2cdc3291451e7c7e62c309384c8d31021df3c6d74
-  data.tar.gz: 88e578bfccddbf24fab533e920b690945d0ac8a5c6ba5a3d34d42a846846383d
+  metadata.gz: 499475c7a996403dfd24966de5fecf052f9acd62c7b49b334ec67b8204cf0b97
+  data.tar.gz: 4d88cc491dfd65af9c93bcff7413aa4e0d9e5f23859a2913aea971ed68ef30f0
 SHA512:
-  metadata.gz: bc9b91a5a112548d353bfd80b59e546979f6b98c1d34f429637c2cbec988b1cac72f6742bf04b696985a38da9bb24d271f101cd6bb636b2de99266e3be89b414
-  data.tar.gz: 6a0e69ac415e379108b3b880fddbd80c027387345704a471a5fcc0fcad74c5d848a0f9afa5c9e2db74c810aafaddcd385f00a81f5e3cfaa3c7b41cae9085ecf2
+  metadata.gz: b26ef0f8fd374b51269747433d489593c4a1b579dc1106349d8b8dae78574976c52f4b38c51756d6603a1ffd7ced442b774e2a21ca5dc8c58d98ba7213948577
+  data.tar.gz: 8ef7b347fddc1c797c4aa16a637797cf4b093418573da52085d82fd73a76d9aeb5b08603a4414c9699ebf658fb8c267d41b9efc536358ead84bf655ecab234bd

data/lib/telbe/base.rb

@@ -0,0 +1,29 @@
+module Telbe
+  class Descriptor
+    def self.inherited(base)
+      base.send(:include, SimplifyApi)
+      base.send(:attribute, :chat_id, Object, mandatory: true)
+      base.send(:attribute, :disable_notification, values: [true, false])
+      base.send(:attribute, :reply_to_message_id, Integer)
+      base.send(:attribute, :reply_markup, Object)
+    end
+  end
+
+  class MediaDescriptor < Descriptor
+    def self.inherited(base)
+      super(base)
+      base.send(:attribute, :caption, String)
+      base.send(:attribute, :parse_mode, String, values: ["Markdown", "HTML"])
+    end
+  end
+
+  class InputMedia
+    def self.inherited(base)
+      base.send(:include, SimplifyApi)
+      base.send(:attribute, :type, String, mandatory: true)
+      base.send(:attribute, :media, String, mandatory: true)
+      base.send(:attribute, :caption, String)
+      base.send(:attribute, :parse_mode, String, values: ["Markdown", "HTML"])
+    end
+  end  
+end

data/lib/telbe/bot.rb

@@ -9,16 +9,13 @@ module Telbe
     end
 
     def request(action, query = {})
-      puts "### Telbe::Bot.request #{action} - #{query.to_h}"
       path = "/bot#{@token}/#{action}"
       response = @connection.post(path: path, query: query.to_h)
       if response.status == 200
-        puts "### Telbe::Bot.request --- Success"
         body = response.body
         data = JSON.parse(body)
         data["result"]
       else
-        puts "### Telbe::Bot.request --- Error"
         raise ResponseError, response.body
       end
     end
@@ -27,31 +24,27 @@ module Telbe
       Message.new(request(:sendMessage, message_descriptor))
     end
 
-    def get_updates(update_descriptor)
-      request(:getUpdates, update_descriptor).collect do |update_hash|
-        Update.new(update_hash)
+    def get_updates(get_updates_descriptor)
+      request(:getUpdates, get_updates_descriptor).collect do |update|
+        Update.new(update)
       end
     end
 
-    def get_me
-      User.new(request(:getMe))
-    end
-
     def get_chat(chatid_descriptor)
       Chat.new(request(:getChat, chatid_descriptor))
     end
 
-    def download_file(file)
-      # https://api.telegram.org/file/bot<token>/<file_path>
+    def send_chat_action(send_chat_action_descriptor)
+      request(:sendChatAction, send_chat_action_descriptor)
     end
   end
 
   class MessageEntity
-    include InitializeFromHash
+    include SimplifyApi
   end
 
   class ForceReply
-    include InitializeFromHash
+    include SimplifyApi
   end
 
   # chat_id 	Integer or String 	Yes 	Unique identifier for the target chat or username of the target channel (in the format @channelusername)
@@ -62,46 +55,154 @@ module Telbe
   # reply_to_message_id 	Integer 	Optional 	If the message is a reply, ID of the original message
   # reply_markup 	InlineKeyboardMarkup or ReplyKeyboardMarkup or ReplyKeyboardRemove or ForceReply 	Optional 	Additional interface options. A JSON-serialized object for an inline keyboard, custom reply keyboard, instructions to remove reply keyboard or to force a reply from the user.
   class MessageDescriptor
-    include InitializeFromHash
-    def self.factory
-      new(
-        chat_id: nil,
-        text: "",
-        parse_mode: "", # Markdown or HTML
-        disable_web_page_preview: false,
-        disable_notification: false,
-        reply_to_message_id: nil,
-        reply_markup: nil
-      )
-    end
-
-    def initialize(opts)
-      raise ArgumentError, 'Invalid parse_mode' unless valid_parse_mode? opts[:parse_mode]
-      super opts
-    end
-
-    def parse_mode= (value)
-      value ||= "" # cast nil to the empty string
-      raise ArgumentError, 'Invalid parse_mode' unless valid_parse_mode? value
-      @parse_mode = value
-    end
-
-    private
-    def valid_parse_mode? (value)
-      value =~ /(^Markdown$)|(^HTML$)|(^$)/ # 0 = true
-    end
+    include SimplifyApi
+    attribute :chat_id, Integer, mandatory: true
+    attribute :text, String, mandatory: true
+    attribute :parse_mode, String, values: ["Markdown", "HTML"]
+    attribute :disable_web_page_preview, values: [true, false]
+    attribute :reply_to_message_id, Integer
+    attribute :reply_markup , Object
   end
 
   class ChatPhoto
-    include InitializeFromHash
+    include SimplifyApi
   end
 
+  class Message # Dummy
+  end
+
+  # id 	Integer 	Unique identifier for this chat. This number may be greater than 32 bits and some programming languages may have difficulty/silent defects in interpreting it. But it is smaller than 52 bits, so a signed 64 bit integer or double-precision float type are safe for storing this identifier.
+  # type 	String 	Type of chat, can be either “private”, “group”, “supergroup” or “channel”
+  # title 	String 	Optional. Title, for supergroups, channels and group chats
+  # username 	String 	Optional. Username, for private chats, supergroups and channels if available
+  # first_name 	String 	Optional. First name of the other party in a private chat
+  # last_name 	String 	Optional. Last name of the other party in a private chat
+  # all_members_are_administrators 	Boolean 	Optional. True if a group has ‘All Members Are Admins’ enabled.
+  # photo 	ChatPhoto 	Optional. Chat photo. Returned only in getChat.
+  # description 	String 	Optional. Description, for supergroups and channel chats. Returned only in getChat.
+  # invite_link 	String 	Optional. Chat invite link, for supergroups and channel chats. Each administrator in a chat generates their own invite links, so the bot must first generate the link using exportChatInviteLink. Returned only in getChat.
+  # pinned_message 	Message 	Optional. Pinned message, for groups, supergroups and channels. Returned only in getChat.
+  # sticker_set_name 	String 	Optional. For supergroups, name of group sticker set. Returned only in getChat.
+  # can_set_sticker_set 	Boolean 	Optional. True, if the bot can change the group sticker set. Returned only in getChat.
   class Chat
-    include InitializeFromHash
+    include SimplifyApi
+    attribute :id, Integer, mandatory: true
+    attribute :type, String, mandatory: true, values: ["private", "group", "supergroup", "channel"]
+    attribute :title, String
+    attribute :username, String
+    attribute :first_name, String
+    attribute :last_name, String
+    attribute :all_members_are_administrators, values: [true, false]
+    attribute :photo, ChatPhoto
+    attribute :description, String
+    attribute :invite_link, String
+    attribute :pinned_message, Message
+    attribute :sticker_set_name, String
+    attribute :can_set_sticker_set, values: [true, false]
+  end
+
+  # chat_id 	Integer or String 	Yes 	Unique identifier for the target chat or username of the target channel (in the format @channelusername)
+  # action 	String 	Yes 	Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for text messages, upload_photo for photos, record_video or upload_video for videos, record_audio or upload_audio for audio files, upload_document for general files, find_location for location data, record_video_note or upload_video_note for video notes.
+  class SendChatActionDescriptor
+    include SimplifyApi
+    attribute :chat_id, Object, mandatory: true
+    attribute :action, String, values: ["typing", "upload_photo", "record_video", "upload_video", "record_audio", "upload_audio", "upload_document", "find_location", "record_video_note", "upload_video_note"]
   end
 
+  # message_id 	Integer 	Unique message identifier inside this chat
+  # from 	User 	Optional. Sender, empty for messages sent to channels
+  # date 	Integer 	Date the message was sent in Unix time
+  # chat 	Chat 	Conversation the message belongs to
+  # forward_from 	User 	Optional. For forwarded messages, sender of the original message
+  # forward_from_chat 	Chat 	Optional. For messages forwarded from channels, information about the original channel
+  # forward_from_message_id 	Integer 	Optional. For messages forwarded from channels, identifier of the original message in the channel
+  # forward_signature 	String 	Optional. For messages forwarded from channels, signature of the post author if present
+  # forward_sender_name 	String 	Optional. Sender's name for messages forwarded from users who disallow adding a link to their account in forwarded messages
+  # forward_date 	Integer 	Optional. For forwarded messages, date the original message was sent in Unix time
+  # reply_to_message 	Message 	Optional. For replies, the original message. Note that the Message object in this field will not contain further reply_to_message fields even if it itself is a reply.
+  # edit_date 	Integer 	Optional. Date the message was last edited in Unix time
+  # media_group_id 	String 	Optional. The unique identifier of a media message group this message belongs to
+  # author_signature 	String 	Optional. Signature of the post author for messages in channels
+  # text 	String 	Optional. For text messages, the actual UTF-8 text of the message, 0-4096 characters.
+  # entities 	Array of MessageEntity 	Optional. For text messages, special entities like usernames, URLs, bot commands, etc. that appear in the text
+  # caption_entities 	Array of MessageEntity 	Optional. For messages with a caption, special entities like usernames, URLs, bot commands, etc. that appear in the caption
+  # audio 	Audio 	Optional. Message is an audio file, information about the file
+  # document 	Document 	Optional. Message is a general file, information about the file
+  # animation 	Animation 	Optional. Message is an animation, information about the animation. For backward compatibility, when this field is set, the document field will also be set
+  # game 	Game 	Optional. Message is a game, information about the game. More about games »
+  # photo 	Array of PhotoSize 	Optional. Message is a photo, available sizes of the photo
+  # sticker 	Sticker 	Optional. Message is a sticker, information about the sticker
+  # video 	Video 	Optional. Message is a video, information about the video
+  # voice 	Voice 	Optional. Message is a voice message, information about the file
+  # video_note 	VideoNote 	Optional. Message is a video note, information about the video message
+  # caption 	String 	Optional. Caption for the animation, audio, document, photo, video or voice, 0-1024 characters
+  # contact 	Contact 	Optional. Message is a shared contact, information about the contact
+  # location 	Location 	Optional. Message is a shared location, information about the location
+  # venue 	Venue 	Optional. Message is a venue, information about the venue
+  # poll 	Poll 	Optional. Message is a native poll, information about the poll
+  # new_chat_members 	Array of User 	Optional. New members that were added to the group or supergroup and information about them (the bot itself may be one of these members)
+  # left_chat_member 	User 	Optional. A member was removed from the group, information about them (this member may be the bot itself)
+  # new_chat_title 	String 	Optional. A chat title was changed to this value
+  # new_chat_photo 	Array of PhotoSize 	Optional. A chat photo was change to this value
+  # delete_chat_photo 	True 	Optional. Service message: the chat photo was deleted
+  # group_chat_created 	True 	Optional. Service message: the group has been created
+  # supergroup_chat_created 	True 	Optional. Service message: the supergroup has been created. This field can‘t be received in a message coming through updates, because bot can’t be a member of a supergroup when it is created. It can only be found in reply_to_message if someone replies to a very first message in a directly created supergroup.
+  # channel_chat_created 	True 	Optional. Service message: the channel has been created. This field can‘t be received in a message coming through updates, because bot can’t be a member of a channel when it is created. It can only be found in reply_to_message if someone replies to a very first message in a channel.
+  # migrate_to_chat_id 	Integer 	Optional. The group has been migrated to a supergroup with the specified identifier. This number may be greater than 32 bits and some programming languages may have difficulty/silent defects in interpreting it. But it is smaller than 52 bits, so a signed 64 bit integer or double-precision float type are safe for storing this identifier.
+  # migrate_from_chat_id 	Integer 	Optional. The supergroup has been migrated from a group with the specified identifier. This number may be greater than 32 bits and some programming languages may have difficulty/silent defects in interpreting it. But it is smaller than 52 bits, so a signed 64 bit integer or double-precision float type are safe for storing this identifier.
+  # pinned_message 	Message 	Optional. Specified message was pinned. Note that the Message object in this field will not contain further reply_to_message fields even if it is itself a reply.
+  # invoice 	Invoice 	Optional. Message is an invoice for a payment, information about the invoice. More about payments »
+  # successful_payment 	SuccessfulPayment 	Optional. Message is a service message about a successful payment, information about the payment. More about payments »
+  # connected_website 	String 	Optional. The domain name of the website on which the user has logged in. More about Telegram Login »
+  # passport_data 	PassportData 	Optional. Telegram Passport data
   class Message
-    include InitializeFromHash
+    include SimplifyApi
+    attribute :message_id, Integer, mandatory: true
+    attribute :from, User
+    attribute :date, Integer, mandatory: true
+    attribute :chat, Chat, mandatory: true
+    attribute :forward_from, User
+    attribute :forward_from_chat, Chat
+    attribute :forward_from_message_id, Integer
+    attribute :forward_signature, String
+    attribute :forward_sender_name, String
+    attribute :forward_date, Integer
+    attribute :reply_to_message, Message
+    attribute :edit_date, Integer
+    attribute :media_group_id, String
+    attribute :author_signature, String
+    attribute :text, String
+    attribute :entities, [MessageEntity]
+    attribute :caption_entities, [MessageEntity]
+    attribute :audio, Audio
+    attribute :document, Document
+    attribute :animation, Animation
+    # attribute :game, Game
+    attribute :photo, [PhotoSize]
+    attribute :sticker, Sticker
+    attribute :video, Video
+    attribute :voice, Voice
+    attribute :video_note, VideoNote
+    attribute :caption, String
+    attribute :contact, Contact
+    attribute :location, Location
+    attribute :venue, Venue
+    attribute :poll, Poll
+    attribute :new_chat_members, [User]
+    attribute :left_chat_member, User
+    attribute :new_chat_title, String
+    attribute :new_chat_photo, [PhotoSize]
+    attribute :delete_chat_photo, values: [true]
+    attribute :group_chat_created, values: [true]
+    attribute :supergroup_chat_created, values: [true]
+    attribute :channel_chat_created, values: [true]
+    attribute :migrate_to_chat_id, Integer
+    attribute :migrate_from_chat_id, Integer
+    attribute :pinned_message, Message
+    # attribute :invoice, Invoice
+    # attribute :successful_payment, SuccessfulPayment
+    attribute :connected_website, String
+    # attribute :passport_data, PassportData
 
     def reply(&block)
       reply = MessageDescriptor.new(chat_id: chat.id)
@@ -114,12 +215,51 @@ module Telbe
     end
   end
 
+  # chat_id 	Integer or String 	Yes 	Unique identifier for the target chat or username of the target channel (in the format @channelusername)
+  # from_chat_id 	Integer or String 	Yes 	Unique identifier for the chat where the original message was sent (or channel username in the format @channelusername)
+  # disable_notification 	Boolean 	Optional 	Sends the message silently. Users will receive a notification with no sound.
+  # message_id 	Integer 	Yes 	Message identifier in the chat specified in from_chat_id
+  class ForwardMessageDescriptor
+    include SimplifyApi
+    attribute :chat_id, Object, mandatory: true
+    attribute :from_chat_id, Object, mandatory: true
+    attribute :disable_notification, values: [true, false]
+    attribute :message_id, Integer, mandatory: true
+  end
+
+  # update_id 	Integer 	The update‘s unique identifier. Update identifiers start from a certain positive number and increase sequentially. This ID becomes especially handy if you’re using Webhooks, since it allows you to ignore repeated updates or to restore the correct update sequence, should they get out of order. If there are no new updates for at least a week, then identifier of the next update will be chosen randomly instead of sequentially.
+  # message 	Message 	Optional. New incoming message of any kind — text, photo, sticker, etc.
+  # edited_message 	Message 	Optional. New version of a message that is known to the bot and was edited
+  # channel_post 	Message 	Optional. New incoming channel post of any kind — text, photo, sticker, etc.
+  # edited_channel_post 	Message 	Optional. New version of a channel post that is known to the bot and was edited
+  # inline_query 	InlineQuery 	Optional. New incoming inline query
+  # chosen_inline_result 	ChosenInlineResult 	Optional. The result of an inline query that was chosen by a user and sent to their chat partner. Please see our documentation on the feedback collecting for details on how to enable these updates for your bot.
+  # callback_query 	CallbackQuery 	Optional. New incoming callback query
+  # shipping_query 	ShippingQuery 	Optional. New incoming shipping query. Only for invoices with flexible price
+  # pre_checkout_query 	PreCheckoutQuery 	Optional. New incoming pre-checkout query. Contains full information about checkout
+  # poll 	Poll 	Optional. New poll state. Bots receive only updates about polls, which are sent or stopped by the bot
   class Update
-    include InitializeFromHash
+    include SimplifyApi
+    attribute :update_id, Integer, mandatory: true
+    attribute :message, Message
+    attribute :edited_message, Message
+    attribute :channel_post, Message
+    attribute :inline_query, InlineQuery
+    attribute :chosen_inline_result, ChosenInlineResult
+    attribute :callback_query, CallbackQuery
+    attribute :poll, Poll
   end
 
-  class UpdateDescriptor
-    include InitializeFromHash
+  # offset 	Integer 	Optional 	Identifier of the first update to be returned. Must be greater by one than the highest among the identifiers of previously received updates. By default, updates starting with the earliest unconfirmed update are returned. An update is considered confirmed as soon as getUpdates is called with an offset higher than its update_id. The negative offset can be specified to retrieve updates starting from -offset update from the end of the updates queue. All previous updates will forgotten.
+  # limit 	Integer 	Optional 	Limits the number of updates to be retrieved. Values between 1—100 are accepted. Defaults to 100.
+  # timeout 	Integer 	Optional 	Timeout in seconds for long polling. Defaults to 0, i.e. usual short polling. Should be positive, short polling should be used for testing purposes only.
+  # allowed_updates 	Array of String 	Optional 	List the types of updates you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See Update for a complete list of available update types. Specify an empty list to receive all updates regardless of type (default). If not specified, the previous setting will be used.
+  class GetUpdatesDescriptor
+    include SimplifyApi
+    attribute :offset, Integer
+    attribute :limit, Integer
+    attribute :timeout, Integer
+    attribute :allowed_updates, [String]
   end
 
   class ResponseError < StandardError

data/lib/telbe/contact.rb

@@ -5,11 +5,33 @@ module Telbe
     end
   end
 
+  # phone_number 	String 	Contact's phone number
+  # first_name 	String 	Contact's first name
+  # last_name 	String 	Optional. Contact's last name
+  # user_id 	Integer 	Optional. Contact's user identifier in Telegram
+  # vcard 	String 	Optional. Additional data about the contact in the form of a vCard
   class Contact
-    include InitializeFromHash
+    include SimplifyApi
+    attribute :phone_number, String, mandatory: true
+    attribute :first_name, String, mandatory: true
+    attribute :last_name, String
+    attribute :user_id, Integer
+    attribute :vcard, String
   end
 
-  class ContactDescriptor
-    include InitializeFromHash
+  # chat_id 	Integer or String 	Yes 	Unique identifier for the target chat or username of the target channel (in the format @channelusername)
+  # phone_number 	String 	Yes 	Contact's phone number
+  # first_name 	String 	Yes 	Contact's first name
+  # last_name 	String 	Optional 	Contact's last name
+  # vcard 	String 	Optional 	Additional data about the contact in the form of a vCard, 0-2048 bytes
+  # disable_notification 	Boolean 	Optional 	Sends the message silently. Users will receive a notification with no sound.
+  # reply_to_message_id 	Integer 	Optional 	If the message is a reply, ID of the original message
+  # reply_markup 	InlineKeyboardMarkup or ReplyKeyboardMarkup or ReplyKeyboardRemove or ForceReply 	Optional 	Additional interface options. A JSON-serialized object for an inline keyboard, custom reply keyboard, instructions to remove keyboard or to force a reply from the user.
+  class ContactDescriptor < Descriptor
+    include SimplifyApi
+    attribute :phone_number, String, mandatory: true
+    attribute :first_name, String, mandatory: true
+    attribute :last_name, String
+    attribute :vcard, String
   end
 end

data/lib/telbe/inline.rb

@@ -0,0 +1,9 @@
+module Telbe
+  class InlineQuery
+    include SimplifyApi
+  end
+
+  class ChosenInlineResult
+    include SimplifyApi
+  end
+end

data/lib/telbe/keyboard.rb

@@ -3,18 +3,20 @@ module Telbe
   # request_contact 	Boolean 	Optional. If True, the user's phone number will be sent as a contact when the button is pressed. Available in private chats only
   # request_location 	Boolean 	Optional. If True, the user's current location will be sent when the button is pressed. Available in private chats only
   class KeyboardButton
-    include InitializeFromHash
-    def self.factory
-      self.new(
-        text: "",
-        request_contact: false,
-        request_location: false
-      )
-    end
+    include SimplifyApi
+    attribute :text, String, mandatory: true
+    attribute :request_contact, values: [true, false]
+    attribute :request_location, values: [true, false]
+  end
+
+  # Created to nest the arrays in ReplyKeyboardMarkup
+  class KeyboardButtons
+    include SimplifyApi
+    attribute :keyboard_button, [KeyboardButton]
   end
 
   class ReplyKeyboardRemove
-    include InitializeFromHash
+    include SimplifyApi
   end
 
   # keyboard 	Array of Array of KeyboardButton 	Array of button rows, each represented by an Array of KeyboardButton objects
@@ -22,22 +24,22 @@ module Telbe
   # one_time_keyboard 	Boolean 	Optional. Requests clients to hide the keyboard as soon as it's been used. The keyboard will still be available, but clients will automatically display the usual letter-keyboard in the chat – the user can press a special button in the input field to see the custom keyboard again. Defaults to false.
   # selective 	Boolean 	Optional. Use this parameter if you want to show the keyboard to specific users only. Targets: 1) users that are @mentioned in the text of the Message object; 2) if the bot's message is a reply (has reply_to_message_id), sender of the original message.
   class ReplyKeyboardMarkup
-    include InitializeFromHash
-    def self.factory
-      self.new(
-        keyboard: [[]],
-        resize_keyboard: true,
-        one_time_keyboard: true,
-        selective: false
-      )
-    end
+    include SimplifyApi
+    attribute :keyboard, [KeyboardButtons], mandatory: true
+    attribute :resize_keyboard, values: [true, false]
+    attribute :one_time_keyboard, values: [true, false]
+    attribute :selective, values: [true, false]
   end
 
   class InlineKeyboardMarkup
-    include InitializeFromHash
+    include SimplifyApi
   end
 
   class InlineKeyboardButton
-    include InitializeFromHash
+    include SimplifyApi
+  end
+
+  class CallbackQuery
+    include SimplifyApi
   end
 end

data/lib/telbe/location.rb

@@ -3,6 +3,14 @@ module Telbe
     def send_location(send_location_descriptor)
       Message.new(request(:sendLocation, send_location_descriptor))
     end
+
+    def edit_message_live_location(edit_message_live_location_descriptor)
+      Message.new(request(:editMessageLiveLocation, edit_message_live_location_descriptor))
+    end
+
+    def stop_message_live_location(stop_message_live_location_descriptor)
+      Message.new(request(:stopMessageLiveLocation, stop_message_live_location_descriptor))
+    end
   end
   # chat_id 	Integer or String 	Yes 	Unique identifier for the target chat or username of the target channel (in the format @channelusername)
   # latitude 	Float number 	Yes 	Latitude of the location
@@ -12,19 +20,14 @@ module Telbe
   # reply_to_message_id 	Integer 	Optional 	If the message is a reply, ID of the original message
   # reply_markup 	InlineKeyboardMarkup or ReplyKeyboardMarkup or ReplyKeyboardRemove or ForceReply
   class SendLocationDescriptor
-    include InitializeFromHash
-
-    def self.factory
-      new(
-        chat_id: nil,
-        latitude: nil,
-        longitude: nil,
-        liveperiod: 60,
-        disable_notification: true,
-        reply_to_message_id: nil,
-        reply_markup: nil
-      )
-    end
+    include SimplifyApi
+    attribute :chat_id, Object, mandatory: true # Integer or String
+    attribute :latitude, Float, mandatory: true
+    attribute :longitude, Float, mandatory: true
+    attribute :live_period, Integer
+    attribute :disable_notification, values: [true, false]
+    attribute :reply_to_message_id, Integer
+    attribute :reply_markup, Object
   end
 
   # chat_id 	Integer or String 	Optional 	Required if inline_message_id is not specified. Unique identifier for the target chat or username of the target channel (in the format @channelusername)
@@ -34,25 +37,46 @@ module Telbe
   # longitude 	Float number 	Yes 	Longitude of new location
   # reply_markup 	InlineKeyboardMarkup 	Optional 	A JSON-serialized object for a new inline keyboard.
   class EditMessageLiveLocationDescriptor
-    include InitializeFromHash
+    include SimplifyApi
+    attribute :chat_id, Object, mandatory: true # Integer or String
+    attribute :message_id, Integer
+    attribute :inline_message_id, String
+    attribute :latitude, Float, mandatory: true
+    attribute :longitude, Float, mandatory: true
+    attribute :reply_markup, Object
+  end
 
-    def self.factory
-      new(
-        chat_id: nil,
-        message_id: nil,
-        inline_message_id: nil,
-        latitude: nil,
-        longitude: nil,
-        reply_markup:nil
-      )
-    end
+  # chat_id 	Integer or String 	Optional 	Required if inline_message_id is not specified. Unique identifier for the target chat or username of the target channel (in the format @channelusername)
+  # message_id 	Integer 	Optional 	Required if inline_message_id is not specified. Identifier of the message with live location to stop
+  # inline_message_id 	String 	Optional 	Required if chat_id and message_id are not specified. Identifier of the inline message
+  # reply_markup 	InlineKeyboardMarkup 	Optional 	A JSON-serialized object for a new inline keyboard.
+  class StopMessageLivaLocationDescriptor
+    include SimplifyApi
+    attribute :chat_id, Object, mandatory: true # Integer or String
+    attribute :message_id, Integer
+    attribute :inline_message_id, String
+    attribute :reply_markup, Object
   end
   
+  # longitude 	Float 	Longitude as defined by sender
+  # latitude 	Float 	Latitude as defined by sender
   class Location
-    include InitializeFromHash
+    include SimplifyApi
+    attribute :longitude, Float, mandatory: true
+    attribute :latitude, Float, mandatory: true
   end
 
+  # location 	Location 	Venue location
+  # title 	String 	Name of the venue
+  # address 	String 	Address of the venue
+  # foursquare_id 	String 	Optional. Foursquare identifier of the venue
+  # foursquare_type 	String 	Optional. Foursquare type of the venue. (For example, “arts_entertainment/default”, “arts_entertainment/aquarium” or “food/icecream”.)
   class Venue
-    include InitializeFromHash
+    include SimplifyApi
+    attribute :location, Location, mandatory: true
+    attribute :title, String, mandatory: true
+    attribute :address, String, mandatory: true
+    attribute :foursquare_id, String
+    attribute :foursquare_type, String
   end
 end