diff --git a/daemon.py b/daemon.py index 477d6f7a..44b52e37 100644 --- a/daemon.py +++ b/daemon.py @@ -1856,7 +1856,7 @@ class PubServer(BaseHTTPRequestHandler): baseDir, httpPrefix, reportPath, None, - [optionsActor], None, + [optionsActor], None, None, pageNumber, chooserNickname, domain, @@ -1925,7 +1925,7 @@ class PubServer(BaseHTTPRequestHandler): baseDir, httpPrefix, reportPath, None, [], - postUrl, pageNumber, + None, postUrl, pageNumber, chooserNickname, domain, domainFull, @@ -8961,7 +8961,7 @@ class PubServer(BaseHTTPRequestHandler): httpPrefix, path, inReplyToUrl, replyToList, - shareDescription, + shareDescription, None, replyPageNumber, nickname, domain, domainFull, diff --git a/webapp_create_post.py b/webapp_create_post.py index 07314610..835ab0ff 100644 --- a/webapp_create_post.py +++ b/webapp_create_post.py @@ -167,6 +167,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, baseDir: str, httpPrefix: str, path: str, inReplyTo: str, mentions: [], + shareDescription: str, reportUrl: str, pageNumber: int, nickname: str, domain: str, domainFull: str, @@ -612,7 +613,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, dropdownReportSuffix += '?mention=' + mentionedActor dropDownContent = '' - if not reportUrl: + if not reportUrl and not shareDescription: dropDownContent = \ htmlNewPostDropDown(scopeIcon, scopeDescription, replyStr, @@ -630,7 +631,9 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, dropdownEventSuffix, dropdownReportSuffix) else: - mentionsStr = 'Re: ' + reportUrl + '\n\n' + mentionsStr + if not shareDescription: + # reporting a post to moderator + mentionsStr = 'Re: ' + reportUrl + '\n\n' + mentionsStr newPostForm += \ '
' + placeholderSubject + '
' - newPostForm += ' ' + if not shareDescription: + shareDescription = '' + newPostForm += \ + ' ' newPostForm += '' selectedStr = ' selected'