Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

# 363 Error message through in 9.x if you send IM message #364

Merged
merged 2 commits into from
Aug 19, 2022
Merged

# 363 Error message through in 9.x if you send IM message #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
714e323
fix for bug 363
jasmintailor-db Aug 10, 2022
8a915a6
changes to fix ml handler issue
jasmintailor-db Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...-spring-boot-starter/src/main/java/org/finos/springbot/symphony/form/ElementsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.name())) {
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.
Expand Down
6 changes: 5 additions & 1 deletion ...ot-starter/src/main/java/org/finos/springbot/symphony/messages/PresentationMLHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.name())) {
rr = ruBuilder.loadRoomById(ms.getMessage().getStream().getStreamId());
}
User u = ruBuilder.loadUserById(ms.getMessage().getUser().getUserId());

// TODO: multi-user chat (not room)
Expand Down