Added And predicate

mymmrac · Nov 8, 2023 · 1c5bff5 · 1c5bff5
1 parent aecb493
commit 1c5bff5
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 3 deletions.
diff --git a/internal/test/main.go b/internal/test/main.go
@@ -385,7 +385,7 @@ func main() {
 			m := tu.Message(tu.ID(msg.Chat.ID), "Run usage:\n```/run test```\n```/run update```")
 			m.ParseMode = telego.ModeMarkdownV2
 			_, _ = bot.SendMessage(m)
-		}, th.Union(
+		}, th.Or(
 			th.CommandEqualArgc("run", 0),
 			th.CommandEqualArgv("help", "run"),
 		))

diff --git a/telegohandler/predicates.go b/telegohandler/predicates.go
@@ -7,8 +7,20 @@ import (
 	"github.com/mymmrac/telego"
 )
 
-// Union is true if at least one of the predicates is true
-func Union(predicates ...Predicate) Predicate {
+// And is true if all the predicates are true
+func And(predicates ...Predicate) Predicate {
+	return func(update telego.Update) bool {
+		for _, p := range predicates {
+			if !p(update) {
+				return false
+			}
+		}
+		return true
+	}
+}
+
+// Or is true if at least one of the predicates is true
+func Or(predicates ...Predicate) Predicate {
 	return func(update telego.Update) bool {
 		for _, p := range predicates {
 			if p(update) {
@@ -19,6 +31,13 @@ func Union(predicates ...Predicate) Predicate {
 	}
 }
 
+// Union is true if at least one of the predicates is true
+//
+// Deprecated: Use [Or] predicate instead
+func Union(predicates ...Predicate) Predicate {
+	return Or(predicates...)
+}
+
 // Not is true if predicate is false
 func Not(predicate Predicate) Predicate {
 	return func(update telego.Update) bool {

diff --git a/telegohandler/predicates_test.go b/telegohandler/predicates_test.go
@@ -27,6 +27,42 @@ func TestPredicates(t *testing.T) {
 		update    telego.Update
 		matches   bool
 	}{
+		{
+			name: "and_matches",
+			predicate: And(
+				func(update telego.Update) bool { return true },
+				func(update telego.Update) bool { return true },
+			),
+			update:  telego.Update{},
+			matches: true,
+		},
+		{
+			name: "and_not_matches",
+			predicate: And(
+				func(update telego.Update) bool { return true },
+				func(update telego.Update) bool { return false },
+			),
+			update:  telego.Update{},
+			matches: false,
+		},
+		{
+			name: "or_matches",
+			predicate: Or(
+				func(update telego.Update) bool { return true },
+				func(update telego.Update) bool { return false },
+			),
+			update:  telego.Update{},
+			matches: true,
+		},
+		{
+			name: "or_not_matches",
+			predicate: Or(
+				func(update telego.Update) bool { return false },
+				func(update telego.Update) bool { return false },
+			),
+			update:  telego.Update{},
+			matches: false,
+		},
 		{
 			name: "union_matches",
 			predicate: Union(