lynnesbian/FediBooks
lynnesbian/FediBooks
1
0
Fork 0
mirror of https://github.com/Lynnesbian/FediBooks/ synced 2024-11-25 08:38:59 +00:00
Code Issues Releases Wiki Activity

handle @x as well as @x@y, fixes #20

Browse source
This commit is contained in:
Lynne Megido 2019-09-14 14:25:54 +10:00
parent 7ee4042592
commit ac9ea67edb
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
functions.py
View file

@ -101,7 +101,7 @@ def make_post(args):
if bot['fake_mentions'] == 'never': if bot['fake_mentions'] == 'never':
# remove all mentions from the training data before the markov model sees it # remove all mentions from the training data before the markov model sees it
posts = re.sub(r"@(\w+)@([\w.]+)\s?", "", posts) posts = re.sub(r"(?<!\S)@\w+(@[\w.]+)?\s?", "", posts)
# even with such a high tries value for markovify, it still sometimes returns none. # even with such a high tries value for markovify, it still sometimes returns none.
# so we implement our own tries function as well, and try ten times. # so we implement our own tries function as well, and try ten times.
@ -119,12 +119,14 @@ def make_post(args):
zws = "\u200B" zws = "\u200B"
if bot['fake_mentions'] == 'middle': if bot['fake_mentions'] == 'middle':
# remove mentions at the start of a post # remove mentions at the start of a post
post = re.sub(r"^(@\w+@[\w.]+\s*)+", "", post) post = re.sub(r"^(@\w+(@[\w.]+)?\s*)+", "", post)
# TODO: does this regex catch all valid handles? # TODO: does this regex catch all valid handles?
if bot['fake_mentions_full']: if bot['fake_mentions_full']:
post = re.sub(r"@(\w+)@([\w.]+)", r"@{}\1@{}\2".format(zws, zws), post) post = re.sub(r"@(\w+)@([\w.]+)", r"@{}\1@{}\2".format(zws, zws), post)
else: else:
post = re.sub(r"@(\w+)@([\w.]+)", r"@{}\1".format(zws), post) post = re.sub(r"@(\w+)@([\w.]+)", r"@{}\1".format(zws), post)
# also format handles without instances, e.g. @user instead of @user@instan.ce
post = re.sub(r"(?<!\S)@(\w+)", r"@{}\1".format(zws), post)
print(post) print(post)
visibility = bot['post_privacy'] if len(args) == 1 else args[2] visibility = bot['post_privacy'] if len(args) == 1 else args[2]