Skip to content

Update develop with main #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ShaneIsrael merged 4 commits into from
Feb 19, 2026
Merged

Update develop with main #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
643e8b9
add og:description tag
p0358 Feb 19, 2026
9bd8b93
make chown error in entrypoint.sh non-fatal
p0358 Feb 19, 2026
516434b
Merge pull request #457 from p0358/patch-chown-problem
ShaneIsrael Feb 19, 2026
72bde7c
Merge pull request #458 from p0358/patch-og-description
ShaneIsrael Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/client/src/views/Watch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ const Watch = ({ authenticated }) => {
<meta property="og:type" value="video" />
<meta property="og:url" value={window.location.href} />
<meta property="og:title" value={details?.info?.title} />
<meta property="og:description" value={details?.info?.description} />
<meta
property="og:image"
value={
Expand Down
3 changes: 2 additions & 1 deletion app/server/fireshare/templates/metadata.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<meta name="theme-color" content="#ffffff">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="theme-color" content="#000000">
<meta name="description" content="{{ video.info.description or 'Self host your media and share with unique links.' }}">
<meta name="description" content="{{ video.info.description or 'Self-host your media and share with unique links.' }}">
<link rel="apple-touch-icon" href="/logo192.png">
<link rel="manifest" href="/manifest.json">
<meta property="og:type" content="video" data-react-helmet="true">
Expand All @@ -23,6 +23,7 @@
<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:description" content="{{ video.info.description }}" 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="{{ domain }}/_content/derived/{{ video.video_id }}/poster.jpg">
Expand Down
6 changes: 3 additions & 3 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ groupmod -o -g "$PGID" appuser
usermod -o -u "$PUID" appuser

# Set ownership of directories
chown -R appuser:appuser $DATA_DIRECTORY
chown -R appuser:appuser $VIDEO_DIRECTORY
chown -R appuser:appuser $PROCESSED_DIRECTORY
chown -R appuser:appuser $DATA_DIRECTORY || >&2 echo "WARNING: Could not chown the data directory ($DATA_DIRECTORY) to $PUID:$PGID. Make sure the container has permissions to access this directory."
chown -R appuser:appuser $VIDEO_DIRECTORY || >&2 echo "WARNING: Could not chown the video directory ($DATA_DIRECTORY) to $PUID:$PGID. Make sure the container has permissions to access this directory."
chown -R appuser:appuser $PROCESSED_DIRECTORY || >&2 echo "WARNING: Could not chown the processed directory ($DATA_DIRECTORY) to $PUID:$PGID. Make sure the container has permissions to access this directory."

echo '-------------------------------------'
echo "User uid: $(id -u appuser)"
Expand Down
Loading