Introduced prefer_emojis for PycordGuild
This commit is contained in:
@@ -26,6 +26,7 @@ class PycordGuild:
|
|||||||
channel_id: int | None
|
channel_id: int | None
|
||||||
category_id: int | None
|
category_id: int | None
|
||||||
timezone: str
|
timezone: str
|
||||||
|
prefer_emojis: bool
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
async def from_id(
|
async def from_id(
|
||||||
@@ -145,6 +146,7 @@ class PycordGuild:
|
|||||||
"channel_id": self.channel_id,
|
"channel_id": self.channel_id,
|
||||||
"category_id": self.category_id,
|
"category_id": self.category_id,
|
||||||
"timezone": self.timezone,
|
"timezone": self.timezone,
|
||||||
|
"prefer_emojis": self.prefer_emojis,
|
||||||
}
|
}
|
||||||
|
|
||||||
# TODO Add documentation
|
# TODO Add documentation
|
||||||
@@ -155,6 +157,7 @@ class PycordGuild:
|
|||||||
"channel_id": None,
|
"channel_id": None,
|
||||||
"category_id": None,
|
"category_id": None,
|
||||||
"timezone": "UTC",
|
"timezone": "UTC",
|
||||||
|
"prefer_emojis": False,
|
||||||
}
|
}
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
@@ -43,7 +43,14 @@ class CogConfig(Cog):
|
|||||||
),
|
),
|
||||||
required=True,
|
required=True,
|
||||||
)
|
)
|
||||||
@option("channel", description="Text channel for admin notifications", required=True)
|
@option(
|
||||||
|
"channel",
|
||||||
|
description=_("description", "commands", "config_set", "options", "channel"),
|
||||||
|
description_localizations=in_every_locale(
|
||||||
|
"description", "commands", "config_set", "options", "channel"
|
||||||
|
),
|
||||||
|
required=True,
|
||||||
|
)
|
||||||
@option(
|
@option(
|
||||||
"timezone",
|
"timezone",
|
||||||
description=_("description", "commands", "config_set", "options", "timezone"),
|
description=_("description", "commands", "config_set", "options", "timezone"),
|
||||||
@@ -53,12 +60,21 @@ class CogConfig(Cog):
|
|||||||
autocomplete=basic_autocomplete(autocomplete_timezones),
|
autocomplete=basic_autocomplete(autocomplete_timezones),
|
||||||
required=True,
|
required=True,
|
||||||
)
|
)
|
||||||
|
@option(
|
||||||
|
"prefer_emojis",
|
||||||
|
description=_("description", "commands", "config_set", "options", "prefer_emojis"),
|
||||||
|
description_localizations=in_every_locale(
|
||||||
|
"description", "commands", "config_set", "options", "prefer_emojis"
|
||||||
|
),
|
||||||
|
required=True,
|
||||||
|
)
|
||||||
async def command_config_set(
|
async def command_config_set(
|
||||||
self,
|
self,
|
||||||
ctx: ApplicationContext,
|
ctx: ApplicationContext,
|
||||||
category: CategoryChannel,
|
category: CategoryChannel,
|
||||||
channel: TextChannel,
|
channel: TextChannel,
|
||||||
timezone: str,
|
timezone: str,
|
||||||
|
prefer_emojis: bool,
|
||||||
) -> None:
|
) -> None:
|
||||||
try:
|
try:
|
||||||
guild: PycordGuild = await self.bot.find_guild(ctx.guild.id)
|
guild: PycordGuild = await self.bot.find_guild(ctx.guild.id)
|
||||||
@@ -79,6 +95,7 @@ class CogConfig(Cog):
|
|||||||
channel_id=channel.id,
|
channel_id=channel.id,
|
||||||
category_id=category.id,
|
category_id=category.id,
|
||||||
timezone=str(timezone_parsed),
|
timezone=str(timezone_parsed),
|
||||||
|
prefer_emojis=prefer_emojis,
|
||||||
)
|
)
|
||||||
|
|
||||||
await ctx.respond(self.bot._("config_set", "messages", locale=ctx.locale))
|
await ctx.respond(self.bot._("config_set", "messages", locale=ctx.locale))
|
||||||
@@ -131,6 +148,7 @@ class CogConfig(Cog):
|
|||||||
channel_id=guild.channel_id,
|
channel_id=guild.channel_id,
|
||||||
category_id=guild.category_id,
|
category_id=guild.category_id,
|
||||||
timezone=guild.timezone,
|
timezone=guild.timezone,
|
||||||
|
prefer_emojis=guild.prefer_emojis,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@@ -65,9 +65,11 @@ class CogGuess(Cog):
|
|||||||
return
|
return
|
||||||
|
|
||||||
if answer.lower() != stage.answer.lower():
|
if answer.lower() != stage.answer.lower():
|
||||||
# TODO Make a nice message
|
await ctx.respond(
|
||||||
# await ctx.respond("Provided answer is wrong.")
|
self.bot.config["emojis"]["guess_wrong"]
|
||||||
await ctx.respond(self.bot.config["emojis"]["guess_wrong"])
|
if guild.prefer_emojis
|
||||||
|
else self.bot._("guess_incorrect", "messages", locale=ctx.locale)
|
||||||
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
next_stage_index = stage.sequence + 1
|
next_stage_index = stage.sequence + 1
|
||||||
|
@@ -6,7 +6,7 @@
|
|||||||
"admin_user_completed_stage": "User **{display_name}** ({mention}) has completed the stage {stage_sequence} of the event **{event_name}**.",
|
"admin_user_completed_stage": "User **{display_name}** ({mention}) has completed the stage {stage_sequence} of the event **{event_name}**.",
|
||||||
"config_reset": "Configuration has been reset. You can update it using `/config set`, otherwise no events can be held.",
|
"config_reset": "Configuration has been reset. You can update it using `/config set`, otherwise no events can be held.",
|
||||||
"config_set": "Configuration has been updated. You can review it anytime using `/config show`.",
|
"config_set": "Configuration has been updated. You can review it anytime using `/config show`.",
|
||||||
"config_show": "**Guild config**\n\nChannel: <#{channel_id}>\nCategory: <#{category_id}>\nTimezone: `{timezone}`",
|
"config_show": "**Guild config**\n\nChannel: <#{channel_id}>\nCategory: <#{category_id}>\nTimezone: `{timezone}`\nPrefer emojis: `{prefer_emojis}`",
|
||||||
"event_cancelled": "Event **{event_name}** was cancelled.",
|
"event_cancelled": "Event **{event_name}** was cancelled.",
|
||||||
"event_created": "Event **{event_name}** has been created and will take place <t:{start_time}:R>.",
|
"event_created": "Event **{event_name}** has been created and will take place <t:{start_time}:R>.",
|
||||||
"event_dates_parsing_failed": "Could not parse start and end dates. Please, make sure these are provided in `DD.MM.YYYY HH:MM` format.",
|
"event_dates_parsing_failed": "Could not parse start and end dates. Please, make sure these are provided in `DD.MM.YYYY HH:MM` format.",
|
||||||
@@ -23,6 +23,7 @@
|
|||||||
"event_start_past": "Start date must not be in the past",
|
"event_start_past": "Start date must not be in the past",
|
||||||
"event_updated": "Event **{event_name}** has been updated and will take place <t:{start_time}:R>.",
|
"event_updated": "Event **{event_name}** has been updated and will take place <t:{start_time}:R>.",
|
||||||
"guess_completed_event": "Congratulations! You have completed the event!",
|
"guess_completed_event": "Congratulations! You have completed the event!",
|
||||||
|
"guess_incorrect": "Provided answer is wrong.",
|
||||||
"guess_incorrect_channel": "Usage outside own event channel is not allowed.",
|
"guess_incorrect_channel": "Usage outside own event channel is not allowed.",
|
||||||
"guess_incorrect_event": "Your event could not be found. Please, contact the administrator.",
|
"guess_incorrect_event": "Your event could not be found. Please, contact the administrator.",
|
||||||
"guess_unregistered": "You have no ongoing events. You can register for events using the `/register` command.",
|
"guess_unregistered": "You have no ongoing events. You can register for events using the `/register` command.",
|
||||||
@@ -67,6 +68,9 @@
|
|||||||
},
|
},
|
||||||
"timezone": {
|
"timezone": {
|
||||||
"description": "Timezone in which events take place"
|
"description": "Timezone in which events take place"
|
||||||
|
},
|
||||||
|
"prefer_emojis": {
|
||||||
|
"description": "Prefer emojis over text messages where available"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user