apps/streamctl
1
0
Fork 0
mirror of https://github.com/xaionaro-go/streamctl.git synced 2025-10-04 07:06:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add MessageFormatType passing through
Some checks failed
rolling-release / build (push) Has been cancelled
Details
rolling-release / rolling-release (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dmitrii Okunev
2025-08-15 04:12:37 +01:00
parent 4f59735ea8
commit 1d65b36720
6 changed files with 135 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/streamcontrol/event.go
View File

@@ -15,7 +15,7 @@ type ChatMessage struct {
Username string Username string
MessageID ChatMessageID MessageID ChatMessageID
Message string Message string
FormatType TextFormatType MessageFormatType TextFormatType
Paid Money Paid Money
} }

2
pkg/streamcontrol/kick/chat_handler_obsolete.go
View File

@@ -161,7 +161,7 @@ func (h *ChatHandlerOBSOLETE) sendMessage(
Username: msg.Sender.Slug, Username: msg.Sender.Slug,
MessageID: streamcontrol.ChatMessageID(msg.ID), MessageID: streamcontrol.ChatMessageID(msg.ID),
Message: msg.Content, Message: msg.Content,
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}: }:
default: default:
} }

2
pkg/streamcontrol/twitch/chat_handler_irc.go
View File

@@ -98,7 +98,7 @@ func newChatHandlerIRC(
Username: ev.Sender.Username, Username: ev.Sender.Username,
MessageID: streamcontrol.ChatMessageID(ev.ID), MessageID: streamcontrol.ChatMessageID(ev.ID),
Message: ev.Text, // TODO: investigate if we need ev.IRCMessage.Text Message: ev.Text, // TODO: investigate if we need ev.IRCMessage.Text
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}: }:
default: default:
logger.Warnf(ctx, "the queue is full, skipping the message") logger.Warnf(ctx, "the queue is full, skipping the message")

26
pkg/streamcontrol/twitch/chat_handler_sub.go
View File

