indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Snake case

merge-requests/30/head
Bob Mottram 2022-01-02 12:53:25 +00:00
parent 7b95d3c3a2
commit b5ef362237
2 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epicyon.py
View File

@ -102,17 +102,16 @@ from migrate import migrate_accounts
from desktop_client import run_desktop_client from desktop_client import run_desktop_client
def str2bool(v) -> bool: def str2bool(value_str) -> bool:
"""Returns true if the given value is a boolean """Returns true if the given value is a boolean
""" """
if isinstance(v, bool): if isinstance(value_str, bool):
return v return value_str
if v.lower() in ('yes', 'true', 't', 'y', '1'): if value_str.lower() in ('yes', 'true', 't', 'y', '1'):
return True return True
elif v.lower() in ('no', 'false', 'f', 'n', '0'): if value_str.lower() in ('no', 'false', 'f', 'n', '0'):
return False return False
else: raise argparse.ArgumentTypeError('Boolean value expected.')
raise argparse.ArgumentTypeError('Boolean value expected.')
parser = argparse.ArgumentParser(description='ActivityPub Server') parser = argparse.ArgumentParser(description='ActivityPub Server')

101
filters.py
View File

@ -14,15 +14,15 @@ from utils import acct_dir
def add_filter(base_dir: str, nickname: str, domain: str, words: str) -> bool: def add_filter(base_dir: str, nickname: str, domain: str, words: str) -> bool:
"""Adds a filter for particular words within the content of a incoming posts """Adds a filter for particular words within the content of a incoming posts
""" """
filtersFilename = acct_dir(base_dir, nickname, domain) + '/filters.txt' filters_filename = acct_dir(base_dir, nickname, domain) + '/filters.txt'
if os.path.isfile(filtersFilename): if os.path.isfile(filters_filename):
if words in open(filtersFilename).read(): if words in open(filters_filename).read():
return False return False
try: try:
with open(filtersFilename, 'a+') as filtersFile: with open(filters_filename, 'a+') as filters_file:
filtersFile.write(words + '\n') filters_file.write(words + '\n')
except OSError: except OSError:
print('EX: unable to append filters ' + filtersFilename) print('EX: unable to append filters ' + filters_filename)
return True return True
@ -34,15 +34,15 @@ def add_global_filter(base_dir: str, words: str) -> bool:
return False return False
if len(words) < 2: if len(words) < 2:
return False return False
filtersFilename = base_dir + '/accounts/filters.txt' filters_filename = base_dir + '/accounts/filters.txt'
if os.path.isfile(filtersFilename): if os.path.isfile(filters_filename):
if words in open(filtersFilename).read(): if words in open(filters_filename).read():
return False return False
try: try:
with open(filtersFilename, 'a+') as filtersFile: with open(filters_filename, 'a+') as filters_file:
filtersFile.write(words + '\n') filters_file.write(words + '\n')
except OSError: except OSError:
print('EX: unable to append filters ' + filtersFilename) print('EX: unable to append filters ' + filters_filename)
return True return True
@ -50,23 +50,24 @@ def remove_filter(base_dir: str, nickname: str, domain: str,
words: str) -> bool: words: str) -> bool:
"""Removes a word filter """Removes a word filter
""" """
filtersFilename = acct_dir(base_dir, nickname, domain) + '/filters.txt' filters_filename = acct_dir(base_dir, nickname, domain) + '/filters.txt'
if not os.path.isfile(filtersFilename): if not os.path.isfile(filters_filename):
return False return False
if words not in open(filtersFilename).read(): if words not in open(filters_filename).read():
return False return False
newFiltersFilename = filtersFilename + '.new' new_filters_filename = filters_filename + '.new'
try: try:
with open(filtersFilename, 'r') as fp: with open(filters_filename, 'r') as fp_filt:
with open(newFiltersFilename, 'w+') as fpnew: with open(new_filters_filename, 'w+') as fpnew:
for line in fp: for line in fp_filt:
line = line.replace('\n', '') line = line.replace('\n', '')
if line != words: if line != words:
fpnew.write(line + '\n') fpnew.write(line + '\n')
except OSError as ex: except OSError as ex:
print('EX: unable to remove filter ' + filtersFilename + ' ' + str(ex)) print('EX: unable to remove filter ' +
if os.path.isfile(newFiltersFilename): filters_filename + ' ' + str(ex))
os.rename(newFiltersFilename, filtersFilename) if os.path.isfile(new_filters_filename):
os.rename(new_filters_filename, filters_filename)
return True return True
return False return False
@ -74,24 +75,24 @@ def remove_filter(base_dir: str, nickname: str, domain: str,
def remove_global_filter(base_dir: str, words: str) -> bool: def remove_global_filter(base_dir: str, words: str) -> bool:
"""Removes a global word filter """Removes a global word filter
""" """
filtersFilename = base_dir + '/accounts/filters.txt' filters_filename = base_dir + '/accounts/filters.txt'
if not os.path.isfile(filtersFilename): if not os.path.isfile(filters_filename):
return False return False
if words not in open(filtersFilename).read(): if words not in open(filters_filename).read():
return False return False
newFiltersFilename = filtersFilename + '.new' new_filters_filename = filters_filename + '.new'
try: try:
with open(filtersFilename, 'r') as fp: with open(filters_filename, 'r') as fp_filt:
with open(newFiltersFilename, 'w+') as fpnew: with open(new_filters_filename, 'w+') as fpnew:
for line in fp: for line in fp_filt:
line = line.replace('\n', '') line = line.replace('\n', '')
if line != words: if line != words:
fpnew.write(line + '\n') fpnew.write(line + '\n')
except OSError as ex: except OSError as ex:
print('EX: unable to remove global filter ' + print('EX: unable to remove global filter ' +
filtersFilename + ' ' + str(ex)) filters_filename + ' ' + str(ex))
if os.path.isfile(newFiltersFilename): if os.path.isfile(new_filters_filename):
os.rename(newFiltersFilename, filtersFilename) os.rename(new_filters_filename, filters_filename)
return True return True
return False return False
@ -101,7 +102,7 @@ def _is_twitter_post(content: str) -> bool:
""" """
if '/twitter.' in content or '@twitter.' in content: if '/twitter.' in content or '@twitter.' in content:
return True return True
elif '>RT <' in content: if '>RT <' in content:
return True return True
return False return False
@ -114,19 +115,19 @@ def _is_filtered_base(filename: str, content: str) -> bool:
return False return False
try: try:
with open(filename, 'r') as fp: with open(filename, 'r') as fp_filt:
for line in fp: for line in fp_filt:
filterStr = line.replace('\n', '').replace('\r', '') filter_str = line.replace('\n', '').replace('\r', '')
if not filterStr: if not filter_str:
continue continue
if len(filterStr) < 2: if len(filter_str) < 2:
continue continue
if '+' not in filterStr: if '+' not in filter_str:
if filterStr in content: if filter_str in content:
return True return True
else: else:
filterWords = filterStr.replace('"', '').split('+') filter_words = filter_str.replace('"', '').split('+')
for word in filterWords: for word in filter_words:
if word not in content: if word not in content:
return False return False
return True return True
@ -138,8 +139,8 @@ def _is_filtered_base(filename: str, content: str) -> bool:
def is_filtered_globally(base_dir: str, content: str) -> bool: def is_filtered_globally(base_dir: str, content: str) -> bool:
"""Is the given content globally filtered? """Is the given content globally filtered?
""" """
globalFiltersFilename = base_dir + '/accounts/filters.txt' global_filters_filename = base_dir + '/accounts/filters.txt'
if _is_filtered_base(globalFiltersFilename, content): if _is_filtered_base(global_filters_filename, content):
return True return True
return False return False
@ -154,9 +155,9 @@ def is_filtered_bio(base_dir: str,
if not nickname or not domain: if not nickname or not domain:
return False return False
accountFiltersFilename = \ account_filters_filename = \
acct_dir(base_dir, nickname, domain) + '/filters_bio.txt' acct_dir(base_dir, nickname, domain) + '/filters_bio.txt'
return _is_filtered_base(accountFiltersFilename, bio) return _is_filtered_base(account_filters_filename, bio)
def is_filtered(base_dir: str, nickname: str, domain: str, def is_filtered(base_dir: str, nickname: str, domain: str,
@ -173,11 +174,11 @@ def is_filtered(base_dir: str, nickname: str, domain: str,
return False return False
# optionally remove retweets # optionally remove retweets
removeTwitter = acct_dir(base_dir, nickname, domain) + '/.removeTwitter' remove_twitter = acct_dir(base_dir, nickname, domain) + '/.removeTwitter'
if os.path.isfile(removeTwitter): if os.path.isfile(remove_twitter):
if _is_twitter_post(content): if _is_twitter_post(content):
return True return True
accountFiltersFilename = \ account_filters_filename = \
acct_dir(base_dir, nickname, domain) + '/filters.txt' acct_dir(base_dir, nickname, domain) + '/filters.txt'
return _is_filtered_base(accountFiltersFilename, content) return _is_filtered_base(account_filters_filename, content)