Compare commits
No commits in common. "ea09f291e521b9740e0b4c64c528920274e4c362" and "623de96463ad390dd8fb6a13feb6f1400f8037ed" have entirely different histories.
ea09f291e5
...
623de96463
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,2 @@
|
|||||||
.env
|
.env
|
||||||
.venv
|
|
||||||
__pycache__
|
__pycache__
|
||||||
|
@ -18,7 +18,7 @@ class Song:
|
|||||||
def format(self, show_queuer=False, hide_preview=False, multiline=False) -> str:
|
def format(self, show_queuer=False, hide_preview=False, multiline=False) -> str:
|
||||||
if multiline:
|
if multiline:
|
||||||
return (
|
return (
|
||||||
f"[`{self.player.title}`]({'<' if hide_preview else ''}{self.player.original_url}{'>' if hide_preview else ''})\n**duration:** {format_duration(self.player.duration) if self.player.duration else '[stream]'}"
|
f"[`{self.player.title}`]({'<' if hide_preview else ''}{self.player.original_url}{'>' if hide_preview else ''})\n**duration:** {format_duration(self.player.duration) if self.player.duration else '[live]'}"
|
||||||
+ (
|
+ (
|
||||||
f", **queued by:** <@{self.trigger_message.author.id}>"
|
f", **queued by:** <@{self.trigger_message.author.id}>"
|
||||||
if show_queuer
|
if show_queuer
|
||||||
@ -27,7 +27,7 @@ class Song:
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
return (
|
return (
|
||||||
f"[`{self.player.title}`]({'<' if hide_preview else ''}{self.player.original_url}{'>' if hide_preview else ''}) [**{format_duration(self.player.duration) if self.player.duration else 'stream'}**]"
|
f"[`{self.player.title}`]({'<' if hide_preview else ''}{self.player.original_url}{'>' if hide_preview else ''}) [**{format_duration(self.player.duration) if self.player.duration else 'live'}**]"
|
||||||
+ (f" (<@{self.trigger_message.author.id}>)" if show_queuer else "")
|
+ (f" (<@{self.trigger_message.author.id}>)" if show_queuer else "")
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -46,7 +46,7 @@ class Song:
|
|||||||
+ (
|
+ (
|
||||||
f"**{format_duration(int(self.player.original.progress))}** / **{format_duration(self.player.duration)}** (**{round(progress * 100)}%**)"
|
f"**{format_duration(int(self.player.original.progress))}** / **{format_duration(self.player.duration)}** (**{round(progress * 100)}%**)"
|
||||||
if self.player.duration
|
if self.player.duration
|
||||||
else "[**stream**]"
|
else "[**live**]"
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@ -56,23 +56,22 @@ class Song:
|
|||||||
name="Uploader",
|
name="Uploader",
|
||||||
value=f"[{self.player.uploader}]({self.player.uploader_url})",
|
value=f"[{self.player.uploader}]({self.player.uploader_url})",
|
||||||
)
|
)
|
||||||
elif self.player.uploader:
|
else:
|
||||||
embed.add_field(
|
embed.add_field(
|
||||||
name="Uploader",
|
name="Uploader",
|
||||||
value=self.player.uploader,
|
value=self.player.uploader,
|
||||||
)
|
)
|
||||||
if self.player.like_count:
|
embed.add_field(
|
||||||
embed.add_field(name="Likes", value=f"{self.player.like_count:,}")
|
name="Likes",
|
||||||
if self.player.view_count:
|
value=f"{self.player.like_count:,}"
|
||||||
|
if self.player.like_count
|
||||||
|
else "Unknown",
|
||||||
|
)
|
||||||
embed.add_field(name="Views", value=f"{self.player.view_count:,}")
|
embed.add_field(name="Views", value=f"{self.player.view_count:,}")
|
||||||
if self.player.timestamp:
|
embed.add_field(name="Published", value=f"<t:{self.player.timestamp}>")
|
||||||
embed.add_field(name="Published", value=f"<t:{int(self.player.timestamp)}>")
|
|
||||||
if self.player.volume:
|
|
||||||
embed.add_field(name="Volume", value=f"{int(self.player.volume * 100)}%")
|
embed.add_field(name="Volume", value=f"{int(self.player.volume * 100)}%")
|
||||||
|
|
||||||
if self.player.thumbnail_url:
|
|
||||||
embed.set_image(self.player.thumbnail_url)
|
embed.set_image(self.player.thumbnail_url)
|
||||||
|
|
||||||
embed.set_footer(
|
embed.set_footer(
|
||||||
text=f"queued by {self.trigger_message.author.name}",
|
text=f"queued by {self.trigger_message.author.name}",
|
||||||
icon_url=(
|
icon_url=(
|
||||||
|
7
core.py
7
core.py
@ -48,11 +48,12 @@ async def on_message(message, edited=False):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
if (cooldowns := command_cooldowns.get(message.author.id)) and not edited:
|
if (cooldowns := command_cooldowns.get(message.author.id)) and not edited:
|
||||||
cur_time = time.time()
|
if (end_time := cooldowns.get(matched)) and int(time.time()) < int(
|
||||||
if (end_time := cooldowns.get(matched)) and round(end_time - cur_time) > 0:
|
end_time
|
||||||
|
):
|
||||||
await utils.reply(
|
await utils.reply(
|
||||||
message,
|
message,
|
||||||
f"please wait **{utils.format_duration(round(end_time - cur_time), natural=True)}** before using this command again!",
|
f"please wait **{utils.format_duration(int(end_time - time.time()), natural=True)}** before using this command again!",
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user