archive/nntpchan
Archived
1
0
Fork 0
Code

fix feed policy logic

Browse Source
This commit is contained in:
Jeff Becker 2017-04-23 07:53:56 -04:00
parent 8d4778c2d7
commit 9e291b1c5a
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
contrib/backends/srndv2/src/srnd/policy.go
View File

@ -4,8 +4,8 @@
package srnd package srnd
import ( import (
"log"
"regexp" "regexp"
"strings"
) )
type FeedPolicy struct { type FeedPolicy struct {
@ -15,18 +15,22 @@ type FeedPolicy struct {
// do we allow this newsgroup? // do we allow this newsgroup?
func (self *FeedPolicy) AllowsNewsgroup(newsgroup string) (result bool) { func (self *FeedPolicy) AllowsNewsgroup(newsgroup string) (result bool) {
var k, v string var k, v string
var allows, disallows int
for k, v = range self.rules { for k, v = range self.rules {
v = strings.Trim(v, " ")
match, err := regexp.MatchString(k, newsgroup) match, err := regexp.MatchString(k, newsgroup)
if err != nil { if err == nil {
log.Fatal(err) if match {
} if v == "1" {
if match { allows++
if v == "0" { } else if v == "0" {
return false disallows++
} else if v == "1" { }
result = true
} }
} }
} }
return result
result = allows > 0 && disallows == 0
return
} }