Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Derive Space media inputs from generated types

Manav Rathi7a99f342f59f
diff --git a/web/apps/space/src/services/profile.ts b/web/apps/space/src/services/profile.ts
index 0118ebcbf7..6ffa4d8a21 100644
--- a/web/apps/space/src/services/profile.ts
+++ b/web/apps/space/src/services/profile.ts
@@ -5,6 +5,7 @@ import { apiOrigin, apiURL } from "ente-base/origins";
import {
openSpaceAccountContext,
type DecryptedSpaceProfile,
+ type ProfileAvatarResponse,
type SpaceAccountCtxHandle,
type SpaceKeyResponse,
type UpdateSpaceProfileResponse,
@@ -37,12 +38,7 @@ const usernamePattern = /^[a-z0-9][a-z0-9._]*$/;
const minUsernameLength = 4;
const maxUsernameLength = 30;
-interface SpaceAvatar {
- keyVersion: number;
- objectID: string;
- size?: number;
- updatedAt?: string;
-}
+type SpaceAvatar = Pick<ProfileAvatarResponse, "objectID" | "keyVersion">;
type SpaceCover = SpaceAvatar;
diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.ts
index c3deccbc7f..d5b9d418f6 100644
--- a/web/apps/space/src/services/space.ts
+++ b/web/apps/space/src/services/space.ts
@@ -11,6 +11,7 @@ import {
type PostObjectPayload,
type PostPage,
type PostResponse,
+ type ProfileAvatarResponse,
type SpaceAccountCtxHandle,
type SpaceActorResponse,
type SpaceLinkCtxHandle,
@@ -45,12 +46,7 @@ import { normalizeSpaceMessageText } from "utils/message-limits";
export { clearSpaceMediaURLCache } from "services/media-cache";
-interface SpaceAvatar {
- keyVersion: number;
- objectID: string;
- size?: number;
- updatedAt?: string;
-}
+type SpaceAvatar = Pick<ProfileAvatarResponse, "objectID" | "keyVersion">;
type SpaceCover = SpaceAvatar;
@@ -1091,8 +1087,6 @@ export const loadCurrentSpacePostAvatarURL: SpacePostAvatarURLLoader = async (
const avatar = {
keyVersion: post.avatarKeyVersion,
objectID: post.avatarObjectID,
- size: post.avatarSize,
- updatedAt: post.avatarUpdatedAt,
};
const cachedAvatarURL = await cachedAccountAvatarURLIfPresent(
post.spaceId,
@@ -1123,8 +1117,6 @@ export const loadCurrentFriendAvatarURL = async (
const avatar = {
keyVersion: friend.avatarKeyVersion,
objectID: friend.avatarObjectID,
- size: friend.avatarSize,
- updatedAt: friend.avatarUpdatedAt,
};
const cachedAvatarURL = await cachedAccountAvatarURLIfPresent(
friend.spaceId,
@@ -1415,8 +1407,6 @@ export const loadCurrentMessageConversationAvatar = async (
{
keyVersion: friend.avatarKeyVersion,
objectID: friend.avatarObjectID,
- size: friend.avatarSize,
- updatedAt: friend.avatarUpdatedAt,
},
viewerSpaceId,
);
diff --git a/web/packages/wasm/space/index.ts b/web/packages/wasm/space/index.ts
index b3fe14a97a..3f638e1581 100644
--- a/web/packages/wasm/space/index.ts
+++ b/web/packages/wasm/space/index.ts
@@ -12,6 +12,7 @@ export type {
PostObjectPayload,
PostPage,
PostResponse,
+ ProfileAvatarResponse,
SpaceAccountCtxHandle,
SpaceActorResponse,
SpaceKeyResponse,