mirror of https://gitlab.com/bashrc2/epicyon
Reply to post
parent
4e67445904
commit
fbb7636a3b
|
@ -640,6 +640,11 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
self.server.GETbusy=False
|
self.server.GETbusy=False
|
||||||
return
|
return
|
||||||
|
|
||||||
|
inReplyTo=None
|
||||||
|
if authorized and '?replyto=' in self.path:
|
||||||
|
inReplyTo=self.path.split('?replyto=')[1]
|
||||||
|
self.path=self.path.split('?replyto=')[0]+'/newpost'
|
||||||
|
|
||||||
if '/users/' in self.path and \
|
if '/users/' in self.path and \
|
||||||
(self.path.endswith('/newpost') or \
|
(self.path.endswith('/newpost') or \
|
||||||
self.path.endswith('/newunlisted') or \
|
self.path.endswith('/newunlisted') or \
|
||||||
|
@ -647,7 +652,7 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
self.path.endswith('/newdm') or \
|
self.path.endswith('/newdm') or \
|
||||||
self.path.endswith('/newshare')):
|
self.path.endswith('/newshare')):
|
||||||
self._set_headers('text/html',cookie)
|
self._set_headers('text/html',cookie)
|
||||||
self.wfile.write(htmlNewPost(self.server.baseDir,self.path).encode())
|
self.wfile.write(htmlNewPost(self.server.baseDir,self.path,inReplyTo).encode())
|
||||||
self.server.GETbusy=False
|
self.server.GETbusy=False
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -883,6 +888,7 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
if 'text/html' in self.headers['Accept']:
|
if 'text/html' in self.headers['Accept']:
|
||||||
self._set_headers('text/html',cookie)
|
self._set_headers('text/html',cookie)
|
||||||
self.wfile.write(htmlIndividualPost( \
|
self.wfile.write(htmlIndividualPost( \
|
||||||
|
self.server.baseDir, \
|
||||||
self.server.session, \
|
self.server.session, \
|
||||||
self.server.cachedWebfingers,self.server.personCache, \
|
self.server.cachedWebfingers,self.server.personCache, \
|
||||||
nickname,self.server.domain,self.server.port, \
|
nickname,self.server.domain,self.server.port, \
|
||||||
|
|
|
@ -81,9 +81,14 @@ def htmlLogin(baseDir: str) -> str:
|
||||||
loginForm+=htmlFooter()
|
loginForm+=htmlFooter()
|
||||||
return loginForm
|
return loginForm
|
||||||
|
|
||||||
def htmlNewPost(baseDir: str,path: str) -> str:
|
def htmlNewPost(baseDir: str,path: str,inReplyTo: str) -> str:
|
||||||
|
replyStr=''
|
||||||
if not path.endswith('/newshare'):
|
if not path.endswith('/newshare'):
|
||||||
|
if not inReplyTo:
|
||||||
newPostText='<p class="new-post-text">Enter your post text below.</p>'
|
newPostText='<p class="new-post-text">Enter your post text below.</p>'
|
||||||
|
else:
|
||||||
|
newPostText='<p class="new-post-text">Enter your reply to <a href="'+inReplyTo+'">this post</a> below.</p>'
|
||||||
|
replyStr='<input type="hidden" name="replyTo" value="'+inReplyTo+'">'
|
||||||
else:
|
else:
|
||||||
newPostText='<p class="new-post-text">Enter the details for your shared item below.</p>'
|
newPostText='<p class="new-post-text">Enter the details for your shared item below.</p>'
|
||||||
|
|
||||||
|
@ -146,7 +151,8 @@ def htmlNewPost(baseDir: str,path: str) -> str:
|
||||||
' </div>' \
|
' </div>' \
|
||||||
' <input type="submit" name="submitPost" value="Submit">' \
|
' <input type="submit" name="submitPost" value="Submit">' \
|
||||||
' <a href="'+pathBase+'/outbox"><button class="cancelbtn">Cancel</button></a>' \
|
' <a href="'+pathBase+'/outbox"><button class="cancelbtn">Cancel</button></a>' \
|
||||||
' </div>' \
|
' </div>'+ \
|
||||||
|
replyStr+ \
|
||||||
' <input type="text" placeholder="'+placeholderSubject+'" name="subject">' \
|
' <input type="text" placeholder="'+placeholderSubject+'" name="subject">' \
|
||||||
'' \
|
'' \
|
||||||
' <textarea id="message" name="message" placeholder="'+placeholderMessage+'" style="height:200px"></textarea>' \
|
' <textarea id="message" name="message" placeholder="'+placeholderMessage+'" style="height:200px"></textarea>' \
|
||||||
|
@ -546,11 +552,11 @@ def individualPostAsHtml(baseDir: str, \
|
||||||
footerStr='<span class="'+timeClass+'">'+publishedStr+'</span>\n'
|
footerStr='<span class="'+timeClass+'">'+publishedStr+'</span>\n'
|
||||||
if showIcons:
|
if showIcons:
|
||||||
footerStr='<div class="'+containerClassIcons+'">'
|
footerStr='<div class="'+containerClassIcons+'">'
|
||||||
footerStr+='<a href="/users/'+nickname+'?replyto='+postJsonObject['object']['id']+'">'
|
footerStr+='<a href="/users/'+nickname+'?replyto='+postJsonObject['object']['id']+'" title="Reply to this post">'
|
||||||
footerStr+='<img src="/icons/reply.png"/></a>'
|
footerStr+='<img src="/icons/reply.png"/></a>'
|
||||||
footerStr+='<a href="/users/'+nickname+'?repeat='+postJsonObject['object']['id']+'">'
|
footerStr+='<a href="/users/'+nickname+'?repeat='+postJsonObject['object']['id']+'" title="Repeat this post">'
|
||||||
footerStr+='<img src="/icons/repeat_inactive.png"/></a>'
|
footerStr+='<img src="/icons/repeat_inactive.png"/></a>'
|
||||||
footerStr+='<a href="/users/'+nickname+'?like='+postJsonObject['object']['id']+'">'
|
footerStr+='<a href="/users/'+nickname+'?like='+postJsonObject['object']['id']+'" title="Like this post">'
|
||||||
footerStr+='<img src="/icons/like_inactive.png"/></a>'
|
footerStr+='<img src="/icons/like_inactive.png"/></a>'
|
||||||
footerStr+='<span class="'+timeClass+'">'+publishedStr+'</span>'
|
footerStr+='<span class="'+timeClass+'">'+publishedStr+'</span>'
|
||||||
footerStr+='</div>'
|
footerStr+='</div>'
|
||||||
|
|
Loading…
Reference in New Issue