indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

When replying to or bouncing a chat message the post should have ChatMessage type

main
Bob Mottram 2022-02-08 12:08:20 +00:00
parent 51a666df39
commit 823b4c331d
4 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
daemon.py
View File

@ -2838,6 +2838,7 @@ class PubServer(BaseHTTPRequestHandler):
custom_submit_text = get_config_param(base_dir, 'customSubmitText')
conversation_id = None
reply_is_chat = False
msg = html_new_post(self.server.css_cache,
False, self.server.translate,
base_dir,
@ -2872,7 +2873,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.signing_priv_key_pem,
self.server.cw_lists,
self.server.lists_enabled,
self.server.default_timeline).encode('utf-8')
self.server.default_timeline,
reply_is_chat).encode('utf-8')
msglen = len(msg)
self._set_headers('text/html', msglen,
cookie, calling_domain, False)
@ -2973,6 +2975,7 @@ class PubServer(BaseHTTPRequestHandler):
custom_submit_text = get_config_param(base_dir, 'customSubmitText')
conversation_id = None
reply_is_chat = False
msg = html_new_post(self.server.css_cache,
False, self.server.translate,
base_dir,
@ -3006,7 +3009,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.signing_priv_key_pem,
self.server.cw_lists,
self.server.lists_enabled,
self.server.default_timeline).encode('utf-8')
self.server.default_timeline,
reply_is_chat).encode('utf-8')
msglen = len(msg)
self._set_headers('text/html', msglen,
cookie, calling_domain, False)
@ -13188,6 +13192,7 @@ class PubServer(BaseHTTPRequestHandler):
media_instance: bool, translate: {},
base_dir: str, http_prefix: str,
in_reply_to_url: str, reply_to_list: [],
reply_is_chat: bool,
share_description: str, reply_page_number: int,
reply_category: str,
domain: str, domain_full: str,
@ -13214,7 +13219,7 @@ class PubServer(BaseHTTPRequestHandler):
str(reply_interval_hours) + ' hours')
self._403()
return True
elif self.server.debug:
if self.server.debug:
print('Reply is within time interval: ' +
str(reply_interval_hours) + ' hours')
@ -13267,7 +13272,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.signing_priv_key_pem,
self.server.cw_lists,
self.server.lists_enabled,
self.server.default_timeline).encode('utf-8')
self.server.default_timeline,
reply_is_chat).encode('utf-8')
if not msg:
print('Error replying to ' + in_reply_to_url)
self._404()
@ -15932,10 +15938,12 @@ class PubServer(BaseHTTPRequestHandler):
# replying as a direct message,
# for moderation posts or the dm timeline
reply_is_chat = False
if '?replydm=' in self.path or '?replychat=' in self.path:
reply_type = 'replydm'
if '?replychat=' in self.path:
reply_type = 'replychat'
reply_is_chat = True
in_reply_to_url = self.path.split('?' + reply_type + '=')[1]
in_reply_to_url = urllib.parse.unquote_plus(in_reply_to_url)
if '?' in in_reply_to_url:
@ -16071,6 +16079,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.base_dir,
self.server.http_prefix,
in_reply_to_url, reply_to_list,
reply_is_chat,
share_description, reply_page_number,
reply_category,
self.server.domain,
@ -16919,6 +16928,7 @@ class PubServer(BaseHTTPRequestHandler):
city = get_spoofed_city(self.server.city,
self.server.base_dir,
nickname, self.server.domain)
conversation_id = None
if fields.get('conversationId'):
conversation_id = fields['conversationId']
@ -17305,6 +17315,10 @@ class PubServer(BaseHTTPRequestHandler):
self.server.domain_full,
self.server.person_cache)
reply_is_chat = False
if fields.get('replychatmsg'):
reply_is_chat = fields['replychatmsg']
message_json = \
create_direct_message_post(self.server.base_dir,
nickname,
@ -17333,7 +17347,8 @@ class PubServer(BaseHTTPRequestHandler):
conversation_id,
self.server.low_bandwidth,
content_license_url,
languages_understood)
languages_understood,
reply_is_chat)
if message_json:
if fields['schedulePost']:
return 1
@ -17396,7 +17411,8 @@ class PubServer(BaseHTTPRequestHandler):
conversation_id,
self.server.low_bandwidth,
self.server.content_license_url,
languages_understood)
languages_understood,
False)
if message_json:
if fields['schedulePost']:
return 1

