OAuth token login

Entered OAuth token login instead of user/password
Compulsory starting from Mastodon 4.4

Author: mpaglia0

fediverse.py

@@ -41,9 +41,9 @@ def post_on_mastodon(settings, new_posts):
    global mt_base_url
    mt_base_url = os.getenv('MASTODON_BASE_URL')
    global mt_username
-   mt_username = os.getenv('MASTODON_USERNAME') # DEPRECATED: to be removed asap
+   mt_username = os.getenv('MASTODON_USERNAME') # DEPRECATED: to be removed soon
    global mt_password
-   mt_password = os.getenv('MASTODON_PASSWORD') # DEPRECATED to be removed asap
+   mt_password = os.getenv('MASTODON_PASSWORD') # DEPRECATED to be removed soon
    global mt_token
    mt_token = os.getenv('MASTODON_OAUTH_TOKEN')
    # Load other details
@@ -53,25 +53,26 @@ def post_on_mastodon(settings, new_posts):
    mt_visibility = settings.get('MASTODON_VISIBILITY', 'direct')
 
    # check if config file contains username and password and prompt the user this is deprecated
-   if mt_username != '' or mt_password != '':
-      logger.warning('Pelican_fediverse: WARNING: password authentication is DEPRECATED and will be removed soon!\nPlease use OAuth token instead...')
+   if mt_username or mt_password in globals():
+      logger.warning('Pelican_fediverse: password authentication is DEPRECATED and will be removed soon!\nPlease use OAuth token instead...')
 
    # check if config file contains OAuth token and exit if not
    if mt_base_url == '' or mt_token == '':
       logger.warning('Pelican_fediverse: Mastodon instance URL and/or OAuth token are missing!\nPlease check your config file...')
       sys.exit(9)
 
-   # if pelicantoot_clientcred.secret does not exist it means we have to create the app on Mastodon
+   # if pelicantoot_clientcred.secret does not exist it means we have to create our Mastodon app
    if os.path.exists('pelicanfediverse_clientcred.secret') == False:
       Mastodon.create_app(
          'PelicanFediverse',
          api_base_url = mt_base_url,
          to_file = 'pelicanfediverse_clientcred.secret'
       )
 
-   # Advise the user with an on-screen message. We are ready to publish!
-   build_message = 'Ready to publish on Mastodon: %s (%s)'
+   # Prepare pubish a message for the user
+   build_message = 'Articles found to publish on Mastodon: %s (%s)'
 
+   # Collect/print information for articles
    for article in new_posts:
       url = article.get_siteurl() + article.url
       title = article.title
@@ -91,19 +92,13 @@ def post_updates(generator, writer):
       if article.url not in articleslist:
          new_posts.append(article)
 
-   # we only write the newly found sites to disk if posting them worked. that way we can retry later
+   # We only write the newly found sites to disk if posting them worked. That way we can retry later
    if new_posts:
       if post_on_mastodon(generator.settings, new_posts):
+         # Log in
          mastodon = Mastodon(
             client_id = 'pelicanfediverse_clientcred.secret',
-            api_base_url = mt_base_url
-         )
-         mastodon.log_in(
-            mt_token,
-            to_file = 'pelicanfediverse_usercred.secret'
-         )
-         mastodon = Mastodon(
-            access_token = 'pelicanfediverse_usercred.secret',
+            access_token = mt_token,
             api_base_url = mt_base_url
          )
          # Build the post structure