From d966231b917357f4e0db901958b30cdd7ef6f4c3 Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Mon, 3 Feb 2020 23:44:45 +1000
Subject: Unbleach Wiki

Disables the sanitisation of HTML in wiki articles.
---
 pydis_site/settings.py | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'pydis_site/settings.py')

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 72cc0ab9..65ef2463 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -360,25 +360,7 @@ WIKI_MESSAGE_TAG_CSS_CLASS = {
     messages.WARNING: "is-warning",
 }
 
-WIKI_MARKDOWN_HTML_STYLES = [
-    'max-width',
-    'min-width',
-    'margin',
-    'padding',
-    'width',
-    'height',
-]
-
-WIKI_MARKDOWN_HTML_ATTRIBUTES = {
-    'img': ['class', 'id', 'src', 'alt', 'width', 'height'],
-    'section': ['class', 'id'],
-    'article': ['class', 'id'],
-    'iframe': ['width', 'height', 'src', 'frameborder', 'allow', 'allowfullscreen'],
-}
-
-WIKI_MARKDOWN_HTML_WHITELIST = [
-    'article', 'section', 'button', 'iframe'
-]
+WIKI_MARKDOWN_SANITIZE_HTML = False
 
 
 # Wiki permissions
-- 
cgit v1.2.3


From 7c865902d645bdae21597b43e52a6e5b70ce18d7 Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Mon, 17 Feb 2020 12:01:35 +1000
Subject: Change MEDIA_ROOT to /site/media

---
 pydis_site/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/settings.py')

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 65ef2463..0a60559d 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -197,7 +197,7 @@ STATICFILES_DIRS = [os.path.join(BASE_DIR, 'pydis_site', 'static')]
 STATIC_ROOT = env('STATIC_ROOT', default='/app/staticfiles')
 
 MEDIA_URL = '/media/'
-MEDIA_ROOT = env('MEDIA_ROOT', default='/app/media')
+MEDIA_ROOT = env('MEDIA_ROOT', default='/site/media')
 
 STATICFILES_FINDERS = [
     'django.contrib.staticfiles.finders.FileSystemFinder',
-- 
cgit v1.2.3


From a103f7c43081b39fe9a994d1c6ebcc5da2b12590 Mon Sep 17 00:00:00 2001
From: Joseph Banks <joseph@josephbanks.me>
Date: Fri, 21 Feb 2020 01:16:35 +0000
Subject: Add sentry SDK init to settings.py

---
 pydis_site/settings.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'pydis_site/settings.py')

diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index 0a60559d..5f80a414 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -16,14 +16,24 @@ import sys
 import typing
 
 import environ
+import sentry_sdk
 from django.contrib.messages import constants as messages
+from sentry_sdk.integrations.django import DjangoIntegration
+
 
 if typing.TYPE_CHECKING:
     from django.contrib.auth.models import User
     from wiki.models import Article
 
 env = environ.Env(
-    DEBUG=(bool, False)
+    DEBUG=(bool, False),
+    SITE_SENTRY_DSN=(str, "")
+)
+
+sentry_sdk.init(
+    dsn=env('SITE_SENTRY_DSN'),
+    integrations=[DjangoIntegration()],
+    send_default_pii=True
 )
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-- 
cgit v1.2.3