12
inbox.py
View File

@ -2826,7 +2826,8 @@ def _bounce_dm(senderPostId: str, session, http_prefix: str,
last_bounce_message: [], system_language: str,
signing_priv_key_pem: str,
content_license_url: str,
languages_understood: []) -> bool:
languages_understood: [],
bounce_is_chat: bool) -> bool:
"""Sends a bounce message back to the sending handle
if a DM has been rejected
"""
@ -2888,7 +2889,7 @@ def _bounce_dm(senderPostId: str, session, http_prefix: str,
system_language, conversation_id,
low_bandwidth,
content_license_url,
languages_understood)
languages_understood, bounce_is_chat)
if not post_json_object:
print('WARN: unable to create bounce message to ' + sending_handle)
return False
@ -2984,6 +2985,10 @@ def _is_valid_dm(base_dir: str, nickname: str, domain: str, port: int,
if not obj.get('inReplyTo'):
bounced_id = \
remove_id_ending(post_json_object['id'])
bounce_chat = False
if obj.get('type'):
if obj['type'] == 'ChatMessage':
bounce_chat = True
_bounce_dm(bounced_id,
session, http_prefix,
base_dir,
@ -2998,7 +3003,8 @@ def _is_valid_dm(base_dir: str, nickname: str, domain: str, port: int,
system_language,
signing_priv_key_pem,
content_license_url,
languages_understood)
languages_understood,
bounce_chat)
return False
# dm index will be updated

5
posts.py
View File

@ -2113,7 +2113,8 @@ def create_direct_message_post(base_dir: str,
location: str, system_language: str,
conversation_id: str, low_bandwidth: bool,
content_license_url: str,
languages_understood: []) -> {}:
languages_understood: [],
dm_is_chat: bool) -> {}:
"""Direct Message post
"""
content = resolve_petnames(base_dir, nickname, domain, content)
@ -2144,6 +2145,8 @@ def create_direct_message_post(base_dir: str,
message_json['object']['to'] = message_json['to']
message_json['cc'] = []
message_json['object']['cc'] = []
if dm_is_chat:
message_json['object']['type'] = 'ChatMessage'
if schedule_post:
post_id = remove_id_ending(message_json['object']['id'])
save_post_to_box(base_dir, http_prefix, post_id,

11
webapp_create_post.py
View File

@ -210,7 +210,8 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
system_language: str,
max_like_count: int, signing_priv_key_pem: str,
cw_lists: {}, lists_enabled: str,
boxName: str) -> str:
boxName: str,
reply_is_chat: bool) -> str:
"""New post screen
"""
reply_str = ''
@ -691,7 +692,10 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
dropdown_new_blog_suffix += '?replyto=' + inReplyTo
dropdown_unlisted_suffix += '?replyto=' + inReplyTo
dropdown_followers_suffix += '?replyfollowers=' + inReplyTo
dropdown_dm_suffix += '?replydm=' + inReplyTo
if reply_is_chat:
dropdown_dm_suffix += '?replychat=' + inReplyTo
else:
dropdown_dm_suffix += '?replydm=' + inReplyTo
for mentioned_actor in mentions:
dropdown_new_post_suffix += '?mention=' + mentioned_actor
dropdown_new_blog_suffix += '?mention=' + mentioned_actor
@ -732,6 +736,9 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
'<form enctype="multipart/form-data" method="POST" ' + \
'accept-charset="UTF-8" action="' + \
path + '?' + endpoint + '?page=' + str(page_number) + '">\n'
if reply_is_chat:
new_post_form += \
' <input type="hidden" name="replychatmsg" value="yes">\n'
if conversationId:
new_post_form += \
' <input type="hidden" name="conversationId" value="' + \