resolve conflicts one more

Author: ZeN220

pyrogram/methods/messages/send_animation.py

@@ -48,6 +48,7 @@ async def send_animation(
         show_caption_above_media: bool = None,
         reply_parameters: "types.ReplyParameters" = None,
         schedule_date: datetime = None,
+        repeat_period: int = None,
         protect_content: bool = None,
         business_connection_id: str = None,
         allow_paid_broadcast: bool = None,
@@ -147,6 +148,9 @@ async def send_animation(
             schedule_date (:py:obj:`~datetime.datetime`, *optional*):
                 Date when the message will be automatically sent.
 
+            repeat_period (``int``, *optional*):
+                Period after which the message will be sent again in seconds.
+
             protect_content (``bool``, *optional*):
                 Protects the contents of the sent message from forwarding and saving.
 
@@ -266,6 +270,7 @@ async def progress(current, total):
                 show_caption_above_media=show_caption_above_media,
                 reply_parameters=reply_parameters,
                 schedule_date=schedule_date,
+                repeat_period=repeat_period,
                 protect_content=protect_content,
                 business_connection_id=business_connection_id,
                 allow_paid_broadcast=allow_paid_broadcast,

pyrogram/methods/messages/send_audio.py

@@ -45,6 +45,7 @@ async def send_audio(
         effect_id: int = None,
         reply_parameters: "types.ReplyParameters" = None,
         schedule_date: datetime = None,
+        repeat_period: int = None,
         protect_content: bool = None,
         business_connection_id: str = None,
         allow_paid_broadcast: bool = None,
@@ -136,6 +137,9 @@ async def send_audio(
             schedule_date (:py:obj:`~datetime.datetime`, *optional*):
                 Date when the message will be automatically sent.
 
+            repeat_period (``int``, *optional*):
+                Period after which the message will be sent again in seconds.
+
             protect_content (``bool``, *optional*):
                 Protects the contents of the sent message from forwarding and saving.
 
@@ -232,7 +236,6 @@ async def progress(current, total):
                 title=title,
             )
 
-            # Подготавливаем медиа
             media, file = await utils.prepare_media_for_upload(
                 client=self,
                 file=audio,
@@ -258,6 +261,7 @@ async def progress(current, total):
                 effect_id=effect_id,
                 reply_parameters=reply_parameters,
                 schedule_date=schedule_date,
+                repeat_period=repeat_period,
                 protect_content=protect_content,
                 business_connection_id=business_connection_id,
                 allow_paid_broadcast=allow_paid_broadcast,

pyrogram/methods/messages/send_document.py

@@ -42,6 +42,7 @@ async def send_document(
         effect_id: int = None,
         reply_parameters: "types.ReplyParameters" = None,
         schedule_date: datetime = None,
+        repeat_period: int = None,
         protect_content: bool = None,
         business_connection_id: str = None,
         allow_paid_broadcast: bool = None,
@@ -127,6 +128,9 @@ async def send_document(
             schedule_date (:py:obj:`~datetime.datetime`, *optional*):
                 Date when the message will be automatically sent.
 
+            repeat_period (``int``, *optional*):
+                Period after which the message will be sent again in seconds.
+
             protect_content (``bool``, *optional*):
                 Protects the contents of the sent message from forwarding and saving.
 
@@ -234,6 +238,7 @@ async def progress(current, total):
                 effect_id=effect_id,
                 reply_parameters=reply_parameters,
                 schedule_date=schedule_date,
+                repeat_period=repeat_period,
                 protect_content=protect_content,
                 business_connection_id=business_connection_id,
                 allow_paid_broadcast=allow_paid_broadcast,

pyrogram/methods/messages/send_photo.py

@@ -44,6 +44,7 @@ async def send_photo(
         show_caption_above_media: bool = None,
         reply_parameters: "types.ReplyParameters" = None,
         schedule_date: datetime = None,
+        repeat_period: int = None,
         protect_content: bool = None,
         view_once: bool = None,
         business_connection_id: str = None,
@@ -126,6 +127,9 @@ async def send_photo(
             schedule_date (:py:obj:`~datetime.datetime`, *optional*):
                 Date when the message will be automatically sent.
 
+            repeat_period (``int``, *optional*):
+                Period after which the message will be sent again in seconds.
+
             protect_content (``bool``, *optional*):
                 Protects the contents of the sent message from forwarding and saving.
 
@@ -248,6 +252,7 @@ async def send_photo(
                 show_caption_above_media=show_caption_above_media,
                 reply_parameters=reply_parameters,
                 schedule_date=schedule_date,
+                repeat_period=repeat_period,
                 protect_content=protect_content,
                 business_connection_id=business_connection_id,
                 allow_paid_broadcast=allow_paid_broadcast,

pyrogram/methods/messages/send_sticker.py

@@ -41,6 +41,7 @@ async def send_sticker(
         effect_id: int = None,
         reply_parameters: "types.ReplyParameters" = None,
         schedule_date: datetime = None,
+        repeat_period: int = None,
         protect_content: bool = None,
         business_connection_id: str = None,
         allow_paid_broadcast: bool = None,
@@ -114,6 +115,9 @@ async def send_sticker(
             schedule_date (:py:obj:`~datetime.datetime`, *optional*):
                 Date when the message will be automatically sent.
 
+            repeat_period (``int``, *optional*):
+                Period after which the message will be sent again in seconds.
+
             protect_content (``bool``, *optional*):
                 Protects the contents of the sent message from forwarding and saving.
 
@@ -217,6 +221,7 @@ async def send_sticker(
                 effect_id=effect_id,
                 reply_parameters=reply_parameters,
                 schedule_date=schedule_date,
+                repeat_period=repeat_period,
                 protect_content=protect_content,
                 business_connection_id=business_connection_id,
                 allow_paid_broadcast=allow_paid_broadcast,

pyrogram/methods/messages/send_video_note.py

@@ -44,6 +44,7 @@ async def send_video_note(
         effect_id: int = None,
         reply_parameters: "types.ReplyParameters" = None,
         schedule_date: datetime = None,
+        repeat_period: int = None,
         protect_content: bool = None,
         view_once: bool = None,
         business_connection_id: str = None,
@@ -122,6 +123,9 @@ async def send_video_note(
             schedule_date (:py:obj:`~datetime.datetime`, *optional*):
                 Date when the message will be automatically sent.
 
+            repeat_period (``int``, *optional*):
+                Period after which the message will be sent again in seconds.
+
             protect_content (``bool``, *optional*):
                 Protects the contents of the sent message from forwarding and saving.
 
@@ -231,13 +235,14 @@ async def send_video_note(
                 client=self,
                 chat_id=chat_id,
                 media=media,
-                caption="",  # Video notes don't have captions
+                caption="",
                 disable_notification=disable_notification,
                 message_thread_id=message_thread_id,
                 direct_messages_topic_id=direct_messages_topic_id,
                 effect_id=effect_id,
                 reply_parameters=reply_parameters,
                 schedule_date=schedule_date,
+                repeat_period=repeat_period,
                 protect_content=protect_content,
                 business_connection_id=business_connection_id,
                 allow_paid_broadcast=allow_paid_broadcast,

pyrogram/methods/messages/send_voice.py

@@ -40,6 +40,7 @@ async def send_voice(
         effect_id: int = None,
         reply_parameters: "types.ReplyParameters" = None,
         schedule_date: datetime = None,
+        repeat_period: int = None,
         protect_content: bool = None,
         view_once: bool = None,
         business_connection_id: str = None,
@@ -114,6 +115,9 @@ async def send_voice(
             schedule_date (:py:obj:`~datetime.datetime`, *optional*):
                 Date when the message will be automatically sent.
 
+            repeat_period (``int``, *optional*):
+                Period after which the message will be sent again in seconds.
+
             protect_content (``bool``, *optional*):
                 Protects the contents of the sent message from forwarding and saving.
 
@@ -232,6 +236,7 @@ async def send_voice(
                 effect_id=effect_id,
                 reply_parameters=reply_parameters,
                 schedule_date=schedule_date,
+                repeat_period=repeat_period,
                 protect_content=protect_content,
                 business_connection_id=business_connection_id,
                 allow_paid_broadcast=allow_paid_broadcast,

pyrogram/utils.py

@@ -40,12 +40,22 @@
 log = logging.getLogger(__name__)
 
 
+def get_event_loop() -> asyncio.AbstractEventLoop:
+    try:
+        loop = asyncio.get_event_loop()
+    except RuntimeError:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+
+    return loop
+
+
 async def ainput(prompt: str = "", *, hide: bool = False, loop: Optional[asyncio.AbstractEventLoop] = None):
     """Just like the built-in input, but async"""
     if isinstance(loop, asyncio.AbstractEventLoop):
         loop = loop
     else:
-        loop = asyncio.get_event_loop()
+        loop = get_event_loop()
 
     with ThreadPoolExecutor(1) as executor:
         func = functools.partial(getpass if hide else input, prompt)
@@ -902,6 +912,7 @@ async def send_media(
     show_caption_above_media: bool = None,
     reply_parameters: "types.ReplyParameters" = None,
     schedule_date: datetime = None,
+    repeat_period: int = None,
     protect_content: bool = None,
     business_connection_id: str = None,
     allow_paid_broadcast: bool = None,
@@ -933,6 +944,7 @@ async def send_media(
                 ),
                 "random_id": client.rnd_id(),
                 "schedule_date": datetime_to_timestamp(schedule_date),
+                "schedule_repeat_period": repeat_period,
                 "noforwards": protect_content,
                 "allow_paid_floodskip": allow_paid_broadcast,
                 "reply_markup": await reply_markup.write(client) if reply_markup else None,
@@ -986,3 +998,14 @@ async def send_media(
                         )
                         break
             return message
+
+
+def get_premium_duration_month_count(day_count: int) -> int:
+    return max(1, day_count // 30)
+
+
+def get_premium_duration_day_count(month_count: int) -> int:
+    if month_count <= 0 or month_count > 10000000:
+        return 7
+
+    return month_count * 30 + month_count // 3 + month_count // 12