From 76cd687715e49cee97bac24f5d3c8ca40ffca099 Mon Sep 17 00:00:00 2001
From: Leon Sandøy <leon.sandoy@conmodo.com>
Date: Thu, 16 Jul 2020 20:48:56 +0200
Subject: Rename AllowList to AllowDenyList.

https://github.com/python-discord/site/issues/305
---
 pydis_site/apps/api/models/__init__.py            |  2 +-
 pydis_site/apps/api/models/bot/__init__.py        |  2 +-
 pydis_site/apps/api/models/bot/allow_deny_list.py | 37 +++++++++++++++++++++
 pydis_site/apps/api/models/bot/allowlist.py       | 39 -----------------------
 4 files changed, 39 insertions(+), 41 deletions(-)
 create mode 100644 pydis_site/apps/api/models/bot/allow_deny_list.py
 delete mode 100644 pydis_site/apps/api/models/bot/allowlist.py

(limited to 'pydis_site/apps/api/models')

diff --git a/pydis_site/apps/api/models/__init__.py b/pydis_site/apps/api/models/__init__.py
index 2839fbba..34973a8d 100644
--- a/pydis_site/apps/api/models/__init__.py
+++ b/pydis_site/apps/api/models/__init__.py
@@ -1,6 +1,6 @@
 # flake8: noqa
 from .bot import (
-    AllowList,
+    AllowDenyList,
     BotSetting,
     DocumentationLink,
     DeletedMessage,
diff --git a/pydis_site/apps/api/models/bot/__init__.py b/pydis_site/apps/api/models/bot/__init__.py
index b373ee84..1234b35a 100644
--- a/pydis_site/apps/api/models/bot/__init__.py
+++ b/pydis_site/apps/api/models/bot/__init__.py
@@ -1,5 +1,5 @@
 # flake8: noqa
-from .allowlist import AllowList
+from .allow_deny_list import AllowDenyList
 from .bot_setting import BotSetting
 from .deleted_message import DeletedMessage
 from .documentation_link import DocumentationLink
diff --git a/pydis_site/apps/api/models/bot/allow_deny_list.py b/pydis_site/apps/api/models/bot/allow_deny_list.py
new file mode 100644
index 00000000..1eef47ba
--- /dev/null
+++ b/pydis_site/apps/api/models/bot/allow_deny_list.py
@@ -0,0 +1,37 @@
+from django.db import models
+
+from pydis_site.apps.api.models.mixins import ModelReprMixin, ModelTimestampMixin
+
+
+class AllowDenyList(ModelTimestampMixin, ModelReprMixin, models.Model):
+    """An item that is either allowed or denied."""
+
+    AllowDenyListType = models.TextChoices(
+        'AllowDenyListType',
+        'GUILD_INVITE_ID '
+        'FILE_FORMAT '
+        'DOMAIN_NAME '
+        'WORD_WATCHLIST '
+    )
+    type = models.CharField(
+        max_length=50,
+        help_text="The type of allowlist this is on.",
+        choices=AllowDenyListType.choices,
+    )
+    allowed = models.BooleanField(
+        help_text="Whether this item is on the allowlist or the denylist."
+    )
+    content = models.TextField(
+        help_text="The data to add to the allow or denylist."
+    )
+
+    class Meta:
+        """Metaconfig for this model."""
+
+        # This constraint ensures only one allow or denylist with the
+        # same content can exist. This means that we cannot have both an allow
+        # and a deny for the same item, and we cannot have duplicates of the
+        # same item.
+        constraints = [
+            models.UniqueConstraint(fields=['content', 'type'], name='unique_allow_deny_list'),
+        ]
diff --git a/pydis_site/apps/api/models/bot/allowlist.py b/pydis_site/apps/api/models/bot/allowlist.py
deleted file mode 100644
index fc57ef32..00000000
--- a/pydis_site/apps/api/models/bot/allowlist.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from django.db import models
-
-from pydis_site.apps.api.models.mixins import ModelReprMixin, ModelTimestampMixin
-
-
-class AllowList(ModelTimestampMixin, ModelReprMixin, models.Model):
-    """An item that is either allowed or denied."""
-
-    AllowListType = models.TextChoices(
-        'AllowListType',
-        'GUILD_INVITE_ID '
-        'FILE_FORMAT '
-        'DOMAIN_NAME '
-        'WORD_WATCHLIST '
-    )
-    type = models.CharField(
-        max_length=50,
-        help_text="The type of allowlist this is on.",
-        choices=AllowListType.choices,
-    )
-    allowed = models.BooleanField(
-        help_text="Whether this item is on the allowlist or the denylist."
-    )
-    content = models.TextField(
-        help_text="The data to add to the allowlist."
-    )
-
-    class Meta:
-        """Metaconfig for this model."""
-
-        db_table = 'allow_list'
-
-        # This constraint ensures only one allowlist with the same content
-        # can exist per type.This means that we cannot have both an allow
-        # and a deny for the same item, and we cannot have duplicates of the
-        # same item.
-        constraints = [
-            models.UniqueConstraint(fields=['content', 'type'], name='unique_allowlist'),
-        ]
-- 
cgit v1.2.3