Remove language_code from User class

                 Rename Message.message_id  to Message.id
                 Fix Message.message_id  to Message.id
                 Fix edit_message add attach
                 Fix docs

Author: matteob99

botogram/frozenbot.py

@@ -161,7 +161,7 @@ def _edit_create_fake_message_object(self, chat, message):
         """Helper method for edit_message and edit_caption"""
         # Also accept objects
         if hasattr(message, "message_id"):
-            message = message.message_id
+            message = message.id
         if hasattr(chat, "id"):
             chat = chat.id
 
@@ -179,15 +179,15 @@ def _edit_create_fake_message_object(self, chat, message):
         }, self.api)
 
     def edit_message(self, chat, message, text, syntax=None, preview=True,
-                     extra=None):
+                     extra=None, attach=None):
         """Edit a message already sent to the user"""
         msg = self._edit_create_fake_message_object(chat, message)
-        msg.edit(text, syntax, preview, extra)
+        msg.edit(text, syntax, preview, extra, attach)
 
-    def edit_caption(self, chat, message, caption, extra=None):
+    def edit_caption(self, chat, message, caption, extra=None, attach=None):
         """Edit the caption of a media already sent to the user"""
         msg = self._edit_create_fake_message_object(chat, message)
-        msg.edit_caption(caption, extra)
+        msg.edit_caption(caption, extra, attach)
 
     # Let's process the messages
 

botogram/objects/chats.py

@@ -41,7 +41,6 @@ class User(BaseObject, mixins.ChatMixin):
     optional = {
         "last_name": str,
         "username": str,
-        "language_code": str,
         "is_bot": bool
     }
     _check_equality_ = "id"

botogram/objects/messages.py

@@ -23,7 +23,6 @@
 from .base import BaseObject, _itself
 from . import mixins
 from .. import utils
-
 from .chats import User, Chat
 from .media import Audio, Voice, Document, Photo, Sticker, Video, Contact, \
     Location, Venue
@@ -93,7 +92,7 @@ def __eq__(self, other):
         if self._message is None or other._message is None:
             return id(self) == id(other)
 
-        return self._message.message_id == other._message.message_id and \
+        return self._message.id == other._message.id and \
             self._offset == other._offset and self._length == other._length
 
     def __str__(self):
@@ -364,6 +363,7 @@ def from_(self):
     replace_keys = {
         "from": "sender",
         "entities": "parsed_text",
+        "message_id": "id",
 
         # Those are provided dynamically by self.forward_from
         "forward_from": "_forward_from",
@@ -413,6 +413,12 @@ def new_chat_participant(self):
 
     @property
     @utils.deprecated("Message.left_chat_participant", "1.0",
-                      "Rename property ot Message.left_chat_member")
+                      "Rename property to Message.left_chat_member")
     def left_chat_participant(self):
         return self.left_chat_member
+
+    @property
+    @utils.deprecated("Message.message_id", "0.5",
+                      "Rename property to Message.id")
+    def message_id(self):
+        return self.id

botogram/objects/mixins.py

@@ -56,7 +56,7 @@ def _get_call_args(self, reply_to, extra, attach, notify):
         """Get default API call arguments"""
         # Convert instance of Message to ids in reply_to
         if hasattr(reply_to, "message_id"):
-            reply_to = reply_to.message_id
+            reply_to = reply_to.id
 
         args = {"chat_id": self.id}
         if reply_to is not None:
@@ -311,7 +311,7 @@ def forward_to(self, to, notify=True):
     @_require_api
     def edit(self, text, syntax=None, preview=True, extra=None, attach=None):
         """Edit this message"""
-        args = {"message_id": self.message_id, "chat_id": self.chat.id}
+        args = {"message_id": self.id, "chat_id": self.chat.id}
         args["text"] = text
 
         syntax = syntaxes.guess_syntax(text, syntax)
@@ -420,7 +420,7 @@ def delete(self):
         """Delete the message"""
         return self._api.call("deleteMessage", {
             "chat_id": self.chat.id,
-            "message_id": self.message_id,
+            "message_id": self.id,
         })
 
 

docs/_themes/botogram/static/fonts/bitter.ttf

@@ -438,7 +438,7 @@ components.
 
       :return: A frozen instance of the current bot.
 
-   .. py:method:: edit_message(chat, message, text, [syntax=None, preview=True, extra=None])
+   .. py:method:: edit_message(chat, message, text, [syntax=None, preview=True, attach=None, extra=None])
 
       With this method you can edit the text of a message the user already
       received. This allows you to do a lot of interesting things, like
@@ -456,6 +456,7 @@ components.
       :param str text: The new text of the message
       :param bool preview: Whether to show link previews.
       :param str syntax: The name of the syntax used for the message.
+      :param object attach: An extra thing to attach to the message.
       :param object extra: An extra reply interface object to attach.
 
       .. versionadded:: 0.3

docs/api/bot.rst

