Merge branch 'master' into #222-offensive-msg-autodeletion

4 files changed, 30 insertions, 1 deletions

diff --git a/pydis_site/apps/api/migrations/0046_reminder_jump_url.py b/pydis_site/apps/api/migrations/0046_reminder_jump_url.py
new file mode 100644
index 00000000..b145f0dd
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0046_reminder_jump_url.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.6 on 2019-10-21 14:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0045_add_plural_name_for_log_entry'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='reminder',
+            name='jump_url',
+            field=models.URLField(default='', help_text='The jump url to the message that created the reminder', max_length=88),
+            preserve_default=False,
+        ),
+    ]
diff --git a/pydis_site/apps/api/models/bot/reminder.py b/pydis_site/apps/api/models/bot/reminder.py
index decc9391..d53fedb5 100644
--- a/pydis_site/apps/api/models/bot/reminder.py
+++ b/pydis_site/apps/api/models/bot/reminder.py
@@ -15,6 +15,12 @@ class Reminder(ModelReprMixin, models.Model):
             "If not, it has been sent out to the user."
         )
     )
+    jump_url = models.URLField(
+        max_length=88,
+        help_text=(
+            "The jump url to the message that created the reminder"
+        )
+    )
     author = models.ForeignKey(
         User,
         on_delete=models.CASCADE,
diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index 4ef7ec78..bc94349e 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -191,7 +191,7 @@ class ReminderSerializer(ModelSerializer):
         """Metadata defined for the Django REST Framework."""
 
         model = Reminder
-        fields = ('active', 'author', 'channel_id', 'content', 'expiration', 'id')
+        fields = ('active', 'author', 'jump_url', 'channel_id', 'content', 'expiration', 'id')
 
 
 class RoleSerializer(ModelSerializer):
diff --git a/pydis_site/apps/api/tests/test_models.py b/pydis_site/apps/api/tests/test_models.py
index bce76942..b4a766d0 100644
--- a/pydis_site/apps/api/tests/test_models.py
+++ b/pydis_site/apps/api/tests/test_models.py
@@ -115,6 +115,10 @@ class StringDunderMethodTests(SimpleTestCase):
                     discriminator=5, avatar_hash=None
                 ),
                 channel_id=555,
+                jump_url=(
+                    'https://discordapp.com/channels/'
+                    '267624335836053506/291284109232308226/463087129459949587'
+                ),
                 content="oh no",
                 expiration=dt(5018, 11, 20, 15, 52, tzinfo=timezone.utc)
             )