ticketfrei
/
ticketfrei
10
1
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

Repair blocklist (#110) 

* fixing blocklist

* added logging of blocklist events

* goodlist logging

* twitter DMs are broken

* fixed blocklist & tested it

* disabling twitterDMs should be in a separate PR.
master
missytake 2020-06-17 12:51:05 +02:00 committed by GitHub
parent 9b6c51ebd6
commit be72923f07
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
user.py
View File

@ -5,7 +5,9 @@ import jwt
from mastodon import Mastodon
from pylibscrypt import scrypt_mcf, scrypt_mcf_check
from os import urandom
import logging
logger = logging.getLogger(__name__)
class User(object):
def __init__(self, uid):
@ -74,6 +76,7 @@ class User(object):
break
else:
# no pattern matched
logger.error("Message didn't trigger goodlist: " + report.text)
return False
default_badwords = """
bitch
@ -93,11 +96,13 @@ schlitz
db.execute("SELECT words FROM badwords WHERE user_id=?;",
(self.uid, ))
badwords = db.cur.fetchone()
for word in report.text.lower().splitlines():
if word in badwords:
for word in report.text.lower().split():
if word in badwords[0].splitlines():
logger.error("Word " + word + " triggered the spam filter on message: " + report.text)
return False
for word in default_badwords.splitlines():
if word in badwords:
for word in report.text.lower().split():
if word in default_badwords.splitlines():
logger.error("Word " + word + " triggered the spam filter on message: " + report.text)
return False
return True