Mercurial > libervia-web
annotate libervia/web/pages/chat/_browser/__init__.py @ 1625:698eaabfca0e
browser (chat): side/panel and keyword handling:
- `dialog.Modal` can now be used with a `position` argument. The default `center` keeps
the old behaviour of modal in the middle of the screen, while using one of the
direction makes the modal appear from top/bottom/right/left with an animation. The
closing cross has been removed in favor of clicking/touching any part outside of the
modal.
- A method to create mockup clones of elements is now used to make placeholders. It is
used for the input panel in the main area when it is moved to a sub-panel modal, this
way there is not element disappearing.
- Clicking on a keyword now shows a sub-messages panel with all messages with this
keyword, in a similar way as for threads. Writing a messages there will add the keyword
automatically.
- Sub-messages panel will auto-scroll when messages are added.
rel 458
author | Goffi <goffi@goffi.org> |
---|---|
date | Fri, 06 Jun 2025 11:08:05 +0200 |
parents | fdb5689fb826 |
children | 84e287565fab |
rev | line source |
---|---|
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
1 from html import escape |
1536 | 2 import json |
1541
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
3 import re |
1619 | 4 from typing import Callable |
5 import errors | |
1536 | 6 |
7 from bridge import AsyncBridge as Bridge | |
1585
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
8 from browser import DOMNode, aio, console as log, document, window |
1619 | 9 from cache import cache, identities, roster |
1541
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
10 import dialog |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
11 from file_uploader import FileUploader |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
12 import jid |
1619 | 13 from javascript import pyobj2jsobj |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
14 from js_modules import emoji_picker_element |
1619 | 15 from js_modules.tippy_js import tippy as tippy_ori |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
16 import popup |
1536 | 17 from template import Template, safe |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
18 from tools import is_touch_device, remove_ids, make_placeholder |
1619 | 19 from loading import remove_loading_screen |
20 from jid_search import JidSearch | |
21 from interpreter import Inspector | |
22 from components import init_collapsible_cards | |
1536 | 23 |
24 log.warning = log.warn | |
25 profile = window.profile or "" | |
1595
7941444c1671
pages: set `own_local_jid` to avoid confusion with `own_jid`:
Goffi <goffi@goffi.org>
parents:
1585
diff
changeset
|
26 # JID used in the local chat (real JID for one2one, room JID otherwise) |
7941444c1671
pages: set `own_local_jid` to avoid confusion with `own_jid`:
Goffi <goffi@goffi.org>
parents:
1585
diff
changeset
|
27 own_local_jid = jid.JID(window.own_local_jid) |
1536 | 28 target_jid = jid.JID(window.target_jid) |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
29 chat_type = window.chat_type |
1619 | 30 chat_url = window.chat_url |
1536 | 31 bridge = Bridge() |
32 | |
33 # Sensible value to consider that user is at the bottom | |
34 SCROLL_SENSITIVITY = 200 | |
35 | |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
36 INPUT_MODES = {"normal", "edit", "quote"} |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
37 MODE_CLASS = "mode_{}" |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
38 SELECTED_THREAD_CLS = "has-background-info-light" |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
39 |
1536 | 40 |
1619 | 41 # FIXME: workaround for https://github.com/brython-dev/brython/issues/2542 |
42 def tippy(target, data): | |
43 return tippy_ori(target, pyobj2jsobj(data)) | |
44 | |
45 | |
46 class NewChatDialog: | |
47 | |
48 def __init__(self, on_select: Callable[[str], None]|None = None) -> None: | |
49 self.on_select = on_select | |
50 self.new_chat_dialog_tpl = Template("chat/new_chat_dialog.html") | |
51 self.dialog_elt = self.new_chat_dialog_tpl.get_elt() | |
52 self.modal = dialog.Modal(self.dialog_elt, is_card=True) | |
53 | |
54 # direct chat | |
55 self.direct_search_input_elt = self.dialog_elt.select_one( | |
56 "div.direct-content input.search-input" | |
57 ) | |
58 self.direct_items_container = self.dialog_elt.select_one(".direct-items") | |
59 self.direct_count_elt = self.dialog_elt.select_one(".direct-count") | |
60 self.start_chat_btn = self.dialog_elt.select_one(".action_ok") | |
61 assert self.start_chat_btn is not None | |
62 self.start_chat_btn.bind("click", self.on_start_chat_btn) | |
63 if not self.direct_count_elt or not self.start_chat_btn: | |
64 log.error('"direct-count" or "action_ok" element is missing.') | |
65 self.selected_entities = set() | |
66 self.jid_search = JidSearch( | |
67 self.direct_search_input_elt, | |
68 self.direct_items_container, | |
69 click_cb = self.on_search_item_click, | |
70 template = "chat/search_item.html", | |
71 ) | |
72 for elt in self.dialog_elt.select(".action_close"): | |
73 elt.bind("click", lambda __: self.close()) | |
74 for elt in self.dialog_elt.select("div.direct-content .action_clear_search"): | |
75 elt.bind("click", lambda __: self.clear_search_input()) | |
76 | |
77 # groups | |
78 self.groups_search_input_elt = self.dialog_elt.select_one( | |
79 "div.groups-content input.search-input" | |
80 ) | |
81 self.groups_items_container = self.dialog_elt.select_one(".groups-items") | |
82 | |
83 self.selected_entities = set() | |
84 | |
85 self.groups_jid_search = JidSearch( | |
86 self.groups_search_input_elt, | |
87 self.groups_items_container, | |
88 click_cb = self.on_group_search_item_click, | |
89 options={"type": "group"}, | |
90 template = "chat/groups_search_item.html", | |
91 ) | |
92 for elt in self.dialog_elt.select(".action_close"): | |
93 elt.bind("click", lambda __: self.close()) | |
94 for elt in self.dialog_elt.select("div.groups-content .action_clear_search"): | |
95 elt.bind("click", lambda __: self.clear_groups_search_input()) | |
96 | |
97 self.new_room_btn = self.dialog_elt.select_one(".action_new_room") | |
98 assert self.new_room_btn is not None | |
99 self.new_room_btn.bind("click", self.on_new_room_btn) | |
100 self.panel_new_room = self.dialog_elt.select_one(".panel_new_room") | |
101 assert self.panel_new_room is not None | |
102 self.create_room_btn = self.dialog_elt.select_one(".action_create_room") | |
103 assert self.create_room_btn is not None | |
104 self.create_room_btn.bind("click", self._on_create_room_btn) | |
105 | |
106 self.error_message_elt = self.dialog_elt.select_one("div.error-message") | |
107 assert self.error_message_elt is not None | |
108 self.error_message_elt.select_one("button.delete").bind( | |
109 "click", | |
110 lambda __: self.error_message_elt.classList.add("is-hidden") | |
111 ) | |
112 | |
113 # tabs | |
114 self.tabs = {} | |
115 self.selected_tab_elt = None | |
116 for tab_elt in self.dialog_elt.select('div.tabs>ul>li'): | |
117 if tab_elt.classList.contains("is-active"): | |
118 self.selected_tab_elt = tab_elt | |
119 tab_name = tab_elt.dataset.tab | |
120 tab_content_elt = self.dialog_elt.select_one(f".{tab_name}-content") | |
121 assert tab_content_elt is not None | |
122 self.tabs[tab_elt] = tab_content_elt | |
123 tab_elt.bind( | |
124 'click', | |
125 lambda __, tab_elt=tab_elt: self.set_active_tab(tab_elt) | |
126 ) | |
127 | |
128 def set_active_tab(self, selected_tab_elt) -> None: | |
129 """Display a tab.""" | |
130 self.selected_tab_elt = selected_tab_elt | |
131 for tab_elt, tab_content_elt in self.tabs.items(): | |
132 if tab_elt == selected_tab_elt: | |
133 tab_elt.classList.add("is-active") | |
134 tab_content_elt.classList.remove("is-hidden") | |
135 else: | |
136 tab_elt.classList.remove("is-active") | |
137 tab_content_elt.classList.add("is-hidden") | |
138 self.update() | |
139 | |
140 def clear_search_input(self) -> None: | |
141 """Clear search input, and update dialog.""" | |
142 self.direct_search_input_elt.value = "" | |
143 self.direct_search_input_elt.dispatchEvent(window.Event.new("input")) | |
144 self.update() | |
145 | |
146 def clear_groups_search_input(self) -> None: | |
147 """Clear search input, and update dialog.""" | |
148 self.groups_search_input_elt.value = "" | |
149 self.groups_search_input_elt.dispatchEvent(window.Event.new("input")) | |
150 self.groups_update() | |
151 | |
152 def on_search_item_click(self, event, item) -> None: | |
153 """A search item has been clicked""" | |
154 search_item_elt = event.currentTarget | |
155 search_item_elt.classList.toggle("is-selected") | |
156 self.update() | |
157 | |
158 def on_group_search_item_click(self, event, item) -> None: | |
159 """A search item has been clicked""" | |
160 for item_elt in self.groups_items_container.select(".search-item"): | |
161 if item_elt == event.currentTarget: | |
162 item_elt.classList.add("is-selected") | |
163 else: | |
164 item_elt.classList.remove("is-selected") | |
165 self.update() | |
166 | |
167 def update(self) -> None: | |
168 """Update dialog elements (counter, button) when search items change.""" | |
169 assert self.selected_tab_elt is not None | |
170 current_tab = self.selected_tab_elt.dataset.tab | |
171 match current_tab: | |
172 case "direct": | |
173 self.selected_entities = { | |
174 item_elt.dataset.entity for item_elt in | |
175 self.direct_items_container.select(".search-item.is-selected") | |
176 } | |
177 self.direct_count_elt.text = str(len(self.selected_entities)) | |
178 case "groups": | |
179 self.selected_entities = { | |
180 item_elt.dataset.entity for item_elt in | |
181 self.groups_items_container.select(".search-item.is-selected") | |
182 } | |
183 case _: | |
184 raise ValueError(f"Unknown tab: {current_tab!r}.") | |
185 | |
186 self.start_chat_btn.disabled = not bool(self.selected_entities) | |
187 | |
188 def groups_update(self) -> None: | |
189 """Update dialog elements when groups search items change.""" | |
190 self.selected_entities = { | |
191 item_elt.dataset.entity for item_elt in | |
192 self.direct_items_container.select(".search-item.is-selected") | |
193 } | |
194 self.start_chat_btn.disabled = not bool(self.selected_entities) | |
195 | |
196 def on_new_room_btn(self, evt) -> None: | |
197 self.panel_new_room.classList.toggle("is-hidden") | |
198 | |
199 def _on_create_room_btn(self, evt) -> None: | |
200 aio.run(self.on_create_room_btn()) | |
201 | |
202 async def on_create_room_btn(self) -> None: | |
203 assert self.on_select is not None | |
204 input_elt = self.dialog_elt.select_one(".input-room-name") | |
205 assert input_elt is not None | |
206 try: | |
207 joined_data = await bridge.muc_join(input_elt.value.strip(), "", {}) | |
208 except Exception as e: | |
209 msg = f"Can't create room: {e}" | |
210 log.error(msg) | |
211 self.error_message_elt.select_one("p").text = msg | |
212 self.error_message_elt.classList.remove("is-hidden") | |
213 return | |
214 | |
215 joined, room_jid_s, occupants, user_nick, subject, statuses, profile = joined_data | |
216 self.on_select(room_jid_s) | |
217 | |
218 def on_start_chat_btn(self, evt) -> None: | |
219 evt.stopPropagation() | |
220 if self.on_select is None: | |
221 return | |
222 if not self.selected_entities: | |
223 raise errors.InternalError( | |
224 "Start button should never be called when no entity is selected." | |
225 ) | |
226 if len(self.selected_entities) == 1: | |
227 selected_entity = next(iter(self.selected_entities)) | |
228 self.on_select(selected_entity) | |
229 else: | |
230 aio.run(self.create_room_selected_jids()) | |
231 | |
232 async def create_room_selected_jids(self) -> None: | |
233 assert self.on_select is not None | |
234 joined_data = await bridge.muc_join("", "", {}) | |
235 joined, room_jid_s, occupants, user_nick, subject, statuses, profile = joined_data | |
236 if not self.selected_entities: | |
237 Inspector() | |
238 for entity_jid in self.selected_entities: | |
239 print(f"inviting {entity_jid=}") | |
240 await bridge.muc_invite(entity_jid, room_jid_s, {}) | |
241 self.on_select(room_jid_s) | |
242 | |
243 | |
244 def show(self) -> None: | |
245 """Show the dialog.""" | |
246 # We want ot be sure to have the elements correctly set when dialog is shown | |
247 self.update() | |
248 self.modal.show() | |
249 | |
250 def close(self) -> None: | |
251 """Close the dialog.""" | |
252 self.modal.close() | |
253 | |
254 | |
1536 | 255 class LiberviaWebChat: |
256 def __init__(self): | |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
257 self._input_mode = "normal" |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
258 self.input_data = {} |
1619 | 259 self.direct_messages_tpl = Template("chat/direct_messages.html") |
1536 | 260 self.message_tpl = Template("chat/message.html") |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
261 self.extra_menu_tpl = Template("chat/extra_menu.html") |
1623
fdb5689fb826
browser (chat): Update following template change + some cleaning:
Goffi <goffi@goffi.org>
parents:
1620
diff
changeset
|
262 self.reactions_tpl = Template("components/reactions.html") |
fdb5689fb826
browser (chat): Update following template change + some cleaning:
Goffi <goffi@goffi.org>
parents:
1620
diff
changeset
|
263 self.reactions_details_tpl = Template("components/reactions_details.html") |
1541
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
264 self.url_preview_control_tpl = Template("components/url_preview_control.html") |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
265 self.url_preview_tpl = Template("components/url_preview.html") |
1542
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
266 self.new_messages_marker_elt = Template("chat/new_messages_marker.html").get_elt() |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
267 self.editions_tpl = Template("chat/editions.html") |
1619 | 268 self.occupant_item_tpl = Template("chat/occupant_item.html") |
269 | |
270 # panels and their toggle buttons | |
271 | |
272 self.left_panel = document["left_panel"] | |
273 self.left_toggle = document["left_panel-toggle"] | |
274 self.left_toggle.bind("click", self.on_left_panel_toggle_click) | |
275 self.main_panel = document["main_panel"] | |
276 self.right_panel = document["right_panel"] | |
277 self.right_toggle = document["right_panel-toggle"] | |
278 self.right_toggle.bind("click", self.on_right_panel_toggle_click) | |
1541
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
279 |
1536 | 280 self.messages_elt = document["messages"] |
281 | |
1619 | 282 # right-panel internal buttons |
283 init_collapsible_cards(self.right_panel) | |
284 | |
1536 | 285 # attachments |
286 self.file_uploader = FileUploader( | |
287 "", "chat/attachment_preview.html", on_delete_cb=self.on_attachment_delete | |
288 ) | |
289 self.attachments_elt = document["attachments"] | |
1619 | 290 self.message_input = document["message_input_area"] |
1536 | 291 |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
292 # reply to/thread |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
293 self.sub_messages_panel_tpl = Template("chat/sub_messages_panel.html") |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
294 # current thread panel, if any. |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
295 self.sub_messages_panel = None |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
296 # Method to call to check if a new message must be displayer in sub-messages |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
297 # panel. |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
298 self.sub_messages_check_cb: Callable|None = None |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
299 self._reply_to: str|None = None |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
300 self.thread_id: str|None = None |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
301 self.keyword: str|None = None |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
302 document["cancel_reply_btn"].bind( |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
303 "click", |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
304 lambda __: setattr(self, "reply_to", None) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
305 ) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
306 # use `thead` property to modify. |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
307 self._show_thread = None |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
308 |
1619 | 309 # close_button = document.select_one(".modal-close") |
310 # close_button.bind("click", self.close_modal) | |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
311 |
1536 | 312 # hide/show attachments |
313 MutationObserver = window.MutationObserver | |
314 observer = MutationObserver.new(lambda *__: self.update_attachments_visibility()) | |
315 observer.observe(self.attachments_elt, {"childList": True}) | |
316 | |
317 # we want the message scroll to be initially at the bottom | |
318 self.messages_elt.scrollTop = self.messages_elt.scrollHeight | |
319 | |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
320 # listeners/dynamic updates |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
321 self.add_message_event_listeners() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
322 self.handle_url_previews() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
323 self.add_reactions_listeners() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
324 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
325 # input |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
326 self.auto_resize_message_input() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
327 self.message_input.focus() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
328 |
1619 | 329 # direct messages |
330 direct_messages_elt = self.direct_messages_tpl.get_elt( | |
331 { | |
332 "roster": roster, | |
333 "identities": identities, | |
334 "chat_url": chat_url | |
335 } | |
336 ) | |
337 document["direct-messages"] <= direct_messages_elt | |
338 | |
339 async def post_init(self) -> None: | |
340 if chat_type == "group": | |
341 occupants = await bridge.muc_occupants_get( | |
342 str(target_jid) | |
343 ) | |
344 document["occupants-count"].text = str(len(occupants)) | |
345 for occupant, occupant_data in occupants.items(): | |
346 occupant_elt = self.occupant_item_tpl.get_elt({ | |
347 "nick": occupant, | |
348 "item": occupant_data, | |
349 "identities": identities, | |
350 }) | |
351 document["group-occupants"] <= occupant_elt | |
352 | |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
353 @property |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
354 def input_mode(self) -> str: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
355 return self._input_mode |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
356 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
357 @input_mode.setter |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
358 def input_mode(self, new_mode: str) -> None: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
359 if new_mode == self.input_mode: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
360 return |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
361 if new_mode not in INPUT_MODES: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
362 raise ValueError(f"Invalid input mode: {new_mode!r}") |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
363 target_elt = self.message_input |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
364 target_elt.classList.remove(MODE_CLASS.format(self._input_mode)) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
365 self._input_mode = new_mode |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
366 target_elt.classList.add(MODE_CLASS.format(new_mode)) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
367 self.input_data.clear() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
368 |
1536 | 369 @property |
370 def is_at_bottom(self): | |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
371 return self.is_elt_at_bottom(self.messages_elt) |
1536 | 372 |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
373 @property |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
374 def reply_to(self) -> dict|None: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
375 return self._reply_to |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
376 |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
377 @reply_to.setter |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
378 def reply_to(self, reply_to: dict|None) -> None: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
379 if reply_to == self._reply_to: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
380 return |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
381 self._reply_to = reply_to |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
382 document["reply-to_message"].clear() |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
383 if reply_to is None: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
384 document["reply-to"].classList.add("is-hidden") |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
385 else: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
386 document["reply-to"].classList.remove("is-hidden") |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
387 parent_message_elt = document[reply_to["id"]] |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
388 cloned_parent_elt = parent_message_elt.cloneNode(True) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
389 remove_ids(cloned_parent_elt) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
390 message_actions_elt = cloned_parent_elt.select_one(".message-actions") |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
391 if message_actions_elt is not None: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
392 message_actions_elt.remove() |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
393 document["reply-to_message"] <= cloned_parent_elt |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
394 |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
395 @property |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
396 def show_thread(self) -> str|None: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
397 """Indicate the thread to highlight""" |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
398 return self._show_thread |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
399 |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
400 @show_thread.setter |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
401 def show_thread(self, thread_id: str|None) -> None: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
402 """Set the thread to highlight, or None to clear view.""" |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
403 if self._show_thread == thread_id: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
404 return |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
405 if self._show_thread is not None: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
406 # If we have a previously selected thread, we clean the view. |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
407 for message_core_elt in self.messages_elt.select(".message-core"): |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
408 message_core_elt.classList.remove(SELECTED_THREAD_CLS) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
409 self._show_thread = thread_id |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
410 if thread_id is not None: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
411 for message_elt in self.messages_elt.select(".chat-message"): |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
412 try: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
413 message_thread_id = message_elt.dataset["thread"] |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
414 except KeyError: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
415 continue |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
416 if message_thread_id == thread_id: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
417 message_core_elt = message_elt.select_one(".message-core") |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
418 if not message_core_elt: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
419 log.debug( |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
420 f"Not message core found for message {message_elt['id']!r}." |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
421 ) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
422 else: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
423 message_core_elt.classList.add(SELECTED_THREAD_CLS) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
424 |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
425 def is_elt_at_bottom(self, elt) -> bool: |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
426 """Tell is a scrollable elemement is scrolled down. |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
427 |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
428 There is a margin to check it set with SCROLL_SENSITIVITY. |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
429 @param element: Scrollable element to check. |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
430 @return: True if the element is as its bottom. |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
431 """ |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
432 return elt.scrollHeight - elt.scrollTop - elt.clientHeight <= SCROLL_SENSITIVITY |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
433 |
1619 | 434 def open_chat(self, entity_jid: str) -> None: |
435 """Change the current chat for the given one.""" | |
436 # For now we keep it simple and just load the new location. | |
437 window.location = f"{chat_url}/{entity_jid}" | |
438 | |
439 async def on_new_chat(self) -> None: | |
440 new_chat_dialog = NewChatDialog(on_select = self.open_chat) | |
441 new_chat_dialog.show() | |
442 | |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
443 async def send_message(self): |
1536 | 444 """Send message currently in input area |
445 | |
446 The message and corresponding attachment will be sent | |
447 """ | |
448 message = self.message_input.value.rstrip() | |
449 log.info(f"{message=}") | |
450 | |
451 # attachments | |
452 attachments = [] | |
453 for attachment_elt in self.attachments_elt.children: | |
454 file_data = json.loads(attachment_elt.getAttribute("data-file")) | |
455 attachments.append(file_data) | |
456 | |
457 if message or attachments: | |
458 extra = {} | |
459 | |
460 if attachments: | |
461 extra["attachments"] = attachments | |
462 | |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
463 if self.reply_to: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
464 extra["reply"] = self.reply_to |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
465 |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
466 if self.thread_id: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
467 extra["thread"] = self.thread_id |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
468 |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
469 if self.keyword: |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
470 extra.setdefault("keywords", []).append(self.keyword) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
471 |
1536 | 472 # now we send the message |
473 try: | |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
474 if self.input_mode == "edit": |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
475 message_id = self.input_data["id"] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
476 edit_data = { |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
477 "message": {"": message}, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
478 "extra": extra |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
479 } |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
480 await bridge.message_edit( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
481 message_id, json.dumps(edit_data, ensure_ascii=False) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
482 ) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
483 else: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
484 await bridge.message_send( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
485 str(target_jid), |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
486 {"": message}, {}, "auto", json.dumps(extra, ensure_ascii=False) |
1536 | 487 ) |
488 except Exception as e: | |
489 dialog.notification.show(f"Can't send message: {e}", "error") | |
490 else: | |
491 self.message_input.value = "" | |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
492 # We must not reset self.thread_id here, it is when the thread panel is |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
493 # closed. |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
494 # FIXME: Another mechanism must be used if the input panel is cloned at |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
495 # some point, with a slide-in panel for thread, as thread_id would then |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
496 # be used for the thread panel's message input, but not if the main area |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
497 # message input is used. |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
498 self.reply_to = None |
1536 | 499 self.attachments_elt.clear() |
1619 | 500 self.auto_resize_message_input() |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
501 self.input_mode = "normal" |
1536 | 502 |
503 def _on_message_new( | |
504 self, | |
505 uid: str, | |
506 timestamp: float, | |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
507 from_jid_s: str, |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
508 to_jid_s: str, |
1536 | 509 message: dict, |
510 subject: dict, | |
511 mess_type: str, | |
512 extra_s: str, | |
513 profile: str, | |
514 ) -> None: | |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
515 from_jid = jid.JID(from_jid_s) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
516 to_jid = jid.JID(to_jid_s) |
1536 | 517 if ( |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
518 from_jid.bare == window.target_jid |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
519 or to_jid.bare == window.target_jid |
1536 | 520 ): |
521 aio.run( | |
522 self.on_message_new( | |
523 uid, | |
524 timestamp, | |
525 from_jid, | |
526 to_jid, | |
527 message, | |
528 subject, | |
529 mess_type, | |
530 json.loads(extra_s), | |
531 profile, | |
532 ) | |
533 ) | |
534 | |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
535 def _on_message_update( |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
536 self, uid: str, type_: str, update_data_s: str, profile: str |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
537 ) -> None: |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
538 aio.run(self.on_message_update(uid, type_, update_data_s, profile)) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
539 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
540 async def on_message_update( |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
541 self, uid: str, type_: str, update_data_s: str, profile: str |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
542 ) -> None: |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
543 update_data = json.loads(update_data_s) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
544 is_at_bottom = self.is_at_bottom |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
545 if type_ == "REACTION": |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
546 reactions = update_data["reactions"] |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
547 log.debug(f"new reactions: {reactions}") |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
548 try: |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
549 reactions_wrapper_elt = document[f"msg_reactions_{uid}"] |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
550 except KeyError: |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
551 log.debug(f"Message {uid} not found, no reactions to update") |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
552 else: |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
553 log.debug(f"Message {uid} found, new reactions: {reactions}") |
1596
52098b5bab8d
browser (chat): add data for reactions
Goffi <goffi@goffi.org>
parents:
1595
diff
changeset
|
554 reactions_elt = self.reactions_tpl.get_elt( |
52098b5bab8d
browser (chat): add data for reactions
Goffi <goffi@goffi.org>
parents:
1595
diff
changeset
|
555 { |
1623
fdb5689fb826
browser (chat): Update following template change + some cleaning:
Goffi <goffi@goffi.org>
parents:
1620
diff
changeset
|
556 "own_jid": str( |
fdb5689fb826
browser (chat): Update following template change + some cleaning:
Goffi <goffi@goffi.org>
parents:
1620
diff
changeset
|
557 own_local_jid if chat_type == "group" else own_local_jid.bare |
fdb5689fb826
browser (chat): Update following template change + some cleaning:
Goffi <goffi@goffi.org>
parents:
1620
diff
changeset
|
558 ), |
1596
52098b5bab8d
browser (chat): add data for reactions
Goffi <goffi@goffi.org>
parents:
1595
diff
changeset
|
559 "reactions": reactions |
52098b5bab8d
browser (chat): add data for reactions
Goffi <goffi@goffi.org>
parents:
1595
diff
changeset
|
560 }) |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
561 reactions_wrapper_elt.clear() |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
562 reactions_wrapper_elt <= reactions_elt |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
563 self.add_reactions_listeners(reactions_elt) |
1585
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
564 elif type_ in ("EDIT", "RETRACT"): |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
565 try: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
566 old_message_elt = document[uid] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
567 except KeyError: |
1585
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
568 log.debug(f"Message {uid} not found, no {type_.lower()}ion to apply") |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
569 else: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
570 template_data = await self.message_to_template_data( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
571 uid, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
572 update_data["timestamp"], |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
573 jid.JID(update_data["from"]), |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
574 jid.JID(update_data["to"]), |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
575 update_data["message"], |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
576 update_data["subject"], |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
577 update_data["type"], |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
578 update_data["extra"] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
579 ) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
580 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
581 new_message_elt = self.message_tpl.get_elt( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
582 template_data |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
583 ) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
584 old_message_elt.replaceWith(new_message_elt) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
585 self.add_message_event_listeners(new_message_elt) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
586 self.handle_url_previews(new_message_elt) |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
587 else: |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
588 log.warning(f"Unsupported update type: {type_!r}") |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
589 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
590 # If user was at the bottom, keep the scroll at the bottom |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
591 if is_at_bottom: |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
592 self.messages_elt.scrollTop = self.messages_elt.scrollHeight |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
593 |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
594 async def message_to_template_data( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
595 self, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
596 uid: str, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
597 timestamp: float, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
598 from_jid: jid.JID, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
599 to_jid: jid.JID, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
600 message_data: dict, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
601 subject_data: dict, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
602 mess_type: str, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
603 extra: dict, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
604 ) -> dict: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
605 """Generate template data to use with [message_tpl] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
606 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
607 @return: template data |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
608 """ |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
609 xhtml_data = extra.get("xhtml") |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
610 if not xhtml_data: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
611 xhtml = None |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
612 else: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
613 try: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
614 xhtml = xhtml_data[""] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
615 except KeyError: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
616 xhtml = next(iter(xhtml_data.values())) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
617 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
618 if chat_type == "group": |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
619 await cache.fill_identities([str(from_jid)]) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
620 else: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
621 await cache.fill_identities([str(jid.JID(from_jid).bare)]) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
622 from_jid = from_jid.bare |
1613
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
623 attachments = extra.get("attachments", []) |
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
624 for attachment in attachments: |
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
625 if "url" not in attachment: |
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
626 try: |
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
627 attachment["url"] = next( |
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
628 s['url'] for s in attachment["sources"] if 'url' in s |
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
629 ) |
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
630 except (StopIteration, KeyError): |
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
631 log.warning( |
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
632 f"An attachment has no URL: {attachment}" |
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
633 ) |
1610
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
634 msg_data = { |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
635 "id": uid, |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
636 "timestamp": extra.get("updated", timestamp), |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
637 "type": mess_type, |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
638 "from_": str(from_jid), |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
639 "text": message_data.get("") or next(iter(message_data.values()), ""), |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
640 "subject": subject_data.get("") or next(iter(subject_data.values()), ""), |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
641 "type": mess_type, |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
642 "reeceived": extra.get("received_timestamp") or timestamp, |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
643 "encrypted": extra.get("encrypted", False), |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
644 "received": extra.get("received", False), |
1613
c4407befc52a
browser (chat): fix attachments URL for messages.
Goffi <goffi@goffi.org>
parents:
1610
diff
changeset
|
645 "attachments": attachments, |
1610
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
646 "extra": extra |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
647 } |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
648 for key in ("thread", "thread_parent", "delay_sender", "info_type"): |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
649 value = extra.get(key) |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
650 if value is not None: |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
651 msg_data[key] = value |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
652 |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
653 if xhtml: |
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
654 msg_data["html"] = safe(xhtml) |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
655 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
656 return { |
1595
7941444c1671
pages: set `own_local_jid` to avoid confusion with `own_jid`:
Goffi <goffi@goffi.org>
parents:
1585
diff
changeset
|
657 "own_local_jid": str(own_local_jid), |
7941444c1671
pages: set `own_local_jid` to avoid confusion with `own_jid`:
Goffi <goffi@goffi.org>
parents:
1585
diff
changeset
|
658 "chat_type": chat_type, |
1610
19c83dd943df
browser (chat): don't set `None` value in message data used in template:
Goffi <goffi@goffi.org>
parents:
1596
diff
changeset
|
659 "msg": msg_data, |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
660 "identities": identities, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
661 } |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
662 |
1536 | 663 async def on_message_new( |
664 self, | |
665 uid: str, | |
666 timestamp: float, | |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
667 from_jid: jid.JID, |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
668 to_jid: jid.JID, |
1536 | 669 message_data: dict, |
670 subject_data: dict, | |
671 mess_type: str, | |
672 extra: dict, | |
673 profile: str, | |
674 ) -> None: | |
1542
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
675 # FIXME: visibilityState doesn't detect OS events such as `Alt + Tab`, using focus |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
676 # event may help to get those use cases, but it gives false positives. |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
677 if ( |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
678 document.visibilityState == "hidden" |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
679 and self.new_messages_marker_elt.parent is None |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
680 ): |
1542
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
681 # the page is not visible, and we have no new messages marker yet, so we add |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
682 # it |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
683 self.messages_elt <= self.new_messages_marker_elt |
1536 | 684 |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
685 template_data = await self.message_to_template_data( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
686 uid, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
687 timestamp, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
688 from_jid, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
689 to_jid, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
690 message_data, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
691 subject_data, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
692 mess_type, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
693 extra |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
694 ) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
695 |
1536 | 696 message_elt = self.message_tpl.get_elt( |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
697 template_data |
1536 | 698 ) |
699 | |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
700 |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
701 if "reply" in extra: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
702 parent_id = extra["reply"]["id"] |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
703 try: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
704 parent_message_elt = document[parent_id] |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
705 except KeyError: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
706 log.info( |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
707 "Parent message of reply not found in current history: " |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
708 f"{parent_id!r}" |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
709 ) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
710 else: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
711 thread_id = extra.get("thread", parent_id) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
712 if "thread" not in parent_message_elt.dataset: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
713 parent_message_elt.dataset["thread"] = thread_id |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
714 # TODO: Regenerate parent message, so thread icon will appear. |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
715 |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
716 if ( |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
717 self.sub_messages_check_cb is not None |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
718 and self.sub_messages_panel is not None |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
719 and self.sub_messages_check_cb(extra) |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
720 ): |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
721 # FIXME: This is quite fragile, IDs are removed, meaning that some listener |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
722 # may not be working correctly, |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
723 cloned_message_elt = message_elt.cloneNode(True) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
724 remove_ids(cloned_message_elt) |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
725 sub_messages_elt = document["sub-messages"] |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
726 is_at_bottom = self.is_elt_at_bottom(sub_messages_elt) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
727 sub_messages_elt.appendChild(cloned_message_elt) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
728 if is_at_bottom: |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
729 sub_messages_elt.scrollTop = sub_messages_elt.scrollHeight |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
730 |
1536 | 731 # Check if user is viewing older messages or is at the bottom |
732 is_at_bottom = self.is_at_bottom | |
733 | |
734 self.messages_elt <= message_elt | |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
735 self.add_message_event_listeners(message_elt) |
1541
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
736 # we add preview in parallel on purpose, as they can be slow to get |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
737 self.handle_url_previews(message_elt) |
1536 | 738 |
739 # If user was at the bottom, keep the scroll at the bottom | |
740 if is_at_bottom: | |
741 self.messages_elt.scrollTop = self.messages_elt.scrollHeight | |
742 | |
743 def auto_resize_message_input(self): | |
744 """Resize the message input field according to content.""" | |
745 is_at_bottom = self.is_at_bottom | |
746 | |
747 # The textarea's height is first reset to 'auto' to ensure it's not influenced by | |
748 # the previous content. | |
749 self.message_input.style.height = "auto" | |
750 | |
751 # Then the height is set to the scrollHeight of the textarea (which is the height | |
752 # of the content), plus the vertical border, resulting in a textarea that grows as | |
753 # more lines of text are added. | |
754 self.message_input.style.height = f"{self.message_input.scrollHeight + 2}px" | |
755 | |
756 if is_at_bottom: | |
757 # we want the message are to still display the last message | |
758 self.messages_elt.scrollTop = self.messages_elt.scrollHeight | |
759 | |
1619 | 760 def on_left_panel_toggle_click(self, evt) -> None: |
761 """Show/Hide side bar.""" | |
762 self.left_panel.classList.toggle("is-collapsed") | |
763 self.main_panel.classList.toggle("is-expanded-left") | |
764 | |
765 def on_right_panel_toggle_click(self, evt) -> None: | |
766 """Show/Hide side bar.""" | |
767 self.right_panel.classList.toggle("is-collapsed") | |
768 self.main_panel.classList.toggle("is-expanded-right") | |
769 | |
1536 | 770 def on_message_keydown(self, evt): |
771 """Handle the 'keydown' event of the message input field | |
772 | |
773 @param evt: The event object. 'target' refers to the textarea element. | |
774 """ | |
775 if evt.keyCode == 13: # <Enter> key | |
776 if not window.navigator.maxTouchPoints: | |
777 # we have a non touch device, we send message on <Enter> | |
778 if not evt.shiftKey: | |
779 evt.preventDefault() # Prevents line break | |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
780 aio.run(self.send_message()) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
781 elif evt.keyCode == 27: # <ESC> key |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
782 evt.preventDefault() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
783 self.message_input.value = '' |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
784 self.input_mode = 'normal' |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
785 self.auto_resize_message_input() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
786 elif evt.keyCode == 38: # <Up> arrow key |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
787 if self.input_mode == "normal" and self.message_input.value.strip() == "": |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
788 evt.preventDefault() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
789 own_msgs = document.getElementsByClassName('own_msg') |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
790 if own_msgs.length > 0: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
791 last_msg = own_msgs[own_msgs.length - 1] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
792 aio.run(self.on_action_edit(None, last_msg)) |
1536 | 793 |
794 def update_attachments_visibility(self): | |
795 if len(self.attachments_elt.children): | |
796 self.attachments_elt.classList.remove("is-contracted") | |
797 else: | |
798 self.attachments_elt.classList.add("is-contracted") | |
799 | |
800 def on_file_selected(self, evt): | |
801 """Handle file selection""" | |
802 log.info("file selected") | |
803 files = evt.currentTarget.files | |
804 self.file_uploader.upload_files(files, self.attachments_elt) | |
805 self.message_input.focus() | |
806 | |
807 def on_attachment_delete(self, evt): | |
808 evt.stopPropagation() | |
809 target = evt.currentTarget | |
1540
b4342176fa0a
browser (chat): minor reformatting
Goffi <goffi@goffi.org>
parents:
1536
diff
changeset
|
810 item_elt = DOMNode(target.closest(".attachment-preview")) |
1536 | 811 item_elt.remove() |
812 | |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
813 def on_attach_btn_click(self, evt): |
1619 | 814 document["file-input"].click() |
1536 | 815 |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
816 def on_reply_btn_click(self, evt) -> None: |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
817 chat_message_elt = evt.currentTarget.closest("div.chat-message") |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
818 self.reply_to = { |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
819 "id": chat_message_elt["id"], |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
820 "to": chat_message_elt.dataset["from"] |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
821 } |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
822 log.debug(f'"reply_to" set to {self.reply_to!r}') |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
823 |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
824 |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
825 def on_extra_btn_click(self, evt): |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
826 message_elt = evt.currentTarget.closest("div.chat-message") |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
827 message_core_elt = evt.currentTarget.closest("div.message-core") |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
828 is_own = message_elt.classList.contains("own_msg") |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
829 if is_own: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
830 own_messages = document.select('.own_msg') |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
831 # with XMPP, we can currently only edit our last message |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
832 can_edit = own_messages and message_elt is own_messages[-1] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
833 else: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
834 can_edit = False |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
835 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
836 content_elt = self.extra_menu_tpl.get_elt({ |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
837 "edit": can_edit, |
1585
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
838 "retract": is_own, |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
839 }) |
1619 | 840 extra_popup = popup.create_popup(evt.target, content_elt, focus_elt=message_core_elt) |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
841 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
842 def on_action_click(evt, callback): |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
843 extra_popup.hide() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
844 aio.run( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
845 callback(evt, message_elt) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
846 ) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
847 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
848 for cls_name, callback in ( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
849 ("action_quote", self.on_action_quote), |
1585
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
850 ("action_edit", self.on_action_edit), |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
851 ("action_retract", self.on_action_retract), |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
852 ): |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
853 for elt in content_elt.select(f".{cls_name}"): |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
854 elt.bind("click", lambda evt, callback=callback: on_action_click( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
855 evt, callback |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
856 )) |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
857 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
858 def on_reaction_click(self, evt, message_elt): |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
859 window.evt = evt |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
860 aio.run( |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
861 bridge.message_reactions_set( |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
862 message_elt["id"], [evt.detail["unicode"]], "toggle" |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
863 ) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
864 ) |
1619 | 865 # if evt.deltaY != 0: |
866 # document["attachments"].scrollLeft += evt.deltaY * 0.8 | |
867 # evt.preventDefault() | |
1536 | 868 |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
869 async def show_filtered_messages( |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
870 self, |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
871 filters: dict, |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
872 sub_messages_panel_args: dict|None = None, |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
873 sub_messages_check_cb: Callable[[dict], bool]|None = None |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
874 ) -> None: |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
875 """Show message matching a filter in a sub-messages panel. |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
876 |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
877 A panel will slide-in from the right to show filtered messages. |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
878 @param filters: Filters to use in ``bridge.history_get``. |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
879 @param sub_messages_panel_args: Args to use with sub_messages_panel template. |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
880 @param sub_messages_check_cb: Method to call to check if a new message must go to |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
881 the sub-messages panel. The method must return True if the message is to be |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
882 displayed in the panel. |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
883 """ |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
884 if sub_messages_panel_args is None: |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
885 sub_messages_panel_args = {} |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
886 self.sub_messages_check_cb = sub_messages_check_cb |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
887 sub_messages_panel_elt = self.sub_messages_panel_tpl.get_elt( |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
888 sub_messages_panel_args |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
889 ) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
890 self.sub_messages_panel = sub_messages_panel_elt |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
891 sub_messages_elt = sub_messages_panel_elt.select_one("#sub-messages") |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
892 sub_messages_input_elt = sub_messages_panel_elt.select_one("#sub-messages-input") |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
893 assert sub_messages_elt is not None |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
894 history_data = await bridge.history_get( |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
895 "", "", -2, True, filters |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
896 ) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
897 for message_data in history_data: |
1623
fdb5689fb826
browser (chat): Update following template change + some cleaning:
Goffi <goffi@goffi.org>
parents:
1620
diff
changeset
|
898 uid, timestamp, from_jid_s, to_jid_s, message_data, subject_data, mess_type, extra_s = message_data |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
899 template_data = await self.message_to_template_data( |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
900 uid, |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
901 timestamp=timestamp, |
1623
fdb5689fb826
browser (chat): Update following template change + some cleaning:
Goffi <goffi@goffi.org>
parents:
1620
diff
changeset
|
902 from_jid=jid.JID(from_jid_s), |
fdb5689fb826
browser (chat): Update following template change + some cleaning:
Goffi <goffi@goffi.org>
parents:
1620
diff
changeset
|
903 to_jid=jid.JID(to_jid_s), |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
904 message_data=message_data, |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
905 subject_data=subject_data, |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
906 mess_type=mess_type, |
1623
fdb5689fb826
browser (chat): Update following template change + some cleaning:
Goffi <goffi@goffi.org>
parents:
1620
diff
changeset
|
907 extra=json.loads(extra_s) |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
908 ) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
909 message_elt = self.message_tpl.get_elt(template_data) |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
910 sub_messages_elt <= message_elt |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
911 # FIXME: The whole input-panel is currently moved to the filtered messages panel |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
912 # so listeners don't have to be moved. At some point, it may be better to make a |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
913 # clone (without the IDs) and to clone listeners too, this way a non-modal panel |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
914 # could be used. |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
915 input_panel_elt = document["input-panel"] |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
916 placeholder = make_placeholder(input_panel_elt) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
917 sub_messages_input_elt <= input_panel_elt |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
918 document["input-panel-area"].appendChild(placeholder) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
919 |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
920 def on_sub_messages_panel_close(): |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
921 placeholder.replaceWith(input_panel_elt) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
922 self.thread_id = None |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
923 self.keyword = None |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
924 self.sub_messages_panel = None |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
925 self.sub_messages_check_cb = None |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
926 |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
927 sub_messages_modal = dialog.Modal( |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
928 sub_messages_panel_elt, |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
929 closable=True, |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
930 close_cb=on_sub_messages_panel_close, |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
931 position="right" |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
932 ) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
933 sub_messages_modal.show() |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
934 |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
935 async def on_show_thread(self, thread_id: str) -> None: |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
936 assert thread_id |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
937 self.thread_id = thread_id |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
938 def sub_messages_check_cb(extra: dict) -> bool: |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
939 return bool( |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
940 self.thread_id |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
941 and "thread" in extra |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
942 and extra["thread"] == self.thread_id |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
943 ) |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
944 |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
945 await self.show_filtered_messages( |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
946 {"thread_id": thread_id}, |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
947 {"title": "Thread view"}, |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
948 sub_messages_check_cb |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
949 ) |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
950 |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
951 async def _on_keyword_click(self, keyword_elt) -> None: |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
952 self.keyword = keyword_elt.text |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
953 def sub_messages_check_cb(extra: dict) -> bool: |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
954 return self.keyword in extra.get("keywords", []) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
955 await self.show_filtered_messages( |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
956 {"keyword": self.keyword}, |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
957 {"title": f"🏷 Label view: {self.keyword}."}, |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
958 sub_messages_check_cb |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
959 ) |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
960 |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
961 |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
962 async def get_message_tuple(self, message_elt) -> tuple|None: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
963 """Retrieve message tuple from as sent by [message_new] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
964 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
965 If not corresponding message data is found, an error will shown, and None is |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
966 returned. |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
967 @param message_elt: message element, it's "id" attribute will be use to retrieve |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
968 message data |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
969 @return: message data as a tuple, or None if not message with this ID is found. |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
970 """ |
1619 | 971 print(f"{message_elt=}") |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
972 message_id = message_elt['id'] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
973 history_data = await bridge.history_get( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
974 "", "", -2, True, {"id": message_elt['id']} |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
975 ) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
976 if not history_data: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
977 dialog.notification.show(f"Can't find message {message_id}", "error") |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
978 return None |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
979 return history_data[0] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
980 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
981 async def on_action_quote(self, __, message_elt) -> None: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
982 message_data = await self.get_message_tuple(message_elt) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
983 if message_data is not None: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
984 messages = message_data[4] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
985 body = next(iter(messages.values()), "") |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
986 quote = "\n".join(f"> {l}" for l in body.split("\n")) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
987 self.message_input.value = f"{quote}\n{self.message_input.value}" |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
988 self.input_mode = "quote" |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
989 self.input_data["id"] = message_elt["id"] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
990 self.auto_resize_message_input() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
991 self.message_input.focus() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
992 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
993 async def on_action_edit(self, __, message_elt) -> None: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
994 message_data = await self.get_message_tuple(message_elt) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
995 if message_data is not None: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
996 messages = message_data[4] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
997 body = next(iter(messages.values()), "") |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
998 if not body: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
999 dialog.notification.show("No content found in message, nothing to edit") |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1000 return |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1001 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1002 self.message_input.value = body |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1003 self.input_mode = "edit" |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1004 self.input_data["id"] = message_elt["id"] |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1005 self.auto_resize_message_input() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1006 self.message_input.focus() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1007 |
1585
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1008 async def on_action_retract(self, __, message_elt) -> None: |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1009 confirmed = await dialog.Confirm(safe( |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1010 "This message will be permanently removed. Are you sure?<br><br>" |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1011 "WARNING: It is impossible to guarantee that other participants in the " |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1012 "discussion will delete this message as well. You must assume it has been " |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1013 "seen. If a password or other sensitive information has been accidentally " |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1014 "shared, please ensure to take appropriate measures to change it and " |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1015 "mitigate the risks." |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1016 )).ashow() |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1017 if confirmed: |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1018 await bridge.message_retract(message_elt["id"]) |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1019 else: |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1020 log.info(f"Retraction of message {message_elt['id']} cancelled by user.") |
9fc4120888be
browser (chat): message retraction implementation
Goffi <goffi@goffi.org>
parents:
1584
diff
changeset
|
1021 |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1022 def get_reaction_panel(self, source_elt): |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1023 emoji_picker_elt = document.createElement("emoji-picker") |
1619 | 1024 message_elt = source_elt.closest("div.chat-message") |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1025 emoji_picker_elt.bind( |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1026 "emoji-click", lambda evt: self.on_reaction_click(evt, message_elt) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1027 ) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1028 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1029 return emoji_picker_elt |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1030 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1031 def add_message_event_listeners(self, parent_elt=None): |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1032 """Prepare a message to be dynamic |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1033 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1034 - make attachments dynamically clickable |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1035 - make the extra button clickable |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1036 """ |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1037 ## attachments |
1536 | 1038 # FIXME: only handle images for now, and display them in a modal |
1039 if parent_elt is None: | |
1040 parent_elt = document | |
1540
b4342176fa0a
browser (chat): minor reformatting
Goffi <goffi@goffi.org>
parents:
1536
diff
changeset
|
1041 img_elts = parent_elt.select(".message-attachment img") |
1536 | 1042 for img_elt in img_elts: |
1540
b4342176fa0a
browser (chat): minor reformatting
Goffi <goffi@goffi.org>
parents:
1536
diff
changeset
|
1043 img_elt.bind("click", self.open_modal) |
b4342176fa0a
browser (chat): minor reformatting
Goffi <goffi@goffi.org>
parents:
1536
diff
changeset
|
1044 img_elt.style.cursor = "pointer" |
1536 | 1045 |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1046 ## reply button |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1047 for reply_btn in parent_elt.select(".reply-button"): |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1048 reply_btn.bind("click", self.on_reply_btn_click) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1049 |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1050 ## reaction button |
1619 | 1051 i = 0 |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1052 for reaction_btn in parent_elt.select(".reaction-button"): |
1619 | 1053 i+=1 |
1054 message_elt = reaction_btn.closest("div.message-core") | |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1055 tippy( |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1056 reaction_btn, |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1057 { |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1058 "trigger": "click", |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1059 "content": self.get_reaction_panel, |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1060 "appendTo": document.body, |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1061 "placement": "bottom", |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1062 "interactive": True, |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1063 "theme": "light", |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1064 "onShow": lambda __, message_elt=message_elt: ( |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1065 message_elt.classList.add("has-popup-focus") |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1066 ), |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1067 "onHide": lambda __, message_elt=message_elt: ( |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1068 message_elt.classList.remove("has-popup-focus") |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1069 ), |
1619 | 1070 } |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1071 ) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1072 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1073 ## extra button |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1074 for extra_btn in parent_elt.select(".extra-button"): |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1075 extra_btn.bind("click", self.on_extra_btn_click) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1076 |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1077 ## editions |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1078 for edition_icon_elt in parent_elt.select(".message-editions"): |
1619 | 1079 message_elt = edition_icon_elt.closest("div.chat-message") |
1584
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1080 dataset = message_elt.dataset.to_dict() |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1081 try: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1082 editions = json.loads(dataset["editions"]) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1083 except (ValueError, KeyError): |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1084 log.error( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1085 f"Internal Error: invalid or missing editions data: {message_elt['id']}" |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1086 ) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1087 else: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1088 for edition in editions: |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1089 edition["text"] = ( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1090 edition["message"].get("") |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1091 or next(iter(edition["message"].values()), "") |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1092 ) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1093 editions_elt = self.editions_tpl.get_elt({"editions": editions}) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1094 tippy( |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1095 edition_icon_elt, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1096 { |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1097 "content": editions_elt, |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1098 "theme": "light", |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1099 "appendTo": document.body |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1100 } |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1101 |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1102 ) |
eab815e48795
browser (chat): message edition + extra menu:
Goffi <goffi@goffi.org>
parents:
1577
diff
changeset
|
1103 |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1104 ## thread |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1105 for thread_icon_elt in parent_elt.select(".message-thread"): |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1106 message_elt = thread_icon_elt.closest("div.chat-message") |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1107 thread_id = message_elt.dataset["thread"] |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1108 thread_icon_elt.bind( |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1109 "mouseenter", |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1110 lambda __, thread_id=thread_id: setattr(self, "show_thread", thread_id) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1111 ) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1112 thread_icon_elt.bind( |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1113 "mouseleave", |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1114 lambda __, thread_id=thread_id: setattr(self, "show_thread", None) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1115 ) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1116 thread_icon_elt.bind( |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1117 "click", |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1118 lambda __, thread_id=thread_id: aio.run(self.on_show_thread(thread_id)) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1119 ) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1120 |
1625
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
1121 ## keywords |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
1122 for keyword_elt in parent_elt.select(".message-keyword"): |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
1123 keyword_elt.bind( |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
1124 "click", |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
1125 lambda __, keyword_elt=keyword_elt: aio.run( |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
1126 self._on_keyword_click(keyword_elt) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
1127 ) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
1128 ) |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
1129 |
698eaabfca0e
browser (chat): side/panel and keyword handling:
Goffi <goffi@goffi.org>
parents:
1623
diff
changeset
|
1130 |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1131 def add_reactions_listeners(self, parent_elt=None) -> None: |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1132 """Add listener on reactions to handle details and reaction toggle""" |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1133 if parent_elt is None: |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1134 parent_elt = document |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1135 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1136 is_touch = is_touch_device() |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1137 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1138 for reaction_elt in parent_elt.select(".reaction"): |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1139 # Reaction details |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1140 dataset = reaction_elt.dataset.to_dict() |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1141 reacting_jids = sorted(json.loads(dataset.get("jids", "[]"))) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1142 reaction_details_elt = self.reactions_details_tpl.get_elt( |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1143 {"reacting_jids": reacting_jids, "identities": identities} |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1144 ) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1145 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1146 # Configure tippy based on device type |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1147 tippy_config = { |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1148 "content": reaction_details_elt, |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1149 "placement": "bottom", |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1150 "theme": "light", |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1151 "touch": ["hold", 500] if is_touch else True, |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1152 "trigger": "click" if is_touch else "mouseenter focus", |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1153 "delay": [0, 800] if is_touch else 0, |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1154 } |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1155 tippy(reaction_elt, tippy_config) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1156 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1157 # Toggle reaction when clicked/touched |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1158 emoji_elt = reaction_elt.select_one(".emoji") |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1159 emoji = emoji_elt.html.strip() |
1619 | 1160 message_elt = reaction_elt.closest("div.chat-message") |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1161 msg_id = message_elt["id"] |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1162 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1163 def toggle_reaction(event, msg_id=msg_id, emoji=emoji): |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1164 # Prevent default if it's a touch device to distinguish from long press |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1165 if is_touch: |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1166 event.preventDefault() |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1167 aio.run(bridge.message_reactions_set(msg_id, [emoji], "toggle")) |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1168 |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1169 reaction_elt.bind("click", toggle_reaction) |
1536 | 1170 |
1541
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1171 def find_links(self, message_elt): |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1172 """Find all http and https links within the body of a message.""" |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1173 msg_body_elt = message_elt.select_one(".msg_body") |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1174 if not msg_body_elt: |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1175 return |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1176 |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1177 # Extracting links from text content |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1178 text = msg_body_elt.text |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1179 raw_urls = re.findall( |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1180 r"http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F])|#)+", |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1181 text, |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1182 ) |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1183 |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1184 # Extracting links from <a> elements |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1185 a_elements = msg_body_elt.select("a") |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1186 for a_elt in a_elements: |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1187 href = a_elt.attrs.get("href", "") |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1188 if href.startswith("http://") or href.startswith("https://"): |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1189 raw_urls.append(href) |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1190 |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1191 # we remove duplicates |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1192 urls = list(dict.fromkeys(raw_urls)) |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1193 |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1194 return urls |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1195 |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1196 async def add_url_previews(self, url_previews_elt, urls) -> None: |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1197 """Add URL previews to the .url-previews element of a message.""" |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1198 url_previews_elt.clear() |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1199 for url in urls: |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1200 try: |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1201 url_preview_data_s = await bridge.url_preview_get(url, "") |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1202 except Exception as e: |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1203 log.warning(f"Couldn't get URL preview for {url}: {e}") |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1204 continue |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1205 |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1206 if not url_preview_data_s: |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1207 log.warning(f"No preview could be found for URL: {url}") |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1208 continue |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1209 |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1210 url_preview_data = json.loads(url_preview_data_s) |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1211 |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1212 url_preview_elt = self.url_preview_tpl.get_elt( |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1213 {"url_preview": url_preview_data} |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1214 ) |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1215 url_previews_elt <= url_preview_elt |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1216 |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1217 def handle_url_previews(self, parent_elt=None): |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1218 """Check if URL are presents in a message and show appropriate element |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1219 |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1220 According to settings, either a preview control panel will be shown to wait for |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1221 user click, or directly the previews, or nothing at all. |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1222 """ |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1223 |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1224 if parent_elt is None: |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1225 parent_elt = document |
1619 | 1226 chat_message_elts = parent_elt.select(".chat-message") |
1541
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1227 else: |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1228 chat_message_elts = [parent_elt] |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1229 for message_elt in chat_message_elts: |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1230 urls = self.find_links(message_elt) |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1231 if urls: |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1232 url_previews_elt = message_elt.select_one(".url-previews") |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1233 url_previews_elt.classList.remove("is-hidden") |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1234 preview_control_elt = self.url_preview_control_tpl.get_elt() |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1235 fetch_preview_btn = preview_control_elt.select_one( |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1236 ".action_fetch_preview" |
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1237 ) |
1541
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1238 fetch_preview_btn.bind( |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1239 "click", |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1240 lambda __, previews_elt=url_previews_elt, preview_urls=urls: aio.run( |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1241 self.add_url_previews(previews_elt, preview_urls) |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1242 ), |
1541
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1243 ) |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1244 url_previews_elt <= preview_control_elt |
3c384b51b2a1
browser (chat): URL previews implementation
Goffi <goffi@goffi.org>
parents:
1540
diff
changeset
|
1245 |
1536 | 1246 def open_modal(self, evt): |
1540
b4342176fa0a
browser (chat): minor reformatting
Goffi <goffi@goffi.org>
parents:
1536
diff
changeset
|
1247 modal_image = document.select_one("#modal-image") |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1248 modal_image.src = evt.currentTarget.src |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1249 modal_image.alt = evt.currentTarget.alt |
1540
b4342176fa0a
browser (chat): minor reformatting
Goffi <goffi@goffi.org>
parents:
1536
diff
changeset
|
1250 modal = document.select_one("#modal") |
b4342176fa0a
browser (chat): minor reformatting
Goffi <goffi@goffi.org>
parents:
1536
diff
changeset
|
1251 modal.classList.add("is-active") |
1536 | 1252 |
1253 def close_modal(self, evt): | |
1540
b4342176fa0a
browser (chat): minor reformatting
Goffi <goffi@goffi.org>
parents:
1536
diff
changeset
|
1254 modal = document.select_one("#modal") |
b4342176fa0a
browser (chat): minor reformatting
Goffi <goffi@goffi.org>
parents:
1536
diff
changeset
|
1255 modal.classList.remove("is-active") |
1536 | 1256 |
1542
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1257 def handle_visibility_change(self, evt): |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1258 if ( |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1259 document.visibilityState == "hidden" |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1260 and self.new_messages_marker_elt.parent is not None |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1261 ): |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1262 # if there is a new messages marker, we remove it |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1263 self.new_messages_marker_elt.remove() |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1264 |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1265 |
1536 | 1266 libervia_web_chat = LiberviaWebChat() |
1540
b4342176fa0a
browser (chat): minor reformatting
Goffi <goffi@goffi.org>
parents:
1536
diff
changeset
|
1267 |
1619 | 1268 document["new_chat_btn"].bind( |
1269 "click", lambda __: aio.run(libervia_web_chat.on_new_chat()) | |
1270 ) | |
1271 | |
1536 | 1272 document["message_input"].bind( |
1273 "input", lambda __: libervia_web_chat.auto_resize_message_input() | |
1274 ) | |
1275 document["message_input"].bind("keydown", libervia_web_chat.on_message_keydown) | |
1620
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1276 document["send_button"].bind( |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1277 "click", |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1278 lambda __: aio.run(libervia_web_chat.send_message()) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1279 ) |
3a60bf3762ef
browser: threads and replies implementation:
Goffi <goffi@goffi.org>
parents:
1619
diff
changeset
|
1280 document["attach-button"].bind("click", libervia_web_chat.on_attach_btn_click) |
1619 | 1281 document["file-input"].bind("change", libervia_web_chat.on_file_selected) |
1542
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1282 |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1283 document.bind("visibilitychange", libervia_web_chat.handle_visibility_change) |
fb31d3dba0c3
browser (chat): add marker for new messages when page is not visible
Goffi <goffi@goffi.org>
parents:
1541
diff
changeset
|
1284 |
1536 | 1285 bridge.register_signal("message_new", libervia_web_chat._on_message_new) |
1577
9ba532041a8e
browser (chat): implement message reactions.
Goffi <goffi@goffi.org>
parents:
1542
diff
changeset
|
1286 bridge.register_signal("message_update", libervia_web_chat._on_message_update) |
1619 | 1287 aio.run(libervia_web_chat.post_init()) |
1288 remove_loading_screen() |