Skip to content

Commit 3317854

Browse files
authored
Merge branch 'main' into otn_softdel
2 parents e7b4da7 + db96e72 commit 3317854

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+829
-202
lines changed

.github/workflows/deploy.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,9 @@ jobs:
4444
site/deployment.yaml
4545
images: 'ghcr.io/python-discord/site:${{ steps.sha_tag.outputs.tag }}'
4646
kubectl-version: 'latest'
47+
48+
- name: Purge Cloudflare Edge Cache
49+
uses: jakejarvis/cloudflare-purge-action@master
50+
env:
51+
CLOUDFLARE_ZONE: 989c984a358bfcd1e9b9d188cc86c1df
52+
CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ rethinkdb_data/
116116
# Node modules
117117
node_modules/
118118

119+
# User configuration
120+
docker-compose.override.yml
121+
119122
pip-wheel-metadata/
120123
staticfiles/
121124

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
version: "3.6"
1212
services:
1313
postgres:
14-
image: postgres:12-alpine
14+
image: postgres:13-alpine
1515
ports:
1616
- "127.0.0.1:7777:5432"
1717
environment:

docs/README.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

docs/configuration.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

docs/setup.md

Lines changed: 0 additions & 91 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by Django 3.0.14 on 2021-06-18 21:14
2+
3+
import django.core.validators
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('api', '0069_documentationlink_validators'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='role',
16+
name='permissions',
17+
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.')]),
18+
),
19+
]
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 3.0.14 on 2021-06-24 14:45
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('api', '0070_auto_20210618_2114'),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name='deletedmessage',
15+
name='content',
16+
field=models.CharField(blank=True, help_text='The content of this message, taken from Discord.', max_length=4000),
17+
),
18+
]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Message(ModelReprMixin, models.Model):
4343
verbose_name="Channel ID"
4444
)
4545
content = models.CharField(
46-
max_length=2_000,
46+
max_length=4_000,
4747
help_text="The content of this message, taken from Discord.",
4848
blank=True
4949
)

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from django.core.validators import MaxValueValidator, MinValueValidator
3+
from django.core.validators import MinValueValidator
44
from django.db import models
55

66
from pydis_site.apps.api.models.mixins import ModelReprMixin
@@ -38,16 +38,12 @@ class Role(ModelReprMixin, models.Model):
3838
),
3939
help_text="The integer value of the colour of this role from Discord."
4040
)
41-
permissions = models.IntegerField(
41+
permissions = models.BigIntegerField(
4242
validators=(
4343
MinValueValidator(
4444
limit_value=0,
4545
message="Role permissions cannot be negative."
4646
),
47-
MaxValueValidator(
48-
limit_value=2 << 32,
49-
message="Role permission bitset exceeds value of having all permissions"
50-
)
5147
),
5248
help_text="The integer value of the permission bitset of this role from Discord."
5349
)

0 commit comments

Comments
 (0)