Release: 20231113

browser-interface/packages/shared/profiles/sagas/fetchProfile/index.ts

@@ -16,6 +16,30 @@ import type { ProfileStatus } from '../../types'
 import { fetchPeerProfile } from '../comms'
 import { fetchCatalystProfile } from '../content'
 
+export function* fetchProfileFromCatalyst(userId: string, version: number) {
+  try {
+    const profile = yield call(fetchFromCatalyst, userId, version)
+
+    const avatar: Avatar = ensureAvatarCompatibilityFormat(profile)
+    avatar.userId = userId
+
+    if (yield select(isCurrentUserId, userId)) {
+      avatar.hasConnectedWeb3 = true
+    }
+
+    yield put(profileSuccess(avatar))
+    return avatar
+  } catch (error: any) {
+    debugger
+    trackEvent('error', {
+      context: 'kernel#saga',
+      message: `Error requesting profile for ${userId}: ${error}`,
+      stack: error.stack || ''
+    })
+    yield put(profileFailure(userId, `${error}`))
+  }
+}
+
 export function* fetchProfile(action: ProfileRequestAction): any {
   const { userId, minimumVersion } = action.payload
   const {

browser-interface/packages/shared/profiles/sagas/initialRemoteProfileLoad.ts

@@ -1,27 +1,41 @@
-import type { Avatar } from '@dcl/schemas'
-import { ethereumConfigurations, ETHEREUM_NETWORK, RESET_TUTORIAL } from 'config'
+import type {Avatar} from '@dcl/schemas'
+import {ETHEREUM_NETWORK, ethereumConfigurations, RESET_TUTORIAL} from 'config'
 import defaultLogger from 'lib/logger'
-import { call, put, select } from 'redux-saga/effects'
-import { BringDownClientAndReportFatalError, ErrorContext } from 'shared/loading/ReportFatalError'
-import { getCurrentIdentity, getCurrentNetwork } from 'shared/session/selectors'
-import type { ExplorerIdentity } from 'shared/session/types'
-import { fetchOwnedENS } from 'lib/web3/fetchOwnedENS'
-import { profileRequest, profileSuccess, saveProfileDelta } from '../actions'
-import { fetchProfile } from './fetchProfile'
-import { fetchLocalProfile } from './local/index'
-import { getFeatureFlagEnabled } from 'shared/meta/selectors'
+import {call, put, select} from 'redux-saga/effects'
+import {BringDownClientAndReportFatalError, ErrorContext} from 'shared/loading/ReportFatalError'
+import {getCurrentIdentity, getCurrentNetwork, isGuestLogin} from 'shared/session/selectors'
+import type {ExplorerIdentity} from 'shared/session/types'
+import {fetchOwnedENS} from 'lib/web3/fetchOwnedENS'
+import {profileSuccess, saveProfileDelta} from '../actions'
+import {fetchProfileFromCatalyst} from './fetchProfile'
+import {fetchLocalProfile} from './local/index'
+import {getFeatureFlagEnabled} from 'shared/meta/selectors'
+import {generateRandomUserProfile} from "../../../lib/decentraland/profiles";
+import {ensureAvatarCompatibilityFormat} from "../../../lib/decentraland/profiles/transformations";
 
 export function* initialRemoteProfileLoad() {
   // initialize profile
   const identity: ExplorerIdentity = yield select(getCurrentIdentity)
   const userId = identity.address
 
-  let profile: Avatar | null = yield call(fetchLocalProfile)
+  const isGuest = yield select(isGuestLogin)
+  let profile: Avatar | null = yield call(fetchLocalProfile, isGuest)
   try {
-    profile = yield call(
-      fetchProfile,
-      profileRequest(userId, profile && profile.userId === userId ? profile.version : 0)
-    )
+    if (!isGuest) {
+      const profileFromCatalyst = yield call(
+        fetchProfileFromCatalyst,
+        userId,
+        profile && profile.userId === userId ? profile.version : 0
+      )
+
+      if (profileFromCatalyst) {
+        profile = profileFromCatalyst;
+      }
+    }
+
+    if (!profile) {
+      profile = ensureAvatarCompatibilityFormat(generateRandomUserProfile(userId))
+    }
   } catch (e: any) {
     BringDownClientAndReportFatalError(e, ErrorContext.KERNEL_INIT, { userId })
     throw e

browser-interface/packages/shared/profiles/sagas/local/index.ts

@@ -1,21 +1,24 @@
 import type { Avatar } from '@dcl/schemas'
 import type { ETHEREUM_NETWORK } from 'config'
 import type { ExplorerIdentity } from 'shared/session/types'
-import { apply, put, select } from 'redux-saga/effects'
+import {apply, put, select} from 'redux-saga/effects'
 import { ensureAvatarCompatibilityFormat } from 'lib/decentraland/profiles/transformations/profileToServerFormat'
 import { localProfilesRepo } from './localProfilesRepo'
 import { getCurrentIdentity, getCurrentNetwork } from 'shared/session/selectors'
 import defaultLogger from 'lib/logger'
-import { profileSuccess } from 'shared/profiles/actions'
+import {profileSuccess} from "../../actions";
 
-export function* fetchLocalProfile() {
+export function* fetchLocalProfile(submit: boolean = false) {
   const network: ETHEREUM_NETWORK = yield select(getCurrentNetwork)
   const identity: ExplorerIdentity = yield select(getCurrentIdentity)
   const profile = (yield apply(localProfilesRepo, localProfilesRepo.get, [identity.address, network])) as Avatar | null
   if (profile && profile.userId === identity.address) {
     try {
-      const finalProfile = ensureAvatarCompatibilityFormat(profile)
-      yield put(profileSuccess(finalProfile))
+      const avatar = ensureAvatarCompatibilityFormat(profile);
+      if (submit) {
+        yield put(profileSuccess(avatar))
+      }
+      return avatar
     } catch (error) {
       defaultLogger.log(`Invalid profile stored: ${JSON.stringify(profile, null, 2)}`)
       return null

unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/AvatarShape/AvatarShape.cs

@@ -3,13 +3,13 @@
 using DCL.Components;
 using DCL.Configuration;
 using DCL.Controllers;
+using DCL.Emotes;
 using DCL.Helpers;
 using DCL.Interface;
 using DCL.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.ExceptionServices;
 using System.Threading;
 using UnityEngine;
 using LOD = AvatarSystem.LOD;
@@ -87,6 +87,8 @@ public class AvatarShape : MonoBehaviour, IHideAvatarAreaHandler, IPoolableObjec
 
         private Service<IAvatarFactory> avatarFactory;
         private Service<IEmotesCatalogService> emotesCatalog;
+        private IAvatarEmotesController emotesController;
+        private AvatarSceneEmoteHandler sceneEmoteHandler;
         public IAvatar internalAvatar => avatar;
 
         private void Awake()
@@ -104,11 +106,19 @@ private void Awake()
             LOD avatarLOD = new LOD(avatarContainer, visibility, avatarMovementController);
             AvatarAnimatorLegacy animator = GetComponentInChildren<AvatarAnimatorLegacy>();
 
+
             //Ensure base avatar references
             var baseAvatarReferences = baseAvatarContainer.GetComponentInChildren<IBaseAvatarReferences>() ?? Instantiate(baseAvatarReferencesPrefab, baseAvatarContainer);
 
             avatar = avatarFactory.Ref.CreateAvatarWithHologram(avatarContainer, new BaseAvatar(baseAvatarReferences), animator, avatarLOD, visibility);
 
+            emotesController = avatar.GetEmotesController();
+
+            sceneEmoteHandler = new AvatarSceneEmoteHandler(
+                emotesController,
+                Environment.i.serviceLocator.Get<IEmotesService>(),
+                new UserProfileWebInterfaceBridge());
+
             avatarReporterController ??= new AvatarReporterController(Environment.i.world.state);
 
             onPointerDown.OnPointerDownReport += PlayerClicked;
@@ -202,8 +212,11 @@ public async void ApplyModel(IParcelScene scene, IDCLEntity entity, PBAvatarShap
                 }
             }
 
-            // If the model contains a value for expressionTriggerId then we try it, if value doesn't exist, we skip
-            if(model.HasExpressionTriggerId)
+            if (sceneEmoteHandler.IsSceneEmote(model.ExpressionTriggerId))
+                sceneEmoteHandler
+                   .LoadAndPlayEmote(model.BodyShape, model.ExpressionTriggerId)
+                   .Forget();
+            else
                 avatar.GetEmotesController().PlayEmote(model.ExpressionTriggerId, model.GetExpressionTriggerTimestamp());
 
             UpdatePlayerStatus(entity, model);

unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/AvatarShape/DCL.ECSComponents.AvatarShape.asmdef

@@ -49,7 +49,8 @@
         "GUID:6c1761dc8f737004198eb333521bd665",
         "GUID:c8ea72e806cd2ab47b539b37895b86b7",
         "GUID:9cccce9925d3495d8a5e4fa5b25f54a5",
-        "GUID:2d39cc535b437e749965d4a8258f0c13"
+        "GUID:2d39cc535b437e749965d4a8258f0c13",
+        "GUID:0c0c18c12967b3944b844b79c47c2320"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/VideoPlayer/VideoPlayerHandler.cs

@@ -20,6 +20,7 @@ public class VideoPlayerHandler : IECSComponentHandler<PBVideoPlayer>
         private readonly ISettingsRepository<AudioSettings> audioSettings;
         private readonly DataStore_VirtualAudioMixer audioMixerDataStore;
         private readonly IntVariable currentPlayerSceneNumber;
+
         internal PBVideoPlayer lastModel = null;
         internal WebVideoPlayer videoPlayer;
 
@@ -118,6 +119,7 @@ public void OnComponentModelUpdated(IParcelScene scene, IDCLEntity entity, PBVid
                 videoPlayer.SetTime(model.GetPosition());
 
             UpdateVolume(model, audioSettings.Data, audioMixerDataStore.sceneSFXVolume.Get(), currentPlayerSceneNumber);
+
             videoPlayer.SetPlaybackRate(model.GetPlaybackRate());
             videoPlayer.SetLoop(model.GetLoop());
 

unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/VideoPlayer/VideoPlayerRegister.cs

@@ -20,6 +20,7 @@ public VideoPlayerRegister(int componentId, ECSComponentsFactory factory, IECSCo
                     Settings.i.audioSettings,
                     DataStore.i.virtualAudioMixer,
                     CommonScriptableObjects.sceneNumber));
+
             componentWriter.AddOrReplaceComponentSerializer<PBVideoPlayer>(componentId, ProtoSerialization.Serialize);
 
             this.factory = factory;