mathdatech/twoot
1
0
Fork 0
mirror of https://gitlab.com/jeancf/twoot.git synced 2025-04-26 14:43:34 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

Improved formatting

Browse Source
This commit is contained in:
jeancf 2023-06-12 17:43:08 +02:00
parent 725b7b5dc9
commit 54c59fa676
1 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
twoot.py
View File

@ -25,7 +25,6 @@ import os
import shutil import shutil
import random import random
import re import re
import shutil
import sqlite3 import sqlite3
import sys import sys
import time import time
@ -294,9 +293,9 @@ def substitute_source(orig_url):
parsed_url.fragment parsed_url.fragment
]) ])
return dest_url return dest_url
def clean_url(orig_url): def clean_url(orig_url):
""" """
Given a URL, return it with the UTM parameters removed from query and fragment Given a URL, return it with the UTM parameters removed from query and fragment
@ -535,8 +534,7 @@ def login(password):
try: try:
mastodon = Mastodon( mastodon = Mastodon(
access_token=TOML['config']['mastodon_user'] + '.secret', access_token=TOML['config']['mastodon_user'] + '.secret',
api_base_url='https://' + TOML['config']['mastodon_instance'] api_base_url='https://' + TOML['config']['mastodon_instance'])
)
except MastodonError as me: except MastodonError as me:
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)
@ -757,12 +755,6 @@ def main(argv):
# Make soup # Make soup
soup = BeautifulSoup(twit_account_page.text, 'html.parser') soup = BeautifulSoup(twit_account_page.text, 'html.parser')
# Replace twitter_account with version with correct capitalization
# ta = soup.find('meta', property='og:title').get('content')
# ta_match = re.search(r'\(@(.+)\)', ta)
# if ta_match is not None:
# TOML['config']['twitter_account'] = ta_match.group(1)
# Extract twitter timeline # Extract twitter timeline
timeline = soup.find_all('div', class_='timeline-item') timeline = soup.find_all('div', class_='timeline-item')
@ -861,8 +853,7 @@ def main(argv):
if attachments_class is not None: if attachments_class is not None:
pics, vid_in_tweet = process_attachments(nitter_url, pics, vid_in_tweet = process_attachments(nitter_url,
attachments_class, attachments_class,
status_id, author_account status_id, author_account)
)
photos.extend(pics) photos.extend(pics)
if vid_in_tweet: if vid_in_tweet:
tweet_text += '\n\n[Video embedded in original tweet]' tweet_text += '\n\n[Video embedded in original tweet]'
@ -872,7 +863,7 @@ def main(argv):
tweet_text += '\n\n' + TOML['options']['footer'] tweet_text += '\n\n' + TOML['options']['footer']
# Add footer with link to original tweet # Add footer with link to original tweet
if TOML['options']['remove_original_tweet_ref'] == False: if TOML['options']['remove_original_tweet_ref'] is False:
if TOML['options']['footer'] != '': if TOML['options']['footer'] != '':
tweet_text += '\nOriginal tweet : ' + substitute_source(full_status_url) tweet_text += '\nOriginal tweet : ' + substitute_source(full_status_url)
else: else:
@ -1054,5 +1045,6 @@ def main(argv):
terminate(0) terminate(0)
if __name__ == "__main__": if __name__ == "__main__":
main(sys.argv) main(sys.argv)