From 31187c99b21b73ede5d22e1abaef4dd73f70fe5d Mon Sep 17 00:00:00 2001
From: Corry Haines <github@corryh.com>
Date: Mon, 26 Dec 2022 09:42:02 -0800
Subject: [PATCH] Quality of life (#266)

Support gunicorn autoreload on DEBUG
Pass docker postgres port to host
Add some typing to posts.py
---
 activities/views/posts.py | 6 +++++-
 docker/docker-compose.yml | 3 +++
 docker/run.sh             | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/activities/views/posts.py b/activities/views/posts.py
index b4a7bf2..0925e62 100644
--- a/activities/views/posts.py
+++ b/activities/views/posts.py
@@ -5,11 +5,12 @@ from django.utils.decorators import method_decorator
 from django.views.decorators.vary import vary_on_headers
 from django.views.generic import TemplateView, View
 
-from activities.models import PostInteraction, PostStates
+from activities.models import Post, PostInteraction, PostStates
 from activities.services import PostService
 from core.decorators import cache_page_by_ap_json
 from core.ld import canonicalise
 from users.decorators import identity_required
+from users.models import Identity
 from users.shortcuts import by_handle_or_404
 
 
@@ -21,6 +22,9 @@ class Individual(TemplateView):
 
     template_name = "activities/post.html"
 
+    identity: Identity
+    post_obj: Post
+
     def get(self, request, handle, post_id):
         self.identity = by_handle_or_404(self.request, handle, local=False)
         if self.identity.blocked:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index b1b8e66..851a571 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -20,6 +20,7 @@ x-takahe-common:
       TAKAHE_EMAIL_BACKEND: "console://console"
       TAKAHE_MAIN_DOMAIN: "example.com"
       TAKAHE_ENVIRONMENT: "development"
+      GUNICORN_EXTRA_CMD_ARGS: "--reload"
     networks:
       - external_network
       - internal_network
@@ -43,6 +44,8 @@ services:
       POSTGRES_DB: takahe
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: insecure_password
+    ports:
+      - "5433:5432"
 
   web:
     <<: *takahe-common
diff --git a/docker/run.sh b/docker/run.sh
index b8f0e69..7f73e06 100644
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -7,7 +7,7 @@ sed s/__CACHESIZE__/${CACHE_SIZE}/g /takahe/docker/nginx.conf > /takahe/docker/n
 # Run nginx and gunicorn
 nginx -c "/takahe/docker/nginx.rendered.conf" &
 
-gunicorn takahe.wsgi:application -b 0.0.0.0:8001 &
+gunicorn takahe.wsgi:application -b 0.0.0.0:8001 $GUNICORN_EXTRA_CMD_ARGS &
 
 # Wait for any process to exit
 wait -n