From 3d974356d06fa8b06cb2a3013ead3cb6c69f5986 Mon Sep 17 00:00:00 2001 From: Mohamed Marrouchi Date: Thu, 19 Dec 2024 14:38:19 +0100 Subject: [PATCH 1/2] fix: type getMessage() --- api/src/channel/lib/EventWrapper.ts | 2 +- api/src/chat/services/conversation.service.ts | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/api/src/channel/lib/EventWrapper.ts b/api/src/channel/lib/EventWrapper.ts index e08b8043..b5ed69fd 100644 --- a/api/src/channel/lib/EventWrapper.ts +++ b/api/src/channel/lib/EventWrapper.ts @@ -227,7 +227,7 @@ export default abstract class EventWrapper< * * @returns The received message */ - abstract getMessage(): any; + abstract getMessage(): StdIncomingMessage; /** * Return the text message received diff --git a/api/src/chat/services/conversation.service.ts b/api/src/chat/services/conversation.service.ts index 6a7e5b31..cebc057a 100644 --- a/api/src/chat/services/conversation.service.ts +++ b/api/src/chat/services/conversation.service.ts @@ -136,11 +136,12 @@ export class ConversationService extends BaseService< } // Handle attachments (location, ...) - if (msgType === 'location') { - const coordinates = event.getMessage().coordinates; + const msg = event.getMessage(); + if (msgType === 'location' && 'coordinates' in msg) { + const coordinates = msg.coordinates; convo.context.user_location = { lat: 0, lon: 0 }; - convo.context.user_location.lat = parseFloat(coordinates.lat); - convo.context.user_location.lon = parseFloat(coordinates.lon); + convo.context.user_location.lat = parseFloat(coordinates.lat.toString()); + convo.context.user_location.lon = parseFloat(coordinates.lon.toString()); } else if (msgType === 'attachments') { // @TODO : deprecated in favor of geolocation msgType const attachments = event.getAttachments(); From 71864ba7ce43f761440975cdddb00e62429d2721 Mon Sep 17 00:00:00 2001 From: Mohamed Marrouchi Date: Thu, 19 Dec 2024 14:49:53 +0100 Subject: [PATCH 2/2] fix: locatation refactor --- api/src/chat/services/conversation.service.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/api/src/chat/services/conversation.service.ts b/api/src/chat/services/conversation.service.ts index cebc057a..fdd65cd2 100644 --- a/api/src/chat/services/conversation.service.ts +++ b/api/src/chat/services/conversation.service.ts @@ -139,9 +139,10 @@ export class ConversationService extends BaseService< const msg = event.getMessage(); if (msgType === 'location' && 'coordinates' in msg) { const coordinates = msg.coordinates; - convo.context.user_location = { lat: 0, lon: 0 }; - convo.context.user_location.lat = parseFloat(coordinates.lat.toString()); - convo.context.user_location.lon = parseFloat(coordinates.lon.toString()); + convo.context.user_location = { + lat: parseFloat(coordinates.lat.toString()), + lon: parseFloat(coordinates.lon.toString()), + }; } else if (msgType === 'attachments') { // @TODO : deprecated in favor of geolocation msgType const attachments = event.getAttachments();