Merge pull request #244 from ShaneIsrael/develop

Develop
ShaneIsrael · Dec 30, 2023 · 887eced · 887eced
2 parents 9c2fc4b + 1751f24
commit 887eced
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 9 deletions.
diff --git a/.env.dev b/.env.dev
@@ -1,6 +1,7 @@
 export FLASK_APP="app/server/fireshare:create_app()"
 export FLASK_DEBUG=1
 export ENVIRONMENT=dev
+export DOMAIN=""
 export THUMBNAIL_VIDEO_LOCATION=50
 export SECRET_KEY=dev-test-key
 export DATA_DIRECTORY=$(pwd)/dev_root/dev_data/

diff --git a/.env.prod b/.env.prod
@@ -4,6 +4,7 @@ export VIDEO_DIRECTORY=/videos/
 export PROCESSED_DIRECTORY=/processed/
 export TEMPLATE_PATH=/app/server/fireshare/templates
 export ENVIRONMENT=production
+export DOMAIN=""
 export THUMBNAIL_VIDEO_LOCATION=0
 export ADMIN_PASSWORD=admin
 export ADMIN_USERNAME=admin
diff --git a/app/client/package.json b/app/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fireshare",
-  "version": "1.2.18",
+  "version": "1.2.19",
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.9.0",

diff --git a/app/client/src/components/admin/UploadCard.js b/app/client/src/components/admin/UploadCard.js
@@ -60,7 +60,7 @@ const UploadCard = ({ authenticated, feedView = false, publicUpload = false, fet
         }
         handleAlert({
           type: 'success',
-          message: 'Your upload will be in a few seconds.',
+          message: 'Your upload will be available in a few seconds.',
           autohideDuration: 3500,
           open: true,
           onClose: () => fetchVideos(),

diff --git a/app/server/fireshare/__init__.py b/app/server/fireshare/__init__.py
@@ -62,6 +62,7 @@ def create_app(init_schedule=False):
         raise Exception("DATA_DIRECTORY not found in environment")
 
     app.config['ENVIRONMENT'] = os.getenv('ENVIRONMENT')
+    app.config['DOMAIN'] = os.getenv('DOMAIN')
     app.config['THUMBNAIL_VIDEO_LOCATION'] = int(os.getenv('THUMBNAIL_VIDEO_LOCATION') or 0)
     app.config['SECRET_KEY'] = os.getenv('SECRET_KEY', secrets.token_hex(32)) 
     app.config['DATA_DIRECTORY'] = os.getenv('DATA_DIRECTORY')

diff --git a/app/server/fireshare/api.py b/app/server/fireshare/api.py
@@ -34,10 +34,11 @@ def get_video_path(id, subid=None):
 @api.route('/w/<video_id>')
 def video_metadata(video_id):
     video = Video.query.filter_by(video_id=video_id).first()
+    domain = f"https://{current_app.config['DOMAIN']}" if current_app.config['DOMAIN'] else ""
     if video:
-        return render_template('metadata.html', video=video.json())
+        return render_template('metadata.html', video=video.json(), domain=domain)
     else:
-        return redirect('/#/w/{}'.format(video_id), code=302)
+        return redirect('{}/#/w/{}'.format(domain, video_id), code=302)
 
 @api.route('/api/config')
 def config():

diff --git a/app/server/fireshare/templates/metadata.html b/app/server/fireshare/templates/metadata.html
@@ -17,14 +17,15 @@
     <link rel="apple-touch-icon" href="/logo192.png">
     <link rel="manifest" href="/manifest.json">
     <meta property="og:type" content="video" data-react-helmet="true">
-    <meta property="og:url" content="/#/w/{{ video.video_id }}" data-react-helmet="true">
-    <meta property="og:image" content="/_content/derived/{{ video.video_id }}/poster.jpg" data-react-helmet="true">
-    <meta property="og:video" content="/_content/video/{{ video.video_id }}{{ video.extension }}" data-react-helmet="true">
+    <meta property="og:url" content="{{ domain }}/#/w/{{ video.video_id }}" data-react-helmet="true">
+    <meta property="og:image" content="{{ domain }}/_content/derived/{{ video.video_id }}/poster.jpg" data-react-helmet="true">
+    <meta property="og:video" content="{{ domain }}/_content/video/{{ video.video_id }}{{ video.extension }}" data-react-helmet="true">
+    <meta property="og:video:secure_url" content="{{ domain }}/_content/video/{{ video.video_id }}{{ video.extension }}" data-react-helmet="true">
     <meta property="og:site_name" content="Fireshare" data-react-helmet="true">
     <meta property="og:title" content="{{ video.info.title }}" data-react-helmet="true">
     <meta property="og:video:width" content="{{ video.info.width }}" data-react-helmet="true">
     <meta property="og:video:height" content="{{ video.info.height }}" data-react-helmet="true">
-    <link itemprop="thumbnailUrl" href="/_content/derived/{{ video.video_id }}/poster.jpg">
+    <link itemprop="thumbnailUrl" href="{{ domain }}/_content/derived/{{ video.video_id }}/poster.jpg">
     <title>{{ video.info.title }}</title>
 </head>
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,7 +14,9 @@ services:
       - ADMIN_PASSWORD=admin
       - SECRET_KEY=replace_this_with_some_random_string
       - MINUTES_BETWEEN_VIDEO_SCANS=5
-      # The location video thumbnails are generated. A value between 0-100 where 50 would be the frame in the middle of the video file and 0 would be the first frame of the video.
+      # The location in the video thumbnails are generated. A value between 0-100 where 50 would be the frame in the middle of the video file and 0 would be the first frame of the video.
       - THUMBNAIL_VIDEO_LOCATION=0
+      # The domain your instance is hosted at. (do not add http or https) e.x: v.fireshare.net, this is required for opengraph to work correctly for shared links.
+      - DOMAIN=""
       - PUID=1000
       - PGID=1000