diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 84a46fcc..272a200f 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -471,8 +471,9 @@ configuration: custom_root_fields: {} custom_column_names: - background_image_url: backgroundImageUrl - image_url: imageUrl + background_image_url: backgroundImageURL + image_url: imageURL + player_id: playerId object_relationships: - name: player using: diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts index eea0194a..2f45d8ee 100644 --- a/packages/backend/src/config.ts +++ b/packages/backend/src/config.ts @@ -12,7 +12,7 @@ interface IConfig { imgixToken: string; infuraId: string; pSEEDAddress: string; - brightIdAppUrl: string; + brightIdAppURL: string; sourceCredLedgerBranch: string; ceramicDaemonURL: string; } @@ -72,7 +72,7 @@ export const CONFIG: IConfig = { process.env.NEXT_PUBLIC_INFURA_ID, '781d8466252d47508e177b8637b1c2fd', ), - brightIdAppUrl: parseEnv( + brightIdAppURL: parseEnv( process.env.NEXT_BRIGHTID_APP_URL, 'https://app.brightid.org', ), diff --git a/packages/backend/src/handlers/actions/3Box/cache3BoxProfile/updateCachedProfile.ts b/packages/backend/src/handlers/actions/3Box/cache3BoxProfile/updateCachedProfile.ts index 515c7ba4..5ea17570 100644 --- a/packages/backend/src/handlers/actions/3Box/cache3BoxProfile/updateCachedProfile.ts +++ b/packages/backend/src/handlers/actions/3Box/cache3BoxProfile/updateCachedProfile.ts @@ -76,15 +76,15 @@ export async function updateCachedProfile( } } const values = { - player_id: playerId, + playerId, name, description, emoji, - imageUrl: getImage(idxProfile.image?.original?.src, { + imageURL: getImage(idxProfile.image?.original?.src, { ar: '1:1', height: 200, }), - backgroundImageUrl: getImage(idxProfile.background?.original?.src, { + backgroundImageURL: getImage(idxProfile.background?.original?.src, { height: 300, }), gender, diff --git a/packages/backend/src/handlers/actions/3Box/refresh3BoxCache/cache3BoxProfiles.ts b/packages/backend/src/handlers/actions/3Box/refresh3BoxCache/cache3BoxProfiles.ts index edd2d86d..a3ff0124 100644 --- a/packages/backend/src/handlers/actions/3Box/refresh3BoxCache/cache3BoxProfiles.ts +++ b/packages/backend/src/handlers/actions/3Box/refresh3BoxCache/cache3BoxProfiles.ts @@ -6,10 +6,11 @@ export async function cache3BoxProfiles(): Promise { const data = await client.GetPlayerIds(); const ids = data.player.map(({ id }) => id); - await Promise.all(ids.map((id) => updateCachedProfile(id))); + try { + await Promise.all(ids.map((id) => updateCachedProfile(id))); + } catch (err) { + return { success: false, error: err.message }; + } - return { - success: true, - error: null, - }; + return { success: true, error: null }; } diff --git a/packages/backend/src/handlers/remote-schemas/resolvers/brightId/resolver.ts b/packages/backend/src/handlers/remote-schemas/resolvers/brightId/resolver.ts index f6b58a5e..585f52cd 100644 --- a/packages/backend/src/handlers/remote-schemas/resolvers/brightId/resolver.ts +++ b/packages/backend/src/handlers/remote-schemas/resolvers/brightId/resolver.ts @@ -3,7 +3,7 @@ import { QueryResolvers } from '../../autogen/types'; const CONTEXT = 'MetaGame'; -const ENDPOINT = `${CONFIG.brightIdAppUrl}/node/v5/verifications/${CONTEXT}`; +const ENDPOINT = `${CONFIG.brightIdAppURL}/node/v5/verifications/${CONTEXT}`; export const getBrightIdStatus: QueryResolvers['getBrightIdStatus'] = async ( _, diff --git a/packages/backend/src/handlers/remote-schemas/resolvers/getBoxProfile/resolver.ts b/packages/backend/src/handlers/remote-schemas/resolvers/getBoxProfile/resolver.ts index 1bc1ca69..dfe7bb8a 100644 --- a/packages/backend/src/handlers/remote-schemas/resolvers/getBoxProfile/resolver.ts +++ b/packages/backend/src/handlers/remote-schemas/resolvers/getBoxProfile/resolver.ts @@ -26,11 +26,11 @@ export const getBoxProfile: QueryResolvers['getBoxProfile'] = async ( location: boxProfile.location, job: boxProfile.job, emoji: boxProfile.emoji, - imageUrl: getImage(boxProfile?.image, { + imageURL: getImage(boxProfile?.image, { ar: '1:1', height: 200, }), - coverImageUrl: getImage(boxProfile?.coverPhoto, { + coverImageURL: getImage(boxProfile?.coverPhoto, { height: 300, }), website: boxProfile.website, diff --git a/packages/backend/src/handlers/remote-schemas/typeDefs.ts b/packages/backend/src/handlers/remote-schemas/typeDefs.ts index a860f02e..e61b913a 100644 --- a/packages/backend/src/handlers/remote-schemas/typeDefs.ts +++ b/packages/backend/src/handlers/remote-schemas/typeDefs.ts @@ -25,8 +25,8 @@ export const typeDefs = gql` location: String job: String emoji: String - imageUrl: String - coverImageUrl: String + imageURL: String + coverImageURL: String website: String collectiblesFavorites: [CollectiblesFavorites!] } diff --git a/packages/web/components/Guild/GuildJoin.tsx b/packages/web/components/Guild/GuildJoin.tsx index 438bc26d..c287621d 100644 --- a/packages/web/components/Guild/GuildJoin.tsx +++ b/packages/web/components/Guild/GuildJoin.tsx @@ -18,18 +18,18 @@ import React from 'react'; import { FaCheckCircle } from 'react-icons/fa'; export const GuildJoin: React.FC = () => { - const discordOAuthCallbackUrl = `${CONFIG.publicUrl}/${Constants.DISCORD_OAUTH_CALLBACK_PATH}`; + const discordOAuthCallbackURL = `${CONFIG.publicURL}/${Constants.DISCORD_OAUTH_CALLBACK_PATH}`; const discordAuthParams = new URLSearchParams({ response_type: 'code', client_id: Constants.DISCORD_BOT_CLIENT_ID, state: 'guid-to-go-in-localstorage', permissions: Constants.DISCORD_BOT_PERMISSIONS, - redirect_uri: encodeURI(discordOAuthCallbackUrl), + redirect_uri: encodeURI(discordOAuthCallbackURL), scope: Constants.DISCORD_OAUTH_SCOPES, }); - const discordAuthUrl = `https://discord.com/api/oauth2/authorize?${discordAuthParams.toString()}`; + const discordAuthURL = `https://discord.com/api/oauth2/authorize?${discordAuthParams.toString()}`; return ( @@ -77,7 +77,7 @@ export const GuildJoin: React.FC = () => { asking for your permission to collect certain relevant information about your guild. - + Apply to Join diff --git a/packages/web/config.ts b/packages/web/config.ts index 8e536d2b..daecacc0 100644 --- a/packages/web/config.ts +++ b/packages/web/config.ts @@ -14,11 +14,11 @@ export const CONFIG = { infuraId: process.env.NEXT_PUBLIC_INFURA_ID || '781d8466252d47508e177b8637b1c2fd', openseaApiKey: process.env.NEXT_OPENSEA_API_KEY || undefined, - brightIdAppUrl: + brightIdAppURL: process.env.NEXT_BRIGHTID_APP_URL || 'https://app.brightid.org', - brightIdNodeUrl: + brightIdNodeURL: process.env.NEXT_BRIGHTID_NODE_URL || 'http:%2f%2fnode.brightid.org', - publicUrl: process.env.NEXT_PUBLIC_VERCEL_URL || 'http://localhost:3000', + publicURL: process.env.NEXT_PUBLIC_VERCEL_URL || 'http://localhost:3000', gaId: process.env.NEXT_PUBLIC_GA4_ID || undefined, clarityId: process.env.NEXT_CLARITY_ID || undefined, }; diff --git a/packages/web/graphql/fragments.ts b/packages/web/graphql/fragments.ts index 588dc467..aa6ed6a8 100644 --- a/packages/web/graphql/fragments.ts +++ b/packages/web/graphql/fragments.ts @@ -34,8 +34,8 @@ export const PlayerFragment = gql` profile_cache { description emoji - backgroundImageUrl - imageUrl + backgroundImageURL + imageURL location name } diff --git a/packages/web/lib/hooks/brightId.ts b/packages/web/lib/hooks/brightId.ts index 146ac42c..b4bf60b8 100644 --- a/packages/web/lib/hooks/brightId.ts +++ b/packages/web/lib/hooks/brightId.ts @@ -3,9 +3,9 @@ import { PlayerFragmentFragment } from 'graphql/autogen/types'; import { useEffect, useMemo } from 'react'; const BRIGHTID_CONTEXT = 'MetaGame'; -const DEEPLINK_ENDPOINT = `brightid://link-verification/${CONFIG.brightIdNodeUrl}/${BRIGHTID_CONTEXT}`; -const UNIVERSAL_LINK_ENDPOINT = `${CONFIG.brightIdAppUrl}/link-verification/${CONFIG.brightIdNodeUrl}/${CONFIG.brightIdNodeUrl}/${BRIGHTID_CONTEXT}`; -const VERIFICATION_ENDPOINT = `${CONFIG.brightIdAppUrl}/node/v5/verifications/${BRIGHTID_CONTEXT}`; +const DEEPLINK_ENDPOINT = `brightid://link-verification/${CONFIG.brightIdNodeURL}/${BRIGHTID_CONTEXT}`; +const UNIVERSAL_LINK_ENDPOINT = `${CONFIG.brightIdAppURL}/link-verification/${CONFIG.brightIdNodeURL}/${CONFIG.brightIdNodeURL}/${BRIGHTID_CONTEXT}`; +const VERIFICATION_ENDPOINT = `${CONFIG.brightIdAppURL}/node/v5/verifications/${BRIGHTID_CONTEXT}`; const POLL_INTERVAL = 5000; type BrightIdVerificationStatus = diff --git a/packages/web/utils/playerHelpers.ts b/packages/web/utils/playerHelpers.ts index d1c6759f..1a764f0e 100644 --- a/packages/web/utils/playerHelpers.ts +++ b/packages/web/utils/playerHelpers.ts @@ -6,7 +6,6 @@ import { PlayerFragmentFragment } from '../graphql/autogen/types'; export const getPlayerImage = (player: PlayerFragmentFragment): string => player.profile_cache?.imageURL || `https://avatars.dicebear.com/api/jdenticon/${player.username}.svg`; - export const getPlayerCoverImage = (player: PlayerFragmentFragment): string => player.profile_cache?.backgroundImageURL || BackgroundImage;