fix for bug 363

finos · Aug 10, 2022 · 714e323 · 714e323
1 parent 0467bcf
commit 714e323
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...-spring-boot-starter/src/main/java/org/finos/springbot/symphony/form/ElementsHandler.java b/...-spring-boot-starter/src/main/java/org/finos/springbot/symphony/form/ElementsHandler.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.symphony.bdk.gen.api.model.StreamType;
 import org.finos.springbot.entityjson.EntityJson;
 import org.finos.springbot.symphony.conversations.SymphonyConversations;
 import org.finos.springbot.workflow.actions.Action;
@@ -66,7 +67,10 @@ public void accept(RealTimeEvent<V4SymphonyElementsAction> event) {
 			}
 
 			EntityJson data = retrieveData(action.getFormMessageId());
-			Addressable rr = ruBuilder.loadRoomById(action.getStream().getStreamId());
+			Addressable rr = null;
+			if(action.getStream().getStreamType().equals(StreamType.TypeEnum.ROOM)) {
+				rr = ruBuilder.loadRoomById(action.getStream().getStreamId());
+			}
 			User u = ruBuilder.loadUserById(event.getInitiator().getUser().getUserId());
 
 			// if we're not in a room, address the user directly.

diff --git a/...ot-starter/src/main/java/org/finos/springbot/symphony/messages/PresentationMLHandler.java b/...ot-starter/src/main/java/org/finos/springbot/symphony/messages/PresentationMLHandler.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import com.symphony.bdk.gen.api.model.StreamType;
 import org.finos.springbot.entityjson.EntityJson;
 import org.finos.springbot.symphony.content.serialization.MessageMLParser;
 import org.finos.springbot.symphony.conversations.SymphonyConversations;
@@ -51,7 +52,10 @@ public void onApplicationEvent(RealTimeEvent<V4MessageSent> t) {
 
 				EntityJson ej = jsonConverter.readValue(ms.getMessage().getData());
 				Message words = messageParser.apply(ms.getMessage().getMessage(), ej);
-				Addressable rr = ruBuilder.loadRoomById(ms.getMessage().getStream().getStreamId());
+				Addressable rr = null;
+				if(ms.getMessage().getStream().getStreamType().equals(StreamType.TypeEnum.ROOM)) {
+					rr = ruBuilder.loadRoomById(ms.getMessage().getStream().getStreamId());
+				}
 				User u = ruBuilder.loadUserById(ms.getMessage().getUser().getUserId());
 
 				// TODO: multi-user chat (not room)