Merge branch 'Cog-Creators:V3/develop' into V3/develop

sravan1946 · Apr 13, 2024 · 779d831 · 779d831
2 parents 8285817 + 97b4679
commit 779d831
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/redbot/cogs/streams/streamtypes.py b/redbot/cogs/streams/streamtypes.py
@@ -221,17 +221,16 @@ async def make_embed(self, data):
         if vid_data["liveStreamingDetails"].get("scheduledStartTime", None) is not None:
             if "actualStartTime" not in vid_data["liveStreamingDetails"]:
                 start_time = parse_time(vid_data["liveStreamingDetails"]["scheduledStartTime"])
+                start_time_unix = time.mktime(start_time.timetuple())
                 start_in = start_time - datetime.now(timezone.utc)
                 if start_in.total_seconds() > 0:
-                    embed.description = _("This stream will start in {time}").format(
-                        time=humanize_timedelta(
-                            timedelta=timedelta(minutes=start_in.total_seconds() // 60)
-                        )  # getting rid of seconds
+                    embed.description = _("This stream will start <t:{time}:R>").format(
+                        time=int(start_time_unix)
                     )
                 else:
-                    embed.description = _(
-                        "This stream was scheduled for {min} minutes ago"
-                    ).format(min=round((start_in.total_seconds() * -1) // 60))
+                    embed.description = _("This stream was scheduled for <t:{time}:R>").format(
+                        time=int(start_time_unix)
+                    )
                 embed.timestamp = start_time
                 is_schedule = True
             else:

diff --git a/redbot/core/bot.py b/redbot/core/bot.py
@@ -2324,7 +2324,7 @@ async def send_interactive(
         *,
         user: Optional[discord.User] = None,
         box_lang: Optional[str] = None,
-        timeout: int = 15,
+        timeout: int = 60,
         join_character: str = "",
     ) -> List[discord.Message]:
         """

diff --git a/redbot/core/commands/context.py b/redbot/core/commands/context.py
@@ -151,7 +151,7 @@ async def send_interactive(
         self,
         messages: Iterable[str],
         box_lang: Optional[str] = None,
-        timeout: int = 15,
+        timeout: int = 60,
         join_character: str = "",
     ) -> List[discord.Message]:
         """