diff --git a/modules/standard/info/info/spamfilter.txt b/modules/standard/info/info/spamfilter.txt index 9bb7c14..c1c8572 100644 --- a/modules/standard/info/info/spamfilter.txt +++ b/modules/standard/info/info/spamfilter.txt @@ -10,6 +10,16 @@ /filter add [Mm][Mm][Oo][Oo][Kk] Singleclick to add +Followed by NWGold: + +/filter add [Nn][Ww][Gg][Oo]*[Ll][Dd].[Cc][Oo][Mm] +Singleclick to add + +And NewGenAO: + +/filter add [Nn][Ee][Ww][Gg][Ee][Nn][Aa][Oo].[Cc][Oo][Mm] +Singleclick to add + Now we enable the filter: /filter enable diff --git a/modules/standard/news/mail_controller.py b/modules/standard/news/mail_controller.py index 29224e9..d985b6e 100644 --- a/modules/standard/news/mail_controller.py +++ b/modules/standard/news/mail_controller.py @@ -43,7 +43,7 @@ class MailController: data = self.db.query( "SELECT a.char_id from mail m " "left join account a ON a.main = m.recipient " - "WHERE `read` = 0 and (a.disabled = 0 and a.member=1) " + "WHERE `read` = 0 and (a.disabled = 0 and a.member!=-1) " "group by a.char_id") for row in data: self.buddy_service.add_buddy(row.char_id, "mail")