Mastodon - fix title item when toot is a reblog

Author: SamR1

twootfeed/mastodon/generate_toots_feed.py

@@ -10,10 +10,12 @@
 def format_toot(toot: Dict, text_length_limit: int) -> Dict:
     created_at = toot['created_at']
     boosted = ""
+    html_boosted = ""
 
     reblog = toot.get('reblog')
     if reblog:
-        boosted = f"<div>Boosted by {toot['account']['display_name']}: </div>"
+        boosted = f"Boosted by {toot['account']['display_name']}: "
+        html_boosted = f"<div>{boosted}</div>"
         toot = reblog
         toot['created_at'] = created_at
 
@@ -23,13 +25,14 @@ def format_toot(toot: Dict, text_length_limit: int) -> Dict:
         'created_at': toot['created_at'],
         'url': toot['url'],
         'htmltext': (
-            f"<blockquote>{boosted}<div><img src=\""
+            f"<blockquote>{html_boosted}<div><img src=\""
             f"{toot['account']['avatar_static']}\" "
             f"alt=\"{toot['account']['display_name']}\""
             f" width= 100px\"/> "
             f"<strong>{toot['account']['display_name']} </strong>"
             f"{toot['content']}"
         ),
+        'boosted': boosted,
     }
 
     source = toot.get('application')
@@ -54,7 +57,7 @@ def format_toot(toot: Dict, text_length_limit: int) -> Dict:
     )
 
     rss_toot['text'] = BeautifulSoup(
-        boosted + unescape(toot['content']), "html.parser"
+        unescape(toot['content']), "html.parser"
     ).text
 
     if len(rss_toot['text']) > text_length_limit:
@@ -85,7 +88,8 @@ def generate_mastodon_feed(
             )
         f.add_item(
             title=(
-                formatted_toot['display_name']
+                formatted_toot['boosted']
+                + formatted_toot['display_name']
                 + ' ('
                 + formatted_toot['screen_name']
                 + '): '

twootfeed/tests/data.py

@@ -411,6 +411,7 @@
 }
 
 formatted_toot1 = {
+    'boosted': '',
     'display_name': 'User',
     'screen_name': 'UserD',
     'created_at': datetime(2018, 10, 25, 14, 16, 42, 11000),
@@ -664,6 +665,7 @@
 }
 
 formatted_toot2 = {
+    'boosted': '',
     'display_name': 'User',
     'screen_name': 'UserD',
     'created_at': datetime(2018, 10, 25, 14, 16, 42, 11000),
@@ -826,6 +828,7 @@
 }
 
 formatted_reblog = {
+    'boosted': 'Boosted by User A: ',
     'display_name': 'User',
     'screen_name': 'UserD',
     'created_at': datetime(2018, 10, 25, 14, 17, 22),
@@ -837,7 +840,7 @@
     '<strong>User </strong>'
     '<p>What\'s New in <a href="https://linuxjobs.social/tags/python" class="mention hashtag" rel="nofollow noopener" target="_blank">#<span>python</span></a> today?</p>'  # noqa
     '<br>♻ : 0, ✰ : 0</div></blockquote>',
-    'text': 'Boosted by User A: What\'s New in #python today?',
+    'text': 'What\'s New in #python today?',
 }
 
 toot_1_home_timeline_feed = (