Merge branch 'master' into off-topic-non-random

2 files changed, 26 insertions, 0 deletions

diff --git a/pydis_site/apps/api/migrations/0051_create_news_setting.py b/pydis_site/apps/api/migrations/0051_create_news_setting.py
new file mode 100644
index 00000000..f18fdfb1
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0051_create_news_setting.py
@@ -0,0 +1,25 @@
+from django.db import migrations
+
+
+def up(apps, schema_editor):
+    BotSetting = apps.get_model('api', 'BotSetting')
+    setting = BotSetting(
+        name='news',
+        data={}
+    ).save()
+
+
+def down(apps, schema_editor):
+    BotSetting = apps.get_model('api', 'BotSetting')
+    BotSetting.objects.get(name='news').delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0050_remove_infractions_active_default_value'),
+    ]
+
+    operations = [
+        migrations.RunPython(up, down)
+    ]
diff --git a/pydis_site/apps/api/models/bot/bot_setting.py b/pydis_site/apps/api/models/bot/bot_setting.py
index b1c3e47c..8d48eac7 100644
--- a/pydis_site/apps/api/models/bot/bot_setting.py
+++ b/pydis_site/apps/api/models/bot/bot_setting.py
@@ -9,6 +9,7 @@ def validate_bot_setting_name(name: str) -> None:
     """Raises a ValidationError if the given name is not a known setting."""
     known_settings = (
         'defcon',
+        'news',
     )
 
     if name not in known_settings: