Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
fix(cloud): display workspace usage against shared plan quotas
Timothy Yin836badedcc26
diff --git a/apps/cloud/i18n/locales/en.json b/apps/cloud/i18n/locales/en.jsonindex 3bc74759..c243e0f7 100644--- a/apps/cloud/i18n/locales/en.json+++ b/apps/cloud/i18n/locales/en.json@@ -436,7 +436,7 @@"photoMembershipCount": "Photographs · {count}","securityFor": "Manage sign-in methods for {email}.","uploadProgress": "{progress}% · Uploading to your private bucket",- "uploadUsage": "{photos} / {photoLimit} photographs · {bytes} / {uploadLimit} GiB uploaded in 30 days",+ "uploadUsage": "Workspace: {photos} / {photoLimit} photographs · {bytes} / {uploadLimit} GiB uploaded in 30 days","connectionRevision": "{bucket} · revision {revision}","admin": "Admin","member": "Member",diff --git a/apps/cloud/i18n/locales/zh-Hans.json b/apps/cloud/i18n/locales/zh-Hans.jsonindex 9a845142..821b5c92 100644--- a/apps/cloud/i18n/locales/zh-Hans.json+++ b/apps/cloud/i18n/locales/zh-Hans.json@@ -436,7 +436,7 @@"photoMembershipCount": "照片 · {count}","securityFor": "管理 {email} 的登录方式。","uploadProgress": "{progress}% · 正在上传到你的私有存储桶",- "uploadUsage": "{photos} / {photoLimit} 张照片 · 30 天上传 {bytes} / {uploadLimit} GiB",+ "uploadUsage": "工作空间:{photos} / {photoLimit} 张照片 · 30 天上传 {bytes} / {uploadLimit} GiB","connectionRevision": "{bucket} · 凭证版本 {revision}","admin": "管理员","member": "成员",diff --git a/apps/cloud/server/api/sites/[siteId]/media/[...operation].ts b/apps/cloud/server/api/sites/[siteId]/media/[...operation].tsindex 7e94f4f6..7e47844b 100644--- a/apps/cloud/server/api/sites/[siteId]/media/[...operation].ts+++ b/apps/cloud/server/api/sites/[siteId]/media/[...operation].ts@@ -142,11 +142,11 @@ export default definePlatformHandler(async (event) => {.first<{ bytes: number }>()const usage = (await sql<{ photos: number; pending: number; bytes: number }>(- `SELECT (SELECT COUNT(*) FROM cloud_photos WHERE site_id=? AND deleted=0) AS photos,(SELECT COUNT(*) FROM cloud_uploads WHERE site_id=? AND state='pending' AND expires_at>?) AS pending,COALESCE((SELECT SUM(bytes) FROM cloud_usage_events WHERE site_id=? AND created_at>?),0) AS bytes`,- siteId,- siteId,+ `SELECT (SELECT COUNT(*) FROM cloud_photos WHERE site_id IN(SELECT id FROM platform_sites WHERE workspace_id=?) AND deleted=0) AS photos,(SELECT COUNT(*) FROM cloud_uploads WHERE site_id IN(SELECT id FROM platform_sites WHERE workspace_id=?) AND state='pending' AND expires_at>?) AS pending,COALESCE((SELECT SUM(bytes) FROM cloud_usage_events WHERE site_id IN(SELECT id FROM platform_sites WHERE workspace_id=?) AND created_at>?),0) AS bytes`,+ site.workspaceId,+ site.workspaceId,now,- siteId,+ site.workspaceId,now - 30 * 86400000,))[0]