From 2ff83b90fadd27fc03a54f4b8ee91433f6861cb5 Mon Sep 17 00:00:00 2001
From: Conatum <cona@thewisewolf.dev>
Date: Sat, 19 Mar 2022 16:18:33 +0200
Subject: [PATCH] (sponsors): Allow `prompt` to be nullable.

---
 bot/modules/sponsors/commands.py | 16 ++--------------
 bot/modules/sponsors/module.py   | 13 +++++++------
 bot/settings/__init__.py         |  1 +
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/bot/modules/sponsors/commands.py b/bot/modules/sponsors/commands.py
index 424f56a2..5ddd8b93 100644
--- a/bot/modules/sponsors/commands.py
+++ b/bot/modules/sponsors/commands.py
@@ -1,5 +1,3 @@
-from cmdClient.checks import is_owner
-
 from .module import module
 
 
@@ -7,20 +5,10 @@ from .module import module
     name="sponsors",
     group="Meta",
     desc="Check out our wonderful partners!",
-    flags=('edit', 'prompt')
 )
-async def cmd_sponsors(ctx, flags):
+async def cmd_sponsors(ctx):
     """
     Usage``:
         {prefix}sponsors
     """
-    if await is_owner.run(ctx) and any(flags.values()):
-        if flags['edit']:
-            # Run edit setting command
-            await ctx.client.settings.sponsor_message.command(ctx, ctx.client.conf.bot['data_appid'])
-        elif flags['prompt']:
-            # Run prompt setting command
-            await ctx.client.settings.sponsor_prompt.command(ctx, ctx.client.conf.bot['data_appid'])
-    else:
-        # Display message
-        await ctx.reply(**ctx.client.settings.sponsor_message.args(ctx))
+    await ctx.reply(**ctx.client.settings.sponsor_message.args(ctx))
diff --git a/bot/modules/sponsors/module.py b/bot/modules/sponsors/module.py
index 489af5ce..d709a16d 100644
--- a/bot/modules/sponsors/module.py
+++ b/bot/modules/sponsors/module.py
@@ -15,11 +15,12 @@ sponsored_commands = {'profile', 'stats', 'weekly', 'monthly'}
 @LionContext.reply.add_wrapper
 async def sponsor_reply_wrapper(func, ctx: LionContext, *args, **kwargs):
     if ctx.cmd and ctx.cmd.name in sponsored_commands:
-        sponsor_hint = discord.Embed(
-            description=ctx.client.settings.sponsor_prompt.value,
-            colour=discord.Colour.dark_theme()
-        )
-        if 'embed' not in kwargs:
-            kwargs['embed'] = sponsor_hint
+        if (prompt := ctx.client.settings.sponsor_prompt.value):
+            sponsor_hint = discord.Embed(
+                description=prompt,
+                colour=discord.Colour.dark_theme()
+            )
+            if 'embed' not in kwargs:
+                kwargs['embed'] = sponsor_hint
 
     return await func(ctx, *args, **kwargs)
diff --git a/bot/settings/__init__.py b/bot/settings/__init__.py
index 3f72ea44..fdd6d18d 100644
--- a/bot/settings/__init__.py
+++ b/bot/settings/__init__.py
@@ -3,3 +3,4 @@ from .setting_types import *  # noqa
 
 from .user_settings import UserSettings, UserSetting  # noqa
 from .guild_settings import GuildSettings, GuildSetting  # noqa
+from .app_settings import AppSettings