Merge pull request #191 from eloonstra/master

Add custom-reward-id to PrivateMessage struct
gempir · Jan 19, 2023 · 2d96376 · 2d96376
2 parents 002ba5c + b86e603
commit 2d96376
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 22 deletions.
diff --git a/client.go b/client.go
@@ -111,20 +111,21 @@ func (msg *WhisperMessage) GetType() MessageType {
 type PrivateMessage struct {
 	User User
 
-	Raw          string
-	Type         MessageType
-	RawType      string
-	Tags         map[string]string
-	Message      string
-	Channel      string
-	RoomID       string
-	ID           string
-	Time         time.Time
-	Emotes       []*Emote
-	Bits         int
-	Action       bool
-	FirstMessage bool
-	Reply        *Reply
+	Raw            string
+	Type           MessageType
+	RawType        string
+	Tags           map[string]string
+	Message        string
+	Channel        string
+	RoomID         string
+	ID             string
+	Time           time.Time
+	Emotes         []*Emote
+	Bits           int
+	Action         bool
+	FirstMessage   bool
+	Reply          *Reply
+	CustomRewardID string
 }
 
 type Reply struct {

diff --git a/message.go b/message.go
@@ -220,14 +220,15 @@ func parsePrivateMessage(message *ircMessage) Message {
 	privateMessage := PrivateMessage{
 		User: parseUser(message),
 
-		Raw:     message.Raw,
-		Type:    parseMessageType(message.Command),
-		RawType: message.Command,
-		Tags:    message.Tags,
-		RoomID:  message.Tags["room-id"],
-		ID:      message.Tags["id"],
-		Time:    parseTime(message.Tags["tmi-sent-ts"]),
-		Reply:   reply,
+		Raw:            message.Raw,
+		Type:           parseMessageType(message.Command),
+		RawType:        message.Command,
+		Tags:           message.Tags,
+		RoomID:         message.Tags["room-id"],
+		ID:             message.Tags["id"],
+		Time:           parseTime(message.Tags["tmi-sent-ts"]),
+		Reply:          reply,
+		CustomRewardID: message.Tags["custom-reward-id"],
 	}
 
 	if len(message.Params) == 2 {

diff --git a/message_test.go b/message_test.go
@@ -226,6 +226,30 @@ func TestCanParsePRIVMSGMessage(t *testing.T) {
 				},
 			},
 		},
+		{
+			"Message With Custom Reward ID",
+			"@badge-info=;badges=vip/1,bits/100;color=#FF69B4;custom-reward-id=ea98be77-c54e-49cd-bc52-d8290cf12ad8;display-name=eloonstra;emotes=;first-msg=0;flags=0-2:S.5;id=c46f5ea8-bbba-499d-a10f-96463d2955c1;mod=0;returning-chatter=0;room-id=75704631;subscriber=0;tmi-sent-ts=1674085692645;turbo=0;user-id=465396358;user-type=;vip=1 :[email protected] PRIVMSG #eloonstra :boing",
+			PrivateMessage{
+				User: User{
+					ID:          "465396358",
+					Name:        "eloonstra",
+					DisplayName: "eloonstra",
+					Color:       "#FF69B4",
+					Badges: map[string]int{
+						"vip":  1,
+						"bits": 100,
+					},
+				},
+				Type:           PRIVMSG,
+				RawType:        "PRIVMSG",
+				Message:        "boing",
+				Channel:        "eloonstra",
+				RoomID:         "75704631",
+				ID:             "c46f5ea8-bbba-499d-a10f-96463d2955c1",
+				FirstMessage:   false,
+				CustomRewardID: "ea98be77-c54e-49cd-bc52-d8290cf12ad8",
+			},
+		},
 	}
 
 	for _, tt := range tests {