diff --git a/.changeset/add_message_forwarding.md b/.changeset/add_message_forwarding.md new file mode 100644 index 00000000..38849d7c --- /dev/null +++ b/.changeset/add_message_forwarding.md @@ -0,0 +1,5 @@ +--- +sable: minor +--- + +Add message forwarding with metadata diff --git a/.changeset/improved_description_ui.md b/.changeset/improved_description_ui.md new file mode 100644 index 00000000..3aa2f0c8 --- /dev/null +++ b/.changeset/improved_description_ui.md @@ -0,0 +1,5 @@ +--- +sable: patch +--- + +Improved the UI of file descriptions diff --git a/Caddyfile b/Caddyfile new file mode 100644 index 00000000..78700b4c --- /dev/null +++ b/Caddyfile @@ -0,0 +1,18 @@ +{ + servers { + protocols h1 h2c + } +} + +:80 { + root * /app + + # Enable on-the-fly compression for things not pre-compressed + encode zstd gzip + + file_server { + precompressed br + } + + try_files {path} /index.html +} diff --git a/Dockerfile b/Dockerfile index aebd72f1..d039ccf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,10 +19,7 @@ FROM scratch AS site-dist COPY --from=builder /src/dist / ## App -FROM nginx:1.29.5-alpine +FROM caddy:2-alpine COPY --from=site-dist / /app -COPY docker-nginx.conf /etc/nginx/conf.d/default.conf - -RUN rm -rf /usr/share/nginx/html \ - && ln -s /app /usr/share/nginx/html +COPY Caddyfile /etc/caddy/Caddyfile diff --git a/docker-nginx.conf b/docker-nginx.conf deleted file mode 100644 index aea395ae..00000000 --- a/docker-nginx.conf +++ /dev/null @@ -1,21 +0,0 @@ -server { - listen 80; - listen [::]:80; - - location / { - root /usr/share/nginx/html; - - rewrite ^/config.json$ /config.json break; - rewrite ^/manifest.json$ /manifest.json break; - - rewrite ^/sw.js$ /sw.js break; - rewrite ^/pdf.worker.min.js$ /pdf.worker.min.js break; - - rewrite ^/public/(.*)$ /public/$1 break; - rewrite ^/assets/(.*)$ /assets/$1 break; - - rewrite ^/element-call/dist/(.*)$ /element-call/dist/$1 break; - - rewrite ^(.+)$ /index.html break; - } -} diff --git a/package-lock.json b/package-lock.json index 85a16648..6cd50589 100644 --- a/package-lock.json +++ b/package-lock.json @@ -98,6 +98,7 @@ "prettier": "3.8.1", "typescript": "^5.9.3", "vite": "^7.3.1", + "vite-plugin-compression2": "2.5.0", "vite-plugin-pwa": "^1.2.0", "vite-plugin-static-copy": "^3.2.0", "vite-plugin-svgr": "4.5.0", @@ -14920,6 +14921,13 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/tar-mini": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/tar-mini/-/tar-mini-0.2.0.tgz", + "integrity": "sha512-+qfUHz700DWnRutdUsxRRVZ38G1Qr27OetwaMYTdg8hcPxf46U0S1Zf76dQMWRBmusOt2ZCK5kbIaiLkoGO7WQ==", + "dev": true, + "license": "MIT" + }, "node_modules/temp-dir": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", @@ -16032,6 +16040,17 @@ } } }, + "node_modules/vite-plugin-compression2": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/vite-plugin-compression2/-/vite-plugin-compression2-2.5.0.tgz", + "integrity": "sha512-bHxtBibPxxSn5eZSe0IAzvYucP/hg8Bz8ppjbH7lndU5kIHT+92qTkB4z9xWYfnyV0YHuir1SjOuyO0fzU4Vgg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rollup/pluginutils": "^5.1.0", + "tar-mini": "^0.2.0" + } + }, "node_modules/vite-plugin-pwa": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-1.2.0.tgz", @@ -25820,6 +25839,12 @@ "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==", "dev": true }, + "tar-mini": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/tar-mini/-/tar-mini-0.2.0.tgz", + "integrity": "sha512-+qfUHz700DWnRutdUsxRRVZ38G1Qr27OetwaMYTdg8hcPxf46U0S1Zf76dQMWRBmusOt2ZCK5kbIaiLkoGO7WQ==", + "dev": true + }, "temp-dir": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", @@ -26369,6 +26394,16 @@ } } }, + "vite-plugin-compression2": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/vite-plugin-compression2/-/vite-plugin-compression2-2.5.0.tgz", + "integrity": "sha512-bHxtBibPxxSn5eZSe0IAzvYucP/hg8Bz8ppjbH7lndU5kIHT+92qTkB4z9xWYfnyV0YHuir1SjOuyO0fzU4Vgg==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^5.1.0", + "tar-mini": "^0.2.0" + } + }, "vite-plugin-pwa": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-1.2.0.tgz", diff --git a/package.json b/package.json index 233e6f71..f0e1c9e6 100644 --- a/package.json +++ b/package.json @@ -114,6 +114,7 @@ "prettier": "3.8.1", "typescript": "^5.9.3", "vite": "^7.3.1", + "vite-plugin-compression2": "2.5.0", "vite-plugin-pwa": "^1.2.0", "vite-plugin-static-copy": "^3.2.0", "vite-plugin-svgr": "4.5.0", diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx index 6811b116..5fcfb472 100644 --- a/src/app/components/RenderMessageContent.tsx +++ b/src/app/components/RenderMessageContent.tsx @@ -2,10 +2,10 @@ import { memo, useMemo, useCallback } from 'react'; import { MsgType } from '$types/matrix-sdk'; import { testMatrixTo } from '$plugins/matrix-to'; import { useSetting } from '$state/hooks/settings'; -import { settingsAtom } from '$state/settings'; +import { settingsAtom, CaptionPosition } from '$state/settings'; import { HTMLReactParserOptions } from 'html-react-parser'; import { Opts } from 'linkifyjs'; -import { config } from 'folds'; +import { Box, config } from 'folds'; import { AudioContent, DownloadFile, @@ -74,6 +74,13 @@ function RenderMessageContentInternal({ const content = useMemo(() => getContent(), [getContent]); const [autoplayGifs] = useSetting(settingsAtom, 'autoplayGifs'); + const [captionPosition] = useSetting(settingsAtom, 'captionPosition'); + const captionPositionMap = { + [CaptionPosition.Above]: 'column-reverse', + [CaptionPosition.Below]: 'column', + [CaptionPosition.Inline]: 'row', + [CaptionPosition.Hidden]: 'row', + } satisfies Record; const renderBody = useCallback( (props: any) => ( @@ -112,54 +119,89 @@ function RenderMessageContentInternal({ ); const renderCaption = () => { + if (captionPosition === CaptionPosition.Hidden) return null; if (content.filename && content.filename !== content.body) { + if (captionPosition !== CaptionPosition.Inline) + return ( + + ); return ( - + + + ); } return null; }; const renderFile = () => ( - <> - ( - ( - +
+ ( + ( + } + /> + )} + renderAsTextFile={() => ( + } + /> + )} + > + } + info={info} /> - )} - renderAsTextFile={() => ( - } - /> - )} - > - - - )} - outlined={outlineAttachment} - /> + + )} + outlined={outlineAttachment} + /> +
{renderCaption()} - + ); if (msgType === MsgType.Text) { @@ -205,79 +247,100 @@ function RenderMessageContentInternal({ (typeof content.url === 'string' && content.url.toLowerCase().includes('gif')); return ( - <> - ( - { - if (isGif && !autoplayGifs && p.src) { - return ( - - - - ); - } - return ; - }} - renderViewer={(p) => } - /> - )} - outlined={outlineAttachment} - /> +
+
+ ( + { + if (isGif && !autoplayGifs && p.src) { + return ( + + + + ); + } + return ; + }} + renderViewer={(p) => } + /> + )} + outlined={outlineAttachment} + /> +
{renderCaption()} - +
); } if (msgType === MsgType.Video) { return ( - <> - ( - ( - ( - {body} - )} - /> - ) - : undefined - } - renderVideo={(p) =>