beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into album-cover

Browse source
This commit is contained in:
Abhinav 2023-07-11 12:17:33 +05:30
parent 3775ecdc15 e62e6523da
commit d809c82b3b
24 changed files with 256 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/photos/public/locales/de/translation.json
View file

@ -235,12 +235,11 @@
"MAP": "",
"MAP_SETTINGS": "",
"ENABLE_MAPS": "",
"ENABLE_MAP": "",
"DISABLE_MAPS": "",
"ENABLE_MAP_DESCRIPTION_1": "",
"ENABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION_3": "",
"DISABLE_MAP_DESCRIPTION_1": "",
"DISABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP": "",
"DETAILS": "",
"VIEW_EXIF": "",
"NO_EXIF": "",

9
apps/photos/public/locales/es/translation.json
View file

@ -235,12 +235,11 @@
"MAP": "",
"MAP_SETTINGS": "",
"ENABLE_MAPS": "",
"ENABLE_MAP": "",
"DISABLE_MAPS": "",
"ENABLE_MAP_DESCRIPTION_1": "",
"ENABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION_3": "",
"DISABLE_MAP_DESCRIPTION_1": "",
"DISABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP": "",
"DETAILS": "Detalles",
"VIEW_EXIF": "Ver todos los datos de EXIF",
"NO_EXIF": "No hay datos EXIF",

9
apps/photos/public/locales/fa/translation.json
View file

@ -235,12 +235,11 @@
"MAP": "",
"MAP_SETTINGS": "",
"ENABLE_MAPS": "",
"ENABLE_MAP": "",
"DISABLE_MAPS": "",
"ENABLE_MAP_DESCRIPTION_1": "",
"ENABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION_3": "",
"DISABLE_MAP_DESCRIPTION_1": "",
"DISABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP": "",
"DETAILS": "",
"VIEW_EXIF": "",
"NO_EXIF": "",

9
apps/photos/public/locales/fi/translation.json
View file

@ -235,12 +235,11 @@
"MAP": "",
"MAP_SETTINGS": "",
"ENABLE_MAPS": "",
"ENABLE_MAP": "",
"DISABLE_MAPS": "",
"ENABLE_MAP_DESCRIPTION_1": "",
"ENABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION_3": "",
"DISABLE_MAP_DESCRIPTION_1": "",
"DISABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP": "",
"DETAILS": "",
"VIEW_EXIF": "",
"NO_EXIF": "",

9
apps/photos/public/locales/fr/translation.json
View file

@ -235,12 +235,11 @@
"MAP": "",
"MAP_SETTINGS": "",
"ENABLE_MAPS": "",
"ENABLE_MAP": "",
"DISABLE_MAPS": "",
"ENABLE_MAP_DESCRIPTION_1": "",
"ENABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION_3": "",
"DISABLE_MAP_DESCRIPTION_1": "",
"DISABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP": "",
"DETAILS": "Détails",
"VIEW_EXIF": "Visualiser toutes les données EXIF",
"NO_EXIF": "Aucune donnée EXIF",

9
apps/photos/public/locales/it/translation.json
View file

@ -235,12 +235,11 @@
"MAP": "",
"MAP_SETTINGS": "",
"ENABLE_MAPS": "",
"ENABLE_MAP": "",
"DISABLE_MAPS": "",
"ENABLE_MAP_DESCRIPTION_1": "",
"ENABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION_3": "",
"DISABLE_MAP_DESCRIPTION_1": "",
"DISABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP": "",
"DETAILS": "",
"VIEW_EXIF": "",
"NO_EXIF": "",

9
apps/photos/public/locales/nl/translation.json
View file

