Modifying reply dm for accommodation category

daemon.py

@@ -2451,7 +2451,7 @@ class PubServer(BaseHTTPRequestHandler):
                               httpPrefix,
                               reportPath, None,
                               [optionsActor], None, None,
-                              pageNumber,
+                              pageNumber, '',
                               chooserNickname,
                               domain,
                               domainFull,
@@ -2566,7 +2566,7 @@ class PubServer(BaseHTTPRequestHandler):
                               baseDir,
                               httpPrefix,
                               reportPath, None, [],
-                              None, postUrl, pageNumber,
+                              None, postUrl, pageNumber, '',
                               chooserNickname,
                               domain,
                               domainFull,
@@ -11449,6 +11449,7 @@ class PubServer(BaseHTTPRequestHandler):
                      baseDir: str, httpPrefix: str,
                      inReplyToUrl: str, replyToList: [],
                      shareDescription: str, replyPageNumber: int,
+                     replyCategory: str,
                      domain: str, domainFull: str,
                      GETstartTime, GETtimings: {}, cookie,
                      noDropDown: bool, conversationId: str) -> bool:
@@ -11496,6 +11497,7 @@ class PubServer(BaseHTTPRequestHandler):
                               replyToList,
                               shareDescription, None,
                               replyPageNumber,
+                              replyCategory,
                               nickname, domain,
                               domainFull,
                               self.server.defaultTimeline,
@@ -13865,6 +13867,7 @@ class PubServer(BaseHTTPRequestHandler):
 #        replyWithDM = False
         replyToList = []
         replyPageNumber = 1
+        replyCategory = ''
         shareDescription = None
         conversationId = None
 #        replytoActor = None
@@ -13934,6 +13937,8 @@ class PubServer(BaseHTTPRequestHandler):
                             replyPageStr = m.replace('page=', '')
                             if replyPageStr.isdigit():
                                 replyPageNumber = int(replyPageStr)
+                        elif m.startswith('category='):
+                            replyCategory = m.replace('category=', '')
                         elif m.startswith('sharedesc:'):
                             # get the title for the shared item
                             shareDescription = \
@@ -14041,6 +14046,7 @@ class PubServer(BaseHTTPRequestHandler):
                                  self.server.httpPrefix,
                                  inReplyToUrl, replyToList,
                                  shareDescription, replyPageNumber,
+                                 replyCategory,
                                  self.server.domain,
                                  self.server.domainFull,
                                  GETstartTime, GETtimings,

webapp_create_post.py

@@ -188,6 +188,7 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
                 mentions: [],
                 shareDescription: str,
                 reportUrl: str, pageNumber: int,
+                category: str,
                 nickname: str, domain: str,
                 domainFull: str,
                 defaultTimeline: str, newswire: {},
@@ -211,6 +212,8 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
                 newPostText = '<h1>' + \
                     translate['Write your post text below.'] + '</h1>\n'
             else:
+                newPostText = ''
+                if category != 'accommodation':
                     newPostText = \
                         '<p class="new-post-text">' + \
                         translate['Write your reply to'] + \
@@ -308,6 +311,9 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
     scopeIcon = 'scope_public.png'
     scopeDescription = translate['Public']
     if shareDescription:
+        if category == 'accommodation':
+            placeholderSubject = translate['Request to stay']
+        else:
             placeholderSubject = translate['Ask about a shared item.'] + '..'
     else:
         placeholderSubject = \
@@ -316,6 +322,8 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
     if inReplyTo:
         placeholderMentions = \
             translate['Replying to'] + '...'
+    placeholderMessage = ''
+    if category != 'accommodation':
         placeholderMessage = translate['Write something'] + '...'
     extraFields = ''
     endpoint = 'newpost'
@@ -528,11 +536,15 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
        endpoint != 'newwanted' and \
        endpoint != 'newreport' and \
        endpoint != 'newquestion':
+        if category != 'accommodation':
             dateAndLocation = \
                 '<div class="container">\n' + \
                 '<p><input type="checkbox" class="profilecheckbox" ' + \
                 'name="commentsEnabled" checked><label class="labels"> ' + \
                 translate['Allow replies.'] + '</label></p>\n'
+        else:
+            dateAndLocation = \
+                '<input type="hidden" name="commentsEnabled" value="true">\n'
 
         if endpoint == 'newpost':
             dateAndLocation += \

webapp_utils.py

@@ -1340,6 +1340,7 @@ def htmlSearchResultShare(baseDir: str, sharedItem: {}, translate: {},
         '<p>' + \
         '<a href="' + actor + '?replydm=sharedesc:' + \
         sharedItem['displayName'] + ';mention=' + contactActor + \
+        ';category=' + category + \
         '"><button class="button">' + contactTitleStr + \
         '</button></a>\n' + \
         '<a href="' + contactActor + '"><button class="button">' + \