Merge pull request #5513 from decentraland/release/release-20230721

release: release 20230721

Author: 0xD-Fabio

.github/auto_assign_config.yml

@@ -6,7 +6,6 @@ numberOfReviewers: 1
 useReviewGroups: true
 reviewGroups:
   techleads:
-    - AjimenezDCL
     - Kinerius
     - mikhail-dcl
   devs:    

browser-interface/build.js

@@ -109,7 +109,8 @@ async function buildRendererProtocol() {
     fse.mkdirSync('packages/shared/protocol/')
 
     // Merge renderer-protocol to @dcl/protocol into a single folder
-    fse.copySync('./node_modules/@dcl/protocol', './protocol-temp/', { overwrite: false })
+    // `dereference: true` to avoid error when `@dcl/protocol` is linked
+    fse.copySync('./node_modules/@dcl/protocol', './protocol-temp/', { overwrite: false, dereference: true })
     fse.copySync('../renderer-protocol/', './protocol-temp/', { overwrite: false })
 
     // Generate the protocol files

browser-interface/package-lock.json

@@ -62,9 +62,9 @@
     "@dcl/hashing": "^1.1.3",
     "@dcl/kernel-interface": "^2.0.0-20230512115658.commit-b582e05",
     "@dcl/legacy-ecs": "^6.11.11",
-    "@dcl/protocol": "1.0.0-5543372274.commit-d0ed9f9",
+    "@dcl/protocol": "^1.0.0-5623934099.commit-07e0626",
     "@dcl/rpc": "^1.1.1",
-    "@dcl/scene-runtime": "7.0.6-20230713133325.commit-28e9c2a",
+    "@dcl/scene-runtime": "7.0.6-20230721154039.commit-22b60b9",
     "@dcl/schemas": "^7.4.1",
     "@dcl/urn-resolver": "^2.2.0",
     "@types/mocha": "^10.0.1",
@@ -74,7 +74,7 @@
     "crypto-browserify": "^3.12.0",
     "dcl-catalyst-client": "^14.0.9",
     "dcl-quests-client": "^2.10.0",
-    "dcl-social-client": "^1.27.0",
+    "dcl-social-client": "^1.27.1",
     "decentraland-ecs": "^6.11.11",
     "devtools-protocol": "0.0.1115542",
     "eth-connect": "^6.1.0",

browser-interface/package.json

@@ -17,9 +17,11 @@ import type {
   MovePlayerToResponse,
   OpenExternalUrlRequest,
   OpenNftDialogRequest,
+  SuccessResponse,
   TeleportToRequest,
   TriggerEmoteRequest,
-  TriggerEmoteResponse
+  TriggerEmoteResponse,
+  TriggerSceneEmoteRequest
 } from 'shared/protocol/decentraland/kernel/apis/restricted_actions.gen'
 import { RestrictedActionsServiceDefinition } from 'shared/protocol/decentraland/kernel/apis/restricted_actions.gen'
 import { changeRealm } from 'shared/dao'
@@ -87,6 +89,32 @@ export function triggerEmote(req: TriggerEmoteRequest, ctx: PortContext): Trigge
   return {}
 }
 
+export async function triggerSceneEmote(req: TriggerSceneEmoteRequest, ctx: PortContext): Promise<SuccessResponse> {
+  // checks permissions
+  assertHasPermission(PermissionItem.PI_ALLOW_TO_TRIGGER_AVATAR_EMOTE, ctx)
+
+  if (!isPositionValid(lastPlayerPosition, ctx)) {
+    ctx.logger.error('Error: Player is not inside of scene', lastPlayerPosition)
+    return { success: false }
+  }
+
+  const emoteService = getRendererModules(store.getState())?.emotes
+
+  if (!emoteService) {
+    return { success: false }
+  }
+
+  const request = {
+    path: req.src,
+    sceneNumber: ctx.sceneData.sceneNumber,
+    loop: req.loop ?? false
+  }
+
+  const response = await emoteService.triggerSceneExpression({ ...request })
+
+  return response
+}
+
 function isPositionValid(position: Vector3, ctx: PortContext) {
   return (
     ctx.sceneData!.isPortableExperience ||
@@ -172,6 +200,10 @@ export function registerRestrictedActionsServiceServerImplementation(port: RpcSe
         getRendererModules(store.getState())?.restrictedActions?.teleportTo({ worldCoordinates: req.worldCoordinates })
 
       return {}
+    },
+    async triggerSceneEmote(req: TriggerSceneEmoteRequest, ctx: PortContext) {
+      const response = await triggerSceneEmote(req, ctx)
+      return response
     }
   }))
 }

browser-interface/packages/shared/apis/host/RestrictedActions.ts

@@ -82,7 +82,7 @@ export type BodyShapeRepresentationV2 = {
   contents: KeyAndHash[]
 }
 
-type KeyAndHash = {
+export type KeyAndHash = {
   key: string
   hash: string
 }

browser-interface/packages/shared/catalogs/types.ts

@@ -984,8 +984,8 @@ export async function getPrivateMessages(getPrivateMessagesPayload: GetPrivateMe
   getUnityInstance().AddChatMessages(addChatMessagesPayload)
 }
 
-export function getUnseenMessagesByUser() {
-  const conversationsWithMessages = getAllFriendsConversationsWithMessages(store.getState())
+export async function getUnseenMessagesByUser() {
+  const conversationsWithMessages = await getAllFriendsConversationsWithMessages(store.getState())
 
   if (conversationsWithMessages.length === 0) {
     return
@@ -1006,7 +1006,7 @@ export function getUnseenMessagesByUser() {
 export async function getFriendsWithDirectMessages(request: GetFriendsWithDirectMessagesPayload) {
   const realmAdapter = await ensureRealmAdapter()
   const fetchContentServerWithPrefix = getFetchContentUrlPrefixFromRealmAdapter(realmAdapter)
-  const conversationsWithMessages = getAllFriendsConversationsWithMessages(store.getState())
+  const conversationsWithMessages = await getAllFriendsConversationsWithMessages(store.getState())
 
   if (conversationsWithMessages.length === 0) {
     return

browser-interface/packages/shared/friends/sagas.ts

@@ -42,13 +42,13 @@ export const getConversations = (
  * Get all conversations `ConversationType.DIRECT` with friends the user has befriended
  * @return `conversation` & `unreadMessages` boolean that indicates whether the conversation has unread messages.
  */
-export const getAllFriendsConversationsWithMessages = (
+export const getAllFriendsConversationsWithMessages = async (
   store: RootFriendsState
-): Array<{ conversation: Conversation; unreadMessages: boolean }> => {
+): Promise<Array<{ conversation: Conversation; unreadMessages: boolean} >> => {
   const client = getSocialClient(store)
   if (!client) return []
 
-  const conversations = client.getAllCurrentFriendsConversations()
+  const conversations = await client.getAllCurrentFriendsConversations()
 
   return conversations
     .filter((conv) => conv.conversation.hasMessages)