@ -235,12 +235,11 @@
"MAP": "",
"MAP_SETTINGS": "",
"ENABLE_MAPS": "",
"ENABLE_MAP": "",
"DISABLE_MAPS": "",
"ENABLE_MAP_DESCRIPTION_1": "",
"ENABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION_3": "",
"DISABLE_MAP_DESCRIPTION_1": "",
"DISABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP": "",
"DETAILS": "Details",
"VIEW_EXIF": "Bekijk alle EXIF gegevens",
"NO_EXIF": "Geen EXIF gegevens",

9
apps/photos/public/locales/pt/translation.json
View file

@ -235,12 +235,11 @@
"MAP": "",
"MAP_SETTINGS": "",
"ENABLE_MAPS": "",
"ENABLE_MAP": "",
"DISABLE_MAPS": "",
"ENABLE_MAP_DESCRIPTION_1": "",
"ENABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION_3": "",
"DISABLE_MAP_DESCRIPTION_1": "",
"DISABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP": "",
"DETAILS": "",
"VIEW_EXIF": "",
"NO_EXIF": "",

9
apps/photos/public/locales/ru/translation.json
View file

@ -235,12 +235,11 @@
"MAP": "",
"MAP_SETTINGS": "",
"ENABLE_MAPS": "",
"ENABLE_MAP": "",
"DISABLE_MAPS": "",
"ENABLE_MAP_DESCRIPTION_1": "",
"ENABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION_3": "",
"DISABLE_MAP_DESCRIPTION_1": "",
"DISABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP": "",
"DETAILS": "",
"VIEW_EXIF": "",
"NO_EXIF": "",

9
apps/photos/public/locales/tr/translation.json
View file

@ -235,12 +235,11 @@
"MAP": "",
"MAP_SETTINGS": "",
"ENABLE_MAPS": "",
"ENABLE_MAP": "",
"DISABLE_MAPS": "",
"ENABLE_MAP_DESCRIPTION_1": "",
"ENABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION_3": "",
"DISABLE_MAP_DESCRIPTION_1": "",
"DISABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP": "",
"DETAILS": "",
"VIEW_EXIF": "",
"NO_EXIF": "",

9
apps/photos/public/locales/zh/translation.json
View file

@ -235,12 +235,11 @@
"MAP": "",
"MAP_SETTINGS": "",
"ENABLE_MAPS": "",
"ENABLE_MAP": "",
"DISABLE_MAPS": "",
"ENABLE_MAP_DESCRIPTION_1": "",
"ENABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION_3": "",
"DISABLE_MAP_DESCRIPTION_1": "",
"DISABLE_MAP_DESCRIPTION_2": "",
"ENABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP_DESCRIPTION": "",
"DISABLE_MAP": "",
"DETAILS": "详情",
"VIEW_EXIF": "查看所有 EXIF 数据",
"NO_EXIF": "无 EXIF 数据",

6
apps/photos/src/components/Collections/CollectionOptions/AlbumCollectionOption.tsx
View file

