Merge branch 'main' of https://github.com/vidzy-social/vidzy

vidzy-social · Jan 24, 2025 · 4c848d9 · 4c848d9
2 parents ba2646e + 36e82dd
commit 4c848d9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -60,6 +60,16 @@
         "code",
         "bug"
       ]
+    },
+    {
+      "login": "honjes",
+      "name": "Clara",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33932833?v=4",
+      "profile": "https://github.com/honjes",
+      "contributions": [
+        "code",
+        "bug"
+      ]
     }
   ]
 }
diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,7 @@ FROM --platform=$BUILDPLATFORM python:3.12-alpine AS builder
 WORKDIR /app
 
 RUN apk update
+RUN apk add ffmpeg
 RUN apk add pkgconfig
 RUN apk add --virtual build-deps gcc python3-dev musl-dev
 RUN apk add --no-cache mariadb-dev

diff --git a/README.md b/README.md
@@ -64,6 +64,7 @@ Vidzy is open-source software licensed under the GNU Affero General Public Licen
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nycterent"><img src="https://avatars.githubusercontent.com/u/81133?v=4?s=100" width="100px;" alt="Marty"/><br /><sub><b>Marty</b></sub></a><br /><a href="#code-nycterent" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://chuso.net"><img src="https://avatars.githubusercontent.com/u/3270352?v=4?s=100" width="100px;" alt="Chuso Pérez"/><br /><sub><b>Chuso Pérez</b></sub></a><br /><a href="#security-chusopr" title="Security">🛡️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://everypizza.bearblog.dev"><img src="https://avatars.githubusercontent.com/u/82726593?v=4?s=100" width="100px;" alt="Derry Tutt"/><br /><sub><b>Derry Tutt</b></sub></a><br /><a href="#code-everypizza1" title="Code">💻</a> <a href="#bug-everypizza1" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/honjes"><img src="https://avatars.githubusercontent.com/u/33932833?v=4?s=100" width="100px;" alt="Clara"/><br /><sub><b>Clara</b></sub></a><br /><a href="#code-honjes" title="Code">💻</a> <a href="#bug-honjes" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/settings.py b/settings.py
@@ -2,8 +2,8 @@
 from dotenv import load_dotenv
 
 # BELOW CODE IS FOR PRODUCTION ONLY
-#project_folder = os.path.expanduser('~/mysite')  # adjust as appropriate
-#load_dotenv(os.path.join(project_folder, '.env'))
+# project_folder = os.path.expanduser('~/mysite')  # adjust as appropriate
+# load_dotenv(os.path.join(project_folder, '.env'))
 # ABOVE CODE IS FOR PRODUCTION ONLY
 
 load_dotenv('.env')
@@ -17,19 +17,17 @@
 
 SECRET_KEY = os.environ.get("VIDZY_APP_SECRET")
 
-MINIFY_HTML = os.environ.get("MINIFY_HTML")
+MINIFY_HTML = os.environ.get("MINIFY_HTML") == "True"
 HOST = os.environ.get("HOST")
 
 ALLOW_UPLOADS = os.environ.get("ALLOW_UPLOADS")
 
-S3_ENABLED = os.environ.get("S3_ENABLED")
+S3_ENABLED = os.environ.get("S3_ENABLED") == "True"
 AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID")
 AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY")
 S3_BUCKET_NAME = os.environ.get("S3_BUCKET_NAME")
 AWS_ENDPOINT_URL = os.environ.get("AWS_ENDPOINT_URL")
 S3_PUBLIC_URL = os.environ.get("S3_PUBLIC_URL")
 
 SENTRY_DSN = os.environ.get("SENTRY_DSN")
-SENTRY_ENABLED = os.environ.get("SENTRY_ENABLED")
-
-
+SENTRY_ENABLED = os.environ.get("SENTRY_ENABLED") == "True"