flake8 format

main
Bob Mottram 2020-04-03 10:11:54 +00:00
parent 654c5104d5
commit a9ee0fc1b2
1 changed files with 33 additions and 25 deletions

View File

@ -1,43 +1,48 @@
__filename__="filters.py"
__author__="Bob Mottram"
__license__="AGPL3+"
__version__="1.1.0"
__maintainer__="Bob Mottram"
__email__="bob@freedombone.net"
__status__="Production"
__filename__ = "filters.py"
__author__ = "Bob Mottram"
__license__ = "AGPL3+"
__version__ = "1.1.0"
__maintainer__ = "Bob Mottram"
__email__ = "bob@freedombone.net"
__status__ = "Production"
import os
def addFilter(baseDir: str,nickname: str,domain: str,words: str) -> bool:
def addFilter(baseDir: str, nickname: str, domain: str, words: str) -> bool:
"""Adds a filter for particular words within the content of a incoming posts
"""
filtersFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/filters.txt'
filtersFilename = baseDir + '/accounts/' + \
nickname + '@' + domain + '/filters.txt'
if os.path.isfile(filtersFilename):
if words in open(filtersFilename).read():
return False
filtersFile=open(filtersFilename, "a+")
filtersFile.write(words+'\n')
filtersFile = open(filtersFilename, "a+")
filtersFile.write(words + '\n')
filtersFile.close()
return True
def removeFilter(baseDir: str,nickname: str,domain: str, \
def removeFilter(baseDir: str, nickname: str, domain: str,
words: str) -> bool:
"""Removes a word filter
"""
filtersFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/filters.txt'
filtersFilename = baseDir + '/accounts/' + \
nickname + '@' + domain + '/filters.txt'
if os.path.isfile(filtersFilename):
if words in open(filtersFilename).read():
with open(filtersFilename, 'r') as fp:
with open(filtersFilename+'.new', 'w') as fpnew:
with open(filtersFilename + '.new', 'w') as fpnew:
for line in fp:
line=line.replace('\n','')
if line!=words:
fpnew.write(line+'\n')
if os.path.isfile(filtersFilename+'.new'):
os.rename(filtersFilename+'.new',filtersFilename)
line = line.replace('\n', '')
if line != words:
fpnew.write(line + '\n')
if os.path.isfile(filtersFilename + '.new'):
os.rename(filtersFilename + '.new', filtersFilename)
return True
return False
def isTwitterPost(content: str) -> bool:
"""Returns true if the given post content is a retweet or twitter crosspost
"""
@ -47,30 +52,33 @@ def isTwitterPost(content: str) -> bool:
return True
return False
def isFiltered(baseDir: str,nickname: str,domain: str,content: str) -> bool:
def isFiltered(baseDir: str, nickname: str, domain: str, content: str) -> bool:
"""Should the given content be filtered out?
This is a simple type of filter which just matches words, not a regex
You can add individual words or use word1+word2 to indicate that two
words must be present although not necessarily adjacent
"""
# optionally remove retweets
removeTwitter=baseDir+'/accounts/'+nickname+'@'+domain+'/.removeTwitter'
removeTwitter = baseDir + '/accounts/' + \
nickname + '@' + domain + '/.removeTwitter'
if os.path.isfile(removeTwitter):
if isTwitterPost(content):
return True
filtersFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/filters.txt'
filtersFilename = baseDir + '/accounts/' + \
nickname + '@' + domain + '/filters.txt'
if os.path.isfile(filtersFilename):
with open(filtersFilename, 'r') as fp:
for line in fp:
filterStr=line.replace('\n','')
filterStr = line.replace('\n', '')
if '+' not in filterStr:
if filterStr in content:
return True
else:
filterWords=filterStr.replace('"','').split('+')
filterWords = filterStr.replace('"', '').split('+')
for word in filterWords:
if not word in content:
if word not in content:
return False
return True
return False