annotate cagou/plugins/plugin_wid_chat.py @ 411:b018386653c2

chat: work around ScrollView bug in attachments by using a StackLayout instead: cf. https://github.com/kivy/kivy/issues/6745
author Goffi <goffi@goffi.org>
date Sat, 22 Feb 2020 18:34:09 +0100
parents 2caea63ae2ab
children 7c6149c249c1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
379
1da3c379205b fixed shebangs
Goffi <goffi@goffi.org>
parents: 378
diff changeset
1 #!/usr/bin/env python3
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
2
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
3 # Cagou: desktop/mobile frontend for Salut à Toi XMPP client
378
4d660b252487 dates update
Goffi <goffi@goffi.org>
parents: 367
diff changeset
4 # Copyright (C) 2016-2020 Jérôme Poisson (goffi@goffi.org)
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
5
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
6 # This program is free software: you can redistribute it and/or modify
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
7 # it under the terms of the GNU Affero General Public License as published by
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
8 # the Free Software Foundation, either version 3 of the License, or
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
9 # (at your option) any later version.
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
10
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
11 # This program is distributed in the hope that it will be useful,
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
14 # GNU Affero General Public License for more details.
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
15
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
16 # You should have received a copy of the GNU Affero General Public License
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
17 # along with this program. If not, see <http://www.gnu.org/licenses/>.
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
18
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
19
276
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
20 from functools import partial
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
21 import mimetypes
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
22 import sys
78
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
23 from kivy.uix.boxlayout import BoxLayout
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
24 from kivy.uix.textinput import TextInput
354
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
25 from kivy.uix.screenmanager import Screen, NoTransition
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
26 from kivy.uix import screenmanager
367
abb57182ebfb chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents: 357
diff changeset
27 from kivy.uix.behaviors import ButtonBehavior
185
ab3f5173ef5c chat, simple XHTML: font size adjustement
Goffi <goffi@goffi.org>
parents: 184
diff changeset
28 from kivy.metrics import sp, dp
276
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
29 from kivy.clock import Clock
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
30 from kivy import properties
411
b018386653c2 chat: work around ScrollView bug in attachments by using a StackLayout instead:
Goffi <goffi@goffi.org>
parents: 409
diff changeset
31 from kivy.uix.stacklayout import StackLayout
325
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
32 from kivy.uix.dropdown import DropDown
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
33 from kivy.core.window import Window
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
34 from sat.core import log as logging
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
35 from sat.core.i18n import _
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
36 from sat.core import exceptions
333
69d2a96ce26f chat: serialise `options` in `fileUpload` following change in backend
Goffi <goffi@goffi.org>
parents: 332
diff changeset
37 from sat.tools.common import data_format
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
38 from sat_frontends.quick_frontend import quick_widgets
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
39 from sat_frontends.quick_frontend import quick_chat
106
9909ed7a7a20 moved SimpleXHTMLWidget to a dedicated module
Goffi <goffi@goffi.org>
parents: 105
diff changeset
40 from sat_frontends.tools import jid
325
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
41 from cagou import G
404
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
42 from ..core.constants import Const as C
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
43 from ..core import cagou_widget
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
44 from ..core import xmlui
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
45 from ..core.image import Image
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
46 from ..core.common import SymbolButton, JidButton
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
47 from ..core.behaviors import FilterBehavior
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
48 from ..core import menu
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
49 from ..core.common import ContactButton
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
50
276
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
51 log = logging.getLogger(__name__)
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
52
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
53 PLUGIN_INFO = {
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
54 "name": _("chat"),
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
55 "main": "Chat",
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
56 "description": _("instant messaging with one person or a group"),
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
57 "icon_symbol": "chat",
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
58 }
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
59
244
5bd94bc08f5c plugin chat: fixed OTR State filtering + removed some legacy code
Goffi <goffi@goffi.org>
parents: 242
diff changeset
60 # FIXME: OTR specific code is legacy, and only used nowadays for lock color
5bd94bc08f5c plugin chat: fixed OTR State filtering + removed some legacy code
Goffi <goffi@goffi.org>
parents: 242
diff changeset
61 # we can probably get rid of them.
122
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
62 OTR_STATE_UNTRUSTED = 'untrusted'
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
63 OTR_STATE_TRUSTED = 'trusted'
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
64 OTR_STATE_TRUST = (OTR_STATE_UNTRUSTED, OTR_STATE_TRUSTED)
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
65 OTR_STATE_UNENCRYPTED = 'unencrypted'
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
66 OTR_STATE_ENCRYPTED = 'encrypted'
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
67 OTR_STATE_ENCRYPTION = (OTR_STATE_UNENCRYPTED, OTR_STATE_ENCRYPTED)
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
68
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
69 SYMBOL_UNENCRYPTED = 'lock-open'
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
70 SYMBOL_ENCRYPTED = 'lock'
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
71 SYMBOL_ENCRYPTED_TRUSTED = 'lock-filled'
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
72 COLOR_UNENCRYPTED = (0.4, 0.4, 0.4, 1)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
73 COLOR_ENCRYPTED = (0.4, 0.4, 0.4, 1)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
74 COLOR_ENCRYPTED_TRUSTED = (0.29,0.87,0.0,1)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
75
326
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
76 # below this limit, new messages will be prepended
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
77 INFINITE_SCROLL_LIMIT = dp(600)
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
78
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
79
411
b018386653c2 chat: work around ScrollView bug in attachments by using a StackLayout instead:
Goffi <goffi@goffi.org>
parents: 409
diff changeset
80 # FIXME: a ScrollLayout was supposed to be used here, but due
b018386653c2 chat: work around ScrollView bug in attachments by using a StackLayout instead:
Goffi <goffi@goffi.org>
parents: 409
diff changeset
81 # to https://github.com/kivy/kivy/issues/6745, a StackLayout is used for now
b018386653c2 chat: work around ScrollView bug in attachments by using a StackLayout instead:
Goffi <goffi@goffi.org>
parents: 409
diff changeset
82 class AttachmentsLayout(StackLayout):
409
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
83 attachments = properties.ObjectProperty()
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
84
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
85
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
86 class AttachmentItem(BoxLayout):
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
87 data = properties.DictProperty()
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
88
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
89 def get_symbol(self, data):
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
90 media_type = data.get('media_type', '')
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
91 main_type = media_type.split('/', 1)[0]
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
92 if main_type == 'image':
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
93 return "file-image"
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
94 elif main_type == 'video':
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
95 return "file-video"
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
96 elif main_type == 'audio':
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
97 return "file-audio"
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
98 else:
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
99 return "doc"
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
100
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
101 def on_press(self):
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
102 url = self.data.get('url')
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
103 if url:
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
104 G.local_platform.open_url(url, self)
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
105 else:
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
106 log.warning("can't find URL in {self.data}")
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
107
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
108
367
abb57182ebfb chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents: 357
diff changeset
109 class MessAvatar(ButtonBehavior, Image):
44
7819e9efa250 chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents: 42
diff changeset
110 pass
7819e9efa250 chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents: 42
diff changeset
111
7819e9efa250 chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents: 42
diff changeset
112
325
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
113 class MessageWidget(quick_chat.MessageWidget, BoxLayout):
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
114 mess_data = properties.ObjectProperty()
57
a51ea7874e43 chat: XHTML parsing first draft:
Goffi <goffi@goffi.org>
parents: 54
diff changeset
115 mess_xhtml = properties.ObjectProperty()
45
b0595a33465d chat: design improvments:
Goffi <goffi@goffi.org>
parents: 44
diff changeset
116 mess_padding = (dp(5), dp(5))
47
abb81efef3bb chat: update avatar following quick frontend improvments
Goffi <goffi@goffi.org>
parents: 46
diff changeset
117 avatar = properties.ObjectProperty()
103
c601e3d40342 chat: display delivery receipt (with a green check mark)
Goffi <goffi@goffi.org>
parents: 102
diff changeset
118 delivery = properties.ObjectProperty()
185
ab3f5173ef5c chat, simple XHTML: font size adjustement
Goffi <goffi@goffi.org>
parents: 184
diff changeset
119 font_size = properties.NumericProperty(sp(12))
325
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
120 right_part = properties.ObjectProperty()
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
121 header_box = properties.ObjectProperty()
47
abb81efef3bb chat: update avatar following quick frontend improvments
Goffi <goffi@goffi.org>
parents: 46
diff changeset
122
409
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
123 def on_kv_post(self, __):
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
124 if not self.mess_data:
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
125 raise exceptions.InternalError(
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
126 "mess_data must always be set in MessageWidget")
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
127
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
128 self.mess_data.widgets.add(self)
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
129 self.add_attachments()
44
7819e9efa250 chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents: 42
diff changeset
130
7819e9efa250 chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents: 42
diff changeset
131 @property
7819e9efa250 chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents: 42
diff changeset
132 def chat(self):
7819e9efa250 chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents: 42
diff changeset
133 """return parent Chat instance"""
7819e9efa250 chat: avatar and nick are now displayed, need further aesthetic improvments
Goffi <goffi@goffi.org>
parents: 42
diff changeset
134 return self.mess_data.parent
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
135
325
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
136 def _get_from_mess_data(self, name, default):
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
137 if self.mess_data is None:
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
138 return default
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
139 return getattr(self.mess_data, name)
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
140
289
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
141 def _get_message(self):
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
142 """Return currently displayed message"""
325
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
143 if self.mess_data is None:
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
144 return ""
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
145 return self.mess_data.main_message
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
146
289
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
147 def _set_message(self, message):
325
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
148 if self.mess_data is None:
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
149 return False
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
150 if message == self.mess_data.message.get(""):
289
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
151 return False
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
152 self.mess_data.message = {"": message}
289
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
153 return True
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
154
325
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
155 message = properties.AliasProperty(
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
156 partial(_get_from_mess_data, name="main_message", default=""),
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
157 _set_message,
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
158 bind=['mess_data'],
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
159 )
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
160 message_xhtml = properties.AliasProperty(
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
161 partial(_get_from_mess_data, name="main_message_xhtml", default=""),
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
162 bind=['mess_data'])
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
163 mess_type = properties.AliasProperty(
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
164 partial(_get_from_mess_data, name="type", default=""), bind=['mess_data'])
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
165 own_mess = properties.AliasProperty(
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
166 partial(_get_from_mess_data, name="own_mess", default=False), bind=['mess_data'])
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
167 nick = properties.AliasProperty(
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
168 partial(_get_from_mess_data, name="nick", default=""), bind=['mess_data'])
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
169 time_text = properties.AliasProperty(
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
170 partial(_get_from_mess_data, name="time_text", default=""), bind=['mess_data'])
57
a51ea7874e43 chat: XHTML parsing first draft:
Goffi <goffi@goffi.org>
parents: 54
diff changeset
171
289
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
172 @property
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
173 def info_type(self):
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
174 return self.mess_data.info_type
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
175
54
514c187afebc chat: changed udpate to use dict instead of single key/value
Goffi <goffi@goffi.org>
parents: 47
diff changeset
176 def update(self, update_dict):
514c187afebc chat: changed udpate to use dict instead of single key/value
Goffi <goffi@goffi.org>
parents: 47
diff changeset
177 if 'avatar' in update_dict:
514c187afebc chat: changed udpate to use dict instead of single key/value
Goffi <goffi@goffi.org>
parents: 47
diff changeset
178 self.avatar.source = update_dict['avatar']
103
c601e3d40342 chat: display delivery receipt (with a green check mark)
Goffi <goffi@goffi.org>
parents: 102
diff changeset
179 if 'status' in update_dict:
c601e3d40342 chat: display delivery receipt (with a green check mark)
Goffi <goffi@goffi.org>
parents: 102
diff changeset
180 status = update_dict['status']
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
181 self.delivery.text = '\u2714' if status == 'delivered' else ''
47
abb81efef3bb chat: update avatar following quick frontend improvments
Goffi <goffi@goffi.org>
parents: 46
diff changeset
182
409
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
183 def add_attachments(self):
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
184 """Add attachments layout + attachments item"""
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
185 attachments = self.mess_data.attachments
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
186 if not attachments:
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
187 return
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
188 root_layout = AttachmentsLayout()
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
189 self.right_part.add_widget(root_layout)
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
190 layout = root_layout.attachments
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
191 for attachment in attachments:
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
192 item = AttachmentItem(data=attachment)
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
193 layout.add_widget(item)
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
194
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
195
276
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
196 class SendButton(SymbolButton):
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
197 message_input_box = properties.ObjectProperty()
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
198
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
199
78
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
200 class MessageInputBox(BoxLayout):
276
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
201 message_input = properties.ObjectProperty()
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
202
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
203 def __init__(self, *args, **kwargs):
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
204 super(MessageInputBox, self).__init__(*args, **kwargs)
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
205 Clock.schedule_once(self.post_init, 0)
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
206
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
207 def post_init(self, *args):
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
208 if sys.platform == 'android':
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
209 self.add_widget(SendButton(message_input_box=self), 0)
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
210
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
211 def send_text(self):
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
212 self.message_input.send_text()
78
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
213
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
214
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
215 class MessageInputWidget(TextInput):
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
216
276
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
217 def keyboard_on_key_down(self, window, keycode, text, modifiers):
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
218 # We don't send text when shift is pressed to be able to add line feeds
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
219 # (i.e. multi-lines messages). We don't send on Android either as the
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
220 # send button appears on this platform.
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
221 if (keycode[-1] == "enter"
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
222 and "shift" not in modifiers
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
223 and sys.platform != 'android'):
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
224 self.send_text()
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
225 else:
276
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
226 return super(MessageInputWidget, self).keyboard_on_key_down(
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
227 window, keycode, text, modifiers)
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
228
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
229 def send_text(self):
a0835f0212d8 chat: multi-lines input:
Goffi <goffi@goffi.org>
parents: 265
diff changeset
230 self.dispatch('on_text_validate')
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
231
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
232
278
444ba439530f chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents: 277
diff changeset
233 class TransferButton(SymbolButton):
444ba439530f chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents: 277
diff changeset
234 chat = properties.ObjectProperty()
444ba439530f chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents: 277
diff changeset
235
444ba439530f chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents: 277
diff changeset
236 def on_release(self, *args):
322
e2b51663d8b8 core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents: 312
diff changeset
237 menu.TransferMenu(callback=self.chat.transferFile).show(self)
278
444ba439530f chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents: 277
diff changeset
238
444ba439530f chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents: 277
diff changeset
239
287
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
240 class ExtraMenu(DropDown):
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
241 chat = properties.ObjectProperty()
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
242
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
243 def on_select(self, menu):
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
244 if menu == 'bookmark':
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
245 G.host.bridge.menuLaunch(C.MENU_GLOBAL, ("groups", "bookmarks"),
287
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
246 {}, C.NO_SECURITY_LIMIT, self.chat.profile,
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
247 callback=partial(
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
248 G.host.actionManager, profile=self.chat.profile),
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
249 errback=G.host.errback)
393
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
250 elif menu == 'close':
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
251 if self.chat.type == C.CHAT_GROUP:
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
252 # for MUC, we have to indicate the backend that we've left
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
253 G.host.bridge.mucLeave(self.chat.target, self.chat.profile)
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
254 else:
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
255 # for one2one, backend doesn't keep any state, so we just delete the
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
256 # widget here in the frontend
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
257 G.host.widgets.deleteWidget(
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
258 self.chat, all_instances=True, explicit_close=True)
287
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
259 else:
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
260 raise exceptions.InternalError("Unknown menu: {}".format(menu))
287
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
261
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
262
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
263 class ExtraButton(SymbolButton):
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
264 chat = properties.ObjectProperty()
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
265
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
266
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
267 class EncryptionMainButton(SymbolButton):
117
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
268
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
269 def __init__(self, chat, **kwargs):
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
270 """
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
271 @param chat(Chat): Chat instance
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
272 """
122
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
273 self.chat = chat
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
274 self.encryption_menu = EncryptionMenu(chat)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
275 super(EncryptionMainButton, self).__init__(**kwargs)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
276 self.bind(on_release=self.encryption_menu.open)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
277
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
278 def selectAlgo(self, name):
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
279 """Mark an encryption algorithm as selected.
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
280
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
281 This will also deselect all other button
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
282 @param name(unicode, None): encryption plugin name
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
283 None for plain text
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
284 """
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
285 buttons = self.encryption_menu.container.children
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
286 buttons[-1].selected = name is None
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
287 for button in buttons[:-1]:
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
288 button.selected = button.text == name
117
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
289
135
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
290 def getColor(self):
122
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
291 if self.chat.otr_state_encryption == OTR_STATE_UNENCRYPTED:
135
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
292 return (0.4, 0.4, 0.4, 1)
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
293 elif self.chat.otr_state_trust == OTR_STATE_TRUSTED:
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
294 return (0.29,0.87,0.0,1)
122
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
295 else:
135
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
296 return (0.4, 0.4, 0.4, 1)
122
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
297
135
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
298 def getSymbol(self):
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
299 if self.chat.otr_state_encryption == OTR_STATE_UNENCRYPTED:
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
300 return 'lock-open'
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
301 elif self.chat.otr_state_trust == OTR_STATE_TRUSTED:
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
302 return 'lock-filled'
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
303 else:
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
304 return 'lock'
122
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
305
117
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
306
242
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
307 class TrustManagementButton(SymbolButton):
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
308 pass
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
309
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
310
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
311 class EncryptionButton(BoxLayout):
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
312 selected = properties.BooleanProperty(False)
242
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
313 text = properties.StringProperty()
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
314 trust_button = properties.BooleanProperty(False)
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
315 best_width = properties.NumericProperty(0)
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
316 bold = properties.BooleanProperty(True)
242
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
317
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
318 def __init__(self, **kwargs):
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
319 super(EncryptionButton, self).__init__(**kwargs)
242
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
320 self.register_event_type('on_release')
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
321 self.register_event_type('on_trust_release')
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
322 if self.trust_button:
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
323 self.add_widget(TrustManagementButton())
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
324
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
325 def on_release(self):
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
326 pass
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
327
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
328 def on_trust_release(self):
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
329 pass
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
330
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
331
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
332 class EncryptionMenu(DropDown):
242
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
333 # best with to display all algorithms buttons + trust buttons
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
334 best_width = properties.NumericProperty(0)
117
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
335
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
336 def __init__(self, chat, **kwargs):
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
337 """
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
338 @param chat(Chat): Chat instance
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
339 """
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
340 self.chat = chat
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
341 super(EncryptionMenu, self).__init__(**kwargs)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
342 btn = EncryptionButton(
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
343 text=_("unencrypted (plain text)"),
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
344 on_release=self.unencrypted,
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
345 selected=True,
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
346 bold=False,
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
347 )
332
13bc00b9743a chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents: 329
diff changeset
348 btn.bind(
13bc00b9743a chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents: 329
diff changeset
349 on_release=self.unencrypted,
13bc00b9743a chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents: 329
diff changeset
350 )
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
351 self.add_widget(btn)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
352 for plugin in G.host.encryption_plugins:
339
63cdabdd032e chat: show encryption button with group chats:
Goffi <goffi@goffi.org>
parents: 338
diff changeset
353 if chat.type == C.CHAT_GROUP and plugin["directed"]:
63cdabdd032e chat: show encryption button with group chats:
Goffi <goffi@goffi.org>
parents: 338
diff changeset
354 # directed plugins can't work with group chat
63cdabdd032e chat: show encryption button with group chats:
Goffi <goffi@goffi.org>
parents: 338
diff changeset
355 continue
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
356 btn = EncryptionButton(
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
357 text=plugin['name'],
332
13bc00b9743a chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents: 329
diff changeset
358 trust_button=True,
13bc00b9743a chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents: 329
diff changeset
359 )
13bc00b9743a chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents: 329
diff changeset
360 btn.bind(
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
361 on_release=partial(self.startEncryption, plugin=plugin),
242
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
362 on_trust_release=partial(self.getTrustUI, plugin=plugin),
332
13bc00b9743a chat: use `bind` for EncryptionButton events:
Goffi <goffi@goffi.org>
parents: 329
diff changeset
363 )
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
364 self.add_widget(btn)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
365 log.info("added encryption: {}".format(plugin['name']))
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
366
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
367 def messageEncryptionStopCb(self):
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
368 log.info(_("Session with {destinee} is now in plain text").format(
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
369 destinee = self.chat.target))
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
370
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
371 def messageEncryptionStopEb(self, failure_):
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
372 msg = _("Error while stopping encryption with {destinee}: {reason}").format(
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
373 destinee = self.chat.target,
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
374 reason = failure_)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
375 log.warning(msg)
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
376 G.host.addNote(_("encryption problem"), msg, C.XMLUI_DATA_LVL_ERROR)
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
377
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
378 def unencrypted(self, button):
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
379 self.dismiss()
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
380 G.host.bridge.messageEncryptionStop(
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
381 str(self.chat.target),
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
382 self.chat.profile,
242
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
383 callback=self.messageEncryptionStopCb,
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
384 errback=self.messageEncryptionStopEb)
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
385
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
386 def messageEncryptionStartCb(self, plugin):
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
387 log.info(_("Session with {destinee} is now encrypted with {encr_name}").format(
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
388 destinee = self.chat.target,
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
389 encr_name = plugin['name']))
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
390
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
391 def messageEncryptionStartEb(self, failure_):
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
392 msg = _("Session can't be encrypted with {destinee}: {reason}").format(
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
393 destinee = self.chat.target,
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
394 reason = failure_)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
395 log.warning(msg)
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
396 G.host.addNote(_("encryption problem"), msg, C.XMLUI_DATA_LVL_ERROR)
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
397
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
398 def startEncryption(self, button, plugin):
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
399 """Request encryption with given plugin for this session
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
400
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
401 @param button(EncryptionButton): button which has been pressed
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
402 @param plugin(dict): plugin data
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
403 """
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
404 self.dismiss()
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
405 G.host.bridge.messageEncryptionStart(
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
406 str(self.chat.target),
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
407 plugin['namespace'],
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
408 True,
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
409 self.chat.profile,
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
410 callback=partial(self.messageEncryptionStartCb, plugin=plugin),
242
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
411 errback=self.messageEncryptionStartEb)
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
412
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
413 def encryptionTrustUIGetCb(self, xmlui_raw):
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
414 xml_ui = xmlui.create(
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
415 G.host, xmlui_raw, profile=self.chat.profile)
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
416 xml_ui.show()
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
417
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
418 def encryptionTrustUIGetEb(self, failure_):
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
419 msg = _("Trust manager interface can't be retrieved: {reason}").format(
242
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
420 reason = failure_)
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
421 log.warning(msg)
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
422 G.host.addNote(_("encryption trust management problem"), msg,
242
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
423 C.XMLUI_DATA_LVL_ERROR)
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
424
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
425 def getTrustUI(self, button, plugin):
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
426 """Request and display trust management UI
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
427
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
428 @param button(EncryptionButton): button which has been pressed
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
429 @param plugin(dict): plugin data
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
430 """
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
431 self.dismiss()
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
432 G.host.bridge.encryptionTrustUIGet(
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
433 str(self.chat.target),
242
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
434 plugin['namespace'],
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
435 self.chat.profile,
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
436 callback=self.encryptionTrustUIGetCb,
c2503168fab7 plugin chat (encryption): added a button to display trust management UI.
Goffi <goffi@goffi.org>
parents: 233
diff changeset
437 errback=self.encryptionTrustUIGetEb)
117
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
438
f0291755b07c chat: OTR integration first draft:
Goffi <goffi@goffi.org>
parents: 111
diff changeset
439
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
440 class Chat(quick_chat.QuickChat, cagou_widget.CagouWidget):
78
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
441 message_input = properties.ObjectProperty()
86
c711be670ecd core, chat: upload plugin system:
Goffi <goffi@goffi.org>
parents: 78
diff changeset
442 messages_widget = properties.ObjectProperty()
326
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
443 history_scroll = properties.ObjectProperty()
387
d61bbbac4160 cagou widget: don't add header_input systematically anymore:
Goffi <goffi@goffi.org>
parents: 379
diff changeset
444 use_header_input = True
354
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
445 global_screen_manager = True
353
19422bbd9c8e core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents: 340
diff changeset
446 collection_carousel = True
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
447
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
448 def __init__(self, host, target, type_=C.CHAT_ONE2ONE, nick=None, occupants=None,
338
d4883f9576db chat: handle room statuses following backend change
Goffi <goffi@goffi.org>
parents: 334
diff changeset
449 subject=None, statuses=None, profiles=None):
354
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
450 self.show_chat_selector = False
353
19422bbd9c8e core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents: 340
diff changeset
451 if statuses is None:
19422bbd9c8e core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents: 340
diff changeset
452 statuses = {}
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
453 quick_chat.QuickChat.__init__(
338
d4883f9576db chat: handle room statuses following backend change
Goffi <goffi@goffi.org>
parents: 334
diff changeset
454 self, host, target, type_, nick, occupants, subject, statuses,
d4883f9576db chat: handle room statuses following backend change
Goffi <goffi@goffi.org>
parents: 334
diff changeset
455 profiles=profiles)
122
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
456 self.otr_state_encryption = OTR_STATE_UNENCRYPTED
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
457 self.otr_state_trust = OTR_STATE_UNTRUSTED
225
a3162b29cda1 plugin chat: fixed AttributeError when message is receved and a corresponding ChatWidget is not created yet
Goffi <goffi@goffi.org>
parents: 193
diff changeset
458 # completion attributes
a3162b29cda1 plugin chat: fixed AttributeError when message is receved and a corresponding ChatWidget is not created yet
Goffi <goffi@goffi.org>
parents: 193
diff changeset
459 self._hi_comp_data = None
a3162b29cda1 plugin chat: fixed AttributeError when message is receved and a corresponding ChatWidget is not created yet
Goffi <goffi@goffi.org>
parents: 193
diff changeset
460 self._hi_comp_last = None
a3162b29cda1 plugin chat: fixed AttributeError when message is receved and a corresponding ChatWidget is not created yet
Goffi <goffi@goffi.org>
parents: 193
diff changeset
461 self._hi_comp_dropdown = DropDown()
a3162b29cda1 plugin chat: fixed AttributeError when message is receved and a corresponding ChatWidget is not created yet
Goffi <goffi@goffi.org>
parents: 193
diff changeset
462 self._hi_comp_allowed = True
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
463 cagou_widget.CagouWidget.__init__(self)
278
444ba439530f chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents: 277
diff changeset
464 transfer_btn = TransferButton(chat=self)
444ba439530f chat: moved transfer button to header_box
Goffi <goffi@goffi.org>
parents: 277
diff changeset
465 self.headerInputAddExtra(transfer_btn)
339
63cdabdd032e chat: show encryption button with group chats:
Goffi <goffi@goffi.org>
parents: 338
diff changeset
466 if (type_ == C.CHAT_ONE2ONE or "REALJID_PUBLIC" in statuses):
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
467 self.encryption_btn = EncryptionMainButton(self)
122
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
468 self.headerInputAddExtra(self.encryption_btn)
287
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
469 self.extra_menu = ExtraMenu(chat=self)
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
470 extra_btn = ExtraButton(chat=self)
5d96bcd3bfec chat: added an extra menu (3 dots menu):
Goffi <goffi@goffi.org>
parents: 284
diff changeset
471 self.headerInputAddExtra(extra_btn)
325
5868a5575e01 chat: cleaning + some improvments:
Goffi <goffi@goffi.org>
parents: 322
diff changeset
472 self.header_input.hint_text = target
326
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
473 self._history_prepend_lock = False
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
474 self.history_count = 0
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
475
353
19422bbd9c8e core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents: 340
diff changeset
476 def on_kv_post(self, __):
19422bbd9c8e core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents: 340
diff changeset
477 self.postInit()
19422bbd9c8e core (widgets handler): refactoring:
Goffi <goffi@goffi.org>
parents: 340
diff changeset
478
354
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
479 def screenManagerInit(self, screen_manager):
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
480 screen_manager.transition = screenmanager.SlideTransition(direction='down')
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
481 sel_screen = Screen(name='chat_selector')
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
482 chat_selector = ChatSelector(profile=self.profile)
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
483 sel_screen.add_widget(chat_selector)
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
484 screen_manager.add_widget(sel_screen)
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
485 if self.show_chat_selector:
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
486 transition = screen_manager.transition
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
487 screen_manager.transition = NoTransition()
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
488 screen_manager.current = 'chat_selector'
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
489 screen_manager.transition = transition
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
490
156
826e7b17a19b chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents: 145
diff changeset
491 def __str__(self):
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
492 return "Chat({})".format(self.target)
156
826e7b17a19b chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents: 145
diff changeset
493
826e7b17a19b chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents: 145
diff changeset
494 def __repr__(self):
826e7b17a19b chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents: 145
diff changeset
495 return self.__str__()
826e7b17a19b chat: added __unicode__ and __str__
Goffi <goffi@goffi.org>
parents: 145
diff changeset
496
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
497 @classmethod
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
498 def factory(cls, plugin_info, target, profiles):
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
499 profiles = list(profiles)
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
500 if len(profiles) > 1:
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
501 raise NotImplementedError("Multi-profiles is not available yet for chat")
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
502 if target is None:
354
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
503 show_chat_selector = True
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
504 target = G.host.profiles[profiles[0]].whoami
354
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
505 else:
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
506 show_chat_selector = False
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
507 wid = G.host.widgets.getOrCreateWidget(cls, target, on_new_widget=None,
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
508 on_existing_widget=G.host.getOrClone,
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
509 profiles=profiles)
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
510 wid.show_chat_selector = show_chat_selector
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
511 return wid
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
512
289
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
513 @property
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
514 def message_widgets_rev(self):
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
515 return self.messages_widget.children
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
516
354
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
517 ## keyboard ##
367
abb57182ebfb chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents: 357
diff changeset
518
354
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
519 def key_input(self, window, key, scancode, codepoint, modifier):
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
520 if key == 27:
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
521 screen_manager = self.screen_manager
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
522 screen_manager.transition.direction = 'down'
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
523 screen_manager.current = 'chat_selector'
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
524 return True
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
525
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
526
109
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
527 ## header ##
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
528
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
529 def changeWidget(self, jid_):
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
530 """change current widget for a new one with given jid
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
531
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
532 @param jid_(jid.JID): jid of the widget to create
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
533 """
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
534 plugin_info = G.host.getPluginInfo(main=Chat)
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
535 factory = plugin_info['factory']
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
536 G.host.switchWidget(self, factory(plugin_info, jid_, profiles=[self.profile]))
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
537 self.header_input.text = ''
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
538
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
539 def onHeaderInput(self):
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
540 text = self.header_input.text.strip()
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
541 try:
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
542 if text.count('@') != 1 or text.count(' '):
109
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
543 raise ValueError
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
544 jid_ = jid.JID(text)
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
545 except ValueError:
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
546 log.info("entered text is not a jid")
109
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
547 return
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
548
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
549 def discoCb(disco):
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
550 # TODO: check if plugin XEP-0045 is activated
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
551 if "conference" in [i[0] for i in disco[1]]:
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
552 G.host.bridge.mucJoin(str(jid_), "", "", self.profile,
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
553 callback=self._mucJoinCb, errback=self._mucJoinEb)
109
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
554 else:
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
555 self.changeWidget(jid_)
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
556
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
557 def discoEb(failure):
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
558 log.warning("Disco failure, ignore this text: {}".format(failure))
109
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
559
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
560 G.host.bridge.discoInfos(jid_.domain, self.profile, callback=discoCb,
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
561 errback=discoEb)
109
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
562
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
563 def onHeaderInputCompleted(self, input_wid, completed_text):
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
564 self._hi_comp_allowed = False
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
565 input_wid.text = completed_text
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
566 self._hi_comp_allowed = True
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
567 self._hi_comp_dropdown.dismiss()
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
568 self.onHeaderInput()
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
569
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
570 def onHeaderInputComplete(self, wid, text):
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
571 if not self._hi_comp_allowed:
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
572 return
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
573 text = text.lstrip()
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
574 if not text:
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
575 self._hi_comp_data = None
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
576 self._hi_comp_last = None
144
ae58f84fe4e6 plugin chat: fixed dropdown:
Goffi <goffi@goffi.org>
parents: 138
diff changeset
577 self._hi_comp_dropdown.dismiss()
109
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
578 return
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
579
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
580 profile = list(self.profiles)[0]
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
581
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
582 if self._hi_comp_data is None:
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
583 # first completion, we build the initial list
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
584 comp_data = self._hi_comp_data = []
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
585 self._hi_comp_last = ''
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
586 for jid_, jid_data in G.host.contact_lists[profile].all_iter:
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
587 comp_data.append((jid_, jid_data))
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
588 comp_data.sort(key=lambda datum: datum[0])
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
589 else:
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
590 comp_data = self._hi_comp_data
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
591
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
592 # XXX: dropdown is rebuilt each time backspace is pressed or if the text is changed,
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
593 # it works OK, but some optimisation may be done here
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
594 dropdown = self._hi_comp_dropdown
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
595
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
596 if not text.startswith(self._hi_comp_last) or not self._hi_comp_last:
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
597 # text has changed or backspace has been pressed, we restart
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
598 dropdown.clear_widgets()
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
599
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
600 for jid_, jid_data in comp_data:
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
601 nick = jid_data.get('nick', '')
109
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
602 if text in jid_.bare or text in nick.lower():
193
284cb5c467b0 core (common): split JidItem in 3 classes:
Goffi <goffi@goffi.org>
parents: 186
diff changeset
603 btn = JidButton(
109
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
604 jid = jid_.bare,
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
605 profile = profile,
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
606 size_hint = (0.5, None),
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
607 nick = nick,
284
ca4daced4638 misc: replaced "dummy" by "__"
Goffi <goffi@goffi.org>
parents: 283
diff changeset
608 on_release=lambda __, txt=jid_.bare: self.onHeaderInputCompleted(wid, txt)
109
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
609 )
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
610 dropdown.add_widget(btn)
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
611 else:
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
612 # more chars, we continue completion by removing unwanted widgets
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
613 to_remove = []
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
614 for c in dropdown.children[0].children:
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
615 if text not in c.jid and text not in (c.nick or ''):
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
616 to_remove.append(c)
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
617 for c in to_remove:
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
618 dropdown.remove_widget(c)
144
ae58f84fe4e6 plugin chat: fixed dropdown:
Goffi <goffi@goffi.org>
parents: 138
diff changeset
619 if dropdown.attach_to is None:
ae58f84fe4e6 plugin chat: fixed dropdown:
Goffi <goffi@goffi.org>
parents: 138
diff changeset
620 dropdown.open(wid)
109
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
621 self._hi_comp_last = text
7631325e11f4 chat: added completion of header's input, any entity in cache containing the entered text is shown
Goffi <goffi@goffi.org>
parents: 106
diff changeset
622
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
623 def messageDataConverter(self, idx, mess_id):
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
624 return {"mess_data": self.messages[mess_id]}
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
625
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
626 def _onHistoryPrinted(self):
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
627 """Refresh or scroll down the focus after the history is printed"""
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
628 # self.adapter.data = self.messages
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
629 for mess_data in self.messages.values():
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
630 self.appendMessage(mess_data)
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
631 super(Chat, self)._onHistoryPrinted()
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
632
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
633 def createMessage(self, message):
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
634 self.appendMessage(message)
329
51520ce98154 common_widgets (DelayedBoxLayout), chat: don't delay layout on new message:
Goffi <goffi@goffi.org>
parents: 326
diff changeset
635 # we need to render immediatly next 2 layouts to avoid an unpleasant flickering
51520ce98154 common_widgets (DelayedBoxLayout), chat: don't delay layout on new message:
Goffi <goffi@goffi.org>
parents: 326
diff changeset
636 # when sending or receiving a message
51520ce98154 common_widgets (DelayedBoxLayout), chat: don't delay layout on new message:
Goffi <goffi@goffi.org>
parents: 326
diff changeset
637 self.messages_widget.dont_delay_next_layouts = 2
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
638
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
639 def appendMessage(self, mess_data):
289
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
640 """Append a message Widget to the history
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
641
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
642 @param mess_data(quick_chat.Message): message data
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
643 """
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
644 if self.handleUserMoved(mess_data):
717c6c368f70 chat: merge user moved info messages:
Goffi <goffi@goffi.org>
parents: 287
diff changeset
645 return
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
646 self.messages_widget.add_widget(MessageWidget(mess_data=mess_data))
184
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
647 self.notify(mess_data)
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
648
326
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
649 def prependMessage(self, mess_data):
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
650 """Prepend a message Widget to the history
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
651
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
652 @param mess_data(quick_chat.Message): message data
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
653 """
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
654 mess_wid = self.messages_widget
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
655 last_idx = len(mess_wid.children)
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
656 mess_wid.add_widget(MessageWidget(mess_data=mess_data), index=last_idx)
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
657
184
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
658 def _get_notif_msg(self, mess_data):
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
659 return _("{nick}: {message}").format(
184
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
660 nick=mess_data.nick,
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
661 message=mess_data.main_message)
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
662
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
663 def notify(self, mess_data):
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
664 """Notify user when suitable
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
665
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
666 For one2one chat, notification will happen when window has not focus
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
667 or when one2one chat is not visible. A note is also there when widget
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
668 is not visible.
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
669 For group chat, note will be added on mention, with a desktop notification if
396
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
670 window has not focus or is not visible.
184
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
671 """
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
672 visible_clones = [w for w in G.host.getVisibleList(self.__class__)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
673 if w.target == self.target]
186
a826c70beda2 chat: avoid multiple notifications when there are several cloned chats (i.e. with same target)
Goffi <goffi@goffi.org>
parents: 185
diff changeset
674 if len(visible_clones) > 1 and visible_clones.index(self) > 0:
a826c70beda2 chat: avoid multiple notifications when there are several cloned chats (i.e. with same target)
Goffi <goffi@goffi.org>
parents: 185
diff changeset
675 # to avoid multiple notifications in case of multiple cloned widgets
a826c70beda2 chat: avoid multiple notifications when there are several cloned chats (i.e. with same target)
Goffi <goffi@goffi.org>
parents: 185
diff changeset
676 # we only handle first clone
a826c70beda2 chat: avoid multiple notifications when there are several cloned chats (i.e. with same target)
Goffi <goffi@goffi.org>
parents: 185
diff changeset
677 return
a826c70beda2 chat: avoid multiple notifications when there are several cloned chats (i.e. with same target)
Goffi <goffi@goffi.org>
parents: 185
diff changeset
678 is_visible = bool(visible_clones)
184
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
679 if self.type == C.CHAT_ONE2ONE:
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
680 if (not Window.focus or not is_visible) and not mess_data.history:
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
681 notif_msg = self._get_notif_msg(mess_data)
396
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
682 G.host.notify(
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
683 type_=C.NOTIFY_MESSAGE,
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
684 entity=mess_data.from_jid,
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
685 message=notif_msg,
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
686 subject=_("private message"),
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
687 widget=self,
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
688 profile=self.profile
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
689 )
184
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
690 if not is_visible:
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
691 G.host.addNote(
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
692 _("private message"),
250
ff1efdeff53f core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents: 244
diff changeset
693 notif_msg,
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
694 symbol = "chat",
250
ff1efdeff53f core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents: 244
diff changeset
695 action = {
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
696 "action": 'chat',
250
ff1efdeff53f core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents: 244
diff changeset
697 "target": self.target,
ff1efdeff53f core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents: 244
diff changeset
698 "profiles": self.profiles}
184
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
699 )
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
700 else:
396
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
701 if mess_data.mention:
184
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
702 notif_msg = self._get_notif_msg(mess_data)
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
703 G.host.addNote(
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
704 _("mention"),
250
ff1efdeff53f core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents: 244
diff changeset
705 notif_msg,
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
706 symbol = "chat",
250
ff1efdeff53f core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents: 244
diff changeset
707 action = {
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
708 "action": 'chat',
250
ff1efdeff53f core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents: 244
diff changeset
709 "target": self.target,
ff1efdeff53f core: notifs can now have a custom icon and be clickable:
Goffi <goffi@goffi.org>
parents: 244
diff changeset
710 "profiles": self.profiles}
184
c63922860f80 chat: show desktop notification and/or note when suitable
Goffi <goffi@goffi.org>
parents: 180
diff changeset
711 )
396
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
712 if not is_visible or not Window.focus:
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
713 subject=_("mention ({room_jid})").format(room_jid=self.target)
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
714 G.host.notify(
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
715 type_=C.NOTIFY_MENTION,
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
716 entity=self.target,
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
717 message=notif_msg,
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
718 subject=subject,
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
719 widget=self,
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
720 profile=self.profile
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
721 )
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
722
367
abb57182ebfb chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents: 357
diff changeset
723 # message input
abb57182ebfb chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents: 357
diff changeset
724
abb57182ebfb chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents: 357
diff changeset
725 def addNick(self, nick):
abb57182ebfb chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents: 357
diff changeset
726 """Add a nickname to message_input if suitable"""
abb57182ebfb chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents: 357
diff changeset
727 if (self.type == C.CHAT_GROUP and not self.message_input.text.startswith(nick)):
abb57182ebfb chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents: 357
diff changeset
728 self.message_input.text = f'{nick}: {self.message_input.text}'
abb57182ebfb chat: prepend nick to message input when occupant avatar is touched on group chat.
Goffi <goffi@goffi.org>
parents: 357
diff changeset
729
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
730 def onSend(self, input_widget):
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
731 G.host.messageSend(
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
732 self.target,
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
733 {'': input_widget.text}, # TODO: handle language
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
734 mess_type = (C.MESS_TYPE_GROUPCHAT
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
735 if self.type == C.CHAT_GROUP else C.MESS_TYPE_CHAT), # TODO: put this in QuickChat
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
736 profile_key=self.profile
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
737 )
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
738 input_widget.text = ''
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
739
277
f5302d57fb09 chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents: 276
diff changeset
740 def fileTransferEb(self, err_msg, cleaning_cb, profile):
88
3dc526bb4a5a upload: plugin android gallery, first draft:
Goffi <goffi@goffi.org>
parents: 86
diff changeset
741 if cleaning_cb is not None:
3dc526bb4a5a upload: plugin android gallery, first draft:
Goffi <goffi@goffi.org>
parents: 86
diff changeset
742 cleaning_cb()
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
743 msg = _("can't transfer file: {reason}").format(reason=err_msg)
283
c73a7cd36b54 chat: show warning note on failing fileUpload + added forgotten "profile" argument
Goffi <goffi@goffi.org>
parents: 282
diff changeset
744 log.warning(msg)
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
745 G.host.addNote(_("File transfer error"),
295
fdbb07f1e373 we are in dev version again
Goffi <goffi@goffi.org>
parents: 289
diff changeset
746 msg,
fdbb07f1e373 we are in dev version again
Goffi <goffi@goffi.org>
parents: 289
diff changeset
747 level=C.XMLUI_DATA_LVL_WARNING)
78
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
748
277
f5302d57fb09 chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents: 276
diff changeset
749 def fileTransferCb(self, metadata, cleaning_cb, profile):
97
5d2289127bb7 menu (upload): better menu using dedicated widget:
Goffi <goffi@goffi.org>
parents: 90
diff changeset
750 log.debug("file transfered: {}".format(metadata))
111
c3952922ca56 chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents: 109
diff changeset
751 extra = {}
c3952922ca56 chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents: 109
diff changeset
752
c3952922ca56 chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents: 109
diff changeset
753 # FIXME: Q&D way of getting file type, upload plugins shouls give it
c3952922ca56 chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents: 109
diff changeset
754 mime_type = mimetypes.guess_type(metadata['url'])[0]
c3952922ca56 chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents: 109
diff changeset
755 if mime_type is not None:
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
756 if mime_type.split('/')[0] == 'image':
111
c3952922ca56 chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents: 109
diff changeset
757 # we generate url ourselves, so this formatting is safe
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
758 extra['xhtml'] = "<img src='{url}' />".format(**metadata)
111
c3952922ca56 chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents: 109
diff changeset
759
78
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
760 G.host.messageSend(
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
761 self.target,
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
762 {'': metadata['url']},
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
763 mess_type = (C.MESS_TYPE_GROUPCHAT
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
764 if self.type == C.CHAT_GROUP else C.MESS_TYPE_CHAT),
111
c3952922ca56 chat: uploaded images are now sent with XHTML, so they are shown inline
Goffi <goffi@goffi.org>
parents: 109
diff changeset
765 extra = extra,
78
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
766 profile_key=profile
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
767 )
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
768
322
e2b51663d8b8 core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents: 312
diff changeset
769 if cleaning_cb is not None:
e2b51663d8b8 core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents: 312
diff changeset
770 cleaning_cb()
e2b51663d8b8 core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents: 312
diff changeset
771
283
c73a7cd36b54 chat: show warning note on failing fileUpload + added forgotten "profile" argument
Goffi <goffi@goffi.org>
parents: 282
diff changeset
772
322
e2b51663d8b8 core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents: 312
diff changeset
773 def transferFile(self, file_path, transfer_type=C.TRANSFER_UPLOAD, cleaning_cb=None):
e2b51663d8b8 core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents: 312
diff changeset
774 if transfer_type == C.TRANSFER_UPLOAD:
333
69d2a96ce26f chat: serialise `options` in `fileUpload` following change in backend
Goffi <goffi@goffi.org>
parents: 332
diff changeset
775 options = {
69d2a96ce26f chat: serialise `options` in `fileUpload` following change in backend
Goffi <goffi@goffi.org>
parents: 332
diff changeset
776 "ignore_tls_errors": not G.host.tls_validation,
69d2a96ce26f chat: serialise `options` in `fileUpload` following change in backend
Goffi <goffi@goffi.org>
parents: 332
diff changeset
777 }
334
36d6763af547 chat: encrypt uploaded file if the session is encrypted
Goffi <goffi@goffi.org>
parents: 333
diff changeset
778 if self.encrypted:
36d6763af547 chat: encrypt uploaded file if the session is encrypted
Goffi <goffi@goffi.org>
parents: 333
diff changeset
779 options['encryption'] = C.ENC_AES_GCM
98
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
780 G.host.bridge.fileUpload(
322
e2b51663d8b8 core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents: 312
diff changeset
781 str(file_path),
98
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
782 "",
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
783 "",
333
69d2a96ce26f chat: serialise `options` in `fileUpload` following change in backend
Goffi <goffi@goffi.org>
parents: 332
diff changeset
784 data_format.serialise(options),
98
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
785 self.profile,
277
f5302d57fb09 chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents: 276
diff changeset
786 callback = partial(
f5302d57fb09 chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents: 276
diff changeset
787 G.host.actionManager,
f5302d57fb09 chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents: 276
diff changeset
788 progress_cb = partial(self.fileTransferCb, cleaning_cb=cleaning_cb),
281
ef77423ce500 core: store tls_validation flag in host and use if for file upload.
Goffi <goffi@goffi.org>
parents: 278
diff changeset
789 progress_eb = partial(self.fileTransferEb, cleaning_cb=cleaning_cb),
283
c73a7cd36b54 chat: show warning note on failing fileUpload + added forgotten "profile" argument
Goffi <goffi@goffi.org>
parents: 282
diff changeset
790 profile = self.profile,
c73a7cd36b54 chat: show warning note on failing fileUpload + added forgotten "profile" argument
Goffi <goffi@goffi.org>
parents: 282
diff changeset
791 ),
c73a7cd36b54 chat: show warning note on failing fileUpload + added forgotten "profile" argument
Goffi <goffi@goffi.org>
parents: 282
diff changeset
792 errback = partial(G.host.errback,
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
793 message=_("can't upload file: {msg}"))
277
f5302d57fb09 chat: use the new progress_cb and progress_eb methods of actionManager:
Goffi <goffi@goffi.org>
parents: 276
diff changeset
794 )
98
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
795 elif transfer_type == C.TRANSFER_SEND:
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
796 if self.type == C.CHAT_GROUP:
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
797 log.warning("P2P transfer is not possible for group chat")
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
798 # TODO: show an error dialog to user, or better hide the send button for
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
799 # MUC
98
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
800 else:
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
801 jid_ = self.target
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
802 if not jid_.resource:
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
803 jid_ = G.host.contact_lists[self.profile].getFullJid(jid_)
322
e2b51663d8b8 core, android: new share widget + added Cagou to "share" menu:
Goffi <goffi@goffi.org>
parents: 312
diff changeset
804 G.host.bridge.fileSend(str(jid_), str(file_path), "", "", {},
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
805 profile=self.profile)
98
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
806 # TODO: notification of sending/failing
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
807 else:
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
808 raise log.error("transfer of type {} are not handled".format(transfer_type))
98
4d8c122b86a6 menu (upload): send transfer (i.e. P2P transfer) is now working
Goffi <goffi@goffi.org>
parents: 97
diff changeset
809
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
810 def messageEncryptionStarted(self, plugin_data):
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
811 quick_chat.QuickChat.messageEncryptionStarted(self, plugin_data)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
812 self.encryption_btn.symbol = SYMBOL_ENCRYPTED
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
813 self.encryption_btn.color = COLOR_ENCRYPTED
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
814 self.encryption_btn.selectAlgo(plugin_data['name'])
233
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
815
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
816 def messageEncryptionStopped(self, plugin_data):
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
817 quick_chat.QuickChat.messageEncryptionStopped(self, plugin_data)
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
818 self.encryption_btn.symbol = SYMBOL_UNENCRYPTED
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
819 self.encryption_btn.color = COLOR_UNENCRYPTED
ba8f3a4a5ac7 plugin chat: e2e encryption improvments:
Goffi <goffi@goffi.org>
parents: 225
diff changeset
820 self.encryption_btn.selectAlgo(None)
78
46d962910801 chat: file upload first draft:
Goffi <goffi@goffi.org>
parents: 68
diff changeset
821
46
d6a63942d5ad chat: fixed MUC joining following changes in backend
Goffi <goffi@goffi.org>
parents: 45
diff changeset
822 def _mucJoinCb(self, joined_data):
338
d4883f9576db chat: handle room statuses following backend change
Goffi <goffi@goffi.org>
parents: 334
diff changeset
823 joined, room_jid_s, occupants, user_nick, subject, statuses, profile = joined_data
46
d6a63942d5ad chat: fixed MUC joining following changes in backend
Goffi <goffi@goffi.org>
parents: 45
diff changeset
824 self.host.mucRoomJoinedHandler(*joined_data[1:])
d6a63942d5ad chat: fixed MUC joining following changes in backend
Goffi <goffi@goffi.org>
parents: 45
diff changeset
825 jid_ = jid.JID(room_jid_s)
42
286865bc013a chat: joining MUC using header input is now working:
Goffi <goffi@goffi.org>
parents: 41
diff changeset
826 self.changeWidget(jid_)
286865bc013a chat: joining MUC using header input is now working:
Goffi <goffi@goffi.org>
parents: 41
diff changeset
827
286865bc013a chat: joining MUC using header input is now working:
Goffi <goffi@goffi.org>
parents: 41
diff changeset
828 def _mucJoinEb(self, failure):
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
829 log.warning("Can't join room: {}".format(failure))
42
286865bc013a chat: joining MUC using header input is now working:
Goffi <goffi@goffi.org>
parents: 41
diff changeset
830
122
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
831 def onOTRState(self, state, dest_jid, profile):
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
832 assert profile in self.profiles
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
833 if state in OTR_STATE_ENCRYPTION:
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
834 self.otr_state_encryption = state
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
835 elif state in OTR_STATE_TRUST:
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
836 self.otr_state_trust = state
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
837 else:
312
772c170b47a9 Python3 port:
Goffi <goffi@goffi.org>
parents: 303
diff changeset
838 log.error(_("Unknown OTR state received: {}".format(state)))
122
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
839 return
135
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
840 self.encryption_btn.symbol = self.encryption_btn.getSymbol()
091e288838e1 plugin chat: use new Symbol widget to display encryption button
Goffi <goffi@goffi.org>
parents: 126
diff changeset
841 self.encryption_btn.color = self.encryption_btn.getColor()
122
dcd6fbb3f010 chat: handle new OTR state signal and change encryption icon consequently
Goffi <goffi@goffi.org>
parents: 121
diff changeset
842
265
805c4103dac5 core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents: 261
diff changeset
843 def onVisible(self):
805c4103dac5 core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents: 261
diff changeset
844 if not self.sync:
805c4103dac5 core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents: 261
diff changeset
845 self.resync()
805c4103dac5 core: resync widgets only when they are visible:
Goffi <goffi@goffi.org>
parents: 261
diff changeset
846
396
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
847 def onSelected(self):
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
848 G.host.clearNotifs(self.target, profile=self.profile)
ae6f7fd1cb0e chat: use QuickApp.notify and clear notifications when selected.
Goffi <goffi@goffi.org>
parents: 395
diff changeset
849
356
307c2501d8b2 chat: keep as many instances of opened chat as there are active WHWrapper, instead of just one:
Goffi <goffi@goffi.org>
parents: 354
diff changeset
850 def onDelete(self, **kwargs):
393
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
851 if kwargs.get('explicit_close', False):
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
852 wrapper = self.whwrapper
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
853 if wrapper is not None:
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
854 if len(wrapper.carousel.slides) == 1:
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
855 # if we delete the last opened chat, we need to show the selector
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
856 screen_manager = self.screen_manager
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
857 screen_manager.transition.direction = 'down'
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
858 screen_manager.current = 'chat_selector'
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
859 wrapper.carousel.remove_widget(self)
e2f806779b53 chat: added a "close" item in menu, to leave MUC/close current chat widget.
Goffi <goffi@goffi.org>
parents: 387
diff changeset
860 return True
261
a579eda31f4f chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents: 260
diff changeset
861 # we always keep one widget, so it's available when swiping
a579eda31f4f chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents: 260
diff changeset
862 # TODO: delete all widgets when chat is closed
a579eda31f4f chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents: 260
diff changeset
863 nb_instances = sum(1 for _ in self.host.widgets.getWidgetInstances(self))
356
307c2501d8b2 chat: keep as many instances of opened chat as there are active WHWrapper, instead of just one:
Goffi <goffi@goffi.org>
parents: 354
diff changeset
864 # we want to keep at least one instance of Chat by WHWrapper
307c2501d8b2 chat: keep as many instances of opened chat as there are active WHWrapper, instead of just one:
Goffi <goffi@goffi.org>
parents: 354
diff changeset
865 nb_to_keep = len(G.host.widgets_handler.children)
307c2501d8b2 chat: keep as many instances of opened chat as there are active WHWrapper, instead of just one:
Goffi <goffi@goffi.org>
parents: 354
diff changeset
866 if nb_instances <= nb_to_keep:
261
a579eda31f4f chat: don't use "force" argument anymore
Goffi <goffi@goffi.org>
parents: 260
diff changeset
867 return False
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
868
326
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
869 def _history_unlock(self, __):
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
870 self._history_prepend_lock = False
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
871 log.debug("history prepend unlocked")
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
872 # we call manually onScroll, to check if we are still in the scrolling zone
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
873 self.onScroll(self.history_scroll, self.history_scroll.scroll_y)
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
874
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
875 def _history_scroll_adjust(self, __, scroll_start_height):
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
876 # history scroll position must correspond to where it was before new messages
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
877 # have been appended
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
878 self.history_scroll.scroll_y = (
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
879 scroll_start_height / self.messages_widget.height
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
880 )
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
881
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
882 # we want a small delay before unlocking, to avoid re-fetching history
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
883 # again
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
884 Clock.schedule_once(self._history_unlock, 1.5)
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
885
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
886 def _backHistoryGetCb_post(self, __, history, scroll_start_height):
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
887 if len(history) == 0:
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
888 # we don't unlock self._history_prepend_lock if there is no history, as there
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
889 # is no sense to try to retrieve more in this case.
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
890 log.debug(f"we've reached top of history for {self.target.bare} chat")
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
891 else:
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
892 # we have to schedule again for _history_scroll_adjust, else messages_widget
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
893 # is not resized (self.messages_widget.height is not yet updated)
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
894 # as a result, the scroll_to can't work correctly
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
895 Clock.schedule_once(partial(
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
896 self._history_scroll_adjust,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
897 scroll_start_height=scroll_start_height))
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
898 log.debug(
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
899 f"{len(history)} messages prepended to history (last: {history[0][0]})")
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
900
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
901 def _backHistoryGetCb(self, history):
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
902 # TODO: factorise with QuickChat._historyGetCb
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
903 scroll_start_height = self.messages_widget.height * self.history_scroll.scroll_y
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
904 for data in reversed(history):
409
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
905 uid, timestamp, from_jid, to_jid, message, subject, type_, extra_s = data
326
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
906 from_jid = jid.JID(from_jid)
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
907 to_jid = jid.JID(to_jid)
409
2caea63ae2ab chat: show attachments as clickable icons
Goffi <goffi@goffi.org>
parents: 406
diff changeset
908 extra = data_format.deserialise(extra_s)
326
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
909 extra["history"] = True
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
910 self.messages[uid] = message = quick_chat.Message(
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
911 self,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
912 uid,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
913 timestamp,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
914 from_jid,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
915 to_jid,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
916 message,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
917 subject,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
918 type_,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
919 extra,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
920 self.profile,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
921 )
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
922 self.messages.move_to_end(uid, last=False)
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
923 self.prependMessage(message)
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
924 Clock.schedule_once(partial(
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
925 self._backHistoryGetCb_post,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
926 history=history,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
927 scroll_start_height=scroll_start_height))
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
928
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
929 def _backHistoryGetEb(self, failure_):
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
930 G.host.addNote(
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
931 _("Problem while getting back history"),
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
932 _("Can't back history for {target}: {problem}").format(
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
933 target=self.target, problem=failure_),
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
934 C.XMLUI_DATA_LVL_ERROR)
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
935 # we don't unlock self._history_prepend_lock on purpose, no need
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
936 # to try to get more history if something is wrong
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
937
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
938 def onScroll(self, scroll_view, scroll_y):
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
939 if self._history_prepend_lock:
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
940 return
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
941 if (1-scroll_y) * self.messages_widget.height < INFINITE_SCROLL_LIMIT:
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
942 self._history_prepend_lock = True
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
943 log.debug(f"Retrieving back history for {self} [{self.history_count}]")
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
944 self.history_count += 1
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
945 first_uid = next(iter(self.messages.keys()))
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
946 filters = self.history_filters.copy()
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
947 filters['before_uid'] = first_uid
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
948 self.host.bridge.historyGet(
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
949 str(self.host.profiles[self.profile].whoami.bare),
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
950 str(self.target),
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
951 30,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
952 True,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
953 {k: str(v) for k,v in filters.items()},
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
954 self.profile,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
955 callback=self._backHistoryGetCb,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
956 errback=self._backHistoryGetEb,
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
957 )
d9d2b56f46db plugin chat: infinite scroll:
Goffi <goffi@goffi.org>
parents: 325
diff changeset
958
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
959
395
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
960 class ChatSelector(cagou_widget.CagouWidget, FilterBehavior):
394
d15828ca9d86 chat: use the new "implicit_update" and "to_show" properties for ChatSelector.jid_selector:
Goffi <goffi@goffi.org>
parents: 393
diff changeset
961 jid_selector = properties.ObjectProperty()
354
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
962 profile = properties.StringProperty()
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
963 plugin_info_class = Chat
395
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
964 use_header_input = True
354
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
965
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
966 def on_select(self, contact_button):
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
967 contact_jid = jid.JID(contact_button.jid)
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
968 plugin_info = G.host.getPluginInfo(main=Chat)
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
969 factory = plugin_info['factory']
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
970 self.screen_manager.transition.direction = 'up'
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
971 carousel = self.whwrapper.carousel
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
972 current_slides = {w.target: w for w in carousel.slides}
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
973 if contact_jid in current_slides:
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
974 slide = current_slides[contact_jid]
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
975 idx = carousel.slides.index(slide)
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
976 carousel.index = idx
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
977 self.screen_manager.current = ''
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
978 else:
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
979 G.host.switchWidget(
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
980 self, factory(plugin_info, contact_jid, profiles=[self.profile]))
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
981
aa860c10acfc chat: new chat selector:
Goffi <goffi@goffi.org>
parents: 353
diff changeset
982
395
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
983 def onHeaderInput(self):
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
984 text = self.header_input.text.strip()
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
985 try:
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
986 if text.count('@') != 1 or text.count(' '):
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
987 raise ValueError
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
988 jid_ = jid.JID(text)
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
989 except ValueError:
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
990 log.info("entered text is not a jid")
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
991 return
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
992 G.host.doAction("chat", jid_, [self.profile])
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
993
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
994 def onHeaderInputComplete(self, wid, text, **kwargs):
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
995 """we filter items when text is entered in input box"""
404
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
996 for layout in self.jid_selector.items_layouts:
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
997 self.do_filter(
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
998 layout,
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
999 text,
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
1000 # we append nick to jid to filter on both
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
1001 lambda c: c.jid + c.data.get('nick', ''),
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
1002 width_cb=lambda c: c.base_width,
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
1003 height_cb=lambda c: c.minimum_height,
f7476818f9fb core (common): JidSelector + behaviors various improvments:
Goffi <goffi@goffi.org>
parents: 396
diff changeset
1004 continue_tests=[lambda c: not isinstance(c, ContactButton)])
395
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
1005
c04c3b167cb0 chat: use header input to filter entities + open a new chat with unknown jid.
Goffi <goffi@goffi.org>
parents: 394
diff changeset
1006
22
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
1007 PLUGIN_INFO["factory"] = Chat.factory
74117b733bac plugin chat: first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
1008 quick_widgets.register(quick_chat.QuickChat, Chat)