archive/nntpchan
Archived
1
0
Fork 0
Code

fix build

Browse Source
This commit is contained in:
Jeff Becker 2018-11-06 15:15:51 -05:00
parent 95448d82f0
commit 5b8326745c
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/backends/srndv2/src/srnd/daemon.go
View File

@ -537,7 +537,9 @@ func (self *NNTPDaemon) ExpireAll() {
func (self *NNTPDaemon) MarkSpam(msgid string) { func (self *NNTPDaemon) MarkSpam(msgid string) {
if ValidMessageID(msgid) { if ValidMessageID(msgid) {
self.modEngine.MarkSpam(msgid) if self.mod != nil {
self.mod.MarkSpam(msgid)
}
} }
} }

1
contrib/backends/srndv2/src/srnd/mod.go
View File

@ -215,6 +215,7 @@ func (self *modEngine) MarkSpam(msgid string) (err error) {
if self.spam == nil { if self.spam == nil {
err = self.store.MarkSpam(msgid) err = self.store.MarkSpam(msgid)
} else { } else {
var f io.ReadCloser
f, err = self.store.OpenMessage(msgid) f, err = self.store.OpenMessage(msgid)
if err == nil { if err == nil {
err = self.spam.MarkSpam(f) err = self.spam.MarkSpam(f)

5
contrib/backends/srndv2/src/srnd/mod_http.go
View File

@ -531,7 +531,8 @@ func (self httpModUI) HandlePostSpam(wr http.ResponseWriter, r *http.Request) {
resp := make(map[string]interface{}) resp := make(map[string]interface{})
self.asAuthed("spam", func(path string) { self.asAuthed("spam", func(path string) {
var mm ModMessage var mm ModMessage
keys := string.Split(r.FormValue("spam"), ",") var err error
keys := strings.Split(r.FormValue("spam"), ",")
for _, k := range keys { for _, k := range keys {
k = strings.TrimSpace(k) k = strings.TrimSpace(k)
go self.daemon.MarkSpam(k) go self.daemon.MarkSpam(k)
@ -552,7 +553,7 @@ func (self httpModUI) HandlePostSpam(wr http.ResponseWriter, r *http.Request) {
} }
resp["error"] = err resp["error"] = err
} }
}) }, wr, r)
json.NewEncoder(wr).Encode(resp) json.NewEncoder(wr).Encode(resp)
} }

6
contrib/backends/srndv2/src/srnd/spam.go
View File

@ -36,7 +36,7 @@ type SpamResult struct {
// feed spam subsystem a spam post // feed spam subsystem a spam post
func (sp *SpamFilter) MarkSpam(msg io.Reader) (err error) { func (sp *SpamFilter) MarkSpam(msg io.Reader) (err error) {
var buff [65636]byte var buf [65636]byte
var u *user.User var u *user.User
u, err = user.Current() u, err = user.Current()
@ -50,9 +50,11 @@ func (sp *SpamFilter) MarkSpam(msg io.Reader) (err error) {
} }
defer conn.Close() defer conn.Close()
fmt.Fprintf(conn, "TELL SPAMC/1.5\r\nUser: %s\r\nMessage-class: spam\r\nSet: local\r\n", u.Username) fmt.Fprintf(conn, "TELL SPAMC/1.5\r\nUser: %s\r\nMessage-class: spam\r\nSet: local\r\n", u.Username)
io.CopyBuffer(conn, buf[:], msg) io.CopyBuffer(conn, msg, buf[:])
conn.CloseWrite() conn.CloseWrite()
r := bufio.NewReader(conn) r := bufio.NewReader(conn)
io.Copy(Discard, r)
return
} }
func (sp *SpamFilter) openConn() (*net.TCPConn, error) { func (sp *SpamFilter) openConn() (*net.TCPConn, error) {

6
contrib/backends/srndv2/src/srnd/store.go
View File

@ -95,12 +95,6 @@ type ArticleStore interface {
// get filepath for spam file via msgid // get filepath for spam file via msgid
SpamFile(msgid string) string SpamFile(msgid string) string
MarkHam(msgid string) error
UnmarkHam(msgid string) error
// get filepath for ham
HamFile(msgid string) string
// iterate over all spam messages // iterate over all spam messages
IterSpam(func(string) error) error IterSpam(func(string) error) error