@@ -101,7 +101,7 @@ func NewChatHandlerSub(
Username: event.UserName, Username: event.UserName,
MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID), MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID),
Message: event.Message.Text, Message: event.Message.Text,
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventChannelAdBreakBegin(func(event twitcheventsub.EventChannelAdBreakBegin, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventChannelAdBreakBegin(func(event twitcheventsub.EventChannelAdBreakBegin, msg twitcheventsub.NotificationMessage) {
@@ -112,7 +112,7 @@ func NewChatHandlerSub(
Username: "Twitch", Username: "Twitch",
MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID), MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID),
Message: fmt.Sprintf("%d seconds", event.DurationSeconds), Message: fmt.Sprintf("%d seconds", event.DurationSeconds),
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventChannelBan(func(event twitcheventsub.EventChannelBan, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventChannelBan(func(event twitcheventsub.EventChannelBan, msg twitcheventsub.NotificationMessage) {
@@ -123,7 +123,7 @@ func NewChatHandlerSub(
Username: event.UserName, Username: event.UserName,
MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID), MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID),
Message: event.Reason, Message: event.Reason,
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventChannelCheer(func(event twitcheventsub.EventChannelCheer, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventChannelCheer(func(event twitcheventsub.EventChannelCheer, msg twitcheventsub.NotificationMessage) {
@@ -138,7 +138,7 @@ func NewChatHandlerSub(
Currency: streamcontrol.CurrencyBits, Currency: streamcontrol.CurrencyBits,
Amount: float64(event.Bits), Amount: float64(event.Bits),
}, },
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventChannelFollow(func(event twitcheventsub.EventChannelFollow, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventChannelFollow(func(event twitcheventsub.EventChannelFollow, msg twitcheventsub.NotificationMessage) {
@@ -149,7 +149,7 @@ func NewChatHandlerSub(
Username: event.UserName, Username: event.UserName,
MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID), MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID),
Message: "", Message: "",
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventChannelRaid(func(event twitcheventsub.EventChannelRaid, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventChannelRaid(func(event twitcheventsub.EventChannelRaid, msg twitcheventsub.NotificationMessage) {
@@ -160,7 +160,7 @@ func NewChatHandlerSub(
Username: event.FromBroadcasterUserName, Username: event.FromBroadcasterUserName,
MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID), MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID),
Message: fmt.Sprintf("%d viewers", event.Viewers), Message: fmt.Sprintf("%d viewers", event.Viewers),
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventChannelShoutoutReceive(func(event twitcheventsub.EventChannelShoutoutReceive, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventChannelShoutoutReceive(func(event twitcheventsub.EventChannelShoutoutReceive, msg twitcheventsub.NotificationMessage) {
@@ -171,7 +171,7 @@ func NewChatHandlerSub(
Username: event.FromBroadcasterUserName, Username: event.FromBroadcasterUserName,
MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID), MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID),
Message: fmt.Sprintf("%d viewers", event.ViewerCount), Message: fmt.Sprintf("%d viewers", event.ViewerCount),
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventChannelSubscribe(func(event twitcheventsub.EventChannelSubscribe, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventChannelSubscribe(func(event twitcheventsub.EventChannelSubscribe, msg twitcheventsub.NotificationMessage) {
@@ -188,7 +188,7 @@ func NewChatHandlerSub(
Username: event.UserName, Username: event.UserName,
MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID), MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID),
Message: strings.Join(description, " "), Message: strings.Join(description, " "),
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventChannelSubscriptionMessage(func(event twitcheventsub.EventChannelSubscriptionMessage, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventChannelSubscriptionMessage(func(event twitcheventsub.EventChannelSubscriptionMessage, msg twitcheventsub.NotificationMessage) {
@@ -202,7 +202,7 @@ func NewChatHandlerSub(
"%d months (%d in total), tier '%s', message: %s", "%d months (%d in total), tier '%s', message: %s",
event.DurationMonths, event.CumulativeMonths, event.Tier, event.Message.Text, event.DurationMonths, event.CumulativeMonths, event.Tier, event.Message.Text,
), ),
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventChannelSubscriptionGift(func(event twitcheventsub.EventChannelSubscriptionGift, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventChannelSubscriptionGift(func(event twitcheventsub.EventChannelSubscriptionGift, msg twitcheventsub.NotificationMessage) {
@@ -216,7 +216,7 @@ func NewChatHandlerSub(
"gift: %d subs, tier '%s'", "gift: %d subs, tier '%s'",
event.Total, event.Tier, event.Total, event.Tier,
), ),
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventStreamOnline(func(event twitcheventsub.EventStreamOnline, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventStreamOnline(func(event twitcheventsub.EventStreamOnline, msg twitcheventsub.NotificationMessage) {
@@ -227,7 +227,7 @@ func NewChatHandlerSub(
Username: event.BroadcasterUserName, Username: event.BroadcasterUserName,
MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID), MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID),
Message: event.StartedAt.Format(time.DateTime), Message: event.StartedAt.Format(time.DateTime),
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventStreamOffline(func(event twitcheventsub.EventStreamOffline, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventStreamOffline(func(event twitcheventsub.EventStreamOffline, msg twitcheventsub.NotificationMessage) {
@@ -238,7 +238,7 @@ func NewChatHandlerSub(
Username: event.BroadcasterUserName, Username: event.BroadcasterUserName,
MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID), MessageID: streamcontrol.ChatMessageID(msg.Metadata.MessageID),
Message: "", Message: "",
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })
eventSubClient.OnEventChannelChatMessage(func(chatEvent twitcheventsub.EventChannelChatMessage, msg twitcheventsub.NotificationMessage) { eventSubClient.OnEventChannelChatMessage(func(chatEvent twitcheventsub.EventChannelChatMessage, msg twitcheventsub.NotificationMessage) {
@@ -254,7 +254,7 @@ func NewChatHandlerSub(
Username: chatEvent.ChatterUserName, Username: chatEvent.ChatterUserName,
MessageID: streamcontrol.ChatMessageID(chatEvent.MessageId), MessageID: streamcontrol.ChatMessageID(chatEvent.MessageId),
Message: chatEvent.Message.Text, Message: chatEvent.Message.Text,
FormatType: streamcontrol.TextFormatTypePlain, MessageFormatType: streamcontrol.TextFormatTypePlain,
}) })
}) })

2
pkg/streamcontrol/youtube/chat_listener_obsolete.go
View File

@@ -152,7 +152,7 @@ func (l *ChatListenerOBSOLETE) listenLoop(ctx context.Context) (_err error) {
// in the mean while we we use a soft key for that: // in the mean while we we use a soft key for that:
MessageID: streamcontrol.ChatMessageID(fmt.Sprintf("%s/%s", msg.AuthorName, msg.Message)), MessageID: streamcontrol.ChatMessageID(fmt.Sprintf("%s/%s", msg.AuthorName, msg.Message)),
Message: text, Message: text,
FormatType: format, MessageFormatType: format,
} }
} }
} }

32
pkg/streamd/grpc/goconv/platform_event.go
View File

@@ -22,6 +22,22 @@ func ChatMessageGo2GRPC(
UsernameReadable: xstring.ToReadable(event.Username), UsernameReadable: xstring.ToReadable(event.Username),
MessageID: string(event.MessageID), MessageID: string(event.MessageID),
Message: event.Message, Message: event.Message,
MessageFormatType: MessageFormatTypeGo2GRPC(event.MessageFormatType),
}
}
func MessageFormatTypeGo2GRPC(
formatType streamcontrol.TextFormatType,
) streamd_grpc.TextFormatType {
switch formatType {
case streamcontrol.TextFormatTypePlain:
return streamd_grpc.TextFormatType_TEXT_FORMAT_TYPE_PLAIN
case streamcontrol.TextFormatTypeMarkdown:
return streamd_grpc.TextFormatType_TEXT_FORMAT_TYPE_MARKDOWN
case streamcontrol.TextFormatTypeHTML:
return streamd_grpc.TextFormatType_TEXT_FORMAT_TYPE_HTML
default:
return streamd_grpc.TextFormatType_TEXT_FORMAT_TYPE_UNDEFINED
} }
} }
@@ -40,7 +56,23 @@ func ChatMessageGRPC2Go(
Username: event.GetUsername(), Username: event.GetUsername(),
MessageID: streamcontrol.ChatMessageID(event.GetMessageID()), MessageID: streamcontrol.ChatMessageID(event.GetMessageID()),
Message: event.GetMessage(), Message: event.GetMessage(),
MessageFormatType: MessageFormatTypeGRPC2Go(event.GetMessageFormatType()),
}, },
Platform: streamcontrol.PlatformName(event.GetPlatID()), Platform: streamcontrol.PlatformName(event.GetPlatID()),
} }
} }
func MessageFormatTypeGRPC2Go(
formatType streamd_grpc.TextFormatType,
) streamcontrol.TextFormatType {
switch formatType {
case streamd_grpc.TextFormatType_TEXT_FORMAT_TYPE_PLAIN:
return streamcontrol.TextFormatTypePlain
case streamd_grpc.TextFormatType_TEXT_FORMAT_TYPE_MARKDOWN:
return streamcontrol.TextFormatTypeMarkdown
case streamd_grpc.TextFormatType_TEXT_FORMAT_TYPE_HTML:
return streamcontrol.TextFormatTypeHTML
default:
return streamcontrol.TextFormatTypeUndefined
}
}