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

.env.sample

@@ -17,4 +17,8 @@ S3_ENABLED=False
 AWS_ACCESS_KEY_ID=AWS_ACCESS_KEY
 AWS_SECRET_ACCESS_KEY=AWS_SECRET_KEY
 AWS_ENDPOINT_URL=https://s3.us-east-1.amazonaws.com
-S3_BUCKET_NAME=vidzy
+S3_BUCKET_NAME=vidzy
+S3_PUBLIC_URL=https://s3.us-east-1.amazonaws.com
+
+SENTRY_DSN=None
+SENTRY_ENABLED=False

.env.sample.docker

@@ -17,4 +17,8 @@ S3_ENABLED: False
 AWS_ACCESS_KEY_ID: AWS_ACCESS_KEY
 AWS_SECRET_ACCESS_KEY: AWS_SECRET_KEY
 AWS_ENDPOINT_URL: https://s3.us-east-1.amazonaws.com
-S3_BUCKET_NAME: vidzy
+S3_BUCKET_NAME: vidzy
+S3_PUBLIC_URL: https://s3.us-east-1.amazonaws.com
+
+SENTRY_DSN: None
+SENTRY_ENABLED: False

app.py

@@ -13,6 +13,7 @@
 import requests
 import nh3
 import boto3
+import urllib.parse
 
 from flask import *
 
@@ -68,6 +69,14 @@ def cleanhtml(raw_html):
 app.jinja_env.globals.update(VIDZY_VERSION=VIDZY_VERSION)
 
 app.config.from_pyfile('settings.py', silent=False)
+if app.config['SENTRY_ENABLED']:
+    import sentry_sdk
+    from sentry_sdk.integrations.flask import FlaskIntegration
+
+    sentry_sdk.init(
+        dsn=app.config['SENTRY_DSN'],
+        integrations=[FlaskIntegration()]
+    )
 app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
 app.config['WTF_CSRF_CHECK_DEFAULT'] = False
 app.config['SQLALCHEMY_DATABASE_URI'] = 'mysql+pymysql://{}:{}@{}:{}/{}'.format(app.config["MYSQL_USER"], app.config["MYSQL_PASSWORD"], app.config["MYSQL_HOST"], app.config["MYSQL_PORT"], app.config["MYSQL_DB"])
@@ -954,10 +963,15 @@ def upload_file():
                 new_filename = uuid.uuid4().hex + '.' + file.filename.rsplit('.', 1)[1].lower()
 
                 bucket_name = app.config['S3_BUCKET_NAME']
-                s3 = boto3.resource("s3")
+
+                s3_session = boto3.Session(
+                    aws_access_key_id=app.config['AWS_ACCESS_KEY_ID'],
+                    aws_secret_access_key=app.config['AWS_SECRET_ACCESS_KEY'],
+                )
+                s3 = s3_session.resource('s3')
                 s3.Bucket(bucket_name).upload_fileobj(file, new_filename)
 
-                s3_fileurl = app.config['AWS_ENDPOINT_URL'] + "/" + app.config['S3_BUCKET_NAME'] + "/" + new_filename
+                s3_fileurl = urllib.parse.urljoin(app.config['S3_PUBLIC_URL'], new_filename)
 
                 cur = mysql.connection.cursor()
 

mysql-dump/MYSQL_DATABASE.sql

@@ -79,7 +79,7 @@ DROP TABLE IF EXISTS `shorts`;
 CREATE TABLE `shorts` (
   `id` int NOT NULL AUTO_INCREMENT,
   `title` varchar(65) DEFAULT NULL,
-  `url` varchar(60) DEFAULT NULL,
+  `url` varchar(2048) DEFAULT NULL,
   `user_id` int DEFAULT NULL,
   PRIMARY KEY (`id`)
 );
@@ -105,7 +105,7 @@ CREATE TABLE `users` (
   `id` int NOT NULL AUTO_INCREMENT,
   `username` varchar(65) DEFAULT NULL,
   `password` varchar(100) DEFAULT NULL,
-  `cover_photo_url` varchar(300) DEFAULT 'assets/black.jpg',
+  `cover_photo_url` varchar(2048) DEFAULT 'assets/black.jpg',
   `is_admin` int DEFAULT '0',
   `first_name` varchar(45) DEFAULT NULL,
   `last_name` varchar(45) DEFAULT NULL,
@@ -173,10 +173,10 @@ ADD COLUMN `description` VARCHAR(400) NULL AFTER `date_uploaded`;
 --
 -- v0.1.4
 --
-ALTER TABLE `shorts` CHANGE COLUMN `url` `url` VARCHAR(100) NULL DEFAULT NULL ;
+ALTER TABLE `shorts` CHANGE COLUMN `url` `url` VARCHAR(2048) NULL DEFAULT NULL ;
 
 --
 -- v0.1.5
 --
 ALTER TABLE `vidzy`.`shorts` 
-ADD COLUMN `tags` VARCHAR(100) NULL AFTER `description`;
+ADD COLUMN `tags` VARCHAR(100) NULL AFTER `description`;

nixpacks.toml

@@ -0,0 +1,12 @@
+[phases.setup]
+aptPkgs = [
+  "mariadb-server", 
+  "libmariadb-dev", 
+  "python3-dev", 
+  "build-essential", 
+  "pkg-config"
+]
+
+[start]
+cmd = "python3 -m waitress --port=8080 --call app:create_app"
+

requirements.txt

@@ -12,3 +12,4 @@ mysqlclient==2.2.4
 flask_sqlalchemy==3.0.2
 sqlalchemy
 PyMySQL
+sentry-sdk[flask]==2.14.0

settings.py

@@ -23,5 +23,13 @@
 ALLOW_UPLOADS = os.environ.get("ALLOW_UPLOADS")
 
 S3_ENABLED = os.environ.get("S3_ENABLED")
+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")
+
+