Merge pull request #1111 from thecourseforum/dev

Moderation

Author: barrettruth

.github/workflows/aws.yml

@@ -106,10 +106,10 @@ jobs:
       - name: Deploy Amazon ECS task definition
         uses: aws-actions/amazon-ecs-deploy-task-definition@v1
         with:
-            task-definition: ${{ steps.task-def.outputs.task-definition }}
-            service: ${{ env.ECS_SERVICE }}
-            cluster: ${{ env.ECS_CLUSTER }}
-            wait-for-service-stability: true
+          task-definition: ${{ steps.task-def.outputs.task-definition }}
+          service: ${{ env.ECS_SERVICE }}
+          cluster: ${{ env.ECS_CLUSTER }}
+          wait-for-service-stability: true
 
       - name: Force new deployment
         run: |

.python-version

@@ -1 +1 @@
-3.11.0
+3.11

package-lock.json

@@ -1,6 +1,12 @@
-[tool.black]
-line-length = 100
-[tool.isort]
-profile = "black"
-[tool.djlint]
-profile = "django"
+[project]
+name = "thecourseforum2"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.11"
+dependencies = [
+    "astroid>=3.3.9",
+    "black>=25.1.0",
+    "dill>=0.3.9",
+    "pylint>=3.3.6",
+]

pyproject.toml

@@ -4,6 +4,7 @@ backoff~=2.2.1
 black~=24.1.1
 boto3~=1.37.4
 coverage~=7.3.3
+detoxify~=0.5.2
 django-cachalot~=2.6.1
 django-environ~=0.11.2
 django-filter~=23.5

requirements.txt

@@ -141,7 +141,9 @@ def create_user(strategy, details, backend, user=None, *args, **kwargs):
     return {"is_new": True, "user": strategy.create_user(**fields)}
 
 
-def check_user_password(strategy, backend, user, is_new=False, password="", *args, **kwargs):
+def check_user_password(
+    strategy, backend, user, is_new=False, password="", *args, **kwargs
+):
     """
     Saves password to user object if a new user (registering).
     Otherwise, validates given password is correct.
@@ -162,7 +164,9 @@ def validate_email(strategy, backend, code, partial_token):
     """
     if not code.verified:
         url = (
-            strategy.build_absolute_uri(reverse("social:complete", args=(backend.name,)))
+            strategy.build_absolute_uri(
+                reverse("social:complete", args=(backend.name,))
+            )
             + "?verification_code="
             + code.code
             + "&partial_token="

tcf_core/auth_pipeline.py

@@ -55,11 +55,7 @@
     STATIC_URL = "/static/"
     STATIC_ROOT = os.path.join(BASE_DIR, "static")
 
-    ALLOWED_HOSTS.extend([
-        "localhost",
-        ".grok.io",
-        "127.0.0.1"
-    ])
+    ALLOWED_HOSTS.extend(["localhost", ".grok.io", "127.0.0.1"])
 
     DATABASES = {
         "default": {
@@ -80,11 +76,13 @@
     AWS_DEFAULT_ACL = None
     AWS_S3_OBJECT_PARAMETERS = {"CacheControl": "max-age=86400"}
 
-    ALLOWED_HOSTS.extend([
-        "tcf-load-balancer-1374896025.us-east-1.elb.amazonaws.com",
-        "thecourseforum.com",
-        "thecourseforumtest.com"
-    ])
+    ALLOWED_HOSTS.extend(
+        [
+            "tcf-load-balancer-1374896025.us-east-1.elb.amazonaws.com",
+            "thecourseforum.com",
+            "thecourseforumtest.com",
+        ]
+    )
 
     STORAGES = {
         "default": {
@@ -198,7 +196,9 @@
 
 WHITELISTED_DOMAINS = ["virginia.edu"]
 
-SOCIAL_AUTH_GOOGLE_OAUTH2_LOGIN_URL = reverse_lazy("social:begin", args=["google-oauth2"])
+SOCIAL_AUTH_GOOGLE_OAUTH2_LOGIN_URL = reverse_lazy(
+    "social:begin", args=["google-oauth2"]
+)
 SOCIAL_AUTH_RAISE_EXCEPTIONS = False
 SOCIAL_AUTH_PIPELINE = (
     "tcf_core.auth_pipeline.password_validation",
@@ -271,3 +271,6 @@
 
 # Required in Django 3.2+ (See https://stackoverflow.com/a/66971803)
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
+# Toxicity threshold for filtering reviews
+TOXICITY_THRESHOLD = 74

tcf_core/settings/base.py

@@ -16,8 +16,11 @@
     ALLOWED_HOSTS = ["*", "thecourseforum.com"]
 
     # CSRF settings to fix form submission issues in production
-    CSRF_TRUSTED_ORIGINS = ['https://thecourseforum.com', 'https://thecourseforumtest.com']
-    SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+    CSRF_TRUSTED_ORIGINS = [
+        "https://thecourseforum.com",
+        "https://thecourseforumtest.com",
+    ]
+    SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
 
     # Use secure connection for database access
     DATABASES["default"]["OPTIONS"] = {"sslmode": "require"}

tcf_core/settings/prod.py

@@ -23,7 +23,10 @@ def __call__(self, request):
             previous_paths_titles = []
 
         response = self.get_response(request)
-        if check_path(request.path) and request.session.get("instructor_fullname") is not None:
+        if (
+            check_path(request.path)
+            and request.session.get("instructor_fullname") is not None
+        ):
             previous_paths.insert(0, request.build_absolute_uri())
             previous_paths = list(dict.fromkeys(previous_paths))
 

tcf_core/settings/record_middleware.py

@@ -67,7 +67,15 @@ def get_queryset(self, request):
 
 class SectionTimeAdmin(admin.ModelAdmin):
     list_display = ["section", "get_days_display", "start_time", "end_time"]
-    list_filter = ["monday", "tuesday", "wednesday", "thursday", "friday", "start_time", "end_time"]
+    list_filter = [
+        "monday",
+        "tuesday",
+        "wednesday",
+        "thursday",
+        "friday",
+        "start_time",
+        "end_time",
+    ]
     search_fields = [
         "section__course__subdepartment__mnemonic",
         "section__course__number",