implement match with search

Author: mattn

filter.go

@@ -93,11 +93,17 @@ func (ef Filter) MatchesIgnoringTimestampConstraints(event *Event) bool {
 	}
 
 	if ef.Search != "" && event.Content != "" {
-		for _, word := range strings.Split(ef.Search, " ") {
-			if strings.Contains(event.Content, word) {
-				return true
+		found := true
+		content := strings.ToLower(strings.TrimSpace(event.Content))
+		for _, word := range strings.Fields(strings.ToLower(strings.ToLower(ef.Search))) {
+			if !strings.Contains(content, word) {
+				found = false
+				break
 			}
 		}
+		if !found {
+			return false
+		}
 	}
 
 	return true

filter_test.go

@@ -151,3 +151,22 @@ func TestTheoreticalLimit(t *testing.T) {
 	require.Equal(t, 24, GetTheoreticalLimit(Filter{Authors: []string{"a", "b", "c", "d", "e", "f"}, Kinds: []int{30023, 30024}, Tags: TagMap{"d": []string{"aaa", "bbb"}}}))
 	require.Equal(t, -1, GetTheoreticalLimit(Filter{Authors: []string{"a", "b", "c", "d", "e", "f"}, Kinds: []int{30023, 30024}}))
 }
+
+func TestFilterMatchSearch(t *testing.T) {
+	var filter Filter
+	var event Event
+
+	json.Unmarshal([]byte(`{"id":"5a127c9c931f392f6afc7fdb74e8be01c34035314735a6b97d2cf360d13cfb94","pubkey":"1d80e5588de010d137a67c42b03717595f5f510e73e42cfc48f31bae91844d59","created_at":1677033299,"kind":1,"tags":[["t","japan"]],"content":"If you like my art,I'd appreciate a coin or two!!\nZap is welcome!! Thanks.\n\n\n#japan #bitcoin #art #bananaart\nhttps://void.cat/d/CgM1bzDgHUCtiNNwfX9ajY.webp","sig":"828497508487ca1e374f6b4f2bba7487bc09fccd5cc0d1baa82846a944f8c5766918abf5878a580f1e6615de91f5b57a32e34c42ee2747c983aaf47dbf2a0255"}`), &event)
+
+	json.Unmarshal([]byte(`{"kinds":[1],"authors":["a8171781fd9e90ede3ea44ddca5d3abf828fe8eedeb0f3abb0dd3e563562e1fc","1d80e5588de010d137a67c42b03717595f5f510e73e42cfc48f31bae91844d59","ed4ca520e9929dfe9efdadf4011b53d30afd0678a09aa026927e60e7a45d9244"],"since":1677033299,"search":"nostr"}`), &filter)
+	assert.False(t, filter.Matches(&event), "should not match")
+
+	json.Unmarshal([]byte(`{"kinds":[1],"authors":["a8171781fd9e90ede3ea44ddca5d3abf828fe8eedeb0f3abb0dd3e563562e1fc","1d80e5588de010d137a67c42b03717595f5f510e73e42cfc48f31bae91844d59","ed4ca520e9929dfe9efdadf4011b53d30afd0678a09aa026927e60e7a45d9244"],"since":1677033299,"search":"YOU"}`), &filter)
+	assert.True(t, filter.Matches(&event), "match with uppercase search failed")
+
+	json.Unmarshal([]byte(`{"kinds":[1],"authors":["a8171781fd9e90ede3ea44ddca5d3abf828fe8eedeb0f3abb0dd3e563562e1fc","1d80e5588de010d137a67c42b03717595f5f510e73e42cfc48f31bae91844d59","ed4ca520e9929dfe9efdadf4011b53d30afd0678a09aa026927e60e7a45d9244"],"since":1677033299,"search":"you"}`), &filter)
+	assert.True(t, filter.Matches(&event), "match with lowercase search failed")
+
+	json.Unmarshal([]byte(`{"kinds":[1],"authors":["a8171781fd9e90ede3ea44ddca5d3abf828fe8eedeb0f3abb0dd3e563562e1fc","1d80e5588de010d137a67c42b03717595f5f510e73e42cfc48f31bae91844d59","ed4ca520e9929dfe9efdadf4011b53d30afd0678a09aa026927e60e7a45d9244"],"since":1677033299,"search":"Zap you"}`), &filter)
+	assert.True(t, filter.Matches(&event), "match with lowercase search failed")
+}