Tidying

webapp_post.py

@@ -832,7 +832,7 @@ def _getPostTitleAnnounceHtml(baseDir: str,
                                      postJsonObject,
                                      announceDisplayName)
     # show avatar of person replied to
-    announceActor = objJson['attributedTo']
+    announceActor = attributedTo
     announceAvatarUrl = \
         getPersonAvatarUrl(baseDir, announceActor,
                            personCache, allowDownloads)
@@ -968,21 +968,53 @@ def _getPostTitleReplyHtml(baseDir: str,
                 containerClassIcons, containerClass)
 
     # has a reply
-    if '/statuses/' in objJson['inReplyTo']:
+    if '/statuses/' not in objJson['inReplyTo']:
+        postDomain = objJson['inReplyTo']
+        prefixes = getProtocolPrefixes()
+        for prefix in prefixes:
+            postDomain = postDomain.replace(prefix, '')
+        if '/' in postDomain:
+            postDomain = postDomain.split('/', 1)[0]
+        if postDomain:
+            titleStr += \
+                _replyWithUnknownPathHtml(translate,
+                                          postJsonObject, postDomain)
+        return (titleStr, replyAvatarImageInPost,
+                containerClassIcons, containerClass)
+
     inReplyTo = objJson['inReplyTo']
     replyActor = inReplyTo.split('/statuses/')[0]
     replyNickname = getNicknameFromActor(replyActor)
-        if replyNickname:
+    if not replyNickname:
+        titleStr += \
+            _replyToUnknownHtml(translate, postJsonObject)
+        return (titleStr, replyAvatarImageInPost,
+                containerClassIcons, containerClass)
+
     replyDomain, replyPort = \
         getDomainFromActor(replyActor)
-            if replyNickname and replyDomain:
+    if not (replyNickname and replyDomain):
+        titleStr += \
+            _replyToUnknownHtml(translate, postJsonObject)
+        return (titleStr, replyAvatarImageInPost,
+                containerClassIcons, containerClass)
+
     getPersonFromCache(baseDir, replyActor,
                        personCache,
                        allowDownloads)
     replyDisplayName = \
         getDisplayName(baseDir, replyActor,
                        personCache)
-                if replyDisplayName:
+    if not replyDisplayName:
+        inReplyTo = objJson['inReplyTo']
+        titleStr += \
+            _getReplyWithoutDisplayName(translate,
+                                        inReplyTo,
+                                        replyNickname,
+                                        replyDomain)
+        return (titleStr, replyAvatarImageInPost,
+                containerClassIcons, containerClass)
+
     # add emoji to the display name
     if ':' in replyDisplayName:
         _logPostTiming(enableTimingLog, postStartTime, '13.5')
@@ -1007,49 +1039,15 @@ def _getPostTitleReplyHtml(baseDir: str,
 
     if replyAvatarUrl:
         replyAvatarImageInPost = \
-                            '        <div class=' + \
+            '        <div class="timeline-avatar-reply">\n' + \
-                            '"timeline-avatar-reply">\n'
-                        replyAvatarImageInPost += \
-                            '          ' + \
             '          <a class="imageAnchor" ' + \
-                            'href="/users/' + nickname + \
+            'href="/users/' + nickname + '?options=' + replyActor + \
-                            '?options=' + replyActor + \
+            ';' + str(pageNumber) + ';' + replyAvatarUrl + \
-                            ';' + str(pageNumber) + ';' + \
+            messageIdStr + '">\n' + \
-                            replyAvatarUrl + \
+            '          <img loading="lazy" src="' + replyAvatarUrl + '" ' + \
-                            messageIdStr + '">\n'
+            'title="' + translate['Show profile'] + \
-                        replyAvatarImageInPost += \
+            '" alt=" "' + avatarPosition + getBrokenLinkSubstitute() + \
-                            '          ' + \
-                            '<img loading="lazy" src="' + \
-                            replyAvatarUrl + '" '
-                        replyAvatarImageInPost += \
-                            'title="' + \
-                            translate['Show profile']
-                        replyAvatarImageInPost += \
-                            '" alt=" "' + \
-                            avatarPosition + \
-                            getBrokenLinkSubstitute() + \
             '/></a>\n        </div>\n'
-                else:
-                    inReplyTo = objJson['inReplyTo']
-                    titleStr += \
-                        _getReplyWithoutDisplayName(translate,
-                                                    inReplyTo,
-                                                    replyNickname,
-                                                    replyDomain)
-        else:
-            titleStr += \
-                _replyToUnknownHtml(translate, postJsonObject)
-    else:
-        postDomain = objJson['inReplyTo']
-        prefixes = getProtocolPrefixes()
-        for prefix in prefixes:
-            postDomain = postDomain.replace(prefix, '')
-        if '/' in postDomain:
-            postDomain = postDomain.split('/', 1)[0]
-        if postDomain:
-            titleStr += \
-                _replyWithUnknownPathHtml(translate,
-                                          postJsonObject, postDomain)
 
     return (titleStr, replyAvatarImageInPost,
             containerClassIcons, containerClass)