Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ddf9da1a55 | ||
|
|
022e5e6987 | ||
|
|
5c765925d2 | ||
|
|
747714b2f3 | ||
|
|
68f44f0f1c |
@@ -1,5 +1,6 @@
|
|||||||
import { keyframes, style } from '@vanilla-extract/css';
|
import { keyframes, style } from '@vanilla-extract/css';
|
||||||
import { DefaultReset, color, config, toRem } from 'folds';
|
import { DefaultReset, color, config, toRem } from 'folds';
|
||||||
|
import { GIF_PREVIEW_MAX_HEIGHT } from '../../utils/gifPreviewSize';
|
||||||
|
|
||||||
export const UrlPreview = style([
|
export const UrlPreview = style([
|
||||||
DefaultReset,
|
DefaultReset,
|
||||||
@@ -955,12 +956,14 @@ export const PortraitSideLayout = style([
|
|||||||
// GIF card (Giphy / Tenor)
|
// GIF card (Giphy / Tenor)
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// Full card width; a GIF narrower than the card (portrait, square, small) is
|
||||||
|
// centred on the surface colour instead of being stretched and cropped.
|
||||||
export const GifThumbnailWrapper = style([
|
export const GifThumbnailWrapper = style([
|
||||||
DefaultReset,
|
DefaultReset,
|
||||||
{
|
{
|
||||||
position: 'relative',
|
display: 'flex',
|
||||||
|
justifyContent: 'center',
|
||||||
width: '100%',
|
width: '100%',
|
||||||
maxHeight: toRem(200),
|
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
flexShrink: 0,
|
flexShrink: 0,
|
||||||
backgroundColor: color.Surface.Container,
|
backgroundColor: color.Surface.Container,
|
||||||
@@ -972,14 +975,26 @@ export const GifThumbnailWrapper = style([
|
|||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// Wraps just the GIF so the "GIF" badge sits on the GIF's own corner.
|
||||||
|
export const GifFrame = style([
|
||||||
|
DefaultReset,
|
||||||
|
{
|
||||||
|
position: 'relative',
|
||||||
|
display: 'block',
|
||||||
|
maxWidth: '100%',
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
// The inline width/aspect-ratio (from og:image:width/height) sets the size;
|
||||||
|
// max-width lets a phone's narrower card shrink it, keeping the ratio.
|
||||||
export const GifThumbnailImg = style([
|
export const GifThumbnailImg = style([
|
||||||
DefaultReset,
|
DefaultReset,
|
||||||
{
|
{
|
||||||
width: '100%',
|
|
||||||
maxHeight: toRem(200),
|
|
||||||
objectFit: 'cover',
|
|
||||||
objectPosition: 'center',
|
|
||||||
display: 'block',
|
display: 'block',
|
||||||
|
maxWidth: '100%',
|
||||||
|
maxHeight: toRem(GIF_PREVIEW_MAX_HEIGHT),
|
||||||
|
height: 'auto',
|
||||||
|
objectFit: 'contain',
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import {
|
|||||||
as,
|
as,
|
||||||
color,
|
color,
|
||||||
config,
|
config,
|
||||||
|
toRem,
|
||||||
} from 'folds';
|
} from 'folds';
|
||||||
import { ImageOverlay } from '../ImageOverlay';
|
import { ImageOverlay } from '../ImageOverlay';
|
||||||
import { MobileTouchTarget } from '../../styles/mobile.css';
|
import { MobileTouchTarget } from '../../styles/mobile.css';
|
||||||
@@ -48,6 +49,11 @@ import {
|
|||||||
tiktokOembedUrl,
|
tiktokOembedUrl,
|
||||||
tiktokPlayerEmbedUrl,
|
tiktokPlayerEmbedUrl,
|
||||||
} from '../../utils/videoEmbed';
|
} from '../../utils/videoEmbed';
|
||||||
|
import {
|
||||||
|
GIF_PREVIEW_MAX_HEIGHT,
|
||||||
|
GIF_PREVIEW_MAX_WIDTH,
|
||||||
|
gifPreviewBox,
|
||||||
|
} from '../../utils/gifPreviewSize';
|
||||||
|
|
||||||
const linkStyles = { color: color.Success.Main };
|
const linkStyles = { color: color.Success.Main };
|
||||||
|
|
||||||
@@ -2277,6 +2283,9 @@ function GifCard({
|
|||||||
}) {
|
}) {
|
||||||
const title = (prev['og:title'] as string | undefined) ?? '';
|
const title = (prev['og:title'] as string | undefined) ?? '';
|
||||||
const mxcImage = prev['og:image'] as string | undefined;
|
const mxcImage = prev['og:image'] as string | undefined;
|
||||||
|
// Size the GIF from its own dimensions (Giphy and Tenor publish them) rather
|
||||||
|
// than forcing every GIF into one cropped band.
|
||||||
|
const box = gifPreviewBox(prev['og:image:width'], prev['og:image:height']);
|
||||||
|
|
||||||
// A GIF card exists to show a moving GIF, so request the original rather than
|
// A GIF card exists to show a moving GIF, so request the original rather than
|
||||||
// a thumbnail — the thumbnail endpoint would return a frozen first frame.
|
// a thumbnail — the thumbnail endpoint would return a frozen first frame.
|
||||||
@@ -2284,7 +2293,15 @@ function GifCard({
|
|||||||
const thumbSrc = mxcImage
|
const thumbSrc = mxcImage
|
||||||
? shouldServeGifOriginal(url, prev)
|
? shouldServeGifOriginal(url, prev)
|
||||||
? mxcUrlToHttp(mx, mxcImage, useAuthentication)
|
? mxcUrlToHttp(mx, mxcImage, useAuthentication)
|
||||||
: mxcUrlToHttp(mx, mxcImage, useAuthentication, 400, 200, 'scale', false)
|
: mxcUrlToHttp(
|
||||||
|
mx,
|
||||||
|
mxcImage,
|
||||||
|
useAuthentication,
|
||||||
|
GIF_PREVIEW_MAX_WIDTH * 2,
|
||||||
|
GIF_PREVIEW_MAX_HEIGHT * 2,
|
||||||
|
'scale',
|
||||||
|
false,
|
||||||
|
)
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
// If there's no image, fall back to a generic-style layout
|
// If there's no image, fall back to a generic-style layout
|
||||||
@@ -2316,7 +2333,9 @@ function GifCard({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Box direction="Column" style={{ width: '100%' }}>
|
<Box direction="Column" style={{ width: '100%' }}>
|
||||||
{/* GIF thumbnail — full width */}
|
{/* The whole GIF at its own aspect ratio, centred; never cropped. With a
|
||||||
|
known size the box is reserved before it loads (no layout jump);
|
||||||
|
without one it shows at its natural size, capped by the card. */}
|
||||||
<a
|
<a
|
||||||
href={url}
|
href={url}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
@@ -2324,8 +2343,22 @@ function GifCard({
|
|||||||
className={previewCss.GifThumbnailWrapper}
|
className={previewCss.GifThumbnailWrapper}
|
||||||
aria-label={`View GIF on ${siteBadgeLabel}: ${title}`}
|
aria-label={`View GIF on ${siteBadgeLabel}: ${title}`}
|
||||||
>
|
>
|
||||||
<img className={previewCss.GifThumbnailImg} src={thumbSrc} alt={title} loading="lazy" />
|
<span className={previewCss.GifFrame}>
|
||||||
<span className={previewCss.GifBadge}>GIF</span>
|
<img
|
||||||
|
className={previewCss.GifThumbnailImg}
|
||||||
|
src={thumbSrc}
|
||||||
|
alt={title}
|
||||||
|
loading="lazy"
|
||||||
|
width={box?.width}
|
||||||
|
height={box?.height}
|
||||||
|
style={
|
||||||
|
box
|
||||||
|
? { width: toRem(box.width), aspectRatio: `${box.width} / ${box.height}` }
|
||||||
|
: undefined
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<span className={previewCss.GifBadge}>GIF</span>
|
||||||
|
</span>
|
||||||
</a>
|
</a>
|
||||||
{/* Footer row */}
|
{/* Footer row */}
|
||||||
<UrlPreviewContent>
|
<UrlPreviewContent>
|
||||||
|
|||||||
@@ -783,15 +783,20 @@ function ReminderMonitor() {
|
|||||||
const { reminders, removeReminder } = useReminders();
|
const { reminders, removeReminder } = useReminders();
|
||||||
const setToast = useSetAtom(toastQueueAtom);
|
const setToast = useSetAtom(toastQueueAtom);
|
||||||
const mDirects = useAtomValue(mDirectAtom);
|
const mDirects = useAtomValue(mDirectAtom);
|
||||||
|
const [showNotifications] = useSetting(settingsAtom, 'showNotifications');
|
||||||
|
const quietActive = useNotificationsQuiet();
|
||||||
const firedRef = useRef<Set<string>>(new Set());
|
const firedRef = useRef<Set<string>>(new Set());
|
||||||
const removingRef = useRef<Set<string>>(new Set());
|
const removingRef = useRef<Set<string>>(new Set());
|
||||||
// Read the latest reminders / DM map via refs so the poll interval below is
|
// Read the latest reminders / DM map / notification prefs via refs so the poll
|
||||||
// created once — not torn down and restarted (which resets its 30s countdown
|
// interval below is created once — not torn down and restarted (which resets
|
||||||
// and can indefinitely defer a near-due reminder) on every reminder sync (N115).
|
// its 30s countdown and can indefinitely defer a near-due reminder) on every
|
||||||
|
// reminder sync (N115).
|
||||||
const remindersRef = useRef(reminders);
|
const remindersRef = useRef(reminders);
|
||||||
remindersRef.current = reminders;
|
remindersRef.current = reminders;
|
||||||
const mDirectsRef = useRef(mDirects);
|
const mDirectsRef = useRef(mDirects);
|
||||||
mDirectsRef.current = mDirects;
|
mDirectsRef.current = mDirects;
|
||||||
|
const osNotifyRef = useRef(false);
|
||||||
|
osNotifyRef.current = showNotifications && !quietActive;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const check = () => {
|
const check = () => {
|
||||||
@@ -815,6 +820,23 @@ function ReminderMonitor() {
|
|||||||
const hashPath = mDirectsRef.current.has(r.roomId)
|
const hashPath = mDirectsRef.current.has(r.roomId)
|
||||||
? getDirectRoomPath(r.roomId, r.eventId)
|
? getDirectRoomPath(r.roomId, r.eventId)
|
||||||
: getHomeRoomPath(r.roomId, r.eventId);
|
: getHomeRoomPath(r.roomId, r.eventId);
|
||||||
|
// [Gitea #338] A reminder is only done once the user has SEEN it: the
|
||||||
|
// toast stays until clicked or dismissed (it used to vanish after 4 s
|
||||||
|
// and the reminder was deleted at once, so one due while the user was
|
||||||
|
// away was lost). The removal is persisted on that click/dismiss; an
|
||||||
|
// unseen reminder comes back on the next start.
|
||||||
|
const done = () => {
|
||||||
|
if (removingRef.current.has(key)) return;
|
||||||
|
removingRef.current.add(key);
|
||||||
|
removeReminder(r.eventId, r.timestamp).catch(() => {
|
||||||
|
removingRef.current.delete(key);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
const open = () => {
|
||||||
|
done();
|
||||||
|
// window.location.hash setter auto-prepends '#' (as the toast does)
|
||||||
|
window.location.hash = hashPath;
|
||||||
|
};
|
||||||
setToast({
|
setToast({
|
||||||
id: `reminder-${key}`,
|
id: `reminder-${key}`,
|
||||||
displayName: 'Reminder',
|
displayName: 'Reminder',
|
||||||
@@ -822,16 +844,30 @@ function ReminderMonitor() {
|
|||||||
roomName,
|
roomName,
|
||||||
roomId: r.roomId,
|
roomId: r.roomId,
|
||||||
hashPath,
|
hashPath,
|
||||||
|
sticky: true,
|
||||||
|
onClick: open,
|
||||||
|
onDismiss: done,
|
||||||
});
|
});
|
||||||
}
|
// Away from the window: also raise an OS notification (the reminder is
|
||||||
// Persist the removal, retrying on a later tick if it fails — without
|
// an explicit request, but quiet hours / notifications-off win). Never
|
||||||
// re-showing the toast (N114). The server echo drops it from
|
// put decrypted E2EE text in it (N106).
|
||||||
// `reminders` once the write lands.
|
if (osNotifyRef.current && notificationPermission('granted') && !document.hasFocus()) {
|
||||||
if (!removingRef.current.has(key)) {
|
const encrypted = !!room?.hasEncryptionStateEvent();
|
||||||
removingRef.current.add(key);
|
showOsNotification(
|
||||||
removeReminder(r.eventId, r.timestamp).catch(() => {
|
'Reminder',
|
||||||
removingRef.current.delete(key);
|
{
|
||||||
});
|
icon: LogoSVG,
|
||||||
|
badge: LogoSVG,
|
||||||
|
body: encrypted ? `A message in ${roomName}` : body,
|
||||||
|
tag: `reminder-${key}`,
|
||||||
|
data: { path: hashPath, roomId: r.roomId },
|
||||||
|
},
|
||||||
|
() => {
|
||||||
|
window.focus();
|
||||||
|
open();
|
||||||
|
},
|
||||||
|
).catch(() => undefined);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { gifPreviewBox } from './gifPreviewSize';
|
||||||
|
|
||||||
|
test('gifPreviewBox: a landscape GIF wider than the card fills its width', () => {
|
||||||
|
assert.deepEqual(gifPreviewBox(480, 270), { width: 400, height: 225 });
|
||||||
|
assert.deepEqual(gifPreviewBox(480, 200), { width: 400, height: 167 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('gifPreviewBox: square and portrait GIFs keep their shape instead of being cropped', () => {
|
||||||
|
assert.deepEqual(gifPreviewBox(300, 300), { width: 320, height: 320 });
|
||||||
|
assert.deepEqual(gifPreviewBox(480, 480), { width: 320, height: 320 });
|
||||||
|
assert.deepEqual(gifPreviewBox(240, 480), { width: 160, height: 320 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('gifPreviewBox: a small GIF is enlarged at most 2×', () => {
|
||||||
|
assert.deepEqual(gifPreviewBox(100, 80), { width: 200, height: 160 });
|
||||||
|
assert.deepEqual(gifPreviewBox(150, 150), { width: 300, height: 300 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('gifPreviewBox: extreme aspect ratios stay inside the box and never collapse to 0', () => {
|
||||||
|
assert.deepEqual(gifPreviewBox(2000, 50), { width: 400, height: 10 });
|
||||||
|
assert.deepEqual(gifPreviewBox(1, 10000), { width: 1, height: 320 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('gifPreviewBox: accepts numeric strings and rejects unknown sizes', () => {
|
||||||
|
assert.deepEqual(gifPreviewBox('480', '270'), { width: 400, height: 225 });
|
||||||
|
assert.equal(gifPreviewBox(undefined, 270), undefined);
|
||||||
|
assert.equal(gifPreviewBox(480, 0), undefined);
|
||||||
|
assert.equal(gifPreviewBox('wide', 270), undefined);
|
||||||
|
assert.equal(gifPreviewBox(Number.NaN, 270), undefined);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('gifPreviewBox: custom limits', () => {
|
||||||
|
assert.deepEqual(gifPreviewBox(480, 270, 200, 200, 1), { width: 200, height: 113 });
|
||||||
|
});
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
/**
|
||||||
|
* Display size for a Giphy / Tenor link-preview GIF. The card used to force
|
||||||
|
* every GIF into a full-width × 200px band with `object-fit: cover`, so square
|
||||||
|
* and portrait GIFs lost most of their height and small ones were blown up.
|
||||||
|
* Fit the GIF inside `maxWidth × maxHeight` keeping its aspect ratio, and
|
||||||
|
* enlarge a small GIF at most `maxUpscale`× so it stays sharp.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** The GIF card's width (UrlPreview is 25rem); a phone shrinks it further via CSS. */
|
||||||
|
export const GIF_PREVIEW_MAX_WIDTH = 400;
|
||||||
|
export const GIF_PREVIEW_MAX_HEIGHT = 320;
|
||||||
|
export const GIF_PREVIEW_MAX_UPSCALE = 2;
|
||||||
|
|
||||||
|
export type GifPreviewBox = { width: number; height: number };
|
||||||
|
|
||||||
|
// og:image:width / og:image:height are numbers from Synapse, but some sites
|
||||||
|
// publish them as strings; anything else (missing, 0, NaN) means "unknown".
|
||||||
|
const dimension = (value: unknown): number | undefined => {
|
||||||
|
const n = typeof value === 'string' ? Number(value) : value;
|
||||||
|
return typeof n === 'number' && Number.isFinite(n) && n > 0 ? n : undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** The box to render the GIF in, or `undefined` when its size isn't known. */
|
||||||
|
export const gifPreviewBox = (
|
||||||
|
rawWidth: unknown,
|
||||||
|
rawHeight: unknown,
|
||||||
|
maxWidth = GIF_PREVIEW_MAX_WIDTH,
|
||||||
|
maxHeight = GIF_PREVIEW_MAX_HEIGHT,
|
||||||
|
maxUpscale = GIF_PREVIEW_MAX_UPSCALE,
|
||||||
|
): GifPreviewBox | undefined => {
|
||||||
|
const width = dimension(rawWidth);
|
||||||
|
const height = dimension(rawHeight);
|
||||||
|
if (!width || !height) return undefined;
|
||||||
|
const scale = Math.min(maxWidth / width, maxHeight / height, maxUpscale);
|
||||||
|
return {
|
||||||
|
width: Math.max(1, Math.round(width * scale)),
|
||||||
|
height: Math.max(1, Math.round(height * scale)),
|
||||||
|
};
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user