diff --git a/chat/src/main/java/com/github/twitch4j/chat/events/IRCEventHandler.java b/chat/src/main/java/com/github/twitch4j/chat/events/IRCEventHandler.java
index ec447b5e9..c4e873249 100644
--- a/chat/src/main/java/com/github/twitch4j/chat/events/IRCEventHandler.java
+++ b/chat/src/main/java/com/github/twitch4j/chat/events/IRCEventHandler.java
@@ -92,14 +92,15 @@ public void onChannelMessage(IRCMessageEvent event) {
// Load Info
EventChannel channel = event.getChannel();
EventUser user = event.getUser();
+ String message = event.getMessage().get();
// Dispatch Event
- if(event.getMessage().get().startsWith("\u0001ACTION ")) {
+ if (message.startsWith("\u0001ACTION ") && message.endsWith("\u0001")) {
// Action
- eventManager.publish(new ChannelMessageActionEvent(channel, event, user, event.getMessage().get().substring(8), event.getClientPermissions()));
+ eventManager.publish(new ChannelMessageActionEvent(channel, event, user, message.substring(8, message.length() - 1), event.getClientPermissions()));
} else {
// Regular Message
- eventManager.publish(new ChannelMessageEvent(channel, event, user, event.getMessage().get(), event.getClientPermissions()));
+ eventManager.publish(new ChannelMessageEvent(channel, event, user, message, event.getClientPermissions()));
}
}
}
diff --git a/chat/src/main/java/com/github/twitch4j/chat/events/channel/ChannelMessageEvent.java b/chat/src/main/java/com/github/twitch4j/chat/events/channel/ChannelMessageEvent.java
index 2606fb03c..339150044 100644
--- a/chat/src/main/java/com/github/twitch4j/chat/events/channel/ChannelMessageEvent.java
+++ b/chat/src/main/java/com/github/twitch4j/chat/events/channel/ChannelMessageEvent.java
@@ -70,10 +70,13 @@ public class ChannelMessageEvent extends AbstractChannelEvent implements Replyab
/**
* Information regarding any associated Crowd Chant for this message, if applicable.
+ *
+ * @deprecated Will be disabled on 2022-02-02
*/
@Nullable
@Unofficial
@Getter(lazy = true)
+ @Deprecated
ChatCrowdChant chantInfo = ChatCrowdChant.parse(getMessageEvent());
/**
diff --git a/chat/src/main/java/com/github/twitch4j/chat/util/ChatCrowdChant.java b/chat/src/main/java/com/github/twitch4j/chat/util/ChatCrowdChant.java
index c1cd2520a..2b60da885 100644
--- a/chat/src/main/java/com/github/twitch4j/chat/util/ChatCrowdChant.java
+++ b/chat/src/main/java/com/github/twitch4j/chat/util/ChatCrowdChant.java
@@ -18,9 +18,11 @@
* Information regarding a Crowd Chant participation or initiation.
*
* @see Related Uservoice
+ * @deprecated Will be disabled on 2022-02-02
*/
@Value
@Unofficial
+@Deprecated
public class ChatCrowdChant {
public static final String CHANT_MSG_ID_TAG_NAME = "crowd-chant-parent-msg-id";
@@ -51,8 +53,10 @@ public class ChatCrowdChant {
* Sends the same message in the same channel to participate in the Crowd Chant, with the proper chat tag.
*
* @param chat an authenticated TwitchChat instance.
+ * @deprecated Will be disabled on 2022-02-02
*/
@Unofficial
+ @Deprecated
public void participate(ITwitchChat chat) {
Map tags = new LinkedHashMap<>();
tags.put(NONCE_TAG_NAME, CryptoUtils.generateNonce(32));