@ -13,7 +13,7 @@ import PushPinOutlined from '@mui/icons-material/PushPinOutlined';
import { UnPinIcon } from 'components/icons/UnPinIcon';
interface Iprops {
IsArchived: boolean;
isArchived: boolean;
isPinned: boolean;
handleCollectionAction: (
action: CollectionActions,
@ -22,7 +22,7 @@ interface Iprops {
}
export function AlbumCollectionOption({
IsArchived,
isArchived,
isPinned,
handleCollectionAction,
}: Iprops) {
@ -63,7 +63,7 @@ export function AlbumCollectionOption({
{t('PIN_ALBUM')}
</OverflowMenuOption>
)}
{IsArchived ? (
{isArchived ? (
<OverflowMenuOption
onClick={handleCollectionAction(
CollectionActions.UNARCHIVE

41
apps/photos/src/components/Collections/CollectionOptions/SharedCollectionOption.tsx
View file

@ -3,23 +3,46 @@ import React from 'react';
import LogoutIcon from '@mui/icons-material/Logout';
import { CollectionActions } from '.';
import { t } from 'i18next';
import Unarchive from '@mui/icons-material/Unarchive';
import ArchiveOutlined from '@mui/icons-material/ArchiveOutlined';
interface Iprops {
isArchived: boolean;
handleCollectionAction: (
action: CollectionActions,
loader?: boolean
) => (...args: any[]) => Promise<void>;
}
export function SharedCollectionOption({ handleCollectionAction }: Iprops) {
export function SharedCollectionOption({
isArchived,
handleCollectionAction,
}: Iprops) {
return (
<OverflowMenuOption
startIcon={<LogoutIcon />}
onClick={handleCollectionAction(
CollectionActions.CONFIRM_LEAVE_SHARED_ALBUM,
false
)}>
{t('LEAVE_ALBUM')}
</OverflowMenuOption>
<>
{isArchived ? (
<OverflowMenuOption
onClick={handleCollectionAction(
CollectionActions.UNARCHIVE
)}
startIcon={<Unarchive />}>
{t('UNARCHIVE_COLLECTION')}
</OverflowMenuOption>
) : (
<OverflowMenuOption
onClick={handleCollectionAction(CollectionActions.ARCHIVE)}
startIcon={<ArchiveOutlined />}>
{t('ARCHIVE_COLLECTION')}
</OverflowMenuOption>
)}
<OverflowMenuOption
startIcon={<LogoutIcon />}
onClick={handleCollectionAction(
CollectionActions.CONFIRM_LEAVE_SHARED_ALBUM,
false
)}>
{t('LEAVE_ALBUM')}
</OverflowMenuOption>
</>
);
}

5
apps/photos/src/components/Collections/CollectionOptions/index.tsx
View file

@ -11,7 +11,7 @@ import {
} from 'utils/collection';
import { SetCollectionNamerAttributes } from '../CollectionNamer';
import { Collection } from 'types/collection';
import { IsArchived, isPinnedCollection } from 'utils/magicMetadata';
import { isArchivedCollection, isPinnedCollection } from 'utils/magicMetadata';
import { GalleryContext } from 'pages/gallery';
import { logError } from 'utils/sentry';
import { VISIBILITY_STATE } from 'types/magicMetadata';
@ -343,11 +343,12 @@ const CollectionOptions = (props: CollectionOptionsProps) => {
collectionSummaryType ===
CollectionSummaryType.incomingShareCollaborator ? (
<SharedCollectionOption
isArchived={isArchivedCollection(activeCollection)}
handleCollectionAction={handleCollectionAction}
/>
) : (
<AlbumCollectionOption
IsArchived={IsArchived(activeCollection)}
isArchived={isArchivedCollection(activeCollection)}
isPinned={isPinnedCollection(activeCollection)}
handleCollectionAction={handleCollectionAction}
/>

23
apps/photos/src/components/PhotoViewer/FileInfo/index.tsx
View file

@ -37,6 +37,7 @@ import {
getMapDisableConfirmationDialog,
getMapEnableConfirmationDialog,
} from 'utils/ui';
import { PublicCollectionGalleryContext } from 'utils/publicCollectionGallery';
export const FileInfoSidebar = styled((props: DialogProps) => (
<EnteDrawer {...props} anchor="right" />
@ -97,6 +98,9 @@ export function FileInfo({
}: Iprops) {
const appContext = useContext(AppContext);
const galleryContext = useContext(GalleryContext);
const publicCollectionGalleryContext = useContext(
PublicCollectionGalleryContext
);
const [parsedExifData, setParsedExifData] = useState<Record<string, any>>();
const [showExif, setShowExif] = useState(false);
@ -235,7 +239,8 @@ export function FileInfo({
icon={<LocationOnOutlined />}
title={t('LOCATION')}
caption={
!appContext.mapEnabled ? (
!appContext.mapEnabled ||
publicCollectionGalleryContext.accessedThroughSharedURL ? (
<Link
href={getOpenStreetMapLink(location)}
target="_blank"
@ -264,13 +269,15 @@ export function FileInfo({
/>
}
/>
<MapBox
location={location}
mapEnabled={appContext.mapEnabled}
openUpdateMapConfirmationDialog={
openEnableMapConfirmationDialog
}
/>
{!publicCollectionGalleryContext.accessedThroughSharedURL && (
<MapBox
location={location}
mapEnabled={appContext.mapEnabled}
openUpdateMapConfirmationDialog={
openEnableMapConfirmationDialog
}
/>
)}
</>
)}
<InfoItem

12
apps/photos/src/components/Sidebar/SubscriptionCard/contentOverlay/family/index.tsx
View file

@ -18,21 +18,17 @@ export function FamilySubscriptionCardContent({ userDetails }: Iprops) {
return userDetails.usage;
}
}, [userDetails]);
const totalStorage =
userDetails.familyData.storage + (userDetails.storageBonus ?? 0);
return (
<>
<StorageSection
storage={userDetails.familyData.storage}
usage={totalUsage}
/>
<StorageSection storage={totalStorage} usage={totalUsage} />
<FamilyUsageSection
userUsage={userDetails.usage}
fileCount={userDetails.fileCount}
totalUsage={totalUsage}
totalStorage={
userDetails.familyData.storage +
(userDetails.storageBonus ?? 0)
}
totalStorage={totalStorage}
/>
</>
);

12
apps/photos/src/components/Sidebar/SubscriptionCard/contentOverlay/individual/index.tsx
View file

@ -8,19 +8,15 @@ interface Iprops {
}
export function IndividualSubscriptionCardContent({ userDetails }: Iprops) {
const totalStorage =
userDetails.subscription.storage + (userDetails.storageBonus ?? 0);
return (
<>
<StorageSection
storage={userDetails.subscription.storage}
usage={userDetails.usage}
/>
<StorageSection storage={totalStorage} usage={userDetails.usage} />
<IndividualUsageSection
usage={userDetails.usage}
fileCount={userDetails.fileCount}
storage={
userDetails.subscription.storage +
(userDetails.storageBonus ?? 0)
}
storage={totalStorage}
/>
</>
);

11
apps/photos/src/components/pages/gallery/PreviewCard.tsx
View file

@ -20,8 +20,7 @@ import {
import { FILE_TYPE } from 'constants/file';
import AlbumOutlined from '@mui/icons-material/AlbumOutlined';
import Avatar from './Avatar';
import { User } from 'types/user';
import { getData, LS_KEYS } from 'utils/storage/localStorage';
import { shouldShowAvatar } from 'utils/file';
interface IProps {
file: EnteFile;
@ -217,7 +216,7 @@ const Cont = styled('div')<{ disabled: boolean }>`
`;
export default function PreviewCard(props: IProps) {
const { thumbs } = useContext(GalleryContext);
const { thumbs, user } = useContext(GalleryContext);
const {
file,
@ -334,8 +333,6 @@ export default function PreviewCard(props: IProps) {
}
};
const user: User = getData(LS_KEYS.USER);
return (
<Cont
key={`thumb-${file.id}-${props.showPlaceholder}`}
@ -371,9 +368,7 @@ export default function PreviewCard(props: IProps) {
)
)}
<SelectedOverlay selected={selected} />
{(file.ownerID !== user.id ||
(file.ownerID === user.id &&
file.pubMagicMetadata?.data?.uploaderName)) && (
{shouldShowAvatar(file, user) && (
<AvatarOverlay>
<Avatar file={file} />
</AvatarOverlay>

4
apps/photos/src/pages/gallery/index.tsx
View file

@ -119,7 +119,7 @@ import ExportModal from 'components/ExportModal';
import GalleryEmptyState from 'components/GalleryEmptyState';
import AuthenticateUserModal from 'components/AuthenticateUserModal';
import useMemoSingleThreaded from 'hooks/useMemoSingleThreaded';
import { IsArchived } from 'utils/magicMetadata';
import { isArchivedFile } from 'utils/magicMetadata';
import { isSameDayAnyYear, isInsideLocationTag } from 'utils/search';
import { getSessionExpiredMessage } from 'utils/ui';
import { syncEntities } from 'services/entityService';
@ -497,7 +497,7 @@ export default function Gallery() {
}
// Archived files can only be seen in archive section or their respective collection
if (IsArchived(item)) {
if (isArchivedFile(item)) {
if (
activeCollection === ARCHIVE_SECTION ||
activeCollection === item.collectionID

73
apps/photos/src/services/collectionService.ts
View file

@ -30,6 +30,7 @@ import {
CollectionMagicMetadataProps,
CollectionPublicMagicMetadata,
RemoveFromCollectionRequest,
CollectionShareeMagicMetadata,
} from 'types/collection';
import {
COLLECTION_LIST_SORT_BY,
@ -44,7 +45,8 @@ import {
} from 'constants/collection';
import { SUB_TYPE, UpdateMagicMetadataRequest } from 'types/magicMetadata';
import {
IsArchived,
isArchivedCollection,
isArchivedFile,
isPinnedCollection,
updateMagicMetadata,
} from 'utils/magicMetadata';
@ -144,12 +146,25 @@ const getCollectionWithSecrets = async (
};
}
let collectionShareeMagicMetadata: CollectionShareeMagicMetadata;
if (collection.sharedMagicMetadata?.data) {
collectionShareeMagicMetadata = {
...collection.sharedMagicMetadata,
data: await cryptoWorker.decryptMetadata(
collection.sharedMagicMetadata.data,
collection.sharedMagicMetadata.header,
collectionKey
),
};
}
return {
...collection,
name: collectionName,
key: collectionKey,
magicMetadata: collectionMagicMetadata,
pubMagicMetadata: collectionPublicMagicMetadata,
sharedMagicMetadata: collectionShareeMagicMetadata,
};
};
@ -293,7 +308,7 @@ export const getCollectionLatestFiles = (
}
if (
!latestFiles.has(ALL_SECTION) &&
!IsArchived(file) &&
!isArchivedFile(file) &&
!archivedCollections.has(file.collectionID)
) {
latestFiles.set(ALL_SECTION, file);
@ -339,7 +354,10 @@ export const getCollectionCoverFiles = (
if (coverFiles.has(ALL_SECTION)) {
break;
}
if (!IsArchived(file) && !archivedCollections.has(file.collectionID)) {
if (
!isArchivedFile(file) &&
!archivedCollections.has(file.collectionID)
) {
coverFiles.set(ALL_SECTION, file);
}
}
@ -407,6 +425,7 @@ const createCollection = async (
isDeleted: false,
magicMetadata: encryptedMagicMetadata,
pubMagicMetadata: null,
sharedMagicMetadata: null,
};
const createdCollection = await postCollection(newCollection, token);
const decryptedCreatedCollection = await getCollectionWithSecrets(
@ -786,6 +805,50 @@ export const updateCollectionMagicMetadata = async (
return updatedCollection;
};
export const updateSharedCollectionMagicMetadata = async (
collection: Collection,
updatedMagicMetadata: CollectionMagicMetadata
) => {
const token = getToken();
if (!token) {
return;
}
const cryptoWorker = await ComlinkCryptoWorker.getInstance();
const { file: encryptedMagicMetadata } = await cryptoWorker.encryptMetadata(
updatedMagicMetadata.data,
collection.key
);
const reqBody: UpdateMagicMetadataRequest = {
id: collection.id,
magicMetadata: {
version: updatedMagicMetadata.version,
count: updatedMagicMetadata.count,
data: encryptedMagicMetadata.encryptedData,
header: encryptedMagicMetadata.decryptionHeader,
},
};
await HTTPService.put(
`${ENDPOINT}/collections/sharee-magic-metadata`,
reqBody,
null,
{
'X-Auth-Token': token,
}
);
const updatedCollection: Collection = {
...collection,
magicMetadata: {
...updatedMagicMetadata,
version: updatedMagicMetadata.version + 1,
},
};
return updatedCollection;
};
export const updatePublicCollectionMagicMetadata = async (
collection: Collection,
updatedPublicMagicMetadata: CollectionPublicMagicMetadata
@ -1082,7 +1145,7 @@ export async function getCollectionSummaries(
type = CollectionSummaryType.outgoingShare;
} else if (isSharedOnlyViaLink(collection)) {
type = CollectionSummaryType.sharedOnlyViaLink;
} else if (IsArchived(collection)) {
} else if (isArchivedCollection(collection)) {
type = CollectionSummaryType.archived;
} else if (isHiddenCollection(collection)) {
type = CollectionSummaryType.hidden;
@ -1177,7 +1240,7 @@ function getCollectionsFileCount(
for (const file of files) {
if (isSharedFile(user, file)) {
continue;
} else if (IsArchived(file)) {
} else if (isArchivedFile(file)) {
uniqueArchivedFileIDs.add(file.id);
} else if (!archivedCollections.has(file.collectionID)) {
uniqueAllSectionFileIDs.add(file.id);

9
apps/photos/src/types/collection/index.ts
View file

@ -37,6 +37,7 @@ export interface EncryptedCollection {
isDeleted: boolean;
magicMetadata: EncryptedMagicMetadata;
pubMagicMetadata: EncryptedMagicMetadata;
sharedMagicMetadata: EncryptedMagicMetadata;
}
export interface Collection
@ -48,11 +49,13 @@ export interface Collection
| 'nameDecryptionNonce'
| 'magicMetadata'
| 'pubMagicMetadata'
| 'sharedMagicMetadata'
> {
key: string;
name: string;
magicMetadata: CollectionMagicMetadata;
pubMagicMetadata: CollectionPublicMagicMetadata;
sharedMagicMetadata: CollectionShareeMagicMetadata;
}
export interface PublicURL {
@ -124,6 +127,12 @@ export interface CollectionMagicMetadataProps {
export type CollectionMagicMetadata =
MagicMetadataCore<CollectionMagicMetadataProps>;
export interface CollectionShareeMetadataProps {
visibility?: VISIBILITY_STATE;
}
export type CollectionShareeMagicMetadata =
MagicMetadataCore<CollectionShareeMetadataProps>;
export interface CollectionPublicMagicMetadataProps {
asc?: boolean;
coverID?: number;

36
apps/photos/src/utils/collection/index.ts
View file

@ -8,6 +8,7 @@ import {
unhideToCollection,
updateCollectionMagicMetadata,
updatePublicCollectionMagicMetadata,
updateSharedCollectionMagicMetadata,
} from 'services/collectionService';
import { downloadFiles } from 'utils/file';
import { getLocalFiles, getLocalHiddenFiles } from 'services/fileService';
@ -34,7 +35,7 @@ import {
} from 'constants/collection';
import { getUnixTimeInMicroSecondsWithDelta } from 'utils/time';
import { SUB_TYPE, VISIBILITY_STATE } from 'types/magicMetadata';
import { IsArchived, updateMagicMetadata } from 'utils/magicMetadata';
import { isArchivedCollection, updateMagicMetadata } from 'utils/magicMetadata';
import { getAlbumsURL } from 'utils/common/apiUtil';
import bs58 from 'bs58';
import { t } from 'i18next';
@ -166,12 +167,29 @@ export const changeCollectionVisibility = async (
visibility,
};
const updatedMagicMetadata = await updateMagicMetadata(
updatedMagicMetadataProps,
collection.magicMetadata,
collection.key
);
await updateCollectionMagicMetadata(collection, updatedMagicMetadata);
const user: User = getData(LS_KEYS.USER);
if (collection.owner.id === user.id) {
const updatedMagicMetadata = await updateMagicMetadata(
updatedMagicMetadataProps,
collection.magicMetadata,
collection.key
);
await updateCollectionMagicMetadata(
collection,
updatedMagicMetadata
);
} else {
const updatedMagicMetadata = await updateMagicMetadata(
updatedMagicMetadataProps,
collection.sharedMagicMetadata,
collection.key
);
await updateSharedCollectionMagicMetadata(
collection,
updatedMagicMetadata
);
}
} catch (e) {
logError(e, 'change collection visibility failed');
throw e;
@ -247,7 +265,9 @@ export const changeCollectionSubType = async (
export const getArchivedCollections = (collections: Collection[]) => {
return new Set<number>(
collections.filter(IsArchived).map((collection) => collection.id)
collections
.filter(isArchivedCollection)
.map((collection) => collection.id)
);
};

23
apps/photos/src/utils/file/index.ts
View file

@ -28,7 +28,7 @@ import PublicCollectionDownloadManager from 'services/publicCollectionDownloadMa
import heicConversionService from 'services/heicConversionService';
import * as ffmpegService from 'services/ffmpeg/ffmpegService';
import { VISIBILITY_STATE } from 'types/magicMetadata';
import { IsArchived, updateMagicMetadata } from 'utils/magicMetadata';
import { isArchivedFile, updateMagicMetadata } from 'utils/magicMetadata';
import { addLocalLog, addLogLine } from 'utils/logging';
import { CustomError } from 'utils/error';
@ -576,7 +576,7 @@ export const isImageOrVideo = (fileType: FILE_TYPE) =>
[FILE_TYPE.IMAGE, FILE_TYPE.VIDEO].includes(fileType);
export const getArchivedFiles = (files: EnteFile[]) => {
return files.filter(IsArchived).map((file) => file.id);
return files.filter(isArchivedFile).map((file) => file.id);
};
export const createTypedObjectURL = async (blob: Blob, fileName: string) => {
@ -672,3 +672,22 @@ export function constructFileToCollectionMap(files: EnteFile[]) {
});
return fileToCollectionsMap;
}
export const shouldShowAvatar = (file: EnteFile, user: User) => {
if (!file || !user) {
return false;
}
// is Shared file
else if (file.ownerID !== user.id) {
return true;
}
// is public collected file
else if (
file.ownerID === user.id &&
file.pubMagicMetadata?.data?.uploaderName
) {
return true;
} else {
return false;
}
};

28
apps/photos/src/utils/magicMetadata/index.ts
View file

@ -3,19 +3,31 @@ import { EnteFile } from 'types/file';
import { MagicMetadataCore, VISIBILITY_STATE } from 'types/magicMetadata';
import ComlinkCryptoWorker from 'utils/comlink/ComlinkCryptoWorker';
export function IsArchived(item: Collection | EnteFile) {
if (
!item ||
!item.magicMetadata ||
!item.magicMetadata.data ||
typeof item.magicMetadata.data === 'string' ||
typeof item.magicMetadata.data.visibility === 'undefined'
) {
export function isArchivedFile(item: EnteFile): boolean {
if (!item || !item.magicMetadata || !item.magicMetadata.data) {
return false;
}
return item.magicMetadata.data.visibility === VISIBILITY_STATE.ARCHIVED;
}
export function isArchivedCollection(item: Collection): boolean {
if (!item) {
return false;
}
if (item.magicMetadata && item.magicMetadata.data) {
return item.magicMetadata.data.visibility === VISIBILITY_STATE.ARCHIVED;
}
if (item.sharedMagicMetadata && item.sharedMagicMetadata.data) {
return (
item.sharedMagicMetadata.data.visibility ===
VISIBILITY_STATE.ARCHIVED
);
}
return false;
}
export function isPinnedCollection(item: Collection) {
if (
!item ||