Merge branch 'main' into move-config-docs-to-contributing-guide

Author: kosayoda

.github/ISSUE_TEMPLATE/resource_suggestion.md

@@ -0,0 +1,21 @@
+---
+name: Resource Suggestion
+about: Suggest a resource for the Python Discord resource index.
+title: 'Resource Suggestion: '
+labels: 'resource suggestion'
+assignees: 'swfarnsworth'
+---
+
+**Resource name**
+
+**Resource location**\
+Should be a link of some kind, either to the resource itself or (in the case of resources that must be purchased) an information page about it.
+
+**Payment type**\
+Options are free, paid, and subscription. Combinations of these are allowed for special cases (like a limited free version).
+
+**Why it should be included**\
+A brief explanation for why you think this resource is valuable.
+
+**Potential limitations**\
+Is the resource easy to use? Does it contain good information but have poorly-written code? Is it outdated in some way? If so, explain why it should still be included.

.github/workflows/deploy.yaml

@@ -44,3 +44,9 @@ jobs:
               site/deployment.yaml
           images: 'ghcr.io/python-discord/site:${{ steps.sha_tag.outputs.tag }}'
           kubectl-version: 'latest'
+
+      - name: Purge Cloudflare Edge Cache
+        uses: jakejarvis/cloudflare-purge-action@master
+        env:
+          CLOUDFLARE_ZONE: 989c984a358bfcd1e9b9d188cc86c1df
+          CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}

pydis_site/apps/api/migrations/0070_auto_20210618_2114.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.0.14 on 2021-06-18 21:14
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0069_documentationlink_validators'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='role',
+            name='permissions',
+            field=models.BigIntegerField(help_text='The integer value of the permission bitset of this role from Discord.', validators=[django.core.validators.MinValueValidator(limit_value=0, message='Role permissions cannot be negative.')]),
+        ),
+    ]

pydis_site/apps/api/migrations/0071_increase_message_content_4000.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.14 on 2021-06-24 14:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0070_auto_20210618_2114'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='deletedmessage',
+            name='content',
+            field=models.CharField(blank=True, help_text='The content of this message, taken from Discord.', max_length=4000),
+        ),
+    ]

pydis_site/apps/api/models/bot/message.py

@@ -43,7 +43,7 @@ class Message(ModelReprMixin, models.Model):
         verbose_name="Channel ID"
     )
     content = models.CharField(
-        max_length=2_000,
+        max_length=4_000,
         help_text="The content of this message, taken from Discord.",
         blank=True
     )

pydis_site/apps/api/models/bot/role.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from django.core.validators import MaxValueValidator, MinValueValidator
+from django.core.validators import MinValueValidator
 from django.db import models
 
 from pydis_site.apps.api.models.mixins import ModelReprMixin
@@ -38,16 +38,12 @@ class Role(ModelReprMixin, models.Model):
         ),
         help_text="The integer value of the colour of this role from Discord."
     )
-    permissions = models.IntegerField(
+    permissions = models.BigIntegerField(
         validators=(
             MinValueValidator(
                 limit_value=0,
                 message="Role permissions cannot be negative."
             ),
-            MaxValueValidator(
-                limit_value=2 << 32,
-                message="Role permission bitset exceeds value of having all permissions"
-            )
         ),
         help_text="The integer value of the permission bitset of this role from Discord."
     )

pydis_site/apps/api/tests/test_models.py

@@ -1,6 +1,7 @@
 from datetime import datetime as dt
 
-from django.test import SimpleTestCase
+from django.core.exceptions import ValidationError
+from django.test import SimpleTestCase, TestCase
 from django.utils import timezone
 
 from pydis_site.apps.api.models import (
@@ -34,6 +35,43 @@ def test_shows_attributes(self):
         self.assertEqual(repr(self.klass), expected)
 
 
+class NitroMessageLengthTest(TestCase):
+    def setUp(self):
+        self.user = User.objects.create(id=50, name='bill', discriminator=5)
+        self.context = MessageDeletionContext.objects.create(
+            id=50,
+            actor=self.user,
+            creation=dt.utcnow()
+        )
+
+    def test_create(self):
+        message = DeletedMessage(
+            id=46,
+            author=self.user,
+            channel_id=666,
+            content="w"*4000,
+            deletion_context=self.context,
+            embeds=[]
+        )
+
+        try:
+            message.clean_fields()
+        except Exception as e:  # pragma: no cover
+            self.fail(f"Creation of message of length 3950 failed with: {e}")
+
+    def test_create_failure(self):
+        message = DeletedMessage(
+            id=47,
+            author=self.user,
+            channel_id=666,
+            content="w"*4001,
+            deletion_context=self.context,
+            embeds=[]
+        )
+
+        self.assertRaisesRegex(ValidationError, "content':", message.clean_fields)
+
+
 class StringDunderMethodTests(SimpleTestCase):
     def setUp(self):
         self.nomination = Nomination(

pydis_site/apps/resources/resources/communities/rlbot.yaml

@@ -48,7 +48,6 @@ li {
     display: flex;
     flex-direction: column;
     max-width: 512px;
-    background-color: white;
     border-radius: 20px;
     overflow: hidden;
     box-shadow: 5px 7px 40px rgba(0, 0, 0, 0.432);
@@ -64,4 +63,5 @@ li {
 
 .content-box {
     padding: 25px;
+    background: #fff;
 }