diff --git a/architecture/epicyon_groups_ActivityPub.png b/architecture/epicyon_groups_ActivityPub.png index d8928af1c..48615e578 100644 Binary files a/architecture/epicyon_groups_ActivityPub.png and b/architecture/epicyon_groups_ActivityPub.png differ diff --git a/architecture/epicyon_groups_ActivityPub_Core.png b/architecture/epicyon_groups_ActivityPub_Core.png index 4dfb426e5..e6cfc545a 100644 Binary files a/architecture/epicyon_groups_ActivityPub_Core.png and b/architecture/epicyon_groups_ActivityPub_Core.png differ diff --git a/architecture/epicyon_groups_ActivityPub_Security.png b/architecture/epicyon_groups_ActivityPub_Security.png index c68653ec0..0e16a9626 100644 Binary files a/architecture/epicyon_groups_ActivityPub_Security.png and b/architecture/epicyon_groups_ActivityPub_Security.png differ diff --git a/architecture/epicyon_groups_Commandline-Interface_ActivityPub.png b/architecture/epicyon_groups_Commandline-Interface_ActivityPub.png index 5aabb8f9d..9a60266f4 100644 Binary files a/architecture/epicyon_groups_Commandline-Interface_ActivityPub.png and b/architecture/epicyon_groups_Commandline-Interface_ActivityPub.png differ diff --git a/architecture/epicyon_groups_Commandline-Interface_Core.png b/architecture/epicyon_groups_Commandline-Interface_Core.png index 5fdd5bd0e..99a1d22e1 100644 Binary files a/architecture/epicyon_groups_Commandline-Interface_Core.png and b/architecture/epicyon_groups_Commandline-Interface_Core.png differ diff --git a/architecture/epicyon_groups_Core.png b/architecture/epicyon_groups_Core.png index 5c4885c9f..5ea67e7aa 100644 Binary files a/architecture/epicyon_groups_Core.png and b/architecture/epicyon_groups_Core.png differ diff --git a/architecture/epicyon_groups_Core_Accessibility.png b/architecture/epicyon_groups_Core_Accessibility.png index 8a860e0f4..f8a2eba5e 100644 Binary files a/architecture/epicyon_groups_Core_Accessibility.png and b/architecture/epicyon_groups_Core_Accessibility.png differ diff --git a/architecture/epicyon_groups_Core_Security.png b/architecture/epicyon_groups_Core_Security.png index 5cdf37b91..70196e4b3 100644 Binary files a/architecture/epicyon_groups_Core_Security.png and b/architecture/epicyon_groups_Core_Security.png differ diff --git a/architecture/epicyon_groups_Timeline_Core.png b/architecture/epicyon_groups_Timeline_Core.png index 50f67dd04..82296522b 100644 Binary files a/architecture/epicyon_groups_Timeline_Core.png and b/architecture/epicyon_groups_Timeline_Core.png differ diff --git a/architecture/epicyon_groups_Timeline_Security.png b/architecture/epicyon_groups_Timeline_Security.png index 4a27e079b..6f293ab5c 100644 Binary files a/architecture/epicyon_groups_Timeline_Security.png and b/architecture/epicyon_groups_Timeline_Security.png differ diff --git a/architecture/epicyon_groups_Web-Interface-Columns_Core.png b/architecture/epicyon_groups_Web-Interface-Columns_Core.png index 4fc87f114..4c0b9628c 100644 Binary files a/architecture/epicyon_groups_Web-Interface-Columns_Core.png and b/architecture/epicyon_groups_Web-Interface-Columns_Core.png differ diff --git a/architecture/epicyon_groups_Web-Interface_Accessibility.png b/architecture/epicyon_groups_Web-Interface_Accessibility.png index 738fd1f73..69fdfe77f 100644 Binary files a/architecture/epicyon_groups_Web-Interface_Accessibility.png and b/architecture/epicyon_groups_Web-Interface_Accessibility.png differ diff --git a/architecture/epicyon_groups_Web-Interface_Core.png b/architecture/epicyon_groups_Web-Interface_Core.png index 49e98b3a2..3eb3c0d30 100644 Binary files a/architecture/epicyon_groups_Web-Interface_Core.png and b/architecture/epicyon_groups_Web-Interface_Core.png differ diff --git a/webapp_post.py b/webapp_post.py index c04630a4b..ce29736c9 100644 --- a/webapp_post.py +++ b/webapp_post.py @@ -948,20 +948,25 @@ def _getPostTitleReplyHtml(baseDir: str, """ titleStr = '' replyAvatarImageInPost = '' + objJson = postJsonObject['object'] - if not postJsonObject['object'].get('inReplyTo'): + # not a reply + if not objJson.get('inReplyTo'): return (titleStr, replyAvatarImageInPost, containerClassIcons, containerClass) containerClassIcons = 'containericons darker' containerClass = 'container darker' - if postJsonObject['object']['inReplyTo'].startswith(postActor): + + # reply to self + if objJson['inReplyTo'].startswith(postActor): titleStr += _replyToYourselfHtml(translate) return (titleStr, replyAvatarImageInPost, containerClassIcons, containerClass) - if '/statuses/' in postJsonObject['object']['inReplyTo']: - inReplyTo = postJsonObject['object']['inReplyTo'] + # has a reply + if '/statuses/' in objJson['inReplyTo']: + inReplyTo = objJson['inReplyTo'] replyActor = inReplyTo.split('/statuses/')[0] replyNickname = getNicknameFromActor(replyActor) if replyNickname: @@ -980,12 +985,9 @@ def _getPostTitleReplyHtml(baseDir: str, _logPostTiming(enableTimingLog, postStartTime, '13.5') replyDisplayName = \ - addEmojiToDisplayName(baseDir, - httpPrefix, - nickname, - domain, - replyDisplayName, - False) + addEmojiToDisplayName(baseDir, httpPrefix, + nickname, domain, + replyDisplayName, False) _logPostTiming(enableTimingLog, postStartTime, '13.6') titleStr += \ @@ -995,10 +997,8 @@ def _getPostTitleReplyHtml(baseDir: str, # show avatar of person replied to replyAvatarUrl = \ - getPersonAvatarUrl(baseDir, - replyActor, - personCache, - allowDownloads) + getPersonAvatarUrl(baseDir, replyActor, + personCache, allowDownloads) _logPostTiming(enableTimingLog, postStartTime, '13.8') @@ -1027,8 +1027,7 @@ def _getPostTitleReplyHtml(baseDir: str, getBrokenLinkSubstitute() + \ '/>\n \n' else: - inReplyTo = \ - postJsonObject['object']['inReplyTo'] + inReplyTo = objJson['inReplyTo'] titleStr += \ _getReplyWithoutDisplayName(translate, inReplyTo, @@ -1038,8 +1037,7 @@ def _getPostTitleReplyHtml(baseDir: str, titleStr += \ _replyToUnknownHtml(translate, postJsonObject) else: - postDomain = \ - postJsonObject['object']['inReplyTo'] + postDomain = objJson['inReplyTo'] prefixes = getProtocolPrefixes() for prefix in prefixes: postDomain = postDomain.replace(prefix, '')