ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

Improve error messages (as suggested by @Viktya)

Browse source
This commit is contained in:
Steffo 2019-10-25 12:34:19 +02:00
parent 633dd37383
commit 754019084c
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
royalnet/packs/royal/commands/play.py
View file

@ -61,9 +61,10 @@ class PlayCommand(Command):
async def run(self, args: CommandArgs, data: CommandData) -> None: async def run(self, args: CommandArgs, data: CommandData) -> None:
guild_name, url = args.match(r"(?:\[(.+)])?\s*<?(.+)>?") guild_name, url = args.match(r"(?:\[(.+)])?\s*<?(.+)>?")
if not (url.startswith("http://") or url.startswith("https://")): if not (url.startswith("http://") or url.startswith("https://")):
raise CommandError("PlayCommand only accepts URLs.\n" raise CommandError(f"Il comando [c]{self.interface.prefix}play[/c] funziona solo per riprodurre file da"
"If you want to search a song on YouTube or Soundcloud, please use YoutubeCommand" f" un URL.\n"
" or SoundcloudCommand!") f"Se vuoi cercare un video, usa [c]{self.interface.prefix}youtube[/c] o"
f" [c]{self.interface.prefix}soundcloud[/c]!")
response: dict = await self.interface.call_herald_action("discord", self._event_name, { response: dict = await self.interface.call_herald_action("discord", self._event_name, {
"guild_name": guild_name, "guild_name": guild_name,
"url": url "url": url

5
royalnet/packs/royal/commands/soundcloud.py
View file

@ -59,8 +59,9 @@ class SoundcloudCommand(Command):
async def run(self, args: CommandArgs, data: CommandData) -> None: async def run(self, args: CommandArgs, data: CommandData) -> None:
guild_name, search = args.match(r"(?:\[(.+)])?\s*<?(.+)>?") guild_name, search = args.match(r"(?:\[(.+)])?\s*<?(.+)>?")
if search.startswith("http://") or search.startswith("https://"): if search.startswith("http://") or search.startswith("https://"):
raise CommandError("SoundcloudCommand only accepts search queries, and you've sent an URL.\n" raise CommandError(f"Il comando [c]{self.interface.prefix}soundcloud[/c] funziona solo per cercare audio su"
"If you want to add a song from an url, please use PlayCommand!") f" Soundcloud con un dato nome.\n"
f"Se vuoi riprodurre una canzone da un URL, usa [c]{self.interface.prefix}play[/c]!")
response = await self.interface.call_herald_action("discord", self._event_name, { response = await self.interface.call_herald_action("discord", self._event_name, {
"guild_name": guild_name, "guild_name": guild_name,
"search": search "search": search

2
royalnet/packs/royal/commands/videochannel.py
View file

@ -47,4 +47,4 @@ class VideochannelCommand(Command):
await data.reply(f"📹 Per entrare in modalità video, clicca qui:\n" await data.reply(f"📹 Per entrare in modalità video, clicca qui:\n"
f"<https://discordapp.com/channels/{channel.guild.id}/{channel.id}>") f"<https://discordapp.com/channels/{channel.guild.id}/{channel.id}>")
else: else:
raise UnsupportedError(f"This command is not supported on {self.interface.name.capitalize()}.") raise UnsupportedError()

5
royalnet/packs/royal/commands/youtube.py
View file

@ -58,8 +58,9 @@ class YoutubeCommand(Command):
async def run(self, args: CommandArgs, data: CommandData) -> None: async def run(self, args: CommandArgs, data: CommandData) -> None:
guild_name, search = args.match(r"(?:\[(.+)])?\s*<?(.+)>?") guild_name, search = args.match(r"(?:\[(.+)])?\s*<?(.+)>?")
if search.startswith("http://") or search.startswith("https://"): if search.startswith("http://") or search.startswith("https://"):
raise CommandError("YoutubeCommand only accepts search queries, and you've sent an URL.\n" raise CommandError(f"Il comando [c]{self.interface.prefix}youtube[/c] funziona solo per cercare video su"
"If you want to add a song from an url, please use PlayCommand!") f" YouTube con un dato nome.\n"
f"Se vuoi riprodurre una canzone da un URL, usa [c]{self.interface.prefix}play[/c]!")
response = await self.interface.call_herald_action("discord", self._event_name, { response = await self.interface.call_herald_action("discord", self._event_name, {
"guild_name": guild_name, "guild_name": guild_name,
"search": search "search": search