peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Check exclude regex on HTML as well

Browse Source
This commit is contained in:
Peter Stuifzand 2018-08-05 21:01:55 +02:00
parent 6ed7dc8ddb
commit d89dac6159
Signed by: peter
GPG Key ID: 374322D56E5209E8
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/eksterd/memory.go
View File

@ -641,6 +641,10 @@ func (b *memoryBackend) Fetch3(channel, fetchURL string) (*http.Response, error)
} }
func (b *memoryBackend) channelAddItemWithMatcher(conn redis.Conn, channel string, item microsub.Item) error { func (b *memoryBackend) channelAddItemWithMatcher(conn redis.Conn, channel string, item microsub.Item) error {
// an item is posted
// check for all channels as channel
// if regex matches item
// - add item to channel
for channelKey, setting := range b.Settings { for channelKey, setting := range b.Settings {
if setting.IncludeRegex != "" { if setting.IncludeRegex != "" {
included := false included := false
@ -671,9 +675,15 @@ func (b *memoryBackend) channelAddItemWithMatcher(conn redis.Conn, channel strin
if err != nil { if err != nil {
log.Printf("error in regexp: %q\n", excludeRegex) log.Printf("error in regexp: %q\n", excludeRegex)
} else { } else {
if item.Content != nil && excludeRegex.MatchString(item.Content.Text) { if item.Content != nil {
log.Printf("Excluded %#v\n", item) if excludeRegex.MatchString(item.Content.Text) {
return nil log.Printf("Excluded %#v\n", item)
return nil
}
if excludeRegex.MatchString(item.Content.HTML) {
log.Printf("Excluded %#v\n", item)
return nil
}
} }
if excludeRegex.MatchString(item.Name) { if excludeRegex.MatchString(item.Name) {