Merge pull request #364 from rtrox/develop

std/msgfilter.go

@@ -68,6 +68,14 @@ func (f *msgFilter) IsByBot(evt interface{}) interface{} {
 	return messageIsBot(evt, true)
 }
 
+func (f *msgFilter) NotByWebhook(evt interface{}) interface{} {
+	return messageIsWebhook(evt, false)
+}
+
+func (f *msgFilter) IsByWebhook(evt interface{}) interface{} {
+	return messageIsWebhook(evt, true)
+}
+
 func (f *msgFilter) HasBotMentionPrefix(evt interface{}) interface{} {
 	return messageHasPrefix(evt, mentionString(f.botID))
 }

std/msgfilter_test.go

@@ -98,6 +98,86 @@ func TestMsgFilter_IsByBot(t *testing.T) {
 	}
 }
 
+func TestMsgFilter_NotByWebhook(t *testing.T) {
+	var webhookID disgord.Snowflake = 456
+	var botID disgord.Snowflake = 123
+
+	messageWithWebhookID := &disgord.Message{
+		Author:    &disgord.User{},
+		WebhookID: webhookID,
+	}
+
+	messageWithoutWebhookID := &disgord.Message{
+		Author:    &disgord.User{},
+		WebhookID: 0,
+	}
+
+	testCases := []struct {
+		name              string
+		evt               interface{}
+		shouldPassThrough bool
+	}{
+		{"MessageCreate_FromWebhook", &disgord.MessageCreate{Message: messageWithWebhookID}, false},
+		{"MessageUpdate_FromWebhook", &disgord.MessageUpdate{Message: messageWithWebhookID}, false},
+		{"MessageCreate_NotWebhook", &disgord.MessageCreate{Message: messageWithoutWebhookID}, true},
+		{"MessageUpdate_NotWebhook", &disgord.MessageUpdate{Message: messageWithoutWebhookID}, true},
+	}
+
+	filter, _ := newMsgFilter(context.Background(), &clientRESTMock{id: botID})
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			result := filter.NotByWebhook(tc.evt)
+			if tc.shouldPassThrough && result == nil {
+				t.Error("expected to passthrough")
+			}
+			if !tc.shouldPassThrough && result != nil {
+				t.Error("expected a filter match")
+			}
+		})
+	}
+}
+
+func TestMsgFilter_IsByWebhook(t *testing.T) {
+	var webhookID disgord.Snowflake = 456
+	var botID disgord.Snowflake = 123
+
+	messageWithWebhookID := &disgord.Message{
+		Author:    &disgord.User{},
+		WebhookID: webhookID,
+	}
+
+	messageWithoutWebhookID := &disgord.Message{
+		Author:    &disgord.User{},
+		WebhookID: 0,
+	}
+
+	testCases := []struct {
+		name              string
+		evt               interface{}
+		shouldPassThrough bool
+	}{
+		{"MessageCreate_FromWebhook", &disgord.MessageCreate{Message: messageWithWebhookID}, true},
+		{"MessageUpdate_FromWebhook", &disgord.MessageUpdate{Message: messageWithWebhookID}, true},
+		{"MessageCreate_NotWebhook", &disgord.MessageCreate{Message: messageWithoutWebhookID}, false},
+		{"MessageUpdate_NotWebhook", &disgord.MessageUpdate{Message: messageWithoutWebhookID}, false},
+	}
+
+	filter, _ := newMsgFilter(context.Background(), &clientRESTMock{id: botID})
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			result := filter.IsByWebhook(tc.evt)
+			if tc.shouldPassThrough && result == nil {
+				t.Error("expected to passthrough")
+			}
+			if !tc.shouldPassThrough && result != nil {
+				t.Error("expected a filter match")
+			}
+		})
+	}
+}
+
 func TestMsgFilter_ContainsBotMention(t *testing.T) {
 	var botID disgord.Snowflake = 123
 	filter, _ := newMsgFilter(context.Background(), &clientRESTMock{id: botID})

std/utils.go

@@ -117,3 +117,20 @@ func messageIsBot(evt interface{}, isBot bool) interface{} {
 
 	return evt
 }
+
+func messageIsWebhook(evt interface{}, isWebhook bool) interface{} {
+	var msg *disgord.Message
+	if msg = getMsg(evt); msg == nil {
+		return nil
+	}
+
+	// Webhook ID is only set if message is sourced from a webhook.
+	// https://discord.com/developers/docs/resources/channel#message-object-message-structure
+	// "You can tell if a message is generated by a webhook by checking for the webhook_id
+	// on the message object."
+	if msg.WebhookID.IsZero() == isWebhook {
+		return nil
+	}
+
+	return evt
+}