mathdatech/twoot
1
0
Fork 0
mirror of https://gitlab.com/jeancf/twoot.git synced 2024-11-23 20:11:11 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

Update nitter url

Browse Source
This commit is contained in:
jeancf 2023-02-27 12:48:48 +01:00
parent c4b6e94178
commit acfe033865
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
twoot.py
View File

@ -45,11 +45,12 @@ HTTPS_REQ_TIMEOUT = 10
NITTER_URLS = [ NITTER_URLS = [
'https://nitter.lacontrevoie.fr', # rate limited 'https://nitter.lacontrevoie.fr', # rate limited
'https://nitter.namazso.eu', 'https://nitter.namazso.eu',
'https://twitter.beparanoid.de', 'https://twitter.femboy.hu/', # Replace beparanoid
'https://n.l5.ca', 'https://n.l5.ca',
'https://nitter.cutelab.space', # USA, added 16/02/2023 'https://nitter.cutelab.space', # USA, added 16/02/2023
'https://nitter.fly.dev', # anycast, added 06/02/2023 'https://nitter.fly.dev', # anycast, added 06/02/2023
'https://notabird.site', # anycast, added 06/02/2023 'https://notabird.site', # anycast, added 06/02/2023
# 'https://twitter.beparanoid.de', # moved 27/022023
# 'https://nitter.fdn.fr', # not updated, rate limited, removed 06/02/2023 # 'https://nitter.fdn.fr', # not updated, rate limited, removed 06/02/2023
# 'https://nitter.hu', # 'https://nitter.hu',
# 'https://nitter.privacydev.net', # USA, added 06/02/2023, removed 15/02/2023 too slow # 'https://nitter.privacydev.net', # USA, added 06/02/2023, removed 15/02/2023 too slow
@ -109,7 +110,7 @@ def build_config(args):
except ModuleNotFoundError: except ModuleNotFoundError:
# for python < 3.11, tomli module must be installed # for python < 3.11, tomli module must be installed
import tomli as tomllib import tomli as tomllib
loaded_toml = None loaded_toml = None
# Load toml file # Load toml file
try: try:
@ -121,7 +122,7 @@ def build_config(args):
except tomllib.TOMLDecodeError: except tomllib.TOMLDecodeError:
print('Malformed config file') print('Malformed config file')
terminate(-1) terminate(-1)
TOML['config'] = loaded_toml['config'] TOML['config'] = loaded_toml['config']
for k in TOML['options'].keys(): for k in TOML['options'].keys():
try: # Go through all valid keys try: # Go through all valid keys
@ -259,7 +260,7 @@ def substitute_source(orig_url):
domain = parsed_url.netloc domain = parsed_url.netloc
logging.debug("Checking domain %s for substitution ", domain) logging.debug("Checking domain %s for substitution ", domain)
# Handle twitter # Handle twitter
twitter_subst = TOML["options"]["subst_twitter"] twitter_subst = TOML["options"]["subst_twitter"]
# Do not substitiute if subdomain is present (e.g. i.twitter.com) # Do not substitiute if subdomain is present (e.g. i.twitter.com)
@ -353,7 +354,7 @@ def process_media_body(tt_iter):
url = deredir_url(tag.get('href')) url = deredir_url(tag.get('href'))
url = substitute_source(url) url = substitute_source(url)
url = clean_url(url) url = clean_url(url)
tweet_text += url tweet_text += url
else: else:
logging.warning("No handler for tag in twitter text: " + tag.prettify()) logging.warning("No handler for tag in twitter text: " + tag.prettify())
@ -520,7 +521,7 @@ def login(password):
logging.fatal('Login to ' + TOML['config']['mastodon_instance'] + ' Failed\n') logging.fatal('Login to ' + TOML['config']['mastodon_instance'] + ' Failed\n')
logging.fatal(me) logging.fatal(me)
terminate(-1) terminate(-1)
if os.path.isfile(TOML['config']['mastodon_user'] + '.secret'): if os.path.isfile(TOML['config']['mastodon_user'] + '.secret'):
logging.warning('You successfully logged in using a password and an access token \ logging.warning('You successfully logged in using a password and an access token \
has been saved. The password can therefore be omitted from the \ has been saved. The password can therefore be omitted from the \
@ -689,7 +690,7 @@ def main(argv):
logging.info(' subst_twitter : ' + str(TOML['options']['subst_reddit'])) logging.info(' subst_twitter : ' + str(TOML['options']['subst_reddit']))
logging.info(' log_level : ' + str(TOML['options']['log_level'])) logging.info(' log_level : ' + str(TOML['options']['log_level']))
logging.info(' log_days : ' + str(TOML['options']['log_days'])) logging.info(' log_days : ' + str(TOML['options']['log_days']))
# Try to open database. If it does not exist, create it # Try to open database. If it does not exist, create it
sql = sqlite3.connect('twoot.db') sql = sqlite3.connect('twoot.db')
db = sql.cursor() db = sql.cursor()
@ -990,7 +991,7 @@ def main(argv):
toot = mastodon.status_post(tweet['tweet_text'], media_ids=media_ids) toot = mastodon.status_post(tweet['tweet_text'], media_ids=media_ids)
except MastodonAPIError: except MastodonAPIError:
# Assuming this is an: # Assuming this is an:
# ERROR ('Mastodon API returned error', 422, 'Unprocessable Entity', 'Cannot attach files that have not finished processing. Try again in a moment!') # ERROR ('Mastodon API returned error', 422, 'Unprocessable Entity', 'Cannot attach files that have not finished processing. Try again in a moment!')
logging.warning('Mastodon API Error 422: Cannot attach files that have not finished processing. Waiting 15 seconds and retrying.') logging.warning('Mastodon API Error 422: Cannot attach files that have not finished processing. Waiting 15 seconds and retrying.')
# Wait 15 seconds # Wait 15 seconds
@ -1047,7 +1048,7 @@ def main(argv):
sql.commit() sql.commit()
logging.info('Deleted ' + str(excess_count) + ' old records from database.') logging.info('Deleted ' + str(excess_count) + ' old records from database.')
terminate(0) terminate(0)
if __name__ == "__main__": if __name__ == "__main__":