Skip to content

armgit / ente

Public Imported from GitHub
0

💚 End-to-end encrypted cloud for everything.

Prune remaining web comments

Manav Rathi557b3d120761
diff --git a/infra/staff/README.md b/infra/staff/README.md
index 1cfba21069..67066161b0 100644
--- a/infra/staff/README.md
+++ b/infra/staff/README.md
@@ -29,10 +29,6 @@ npm run lint # or lint:fix
npm run build
```
-> [!NOTE]
->
-> If `package-lock.json` has not changed since your last `npm ci`, you can use `npm install` as a faster incremental alternative.
-
### Deployment
-The app gets redeployed whenever a PR that touches `infra/staff/**` is merged into main. See [web/docs/deploy.md](../../web/docs/deploy.md) for details.
+The app gets redeployed whenever a PR that touches `infra/staff/**` is merged into main.
diff --git a/web/apps/accounts/.env.development b/web/apps/accounts/.env.development
index 704ac35550..992b018bbf 100644
--- a/web/apps/accounts/.env.development
+++ b/web/apps/accounts/.env.development
@@ -1,6 +1,3 @@
-# Copy this file into `.env.development.local` and uncomment this to develop
-# against apps and server running on localhost.
-#
-# For details, see `apps/photos/.env.development`
+# Copy this to `.env.development.local` and uncomment the endpoint to use local Museum.
-#NEXT_PUBLIC_ENTE_ENDPOINT = http://localhost:8080
+# NEXT_PUBLIC_ENTE_ENDPOINT = http://localhost:8080
diff --git a/web/apps/accounts/README.md b/web/apps/accounts/README.md
index 0af7b33ceb..0456e19c1a 100644
--- a/web/apps/accounts/README.md
+++ b/web/apps/accounts/README.md
@@ -1,20 +1,16 @@
# Ente Accounts
-Code that runs on `accounts.ente.com`.
-
-Primarily, this serves a common domain where our clients can create and authenticate using shared passkeys tied to the user's Ente account.
-
-It also includes other cross app account-level like family invitation acceptance.
+Code that runs on `accounts.ente.com`, providing a common origin where Ente clients associate passkeys tied to the user's account. It also handles other cross-app account flows like accepting family invitations.
> [!NOTE]
>
-> Passkeys can be shared by multiple subdomains, so we didn't strictly need a separate web origin for sharing passkeys between our (photos and auth) web clients, but we do need a web origin to handle the passkey flow for the desktop and mobile clients.
+> Web subdomains can share passkeys through a common relying-party ID, but desktop and mobile clients still need a web origin to complete the passkey flow.
`accounts.ente.io` remains the legacy origin for users who already have Passkeys scoped to the old `ente.io` relying-party ID.
## Development
-To set this up to work with a locally running museum, modify your local `museum.yaml` to set the relaying party's ID to "localhost" (without any port number).
+The repository's local Museum configuration already supports the Accounts app on `http://localhost:3001`. When using another configuration, set the relying-party ID to `localhost` and allow the app's origin:
```yaml
webauthn:
@@ -23,4 +19,4 @@ webauthn:
- "http://localhost:3001"
```
-Note that browsers already treat `localhost` as a secure domain, so Passkey APIs will work even if our local dev server is using `http`.
+Browsers treat `localhost` as a secure context, so WebAuthn works with the local HTTP server.
diff --git a/web/apps/accounts/src/pages/passkeys/verify.tsx b/web/apps/accounts/src/pages/passkeys/verify.tsx
index 6f7fd4d246..a857d9a343 100644
--- a/web/apps/accounts/src/pages/passkeys/verify.tsx
+++ b/web/apps/accounts/src/pages/passkeys/verify.tsx
@@ -42,11 +42,8 @@ const Page = () => {
const [status, setStatus] = useState<Status>("loading");
- // Safari can reject the WebAuthn call with "NotAllowedError: The document
- // is not focused" even when it has just opened the page and brought it to
- // the front. So the flow is split into two phases: the state phase 2 needs
- // is stashed in this continuation, and phase 2 runs again after an
- // explicit user click (the "needUserFocus" status).
+ // Safari can reject WebAuthn on a newly opened page as unfocused.
+ // Preserve the server response so a user click can retry the browser step.
interface Continuation {
redirectURL: URL;
clientPackage: string;
diff --git a/web/apps/accounts/src/services/passkey.ts b/web/apps/accounts/src/services/passkey.ts
index 877f1ce0fa..7645717d90 100644
--- a/web/apps/accounts/src/services/passkey.ts
+++ b/web/apps/accounts/src/services/passkey.ts
@@ -103,12 +103,8 @@ const beginPasskeyRegistration = async (token: string) => {
return { sessionID, options };
};
-// WebAuthn binary fields (challenges, user ids, credential ids and responses)
-// travel over the wire as unpadded URL-safe base64 strings, the encoding the
-// WebAuthn spec recommends, while the browser APIs produce and expect
-// BufferSource. These two helpers convert in each direction; the force casts
-// are needed because the DOM types say BufferSource where the wire actually
-// carries strings.
+// Browser WebAuthn APIs use binary values. The API sends them as unpadded
+// base64url strings, which the DOM types do not describe; hence the casts.
const serverB64ToBinary = async (b: BufferSource) => {
const b64String = b as unknown as string;
@@ -154,9 +150,7 @@ const finishPasskeyRegistration = async ({
headers: accountsAuthenticatedRequestHeaders(token),
body: JSON.stringify({
id: credential.id,
- // rawId is nominally the binary form of id, but id is already its
- // base64url encoding, which is what the wire wants, so the same
- // string can be reused.
+ // id is already the base64url form of rawId expected by the API.
rawId: credential.id,
type: credential.type,
response: { attestationObject, clientDataJSON, transports },
@@ -185,9 +179,8 @@ const isAllowedRedirectScheme = (url: URL) =>
// flow runs inside the app's WebView.
(url.protocol === "tauri:" && url.hostname === "localhost");
-// The redirect host whitelist is an extra safety net, but it would break
-// people who self host Ente, so it is enforced only when the accounts app
-// itself runs on an Ente domain (or localhost).
+// Ente-hosted and local builds restrict redirect hosts.
+// Self-hosted Accounts must accept its own hosts.
export const isWhitelistedRedirect = (redirectURL: URL) => {
if (!isAllowedRedirectScheme(redirectURL)) return false;
if (!shouldRestrictToWhitelistedRedirect()) return true;
@@ -272,13 +265,8 @@ export const beginPasskeyAuthentication = async (
export const signChallenge = async (
publicKey: PublicKeyCredentialRequestOptions,
) => {
- // The spec says the transports stored at registration should be passed
- // back as hints during authentication, but browsers get this wrong in
- // practice (2024). E.g. Firefox reports only ["usb"] for a Yubikey NFC
- // security key, and iPhone Safari then refuses to try that key over NFC,
- // even though transports are meant to be hints, not bindings. As a
- // workaround, hint every possible transport.
- // https://www.w3.org/TR/webauthn-3/#dom-publickeycredentialdescriptor-transports
+ // Browsers report incomplete transports, and other browsers may treat
+ // those hints as restrictions. Send every transport as a workaround.
for (const cred of publicKey.allowCredentials ?? []) {
cred.transports = [
...(cred.transports ?? []),
@@ -332,9 +320,7 @@ export const finishPasskeyAuthentication = async ({
},
body: JSON.stringify({
id: credential.id,
- // rawId is nominally the binary form of id, but id is already its
- // base64url encoding, which is what the wire wants, so the same
- // string can be reused.
+ // id is already the base64url form of rawId expected by the API.
rawId: credential.id,
type: credential.type,
response: {
diff --git a/web/apps/albums/.env b/web/apps/albums/.env
index 167512ccf9..49aeddbfd6 100644
--- a/web/apps/albums/.env
+++ b/web/apps/albums/.env
@@ -1,5 +1,5 @@
-NEXT_TELEMETRY_DISABLED = 1
+# See `apps/photos/.env` for details.
-# For more details, see `apps/photos/.env`.
-#
# NEXT_PUBLIC_ENTE_ENDPOINT = http://localhost:8080
+
+NEXT_TELEMETRY_DISABLED = 1
diff --git a/web/apps/albums/.env.development b/web/apps/albums/.env.development
index 704ac35550..992b018bbf 100644
--- a/web/apps/albums/.env.development
+++ b/web/apps/albums/.env.development
@@ -1,6 +1,3 @@
-# Copy this file into `.env.development.local` and uncomment this to develop
-# against apps and server running on localhost.
-#
-# For details, see `apps/photos/.env.development`
+# Copy this to `.env.development.local` and uncomment the endpoint to use local Museum.
-#NEXT_PUBLIC_ENTE_ENDPOINT = http://localhost:8080
+# NEXT_PUBLIC_ENTE_ENDPOINT = http://localhost:8080
diff --git a/web/apps/auth/.env b/web/apps/auth/.env
index 49fd5c743a..4f4b9b3973 100644
--- a/web/apps/auth/.env
+++ b/web/apps/auth/.env
@@ -1,4 +1,3 @@
-NEXT_TELEMETRY_DISABLED = 1
+# See `apps/photos/.env` for details.
-# For details on how to populate a .env.local to run auth and get it to connect
-# to an arbitrary Ente instance, see `apps/photos/.env`.
+NEXT_TELEMETRY_DISABLED = 1
diff --git a/web/apps/embed/src/styles/photoswipe.css b/web/apps/embed/src/styles/photoswipe.css
index 8a18e97b5a..eeeb8b2bef 100644
--- a/web/apps/embed/src/styles/photoswipe.css
+++ b/web/apps/embed/src/styles/photoswipe.css
@@ -1,12 +1,8 @@
.pswp-ente {
- /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
- Give it a more moderate value so that MUI elements can be used with it. */
+ /* PhotoSwipe defaults to z-index 10000; keep it below MUI drawers. */
z-index: calc(var(--mui-zIndex-drawer) - 1);
}
-/* Shift the top bar by a fraction of the desktop title bar, if any. The top bar
- contents already have a decent top padding, so we don't need to shift by the
- entire amount. See also: [Note: Customize the desktop title bar] */
.pswp-ente .pswp__top-bar {
top: calc(env(titlebar-area-height, 0px) * 0.4);
}
@@ -17,7 +13,6 @@
}
}
-/* Black gradient overlay at the top */
.pswp-ente .pswp__top-bar::before {
content: "";
position: absolute;
@@ -38,13 +33,7 @@
z-index: -1;
}
-/* The PhotoSwipe CSS already disables and re-enables pointer-events for hidden
- UI elements, but for a reason that I didn't investigate more, that isn't
- working, and the hidden buttons still remain clickable.
-
- As a workaround, repeat the CSS, but with a higher specificity by including
- the button selector */
-
+/* PhotoSwipe's lower-specificity rule leaves hidden buttons clickable. */
.pswp .pswp__hide-on-close button {
pointer-events: none;
}
@@ -53,44 +42,27 @@
pointer-events: auto;
}
-/* Tweak the visual look of the preloader to match the rest of the elements */
-
.pswp-ente .pswp__preloader--active .pswp__icn {
opacity: 0.4;
}
-/*
- Error indicator on the file viewer.
-
- It is styled similar to the loading indicator provided by PhotoSwipe since it
- is meant to occupy the same space. Only one of these will be shown at the same
- time, so it can also set the auto right margin.
- */
.pswp-ente .pswp__error {
position: relative;
overflow: hidden;
width: 50px;
height: 60px;
- /* Unlike the loading indicator, "display" is used to toggle visibility, and
- the opacity is fixed to be similar to that of the counter. */
display: none;
opacity: 0.85;
}
.pswp-ente .pswp__error .pswp__icn {
- /* Use a warning color for the error icon */
fill: var(--mui-palette-fixed-golden);
}
.pswp-ente .pswp__error .pswp__icn-shadow {
- /* Reduce the stroke from default (2px) to make it look better with the
- golden icon outline */
stroke-width: 1px;
}
-/* The ".pswp--ui-visible .pswp__hide-on-close" selector in PhotoSwipe's CSS
- sets the opacity of the arrows to 1, which doesn't match the rest of the
- controls (0.85). */
.pswp-ente.pswp--ui-visible .pswp__hide-on-close.pswp__button--arrow {
opacity: 0.85;
}
@@ -99,8 +71,6 @@
display: initial;
}
-/* Transform the built in controls to better fit our requirements */
-
.pswp-ente .pswp__counter {
margin-top: 22.5px;
margin-inline-start: 18px;
@@ -120,7 +90,6 @@
transform: scale(0.85);
}
-/* When counter is hidden (single photo), give zoom button the left margin */
.pswp-ente.pswp--one-slide .pswp__top-bar .pswp__button--zoom {
margin-left: 4px;
}
@@ -147,7 +116,6 @@
margin-right: 2px;
}
-/* Remove black strokes from top bar icons */
.pswp-ente .pswp__top-bar .pswp__icn-shadow {
stroke-width: 0;
}
@@ -167,18 +135,13 @@
}
.pswp-ente .pswp__button--arrow--next .pswp__icn {
- /* default is a horizontal flip, transform: scale(-1, 1); */
transform: scale(-0.8, 0.8);
}
-/* Toggleable live photo buttons */
-
.pswp-ente button.pswp-ente-off .pswp__icn {
- /* PhotoSwipe already uses the CSS opacity, so reduce the color's opacity */
fill: rgb(255 255 255 / 0.6);
}
-/* Make the controls fit the top bar on mobile sized screens */
@media (width < 450px) {
.pswp-ente .pswp__button {
width: 44px;
@@ -208,17 +171,13 @@
}
}
-/* Caption styling */
-
.pswp-ente .pswp__caption {
border-radius: 3px;
- /* Same opacity as the other controls. */
color: rgb(255 255 255 / 0.85);
max-width: 375px;
max-height: 200px;
p {
margin: 12px 17px;
- /* 4 lines max, ellipsis on overflow. */
word-break: break-word;
overflow: hidden;
text-overflow: ellipsis;
@@ -229,7 +188,6 @@
}
}
-/* Desktop caption: max 40% width */
@media (width >= 450px) {
.pswp-ente .pswp__caption {
max-width: 40%;
@@ -237,12 +195,9 @@
}
.pswp-ente .pswp__caption.ente-video {
- /* Add blur box background for videos since we hide the gradient overlay */
background-color: rgb(0 0 0 / 0.2);
backdrop-filter: blur(10px);
border-radius: 16px;
- /* Since there is too much going on in this part of the screen now, also
- reduce the maximum number of lines for the caption. */
p {
-webkit-line-clamp: 2;
line-clamp: 2;
@@ -255,106 +210,55 @@
cursor: pointer;
}
-/* When More link is present, don't use line-clamp since JS already truncated */
.pswp-ente .pswp__caption p:has(.pswp__caption-more) {
display: block;
-webkit-line-clamp: unset;
line-clamp: unset;
}
-/* Change the cursor on the thumbnail to the default arrow to indicate that it
- is not interactable (PhotoSwipe by default shows the zoom out icon). */
.pswp-ente .pswp__img {
cursor: auto;
}
-/*
- Make the controllable video elements we render as custom PhotoSwipe content
- take .pswp-ente up the entire container.
- */
.pswp-ente video[controls] {
width: 100%;
height: 100%;
}
-/*
- I tried various ways to get media-controller to embed a normal video, but in
- all methods I kept getting a flickering at the edges on Chrome. My best guess
- is that it happens when the resolved size of the video is a fractional value.
-
- This is the current magic incantation that seems to get them to play without
- the video's frame jittering. Note that the streaming hls-video elements work
- fine without any workarounds, it is only the vanilla video elements that have
- this issue and necessitate this workaround. The downside is that clicking
- "outside" the video works for hls-video, but not for vanilla videos.
- */
.pswp-ente media-controller.ente-vanilla-video {
width: 100%;
height: 100%;
video {
+ /* The one-pixel inset prevents fractional-size flicker in Chrome. HLS video does not need it. */
width: calc(100% - 1px);
height: calc(100% - 1px);
}
}
-/*
- Style the custom video controls we provide.
-
- The media-controller itself is center positioned (shrinking if needed) by
- PhotoSwipe using the width and height of the video that we provide to it.
-
- The controls are absolutely position at the bottom of the screen instead of
- being attached to the video.
- */
.pswp-ente .pswp__media-controls {
position: absolute;
bottom: 0px;
left: 0px;
right: 0px;
-
background: linear-gradient(transparent, rgb(0 0 0 / 0.8));
-
- /* Similar to our other controls */
--media-icon-color: rgb(255 255 255 / 0.8);
- /* NB: We don't reset the font-weight, so this'll be using 400 instead of
- the 500 we use elsewhere. See: [Note: Font weights].
-
- We don't reset it because on this screen the 400 looks better (for now).
- */
--media-font-family: "Inter Variable", sans-serif;
--media-control-background: transparent;
--media-control-hover-background: rgb(255 255 255 / 0.12);
/*
- Prevent menus from occluding clicks on other controls when hidden.
-
- [Note: Showing menus outside of media-controller]
-
- This is all very hacky. The standalone control example
- (https://media-chrome.mux.dev/examples/vanilla/standalone-controls.html),
- doesn't (as of now) include a menu, so it is possible this is just not
- supported. None of the media controller examples I could find show menus
- work for our specific scenario (the controls detached from the the media
- controller itself, and shown at the bottom of the screen).
-
- As such, a lot of undocumented and arbitrary tweaks are needed. This is a
- house of cards, and might fall when the media-chrome version is updated;
- on the other hand, they might also add better support for our scenario, in
- which case this should be possible straightforwardly.
- */
+ * These controls sit outside media-controller, a layout Media Chrome does not officially support.
+ * The height overrides stop hidden menus from intercepting clicks. Recheck them when upgrading media-chrome.
+ */
--media-menu-hidden-max-height: 1px;
--media-menu-max-height: 1000px;
}
-/*
- Stack controls rows vertically.
- */
.pswp-ente .pswp__media-controls > div {
display: flex;
flex-direction: column;
}
-/* Hide the controls if they're not associated to a media-controller. */
media-control-bar:not([mediacontroller]) {
display: none;
}
@@ -368,11 +272,9 @@ media-control-bar:last-child {
}
media-loading-indicator {
- /* Similar to the top bar loading indicator */
--media-icon-color: rgb(255 255 255 / 0.6);
}
-/* Used as a spacer. */
media-text-display {
flex-grow: 1;
}
@@ -389,34 +291,17 @@ media-time-range:hover {
--media-range-thumb-transform: scale(1.1);
}
-/*
- Hide specific controls when the user's browser doesn't support the feature
- they trigger.
- */
media-pip-button[mediapipunavailable],
media-fullscreen-button[mediafullscreenunavailable] {
display: none;
}
media-settings-menu {
- /*
- Restore the background for the settings menu (we made it transparent). The
- default is var(--_menu-bg), which is rgb(20 20 30 / .8).
- */
--media-control-background: var(--mui-palette-fixed-dark-background-paper);
- /* Regular, but since the rest of media controls use 400, it
- appears heavier. */
--media-font-weight: 500;
- /*
- Bring it above the rest of our controls.
-
- See: [Note: Showing menus outside of media-controller]
- */
z-index: 1;
}
-/* Hide the bottom right controls when hovering over the video controls or
- when the settings menu is open. */
body:has(
media-time-range[mediapreviewtime],
media-settings-menu:not([hidden])
@@ -426,56 +311,40 @@ body:has(
}
}
-/*
- Video fullscreen mode styles.
-
- When entering fullscreen via the video controls, we hide the PhotoSwipe
- navigation UI (top bar, arrows) and only show the video controls at the
- bottom. The controls auto-hide and appear when the user moves to the bottom.
- */
-
-/* Hide navigation controls in video fullscreen mode */
.pswp-ente.pswp--video-fullscreen .pswp__top-bar,
.pswp-ente.pswp--video-fullscreen .pswp__button--arrow {
display: none !important;
}
-/* Auto-hide video controls in fullscreen, show when mouse near bottom */
.pswp-ente.pswp--video-fullscreen .pswp__media-controls {
opacity: 0;
transition: opacity 0.3s ease;
}
-/* Show controls when hovering or when settings menu is open */
.pswp-ente.pswp--video-fullscreen .pswp__media-controls:hover,
.pswp-ente.pswp--video-fullscreen:has(media-settings-menu:not([hidden]))
.pswp__media-controls {
opacity: 1;
}
-/* JS adds this class when mouse is near bottom of screen */
.pswp-ente.pswp--video-fullscreen.pswp--controls-visible .pswp__media-controls {
opacity: 1;
}
-/* Also hide the bottom right controls in video fullscreen mode */
.pswp-ente.pswp--video-fullscreen .pswp__bottom-right-controls {
display: none;
}
-/* Bottom controls container (caption on left, action buttons on right on desktop) */
.pswp-ente .pswp__bottom-right-controls {
position: absolute;
bottom: 20px;
right: 24px;
display: flex;
- /* column-reverse to show buttons on top, caption below (matching original HTML order) */
flex-direction: column-reverse;
align-items: flex-end;
gap: 12px;
}
-/* Black gradient overlay at the bottom */
.pswp-ente .pswp__bottom-right-controls::before {
content: "";
position: absolute;
@@ -496,7 +365,6 @@ body:has(
z-index: -1;
}
-/* Row layout on desktop: caption on left, buttons on right */
@media (width >= 450px) {
.pswp-ente .pswp__bottom-right-controls {
bottom: 40px;
@@ -514,17 +382,14 @@ body:has(
}
}
-/* Extra offset for video to clear video controls */
.pswp-ente .pswp__bottom-right-controls:has(.pswp__caption.ente-video) {
bottom: 100px;
}
-/* Hide gradient overlay for videos since they have their own controls gradient */
.pswp-ente .pswp__bottom-right-controls:has(.pswp__caption.ente-video)::before {
display: none;
}
-/* Hide gradient overlay when description is not present */
.pswp-ente
.pswp__bottom-right-controls:has(
.pswp__caption[style*="display: none"]
@@ -532,7 +397,6 @@ body:has(
display: none;
}
-/* Action buttons row - margin-left: auto keeps them on the right when no caption */
.pswp-ente .pswp__action-buttons {
display: flex;
flex-direction: row;
@@ -563,7 +427,6 @@ body:has(
fill: white;
}
-/* Comment button with count indicator */
.pswp-ente .pswp__action-button--comment {
position: relative;
}
@@ -589,7 +452,6 @@ body:has(
display: block;
}
-/* Reduce padding on mobile */
@media (width < 450px) {
.pswp-ente .pswp__bottom-right-controls {
bottom: 12px;
@@ -604,7 +466,6 @@ body:has(
}
}
-/* Heart (like) button icons - uses pswp__hidden class toggled by showIf() */
#pswp__icn-heart-fill {
display: none;
}
diff --git a/web/apps/photos/.env b/web/apps/photos/.env
index d656dd3856..fc6064ab7d 100644
--- a/web/apps/photos/.env
+++ b/web/apps/photos/.env
@@ -1,50 +1,9 @@
-# Sample configuration file
+# Copy overrides into the gitignored `.env.local`.
#
-# All variables are commented out by default. Copy paste this into a new file
-# called `.env.local` (or create a new empty file with that name) and add the
-# environment variables you want to apply. `.env.local` is gitignored, so you
-# can freely customize it for your local setup.
-#
-# `.env.local` is picked up by Next.js when NODE_ENV is 'development' (it is
-# 'production' by default, but gets set to 'development' when we run `next
-# dev`). Here's a list of the various files that come into play:
-#
-# .env loaded in all cases
-# .env.local loaded in all cases, gitignored
-# .env.development only loaded for npm run dev
-# .env.development.local only loaded for npm run dev, gitignored
-# .env.production only loaded for npm run build
-# .env.production.local only loaded for npm run build, gitignored
-#
-# Alternatively, these variables can be provided as environment variables, say:
-#
-# NEXT_PUBLIC_ENTE_ENDPOINT=http://localhost:8080 npm run dev:photos
-#
-# Variables prefixed with NEXT_PUBLIC_ are made available when Next.js runs our
-# code in the browser (Behind the scenes, Next.js just hardcodes occurrences of
-# `process.env.NEXT_PUBLIC_FOO` with the value of the `NEXT_PUBLIC_FOO` env var
-# when the bundle is built). See
-# https://nextjs.org/docs/pages/building-your-application/configuring/environment-variables
-#
-# A development build behaves differently in some aspects:
-#
-# - Logs go to the browser console (in addition to the log file)
-# - There is some additional logging
-# - ... (search for isDevBuild to see all impacts)
-#
-# By default, the app connects to Ente's production API. Set this if you want
-# to point it at another Museum server.
+# `NEXT_PUBLIC_` values are embedded into the browser bundle at build time.
-# NEXT_PUBLIC_ENTE_ENDPOINT = http://localhost:8080
+# The API origin to connect to.
-# The JSON which describes the expected results of our integration tests. See
-# `upload.test.ts` for more details of the expected format.
-#
-# This is perhaps easier to specify as an environment variable, since then we
-# can directly read from the source file when running `npm run dev`. For example,
-#
-# NEXT_PUBLIC_ENTE_TEST_EXPECTED_JSON=`cat path/to/expected.json` npm run dev
-#
-# NEXT_PUBLIC_ENTE_TEST_EXPECTED_JSON = {}
+# NEXT_PUBLIC_ENTE_ENDPOINT = http://localhost:8080
NEXT_TELEMETRY_DISABLED = 1
diff --git a/web/apps/photos/.env.development b/web/apps/photos/.env.development
index 26381dbec6..992b018bbf 100644
--- a/web/apps/photos/.env.development
+++ b/web/apps/photos/.env.development
@@ -1,6 +1,3 @@
-# Copy this file into `.env.development.local` and uncomment this to develop
-# against apps and server running on localhost.
-#
-# For details, see `.env`
+# Copy this to `.env.development.local` and uncomment the endpoint to use local Museum.
-#NEXT_PUBLIC_ENTE_ENDPOINT = http://localhost:8080
+# NEXT_PUBLIC_ENTE_ENDPOINT = http://localhost:8080
diff --git a/web/apps/photos/src/components/Collections/CollectionMapDialog.tsx b/web/apps/photos/src/components/Collections/CollectionMapDialog.tsx
index e2b57364d7..cab298f6fa 100644
--- a/web/apps/photos/src/components/Collections/CollectionMapDialog.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionMapDialog.tsx
@@ -1343,9 +1343,7 @@ export const CollectionMapDialog: React.FC<CollectionMapDialogProps> = ({
[activeCollection?.id, collectionSummary.id],
);
- const noOpSetSelected = useCallback(() => {
- // no-op
- }, []);
+ const noOpSetSelected = useCallback(() => undefined, []);
const handleMarkTempDeleted = useCallback(
(files: EnteFile[]) => {
diff --git a/web/apps/photos/src/components/FixCreationTime.tsx b/web/apps/photos/src/components/FixCreationTime.tsx
index a096c75c17..6865aa4fa0 100644
--- a/web/apps/photos/src/components/FixCreationTime.tsx
+++ b/web/apps/photos/src/components/FixCreationTime.tsx
@@ -317,8 +317,8 @@ const updateFileDate = async (
if (fixOption == "custom") {
newDate = {
dateTime: customDate!.dateTime,
- // See [Note: Don't modify offsetTime when editing date via picker]
- // for why we don't also set the offset here.
+ // The picker reports this computer's offset, not the photo's, so
+ // leave the offset unset.
offset: undefined,
timestamp: customDate!.timestamp,
};
diff --git a/web/apps/photos/src/components/sidebar/SessionsSettings.tsx b/web/apps/photos/src/components/sidebar/SessionsSettings.tsx
index 432bf223e6..77fc667c7d 100644
--- a/web/apps/photos/src/components/sidebar/SessionsSettings.tsx
+++ b/web/apps/photos/src/components/sidebar/SessionsSettings.tsx
@@ -73,9 +73,9 @@ const SessionsSettingsContents: React.FC<SessionsSettingsContentsProps> = ({
}) => {
const { logout, showMiniDialog } = useBaseContext();
- const [sessions, setSessions] = useState<Session[] | undefined>(); // storing and displaying the current active sessions
- const [currentToken, setCurrentToken] = useState<string | undefined>(); // to check whether isCurrentDevice
- const [isLoading, setIsLoading] = useState(true); // to show loader on each session termination and inital load
+ const [sessions, setSessions] = useState<Session[] | undefined>();
+ const [currentToken, setCurrentToken] = useState<string | undefined>();
+ const [isLoading, setIsLoading] = useState(true);
const [error, setError] = useState<string | undefined>();
const fetchSessions = useCallback(async () => {
diff --git a/web/apps/photos/src/services/search/sidebar-search-registry.ts b/web/apps/photos/src/services/search/sidebar-search-registry.ts
index 6214991c10..e8282e2617 100644
--- a/web/apps/photos/src/services/search/sidebar-search-registry.ts
+++ b/web/apps/photos/src/services/search/sidebar-search-registry.ts
@@ -17,7 +17,6 @@ interface SidebarAction {
}
interface SidebarActionContext {
- // top-level sidebar controls
onClose: () => void;
onShowCollectionSummary: (
collectionSummaryID: number,
@@ -38,8 +37,6 @@ interface SidebarActionContext {
hidden: number;
trash: number;
};
-
- // nested drawer hooks
setPendingAccountAction: (a: SidebarActionID | undefined) => void;
setPendingPreferencesAction: (a: SidebarActionID | undefined) => void;
setPendingHelpAction: (a: SidebarActionID | undefined) => void;
diff --git a/web/apps/space/.env.development b/web/apps/space/.env.development
index 26b087a9b7..992b018bbf 100644
--- a/web/apps/space/.env.development
+++ b/web/apps/space/.env.development
@@ -1,7 +1,3 @@
-# Copy this file into `.env.local` or `.env.development.local` and uncomment
-# these to develop against apps and server running on localhost.
-#
-# For details, please see `apps/photos/.env.development`.
+# Copy this to `.env.development.local` and uncomment the endpoint to use local Museum.
-#NEXT_PUBLIC_ENTE_ENDPOINT = http://localhost:8080
-#NEXT_PUBLIC_ENTE_PHOTOS_ENDPOINT = http://localhost:3000
+# NEXT_PUBLIC_ENTE_ENDPOINT = http://localhost:8080
diff --git a/web/docs/translations.md b/web/docs/translations.md
index b196452166..2fdd39953a 100644
--- a/web/docs/translations.md
+++ b/web/docs/translations.md
@@ -16,11 +16,11 @@ Partial translations are welcome; the apps generally enable a language after rou
2. Use the key in the app code:
- ```ts
- import { t } from "i18next";
+ ```ts
+ import { t } from "i18next";
- t("new_string_key");
- ```
+ t("new_string_key");
+ ```
3. Commit the source string and app changes.
diff --git a/web/packages/accounts-rs/services/passkey.ts b/web/packages/accounts-rs/services/passkey.ts
index 3160162efa..09b1ef7c13 100644
--- a/web/packages/accounts-rs/services/passkey.ts
+++ b/web/packages/accounts-rs/services/passkey.ts
@@ -46,11 +46,8 @@ interface OpenPasskeyVerificationURLOptions {
url: string;
}
-// Passkeys are tied to web origins and do not work over the custom protocol
-// that the desktop app uses to serve the bundled web app. So the desktop app
-// (like the mobile app) opens the accounts app origin in the system browser,
-// and on successful verification the accounts app redirects back to the
-// desktop app via a registered custom protocol.
+// Passkeys do not work on the desktop app's custom protocol.
+// Complete the flow in the system browser and return through a deep link.
export const openPasskeyVerificationURL = ({
passkeySessionID,
url,
diff --git a/web/packages/accounts/services/passkey.ts b/web/packages/accounts/services/passkey.ts
index b0a4c0795b..0c53d26623 100644
--- a/web/packages/accounts/services/passkey.ts
+++ b/web/packages/accounts/services/passkey.ts
@@ -46,11 +46,8 @@ interface OpenPasskeyVerificationURLOptions {
url: string;
}
-// Passkeys are tied to web origins and do not work over the custom protocol
-// that the desktop app uses to serve the bundled web app. So the desktop app
-// (like the mobile app) opens the accounts app origin in the system browser,
-// and on successful verification the accounts app redirects back to the
-// desktop app via a registered custom protocol.
+// Passkeys do not work on the desktop app's custom protocol.
+// Complete the flow in the system browser and return through a deep link.
export const openPasskeyVerificationURL = ({
passkeySessionID,
url,
diff --git a/web/packages/base/file-download.ts b/web/packages/base/file-download.ts
index 3c59df2a3e..2cf7589ae4 100644
--- a/web/packages/base/file-download.ts
+++ b/web/packages/base/file-download.ts
@@ -53,7 +53,7 @@ export const fetchFile = async (fileID: number, kind: FileKind) => {
return response;
}
- // TODO: Remove this legacy endpoint after the v3 migration window.
+ // migration : 3 aug 2026
const token = await ensureAuthToken();
return fetch(
await apiURL(`/files/${legacyFilePath(kind)}/${fileID}`, { token }),
diff --git a/web/packages/gallery/services/files-db.ts b/web/packages/gallery/services/files-db.ts
index f8d10175bc..288bd5e185 100644
--- a/web/packages/gallery/services/files-db.ts
+++ b/web/packages/gallery/services/files-db.ts
@@ -81,7 +81,10 @@ const LocalCollection = z
),
})
.transform((c) => {
- // TODO: Remove this June 2025 local collection migration when obsolete.
+ // Old data stored locally contained fields which are no longer needed.
+ // Do some zod gymnastics to drop these when reading (so that they're
+ // not written back the next time). This code was added June 2025,
+ // 1.7.14-beta, and can be removed after a bit (tag: Migration).
const {
encryptedKey,
keyDecryptionNonce,
@@ -120,7 +123,39 @@ export const LocalEnteFile = z.looseObject({
export const LocalEnteFiles = z.array(LocalEnteFile);
-// TODO: Remove this June 2025 local file migration when obsolete.
+/**
+ * Apply transformations when reading files from the DB.
+ *
+ * There are two parts to it -
+ *
+ * 1. the required part (patching old entries that might be present in the local
+ * database),
+ * 2. the optional part (removing some unused fields).
+ *
+ * Part 1 ---
+ *
+ * Transform metadata in legacy files that might be present in the local
+ * database. Note that this will not be needed for files that are fetched
+ * afresh, since the corresponding transform is already done during
+ * {@link decryptRemoteFile}; this is only for handling potentially items that
+ * might've been already present locally.
+ *
+ * Part 2 ---
+ *
+ * Remove unused fields from the file objects when reading them.
+ *
+ * This is similar to the transformation we perform when reading collections
+ * from the database, to discard fields that are no longer forwarded when we
+ * parse the remote object, and thus will not be present in the local DB either
+ * when going forward. They might be present for the existing entries in DB
+ * though, which is why these functions are needed.
+ *
+ * However, since unlike collections, we don't route the files through Zod when
+ * reading. So instead we do it using this function. Effectively, the end result
+ * should be the same. In any case, doing this cleanup has no functional impact.
+ *
+ * Both parts added June 2025, 1.7.14-beta, prune eventually (tag: Migration).
+ */
export const transformFilesIfNeeded = (files: EnteFile[]) =>
isFilesTransformNeeded(files) ? files.map(transformFile) : files;
diff --git a/web/packages/gallery/services/video.ts b/web/packages/gallery/services/video.ts
index f60a187df5..7c75cc25b2 100644
--- a/web/packages/gallery/services/video.ts
+++ b/web/packages/gallery/services/video.ts
@@ -459,17 +459,8 @@ const processQueueItem = async ({
authToken,
);
} catch (e) {
- // Failures during stream generation on the native side are expected to
- // happen in two cases:
- //
- // 1. There is something specific to this video that doesn't work with
- // the current HLS generation pipeline (the ffmpeg invocation).
- //
- // 2. The upload of the generated video fails.
- //
- // The native side code already retries failures for case 2 (except HTTP
- // 4xx errors). Thus, usually we should come here only for case 1, and
- // retrying the same video again will not work either.
+ // Native already retries upload failures other than 4xx responses.
+ // A rejection here normally means this video cannot be converted.
await markFailedVideoFile(file);
throw e;
}
diff --git a/web/packages/gallery/styles/photoswipe.css b/web/packages/gallery/styles/photoswipe.css
index 80f5722825..2460a27468 100644
--- a/web/packages/gallery/styles/photoswipe.css
+++ b/web/packages/gallery/styles/photoswipe.css
@@ -1,14 +1,10 @@
@import "photoswipe/dist/photoswipe.css";
.pswp-ente {
- /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
- Give it a more moderate value so that MUI elements can be used with it. */
+ /* PhotoSwipe defaults to z-index 10000; keep it below MUI drawers. */
z-index: calc(var(--mui-zIndex-drawer) - 1);
}
-/* Shift the top bar by a fraction of the desktop title bar, if any. The top bar
- contents already have a decent top padding, so we don't need to shift by the
- entire amount. See also: [Note: Customize the desktop title bar] */
.pswp-ente .pswp__top-bar {
top: calc(env(titlebar-area-height, 0px) * 0.4);
}
@@ -19,12 +15,9 @@
}
}
-/* Black gradient overlay at the top */
.pswp-ente .pswp__top-bar::before {
content: "";
position: absolute;
- /* Offset to start at the actual viewport top despite top-bar being shifted
- down for the desktop title bar. See line 10-12. */
top: calc(env(titlebar-area-height, 0px) * -0.4);
left: 0;
right: 0;
@@ -42,13 +35,7 @@
z-index: -1;
}
-/* The PhotoSwipe CSS already disables and re-enables pointer-events for hidden
- UI elements, but for a reason that I didn't investigate more, that isn't
- working, and the hidden buttons still remain clickable.
-
- As a workaround, repeat the CSS, but with a higher specificity by including
- the button selector */
-
+/* PhotoSwipe's lower-specificity rule leaves hidden buttons clickable. */
.pswp .pswp__hide-on-close button {
pointer-events: none;
}
@@ -57,44 +44,27 @@
pointer-events: auto;
}
-/* Tweak the visual look of the preloader to match the rest of the elements */
-
.pswp-ente .pswp__preloader--active .pswp__icn {
opacity: 0.4;
}
-/*
- Error indicator on the file viewer.
-
- It is styled similar to the loading indicator provided by PhotoSwipe since it
- is meant to occupy the same space. Only one of these will be shown at the same
- time, so it can also set the auto right margin.
- */
.pswp-ente .pswp__error {
position: relative;
overflow: hidden;
width: 50px;
height: 60px;
- /* Unlike the loading indicator, "display" is used to toggle visibility, and
- the opacity is fixed to be similar to that of the counter. */
display: none;
opacity: 0.85;
}
.pswp-ente .pswp__error .pswp__icn {
- /* Use a warning color for the error icon */
fill: var(--mui-palette-fixed-golden);
}
.pswp-ente .pswp__error .pswp__icn-shadow {
- /* Reduce the stroke from default (2px) to make it look better with the
- golden icon outline */
stroke-width: 1px;
}
-/* The ".pswp--ui-visible .pswp__hide-on-close" selector in PhotoSwipe's CSS
- sets the opacity of the arrows to 1, which doesn't match the rest of the
- controls (0.85). */
.pswp-ente.pswp--ui-visible .pswp__hide-on-close.pswp__button--arrow {
opacity: 0.85;
}
@@ -103,8 +73,6 @@
display: initial;
}
-/* Transform the built in controls to better fit our requirements */
-
.pswp-ente .pswp__counter {
margin-top: 22.5px;
margin-inline-start: 18px;
@@ -128,7 +96,6 @@
transform: scale(0.85);
}
-/* When counter is hidden (single photo), give zoom button the left margin */
.pswp-ente.pswp--one-slide .pswp__top-bar .pswp__button--zoom {
margin-left: 4px;
}
@@ -155,7 +122,6 @@
margin-right: 2px;
}
-/* Remove black strokes from top bar icons */
.pswp-ente .pswp__top-bar .pswp__icn-shadow {
stroke-width: 0;
}
@@ -175,18 +141,13 @@
}
.pswp-ente .pswp__button--arrow--next .pswp__icn {
- /* default is a horizontal flip, transform: scale(-1, 1); */
transform: scale(-0.8, 0.8);
}
-/* Toggleable live photo buttons */
-
.pswp-ente button.pswp-ente-off .pswp__icn {
- /* PhotoSwipe already uses the CSS opacity, so reduce the color's opacity */
fill: rgb(255 255 255 / 0.6);
}
-/* Make the controls fit the top bar on mobile sized screens */
@media (width < 450px) {
.pswp-ente .pswp__button {
width: 44px;
@@ -251,17 +212,13 @@
}
}
-/* Caption styling */
-
.pswp-ente .pswp__caption {
border-radius: 3px;
- /* Same opacity as the other controls. */
color: rgb(255 255 255 / 0.85);
max-width: 375px;
max-height: 200px;
p {
margin: 12px 17px;
- /* 4 lines max, ellipsis on overflow. */
word-break: break-word;
overflow: hidden;
text-overflow: ellipsis;
@@ -272,7 +229,6 @@
}
}
-/* Desktop caption: max 40% width */
@media (width >= 450px) {
.pswp-ente .pswp__caption {
max-width: 40%;
@@ -280,12 +236,9 @@
}
.pswp-ente .pswp__caption.ente-video {
- /* Add blur box background for videos since we hide the gradient overlay */
background-color: rgb(0 0 0 / 0.2);
backdrop-filter: blur(10px);
border-radius: 16px;
- /* Since there is too much going on in this part of the screen now, also
- reduce the maximum number of lines for the caption. */
p {
-webkit-line-clamp: 2;
line-clamp: 2;
@@ -298,107 +251,56 @@
cursor: pointer;
}
-/* When More link is present, don't use line-clamp since JS already truncated */
.pswp-ente .pswp__caption p:has(.pswp__caption-more) {
display: block;
-webkit-line-clamp: unset;
line-clamp: unset;
}
-/* Change the cursor on the thumbnail to the default arrow to indicate that it
- is not interactable (PhotoSwipe by default shows the zoom out icon). */
.pswp-ente .pswp__img {
cursor: auto;
}
-/*
- Make the controllable video elements we render as custom PhotoSwipe content
- take .pswp-ente up the entire container.
- */
.pswp-ente video[controls] {
width: 100%;
height: 100%;
}
-/*
- I tried various ways to get media-controller to embed a normal video, but in
- all methods I kept getting a flickering at the edges on Chrome. My best guess
- is that it happens when the resolved size of the video is a fractional value.
-
- This is the current magic incantation that seems to get them to play without
- the video's frame jittering. Note that the streaming hls-video elements work
- fine without any workarounds, it is only the vanilla video elements that have
- this issue and necessitate this workaround. The downside is that clicking
- "outside" the video works for hls-video, but not for vanilla videos.
- */
.pswp-ente media-controller.ente-vanilla-video {
width: 100%;
height: 100%;
video {
+ /* The one-pixel inset prevents fractional-size flicker in Chrome. HLS video does not need it. */
width: calc(100% - 1px);
height: calc(100% - 1px);
}
}
-/*
- Style the custom video controls we provide.
-
- The media-controller itself is center positioned (shrinking if needed) by
- PhotoSwipe using the width and height of the video that we provide to it.
-
- The controls are absolutely position at the bottom of the screen instead of
- being attached to the video.
- */
.pswp-ente .pswp__media-controls {
display: none;
position: absolute;
bottom: 0px;
left: 0px;
right: 0px;
-
background: linear-gradient(transparent, rgb(0 0 0 / 0.8));
-
- /* Similar to our other controls */
--media-icon-color: rgb(255 255 255 / 0.8);
- /* NB: We don't reset the font-weight, so this'll be using 400 instead of
- the 500 we use elsewhere. See: [Note: Font weights].
-
- We don't reset it because on this screen the 400 looks better (for now).
- */
--media-font-family: "Inter Variable", sans-serif;
--media-control-background: transparent;
--media-control-hover-background: rgb(255 255 255 / 0.12);
/*
- Prevent menus from occluding clicks on other controls when hidden.
-
- [Note: Showing menus outside of media-controller]
-
- This is all very hacky. The standalone control example
- (https://media-chrome.mux.dev/examples/vanilla/standalone-controls.html),
- doesn't (as of now) include a menu, so it is possible this is just not
- supported. None of the media controller examples I could find show menus
- work for our specific scenario (the controls detached from the the media
- controller itself, and shown at the bottom of the screen).
-
- As such, a lot of undocumented and arbitrary tweaks are needed. This is a
- house of cards, and might fall when the media-chrome version is updated;
- on the other hand, they might also add better support for our scenario, in
- which case this should be possible straightforwardly.
- */
+ * These controls sit outside media-controller, a layout Media Chrome does not officially support.
+ * The height overrides stop hidden menus from intercepting clicks. Recheck them when upgrading media-chrome.
+ */
--media-menu-hidden-max-height: 1px;
--media-menu-max-height: 1000px;
}
-/*
- Stack controls rows vertically.
- */
.pswp-ente .pswp__media-controls > div {
display: flex;
flex-direction: column;
}
-/* Controls are shown in a disabled state while video data is still loading. */
.pswp-ente .pswp__media-controls.pswp__media-controls--visible {
display: block;
}
@@ -422,11 +324,9 @@ media-control-bar:last-child {
}
media-loading-indicator {
- /* Similar to the top bar loading indicator */
--media-icon-color: rgb(255 255 255 / 0.6);
}
-/* Used as a spacer. */
media-text-display {
flex-grow: 1;
}
@@ -443,34 +343,17 @@ media-time-range:hover {
--media-range-thumb-transform: scale(1.1);
}
-/*
- Hide specific controls when the user's browser doesn't support the feature
- they trigger.
- */
media-pip-button[mediapipunavailable],
media-fullscreen-button[mediafullscreenunavailable] {
display: none;
}
media-settings-menu {
- /*
- Restore the background for the settings menu (we made it transparent). The
- default is var(--_menu-bg), which is rgb(20 20 30 / .8).
- */
--media-control-background: var(--mui-palette-fixed-dark-background-paper);
- /* Regular, but since the rest of media controls use 400, it
- appears heavier. */
--media-font-weight: 500;
- /*
- Bring it above the rest of our controls.
-
- See: [Note: Showing menus outside of media-controller]
- */
z-index: 1;
}
-/* Hide the bottom right controls when hovering over the video controls or
- when the settings menu is open. */
body:has(
media-time-range[mediapreviewtime],
media-settings-menu:not([hidden])
@@ -480,56 +363,40 @@ body:has(
}
}
-/*
- Video fullscreen mode styles.
-
- When entering fullscreen via the video controls, we hide the PhotoSwipe
- navigation UI (top bar, arrows) and only show the video controls at the
- bottom. The controls auto-hide and appear when the user moves to the bottom.
- */
-
-/* Hide navigation controls in video fullscreen mode */
.pswp-ente.pswp--video-fullscreen .pswp__top-bar,
.pswp-ente.pswp--video-fullscreen .pswp__button--arrow {
display: none !important;
}
-/* Auto-hide video controls in fullscreen, show when mouse near bottom */
.pswp-ente.pswp--video-fullscreen .pswp__media-controls {
opacity: 0;
transition: opacity 0.3s ease;
}
-/* Show controls when hovering or when settings menu is open */
.pswp-ente.pswp--video-fullscreen .pswp__media-controls:hover,
.pswp-ente.pswp--video-fullscreen:has(media-settings-menu:not([hidden]))
.pswp__media-controls {
opacity: 1;
}
-/* JS adds this class when mouse is near bottom of screen */
.pswp-ente.pswp--video-fullscreen.pswp--controls-visible .pswp__media-controls {
opacity: 1;
}
-/* Also hide the bottom right controls in video fullscreen mode */
.pswp-ente.pswp--video-fullscreen .pswp__bottom-right-controls {
display: none;
}
-/* Bottom controls container (caption on left, action buttons on right on desktop) */
.pswp-ente .pswp__bottom-right-controls {
position: absolute;
bottom: 20px;
right: 24px;
display: flex;
- /* column-reverse to show buttons on top, caption below (matching original HTML order) */
flex-direction: column-reverse;
align-items: flex-end;
gap: 12px;
}
-/* Black gradient overlay at the bottom */
.pswp-ente .pswp__bottom-right-controls::before {
content: "";
position: absolute;
@@ -550,7 +417,6 @@ body:has(
z-index: -1;
}
-/* Row layout on desktop: caption on left, buttons on right */
@media (width >= 450px) {
.pswp-ente .pswp__bottom-right-controls {
bottom: 40px;
@@ -568,17 +434,14 @@ body:has(
}
}
-/* Extra offset for video to clear video controls */
.pswp-ente .pswp__bottom-right-controls:has(.pswp__caption.ente-video) {
bottom: 100px;
}
-/* Hide gradient overlay for videos since they have their own controls gradient */
.pswp-ente .pswp__bottom-right-controls:has(.pswp__caption.ente-video)::before {
display: none;
}
-/* Hide gradient overlay when description is not present */
.pswp-ente
.pswp__bottom-right-controls:has(
.pswp__caption[style*="display: none"]
@@ -586,7 +449,6 @@ body:has(
display: none;
}
-/* Action buttons row - margin-left: auto keeps them on the right when no caption */
.pswp-ente .pswp__action-buttons {
display: flex;
flex-direction: row;
@@ -617,7 +479,6 @@ body:has(
fill: white;
}
-/* Comment button with count indicator */
.pswp-ente .pswp__action-button--comment {
position: relative;
}
@@ -643,7 +504,6 @@ body:has(
display: block;
}
-/* Reduce padding on mobile */
@media (width < 450px) {
.pswp-ente .pswp__bottom-right-controls {
bottom: 12px;
@@ -658,7 +518,6 @@ body:has(
}
}
-/* Heart (like) button icons - uses pswp__hidden class toggled by showIf() */
#pswp__icn-heart-fill {
display: none;
}
diff --git a/web/packages/gallery/utils/units.ts b/web/packages/gallery/utils/units.ts
index 2ed94bd389..8dae6b847b 100644
--- a/web/packages/gallery/utils/units.ts
+++ b/web/packages/gallery/utils/units.ts
@@ -19,12 +19,6 @@ export function formattedByteSize(bytes: number, precision = 2): string {
}
interface FormattedStorageByteSizeOptions {
- /**
- * If `true` then round up the fractional quantity we obtain when dividing
- * the number of bytes by the number of bytes in the unit that got chosen.
- *
- * The default behaviour is to take the ceiling.
- */
round?: boolean;
}
diff --git a/web/packages/media/collection.ts b/web/packages/media/collection.ts
index 0c99cfb3ce..f220ff3a1e 100644
--- a/web/packages/media/collection.ts
+++ b/web/packages/media/collection.ts
@@ -43,13 +43,8 @@ interface CollectionTypeAndOwner {
owner: { id: number };
}
-// A file must always belong to at least one collection. A client that would
-// otherwise orphan a file (e.g. when deleting the last collection containing
-// it) must instead move the file to the user's "uncategorized" collection,
-// creating that if needed.
-//
-// Shared collections of type "uncategorized" can also be present locally, so
-// the owner check is needed to find the user's own one.
+// Files cannot be orphaned. Their last membership moves to Uncategorized.
+// The owner check excludes a sharee's Uncategorized collection.
export const findUserUncategorizedCollection = <
T extends CollectionTypeAndOwner,
>(
@@ -76,10 +71,7 @@ export interface CollectionUser {
role?: string;
}
-// Enum-like remote fields (e.g. role) are deliberately kept as plain strings
-// or numbers instead of being validated against a closed enum. Validating
-// would break existing clients when remote adds new cases, and persisted
-// values must remain readable by future clients that understand them.
+// Keep remote enums open-ended so newer values survive older clients.
export const RemoteCollectionUser = z.looseObject({
id: z.number(),
email: z.string().nullish().transform(nullToUndefined),
diff --git a/web/packages/new/photos/services/ml/cluster.ts b/web/packages/new/photos/services/ml/cluster.ts
index d1ff890599..19da3f25f7 100644
--- a/web/packages/new/photos/services/ml/cluster.ts
+++ b/web/packages/new/photos/services/ml/cluster.ts
@@ -174,12 +174,6 @@ const sortFacesNewestOnesFirst = (
return faces.sort((a, b) => sortTimeForFace(b) - sortTimeForFace(a));
};
-/**
- * Return true if the given face is above the minimum inclusion thresholds, but
- * is otherwise heuristically determined to be possibly spurious face detection.
- *
- * We apply a higher threshold when clustering such faces.
- */
const isBadFace = (face: Face) =>
face.blur < 50 ||
(face.blur < 200 && face.blur < 0.85) ||
diff --git a/web/packages/new/photos/services/photos-fdb.ts b/web/packages/new/photos/services/photos-fdb.ts
index 1d49f89aa5..f02550350c 100644
--- a/web/packages/new/photos/services/photos-fdb.ts
+++ b/web/packages/new/photos/services/photos-fdb.ts
@@ -48,7 +48,11 @@ export const savedCollectionFiles = async (): Promise<EnteFile[]> => {
// Zod parsing 200k self-written records costs about a second.
let files = (await localForage.getItem<EnteFile[]>("files")) ?? [];
- // TODO: Remove this June 2025 hidden-file migration when obsolete.
+ // Previously hidden files were stored separately. If that key is present,
+ // also read those files, and migrate them (save the concatenation to disk
+ // and delete the corresponding DB key).
+ //
+ // This migration was added Jun 2025, v1.7.14-beta (tag: Migration).
const previousHiddenFiles =
await localForage.getItem<EnteFile[]>("hidden-files");
if (previousHiddenFiles) {
diff --git a/web/packages/new/photos/services/search/worker.ts b/web/packages/new/photos/services/search/worker.ts
index 6fb31c0c1a..46acedf30d 100644
--- a/web/packages/new/photos/services/search/worker.ts
+++ b/web/packages/new/photos/services/search/worker.ts
@@ -478,15 +478,6 @@ const isWithinRadius = (
return (x * x) / (a * a) + (y * y) / (b * b) <= 1;
};
-/**
- * A latitude specific scaling factor to apply to the radius of a location
- * search.
- *
- * The area bounded by the location tag becomes more elliptical with increase in
- * the magnitude of the latitude on the cartesian plane. When latitude is 0
- * degrees, the ellipse is a circle with a = b = r. When latitude increases, the
- * major axis (a) has to be scaled by the secant of the latitude.
- */
const radiusScaleFactor = (lat: number) => 1 / Math.cos(lat * (Math.PI / 180));
const sortMatchesIfNeeded = (