Merge branch 'main' into new-filter-schema

5 files changed, 94 insertions, 29 deletions

diff --git a/pydis_site/apps/api/migrations/0059_populate_filterlists.py b/pydis_site/apps/api/migrations/0059_populate_filterlists.py
index 8c550191..273db3d1 100644
--- a/pydis_site/apps/api/migrations/0059_populate_filterlists.py
+++ b/pydis_site/apps/api/migrations/0059_populate_filterlists.py
@@ -60,35 +60,35 @@ domain_name_blacklist = [
 ]
 
 filter_token_blacklist = [
-    ("\bgoo+ks*\b", None, False),
-    ("\bky+s+\b", None, False),
-    ("\bki+ke+s*\b", None, False),
-    ("\bbeaner+s?\b", None, False),
-    ("\bcoo+ns*\b", None, False),
-    ("\bnig+lets*\b", None, False),
-    ("\bslant-eyes*\b", None, False),
-    ("\btowe?l-?head+s*\b", None, False),
-    ("\bchi*n+k+s*\b", None, False),
-    ("\bspick*s*\b", None, False),
-    ("\bkill* +(?:yo)?urself+\b", None, False),
-    ("\bjew+s*\b", None, False),
-    ("\bsuicide\b", None, False),
-    ("\brape\b", None, False),
-    ("\b(re+)tar+(d+|t+)(ed)?\b", None, False),
-    ("\bta+r+d+\b", None, False),
-    ("\bcunts*\b", None, False),
-    ("\btrann*y\b", None, False),
-    ("\bshemale\b", None, False),
-    ("fa+g+s*", None, False),
-    ("卐", None, False),
-    ("卍", None, False),
-    ("࿖", None, False),
-    ("࿕", None, False),
-    ("࿘", None, False),
-    ("࿗", None, False),
-    ("cuck(?!oo+)", None, False),
-    ("nigg+(?:e*r+|a+h*?|u+h+)s?", None, False),
-    ("fag+o+t+s*", None, False),
+    (r"\bgoo+ks*\b", None, False),
+    (r"\bky+s+\b", None, False),
+    (r"\bki+ke+s*\b", None, False),
+    (r"\bbeaner+s?\b", None, False),
+    (r"\bcoo+ns*\b", None, False),
+    (r"\bnig+lets*\b", None, False),
+    (r"\bslant-eyes*\b", None, False),
+    (r"\btowe?l-?head+s*\b", None, False),
+    (r"\bchi*n+k+s*\b", None, False),
+    (r"\bspick*s*\b", None, False),
+    (r"\bkill* +(?:yo)?urself+\b", None, False),
+    (r"\bjew+s*\b", None, False),
+    (r"\bsuicide\b", None, False),
+    (r"\brape\b", None, False),
+    (r"\b(re+)tar+(d+|t+)(ed)?\b", None, False),
+    (r"\bta+r+d+\b", None, False),
+    (r"\bcunts*\b", None, False),
+    (r"\btrann*y\b", None, False),
+    (r"\bshemale\b", None, False),
+    (r"fa+g+s*", None, False),
+    (r"卐", None, False),
+    (r"卍", None, False),
+    (r"࿖", None, False),
+    (r"࿕", None, False),
+    (r"࿘", None, False),
+    (r"࿗", None, False),
+    (r"cuck(?!oo+)", None, False),
+    (r"nigg+(?:e*r+|a+h*?|u+h+)s?", None, False),
+    (r"fag+o+t+s*", None, False),
 ]
 
 file_format_whitelist = [
diff --git a/pydis_site/apps/api/migrations/0070_auto_20210519_0545.py b/pydis_site/apps/api/migrations/0070_auto_20210519_0545.py
new file mode 100644
index 00000000..dbd7ac91
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0070_auto_20210519_0545.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.0.14 on 2021-05-19 05:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0069_documentationlink_validators'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='offtopicchannelname',
+            name='active',
+            field=models.BooleanField(default=True, help_text='Whether or not this name should be considered for naming channels.'),
+        ),
+        migrations.AlterField(
+            model_name='offtopicchannelname',
+            name='used',
+            field=models.BooleanField(default=False, help_text='Whether or not this name has already been used during this rotation.'),
+        ),
+    ]
diff --git a/pydis_site/apps/api/migrations/0072_merge_20210724_1354.py b/pydis_site/apps/api/migrations/0072_merge_20210724_1354.py
new file mode 100644
index 00000000..f12efab5
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0072_merge_20210724_1354.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.14 on 2021-07-24 13:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0071_increase_message_content_4000'),
+        ('api', '0070_auto_20210519_0545'),
+    ]
+
+    operations = [
+    ]
diff --git a/pydis_site/apps/api/migrations/0074_merge_20211105_0518.py b/pydis_site/apps/api/migrations/0074_merge_20211105_0518.py
new file mode 100644
index 00000000..ebf5ae15
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0074_merge_20211105_0518.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.14 on 2021-11-05 05:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0072_merge_20210724_1354'),
+        ('api', '0073_otn_allow_GT_and_LT'),
+    ]
+
+    operations = [
+    ]
diff --git a/pydis_site/apps/api/migrations/0078_merge_20211213_0552.py b/pydis_site/apps/api/migrations/0078_merge_20211213_0552.py
new file mode 100644
index 00000000..5ce0e871
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0078_merge_20211213_0552.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.14 on 2021-12-13 05:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0077_use_generic_jsonfield'),
+        ('api', '0074_merge_20211105_0518'),
+    ]
+
+    operations = [
+    ]