@@ -28,6 +28,7 @@ about its business.
 * :py:class:`~botogram.Voice`
 * :py:class:`~botogram.Contact`
 * :py:class:`~botogram.Location`
+* :py:class:`~botogram.Permissions`
 * :py:class:`~botogram.Venue`
 * :py:class:`~botogram.Update`
 * :py:class:`~botogram.UserProfilePhotos`
@@ -70,6 +71,13 @@ about its business.
       change :py:attr:`~botogram.User.first_name` or
       :py:attr:`~botogram.User.last_name`.
 
+   .. py:attribute:: is_bot
+
+      is_bot indicates if the user is a bot. due to the telegram privacy rules,
+      this can be true only when your bot can actually see other bots' messages.
+
+
+
       .. versionadded:: 0.2
 
    .. py:attribute:: avatar
@@ -497,6 +505,42 @@ about its business.
 
       *This attribute can be None if it's not provided by Telegram.*
 
+   .. py:attribute:: all_members_are_administrators
+
+      This attribute is True if all the members of the group are administrator.
+
+      *This attribute can be None if it's not provided by Telegram.*
+
+   .. py:attribute:: description
+
+      The group/channel description
+
+      *This attribute can be None if it's not provided by Telegram.*
+
+   .. py:attribute:: invite_link
+
+      This group chat/channel invite link.
+
+      *This attribute can be None if it's not provided by Telegram.*
+
+   .. py:attribute:: pinned_message
+
+      This group/chat pinned :py:class:`~botogram.Message`
+
+      *This attribute can be None if it's not provided by Telegram.*
+
+   .. py:attribute:: sticker_set_name
+
+      The name of the supergroup's sticker set.
+
+      *This attribute can be None if it's not provided by Telegram.*
+
+   .. py:attribute:: can_set_sticker_set
+
+      This attribute is True if the bot can set this supergroup's sticker set.
+
+      *This attribute can be None if it's not provided by Telegram.*
+
    .. py:attribute:: name
 
       The computed name of the chat. If this chat has a title this attribute
@@ -709,6 +753,47 @@ about its business.
 
       .. versionadded:: 0.3
 
+   .. py:method:: kick(user[, time=None])
+
+      Kick the user form this group chat.
+
+      Remember your bot must be an administrator of the chat in order for this method to work properly.
+
+     :param int user: The user you want to kick (user ID or
+                       :py:class:`~botogram.User`)
+
+     :param int time:  until the user can't enter in the chat (unix time or
+                       datetime format)
+
+   .. py:method:: permissions(user)
+
+     Retrieve or edit the permissions of the provided user in the current group. This method returns an instance of
+     :py:class:`~botogram.Permissions`
+
+      .. code-block:: python
+
+         from datetime import datetime as dt, timedelta
+         @bot.command("limit")
+         def limit_user(chat, message):
+          # Allow only groups
+          if chat.type not in ("group", "supergroup"):
+             return
+
+         # Allow only replies with text in the reply
+         if message.text is None or message.reply_to_message is None:
+             return
+
+         # Allow only admins to limit people
+         if message.sender not in chat.admins:
+             return
+         with chat.permissions(message.reply_to_message.sender) as perms:
+             perms.send_messages = False
+             perms.until_date = dt.now() + timedelta(minutes=10)
+
+      :param int user: The user you want to change permissions (user ID or :py:class:`~botogram.User`)
+      :returns: The class to edit permissions
+      :rtype: :py:class:`~botogram.Permissions`
+
    .. py:method:: send(message, [preview=True, reply_to=None, syntax=None, attach=None, extra=None, notify=True])
 
       Send the textual *message* to the chat. You may optionally stop clients
@@ -1176,7 +1261,7 @@ about its business.
    This class represents messages received by and sent from your bot. Messages
    serve as a container for many of the core API objects described here.
 
-   .. py:attribute:: message_id
+   .. py:attribute:: id
 
       The integer ID of the message.
 
@@ -2164,6 +2249,39 @@ about its business.
       The float latitude as defined by the sender.
 
 
+.. py:class:: botogram.Permissions
+
+   This class represents the permissions of the user.
+   If you use this as a context manager, the save method will automatically be called if no exceptions were raised."
+   [example with only the context manager, not the full handler]
+
+   .. py:attribute:: until_date
+
+      The unix timestamp or datime format of when the changes you're doing will be reverted.
+
+   .. py:attribute:: send_messages
+
+      The boolean value if the user can send messages.
+
+   .. py:attribute:: send_media_messages
+
+      The boolean value if the user can send media messages.
+
+   .. py:attribute:: send_other_messages
+
+      The boolean value if the user can send other messages.
+
+   .. py:attribute:: add_web_page_previews
+
+      The boolean value if the user can send web page previews.
+
+   .. py:method:: save()
+
+      Send the changes to Telegram.
+
+      This method automatically detects the changes you made and doesn't do anything if no attribute was changed.
+
+
 .. py:class:: botogram.Venue
 
    This object represents a venue (a location with attached a title and an