Mercurial > libervia-web
annotate src/browser/libervia_main.py @ 562:7e8356479fef
misc: launch script fix (there can now be more than 1 argument)
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Fri, 03 Oct 2014 18:31:40 +0200 |
| parents | cd56f2b0e85b |
| children | 7a823c6568e2 |
| rev | line source |
|---|---|
| 0 | 1 #!/usr/bin/python |
| 2 # -*- coding: utf-8 -*- | |
| 3 | |
|
339
2067d6241927
fixed docstrings wrong usage for licence informations
Goffi <goffi@goffi.org>
parents:
336
diff
changeset
|
4 # Libervia: a Salut à Toi frontend |
| 340 | 5 # Copyright (C) 2011, 2012, 2013, 2014 Jérôme Poisson <goffi@goffi.org> |
| 0 | 6 |
|
339
2067d6241927
fixed docstrings wrong usage for licence informations
Goffi <goffi@goffi.org>
parents:
336
diff
changeset
|
7 # This program is free software: you can redistribute it and/or modify |
|
2067d6241927
fixed docstrings wrong usage for licence informations
Goffi <goffi@goffi.org>
parents:
336
diff
changeset
|
8 # it under the terms of the GNU Affero General Public License as published by |
|
2067d6241927
fixed docstrings wrong usage for licence informations
Goffi <goffi@goffi.org>
parents:
336
diff
changeset
|
9 # the Free Software Foundation, either version 3 of the License, or |
|
2067d6241927
fixed docstrings wrong usage for licence informations
Goffi <goffi@goffi.org>
parents:
336
diff
changeset
|
10 # (at your option) any later version. |
| 0 | 11 |
|
339
2067d6241927
fixed docstrings wrong usage for licence informations
Goffi <goffi@goffi.org>
parents:
336
diff
changeset
|
12 # This program is distributed in the hope that it will be useful, |
|
2067d6241927
fixed docstrings wrong usage for licence informations
Goffi <goffi@goffi.org>
parents:
336
diff
changeset
|
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
2067d6241927
fixed docstrings wrong usage for licence informations
Goffi <goffi@goffi.org>
parents:
336
diff
changeset
|
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
2067d6241927
fixed docstrings wrong usage for licence informations
Goffi <goffi@goffi.org>
parents:
336
diff
changeset
|
15 # GNU Affero General Public License for more details. |
| 0 | 16 |
|
339
2067d6241927
fixed docstrings wrong usage for licence informations
Goffi <goffi@goffi.org>
parents:
336
diff
changeset
|
17 # You should have received a copy of the GNU Affero General Public License |
|
2067d6241927
fixed docstrings wrong usage for licence informations
Goffi <goffi@goffi.org>
parents:
336
diff
changeset
|
18 # along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 0 | 19 |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
20 import pyjd # this is dummy in pyjs |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
21 |
|
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
22 ### logging configuration ### |
| 467 | 23 from sat_browser import logging |
|
440
88461e9c3e47
browser_side (log): move logging configuration in a "logging" module + use custom backend with console.debug/info/etc output.
Goffi <goffi@goffi.org>
parents:
439
diff
changeset
|
24 logging.configure() |
|
88461e9c3e47
browser_side (log): move logging configuration in a "logging" module + use custom backend with console.debug/info/etc output.
Goffi <goffi@goffi.org>
parents:
439
diff
changeset
|
25 from sat.core.log import getLogger |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
26 log = getLogger(__name__) |
|
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
27 ### |
|
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
28 |
|
449
981ed669d3b3
/!\ reorganize all the file hierarchy, move the code and launching script to src:
souliane <souliane@mailoo.org>
parents:
442
diff
changeset
|
29 from sat_frontends.tools.misc import InputHistory |
|
503
88ece2a00c63
browser_side: display new lines and clickable URLs for headline message
souliane <souliane@mailoo.org>
parents:
500
diff
changeset
|
30 from sat_frontends.tools import strings |
|
449
981ed669d3b3
/!\ reorganize all the file hierarchy, move the code and launching script to src:
souliane <souliane@mailoo.org>
parents:
442
diff
changeset
|
31 from sat.core.i18n import _ |
|
981ed669d3b3
/!\ reorganize all the file hierarchy, move the code and launching script to src:
souliane <souliane@mailoo.org>
parents:
442
diff
changeset
|
32 |
| 0 | 33 from pyjamas.ui.RootPanel import RootPanel |
|
21
77c2e48efa29
browser side: a warning message now show who will receive the message entered in UniBox, with a color depending on how many people will be able to see it
Goffi <goffi@goffi.org>
parents:
20
diff
changeset
|
34 from pyjamas.ui.HTML import HTML |
|
43
a7ff1e6f1229
browser_side: prevent default for escape key (cancel HTTPRequest in FF)
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
35 from pyjamas.ui.KeyboardListener import KEY_ESCAPE |
|
108
fad0e51cf565
on failure, Libervia now wait 5 s before trying again to call the serveur + only room name is now shown in tabs
Goffi <goffi@goffi.org>
parents:
107
diff
changeset
|
36 from pyjamas.Timer import Timer |
|
43
a7ff1e6f1229
browser_side: prevent default for escape key (cancel HTTPRequest in FF)
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
37 from pyjamas import Window, DOM |
| 0 | 38 from pyjamas.JSONService import JSONProxy |
|
323
0b7934e75e76
misc: reorganization of the file panels.py + clean the modules import:
souliane <souliane@mailoo.org>
parents:
321
diff
changeset
|
39 |
| 467 | 40 from sat_browser import register |
| 41 from sat_browser import contact | |
| 42 from sat_browser import base_widget | |
| 43 from sat_browser import panels | |
| 44 from sat_browser import dialog | |
| 45 from sat_browser import jid | |
| 46 from sat_browser import xmlui | |
| 47 from sat_browser import html_tools | |
| 48 from sat_browser import notification | |
|
323
0b7934e75e76
misc: reorganization of the file panels.py + clean the modules import:
souliane <souliane@mailoo.org>
parents:
321
diff
changeset
|
49 |
| 467 | 50 from sat_browser.constants import Const as C |
|
317
bbadd490e63c
misc: gather the constants in a single file, as it is done for other frontends
souliane <souliane@mailoo.org>
parents:
316
diff
changeset
|
51 |
|
549
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
52 try: |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
53 # FIXME: import plugin dynamically |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
54 from sat_browser import plugin_sec_otr |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
55 except ImportError: |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
56 pass |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
57 |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
58 MAX_MBLOG_CACHE = 500 # Max microblog entries kept in memories |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
59 |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
60 # Set to true to not create a new LiberviaWidget when a similar one |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
61 # already exist (i.e. a chat panel with the same target). Instead |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
62 # the existing widget will be eventually removed from its parent |
| 467 | 63 # and added to new base_widget.WidgetsPanel, or replaced to the expected |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
64 # position if the previous and the new parent are the same. |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
65 REUSE_EXISTING_LIBERVIA_WIDGETS = True |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
66 |
|
58
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
67 |
| 0 | 68 class LiberviaJsonProxy(JSONProxy): |
| 69 def __init__(self, *args, **kwargs): | |
| 70 JSONProxy.__init__(self, *args, **kwargs) | |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
71 self.handler = self |
|
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
72 self.cb = {} |
|
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
73 self.eb = {} |
| 0 | 74 |
| 75 def call(self, method, cb, *args): | |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
76 _id = self.callMethod(method, args) |
|
11
331c093e4eb3
magicBox is now able to send global microblog
Goffi <goffi@goffi.org>
parents:
9
diff
changeset
|
77 if cb: |
|
203
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
78 if isinstance(cb, tuple): |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
79 if len(cb) != 2: |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
80 log.error("tuple syntax for bridge.call is (callback, errback), aborting") |
|
203
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
81 return |
|
296
92d76ab67156
server+browser side: fixed bridge errback handling
Goffi <goffi@goffi.org>
parents:
285
diff
changeset
|
82 if cb[0] is not None: |
|
92d76ab67156
server+browser side: fixed bridge errback handling
Goffi <goffi@goffi.org>
parents:
285
diff
changeset
|
83 self.cb[_id] = cb[0] |
|
203
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
84 self.eb[_id] = cb[1] |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
85 else: |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
86 self.cb[_id] = cb |
| 0 | 87 |
| 88 def onRemoteResponse(self, response, request_info): | |
|
203
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
89 if request_info.id in self.cb: |
|
132
30d8e328559b
server & browser side: microblogging refactoring first draft
Goffi <goffi@goffi.org>
parents:
131
diff
changeset
|
90 _cb = self.cb[request_info.id] |
|
203
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
91 # if isinstance(_cb, tuple): |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
92 # #we have arguments attached to the callback |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
93 # #we send them after the answer |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
94 # callback, args = _cb |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
95 # callback(response, *args) |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
96 # else: |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
97 # #No additional argument, we call directly the callback |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
98 _cb(response) |
| 33 | 99 del self.cb[request_info.id] |
|
203
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
100 if request_info.id in self.eb: |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
101 del self.eb[request_info.id] |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
102 |
| 0 | 103 def onRemoteError(self, code, errobj, request_info): |
| 62 | 104 """def dump(obj): |
| 105 print "\n\nDUMPING %s\n\n" % obj | |
| 106 for i in dir(obj): | |
| 107 print "%s: %s" % (i, getattr(obj,i))""" | |
|
203
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
108 if request_info.id in self.eb: |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
109 _eb = self.eb[request_info.id] |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
110 _eb((code, errobj)) |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
111 del self.cb[request_info.id] |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
112 del self.eb[request_info.id] |
| 0 | 113 else: |
|
203
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
114 if code != 0: |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
115 log.error("Internal server error") |
|
203
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
116 """for o in code, error, request_info: |
|
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
117 dump(o)""" |
| 0 | 118 else: |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
119 if isinstance(errobj['message'], dict): |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
120 log.error("Error %s: %s" % (errobj['message']['faultCode'], errobj['message']['faultString'])) |
|
203
5fdea93b2541
browser side: errback management in bridge calls
Goffi <goffi@goffi.org>
parents:
202
diff
changeset
|
121 else: |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
122 log.error("%s" % errobj['message']) |
|
239
b911f2b43fd4
browser_side: added input history in the unibox:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
123 |
| 0 | 124 |
| 125 class RegisterCall(LiberviaJsonProxy): | |
| 126 def __init__(self): | |
| 127 LiberviaJsonProxy.__init__(self, "/register_api", | |
|
456
da2a7f2b34c9
browser and server sides: use asyncConnect instead of connect
souliane <souliane@mailoo.org>
parents:
455
diff
changeset
|
128 ["isRegistered", "isConnected", "asyncConnect", "registerParams", "getMenus"]) |
| 0 | 129 |
|
239
b911f2b43fd4
browser_side: added input history in the unibox:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
130 |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
131 class BridgeCall(LiberviaJsonProxy): |
| 0 | 132 def __init__(self): |
| 133 LiberviaJsonProxy.__init__(self, "/json_api", | |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
213
diff
changeset
|
134 ["getContacts", "addContact", "sendMessage", "sendMblog", "sendMblogComment", |
|
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
213
diff
changeset
|
135 "getLastMblogs", "getMassiveLastMblogs", "getMblogComments", "getProfileJid", |
|
427
b5b440e6ea16
server + browser side, getPresenceStatuses has been renamed
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
136 "getHistory", "getPresenceStatuses", "joinMUC", "mucLeave", "getRoomsJoined", |
|
266
cc778206b7ae
bridge: added inviteMUC + modify joinMUC to make it accept room_jid = ""
souliane <souliane@mailoo.org>
parents:
251
diff
changeset
|
137 "inviteMUC", "launchTarotGame", "getTarotCardsPaths", "tarotGameReady", |
|
389
2d782349b88a
server_side: display blog comments when you click on a main item header or title
souliane <souliane@mailoo.org>
parents:
381
diff
changeset
|
138 "tarotGamePlayCards", "launchRadioCollective", "getMblogs", "getMblogsWithComments", |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
213
diff
changeset
|
139 "getWaitingSub", "subscription", "delContact", "updateContact", "getCard", |
|
229
e632f77c4219
bridge: asyncGetParamA takes a security_limit argument
souliane <souliane@mailoo.org>
parents:
227
diff
changeset
|
140 "getEntityData", "getParamsUI", "asyncGetParamA", "setParam", "launchAction", |
|
282
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
141 "disconnect", "chatStateComposing", "getNewAccountDomain", "confirmationAnswer", |
|
520
d58d4dd0cefe
browser and server sides: add bridge method getLastResource
souliane <souliane@mailoo.org>
parents:
505
diff
changeset
|
142 "syntaxConvert", "getAccountDialogUI", "getLastResource" |
|
148
8635bc9db9bf
added parameter management to test XMLUI, but it's currently deactivated for security reasons (need some configuration options) + separated mainTabPanel CSS from LiberviaTabPanel
Goffi <goffi@goffi.org>
parents:
146
diff
changeset
|
143 ]) |
| 0 | 144 |
|
242
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
239
diff
changeset
|
145 |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
146 class BridgeSignals(LiberviaJsonProxy): |
|
157
b17ec3a6a112
browser side: in case of error, retry delay is doubled at each try
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
147 RETRY_BASE_DELAY = 1000 |
|
b17ec3a6a112
browser side: in case of error, retry delay is doubled at each try
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
148 |
| 99 | 149 def __init__(self, host): |
| 150 self.host = host | |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
151 self.retry_delay = self.RETRY_BASE_DELAY |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
152 LiberviaJsonProxy.__init__(self, "/json_signal_api", |
|
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
153 ["getSignals"]) |
|
210
3092f6b1710c
browser side: make the OK button title for group selector configureable + few "cosmetic" changes (PEP 8...)
souliane <souliane@mailoo.org>
parents:
205
diff
changeset
|
154 |
|
157
b17ec3a6a112
browser side: in case of error, retry delay is doubled at each try
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
155 def onRemoteResponse(self, response, request_info): |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
156 self.retry_delay = self.RETRY_BASE_DELAY |
|
157
b17ec3a6a112
browser side: in case of error, retry delay is doubled at each try
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
157 LiberviaJsonProxy.onRemoteResponse(self, response, request_info) |
|
210
3092f6b1710c
browser side: make the OK button title for group selector configureable + few "cosmetic" changes (PEP 8...)
souliane <souliane@mailoo.org>
parents:
205
diff
changeset
|
158 |
| 99 | 159 def onRemoteError(self, code, errobj, request_info): |
|
158
58442ed28f2b
browser side: basic disconnection management: hard reload is done on empty signal response
Goffi <goffi@goffi.org>
parents:
157
diff
changeset
|
160 if errobj['message'] == 'Empty Response': |
|
274
886b47896f3c
browser_side: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
269
diff
changeset
|
161 Window.getLocation().reload() # XXX: reset page in case of session ended. |
|
886b47896f3c
browser_side: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
269
diff
changeset
|
162 # FIXME: Should be done more properly without hard reload |
|
158
58442ed28f2b
browser side: basic disconnection management: hard reload is done on empty signal response
Goffi <goffi@goffi.org>
parents:
157
diff
changeset
|
163 LiberviaJsonProxy.onRemoteError(self, code, errobj, request_info) |
| 99 | 164 #we now try to reconnect |
|
274
886b47896f3c
browser_side: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
269
diff
changeset
|
165 if isinstance(errobj['message'], dict) and errobj['message']['faultCode'] == 0: |
|
886b47896f3c
browser_side: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
269
diff
changeset
|
166 Window.alert('You are not allowed to connect to server') |
|
108
fad0e51cf565
on failure, Libervia now wait 5 s before trying again to call the serveur + only room name is now shown in tabs
Goffi <goffi@goffi.org>
parents:
107
diff
changeset
|
167 else: |
|
422
20c508f9b32a
browser side: fixed bad use of Timer
Goffi <goffi@goffi.org>
parents:
415
diff
changeset
|
168 def _timerCb(timer): |
|
108
fad0e51cf565
on failure, Libervia now wait 5 s before trying again to call the serveur + only room name is now shown in tabs
Goffi <goffi@goffi.org>
parents:
107
diff
changeset
|
169 self.host.bridge_signals.call('getSignals', self.host._getSignalsCB) |
|
157
b17ec3a6a112
browser side: in case of error, retry delay is doubled at each try
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
170 Timer(notify=_timerCb).schedule(self.retry_delay) |
|
b17ec3a6a112
browser side: in case of error, retry delay is doubled at each try
Goffi <goffi@goffi.org>
parents:
148
diff
changeset
|
171 self.retry_delay *= 2 |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
172 |
|
239
b911f2b43fd4
browser_side: added input history in the unibox:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
173 |
|
b911f2b43fd4
browser_side: added input history in the unibox:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
174 class SatWebFrontend(InputHistory): |
| 0 | 175 def onModuleLoad(self): |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
176 log.info("============ onModuleLoad ==============") |
| 195 | 177 panels.ChatPanel.registerClass() |
| 178 panels.MicroblogPanel.registerClass() | |
| 19 | 179 self.whoami = None |
|
193
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
180 self._selected_listeners = set() |
|
11
331c093e4eb3
magicBox is now able to send global microblog
Goffi <goffi@goffi.org>
parents:
9
diff
changeset
|
181 self.bridge = BridgeCall() |
| 99 | 182 self.bridge_signals = BridgeSignals(self) |
| 33 | 183 self.uni_box = None |
|
426
77d8f55fc5f0
browser_side: hide the presence/status panel until the connection is made
souliane <souliane@mailoo.org>
parents:
422
diff
changeset
|
184 self.status_panel = HTML('<br />') |
| 467 | 185 self.contact_panel = contact.ContactPanel(self) |
|
43
a7ff1e6f1229
browser_side: prevent default for escape key (cancel HTTPRequest in FF)
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
186 self.panel = panels.MainPanel(self) |
| 23 | 187 self.discuss_panel = self.panel.discuss_panel |
| 84 | 188 self.tab_panel = self.panel.tab_panel |
|
193
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
189 self.tab_panel.addTabListener(self) |
|
274
886b47896f3c
browser_side: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
269
diff
changeset
|
190 self.libervia_widgets = set() # keep track of all actives LiberviaWidgets |
|
275
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
191 self.room_list = [] # list of rooms |
|
274
886b47896f3c
browser_side: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
269
diff
changeset
|
192 self.mblog_cache = [] # used to keep our own blog entries in memory, to show them in new mblog panel |
|
886b47896f3c
browser_side: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
269
diff
changeset
|
193 self.avatars_cache = {} # keep track of jid's avatar hash (key=jid, value=file) |
|
66
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
64
diff
changeset
|
194 self._register_box = None |
| 0 | 195 RootPanel().add(self.panel) |
| 467 | 196 self.notification = notification.Notification() |
|
43
a7ff1e6f1229
browser_side: prevent default for escape key (cancel HTTPRequest in FF)
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
197 DOM.addEventPreview(self) |
|
521
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
198 self.importPlugins() |
| 0 | 199 self._register = RegisterCall() |
|
494
5d8632a7bfde
browser_side: refactorisation of menus and LiberviaWidget's header
souliane <souliane@mailoo.org>
parents:
483
diff
changeset
|
200 self._register.call('getMenus', self.gotMenus) |
|
318
c12c9a1acf2f
server_side: added support for paramsRegisterApp to define frontend's specific parameters like "Enable unibox"
souliane <souliane@mailoo.org>
parents:
317
diff
changeset
|
201 self._register.call('registerParams', None) |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
202 self._register.call('isRegistered', self._isRegisteredCB) |
|
205
ee744ffed7fc
browser side: events data are cached until initialisation is finished (we get all microblogs)
Goffi <goffi@goffi.org>
parents:
204
diff
changeset
|
203 self.initialised = False |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
204 self.init_cache = [] # used to cache events until initialisation is done |
|
478
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
205 self.cached_params = {} |
|
193
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
206 |
|
521
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
207 def importPlugins(self): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
208 self.plugins = {} |
|
549
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
209 inhibited_menus = [] |
|
521
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
210 # FIXME: plugins import should be dynamic and generic like in sat |
|
549
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
211 try: |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
212 self.plugins['otr'] = plugin_sec_otr.OTR(self) |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
213 except TypeError: # plugin_sec_otr has not been imported |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
214 inhibited_menus.append('OTR') |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
215 |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
216 class DummyPlugin(object): |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
217 def inhibitMenus(self): |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
218 return inhibited_menus |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
219 |
|
cd56f2b0e85b
browser_side: disable OTR if the browser is too old to offer crypto.getRandomValues (CSPRNG)
souliane <souliane@mailoo.org>
parents:
548
diff
changeset
|
220 self.plugins['dummy_plugin'] = DummyPlugin() |
|
521
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
221 |
|
193
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
222 def addSelectedListener(self, callback): |
|
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
223 self._selected_listeners.add(callback) |
|
192
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
224 |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
225 def getSelected(self): |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
226 wid = self.tab_panel.getCurrentPanel() |
| 467 | 227 if not isinstance(wid, base_widget.WidgetsPanel): |
| 228 log.error("Tab widget is not a base_widget.WidgetsPanel, can't get selected widget") | |
|
192
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
229 return None |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
230 return wid.selected |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
231 |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
232 def setSelected(self, widget): |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
233 """Define the selected widget""" |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
234 widgets_panel = self.tab_panel.getCurrentPanel() |
| 467 | 235 if not isinstance(widgets_panel, base_widget.WidgetsPanel): |
|
192
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
236 return |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
237 |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
238 selected = widgets_panel.selected |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
239 |
|
193
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
240 if selected == widget: |
|
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
241 return |
|
210
3092f6b1710c
browser side: make the OK button title for group selector configureable + few "cosmetic" changes (PEP 8...)
souliane <souliane@mailoo.org>
parents:
205
diff
changeset
|
242 |
|
192
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
243 if selected: |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
244 selected.removeStyleName('selected_widget') |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
245 |
|
192
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
246 widgets_panel.selected = widget |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
247 |
|
192
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
248 if widget: |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
249 widgets_panel.selected.addStyleName('selected_widget') |
|
cf5c83e7d515
browser side: per tab selected widget management
Goffi <goffi@goffi.org>
parents:
179
diff
changeset
|
250 |
|
193
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
251 for callback in self._selected_listeners: |
|
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
252 callback(widget) |
| 0 | 253 |
| 33 | 254 def resize(self): |
| 255 """Resize elements""" | |
| 256 Window.onResize() | |
| 257 | |
|
193
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
258 def onBeforeTabSelected(self, sender, tab_index): |
|
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
259 return True |
|
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
260 |
|
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
261 def onTabSelected(self, sender, tab_index): |
|
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
262 selected = self.getSelected() |
|
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
263 for callback in self._selected_listeners: |
|
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
264 callback(selected) |
|
f2ae8e170c49
browser side: selected widget caching in UniBox, to avoid to ask the getter at each key pressed, which make the box very slow.
Goffi <goffi@goffi.org>
parents:
192
diff
changeset
|
265 |
|
43
a7ff1e6f1229
browser_side: prevent default for escape key (cancel HTTPRequest in FF)
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
266 def onEventPreview(self, event): |
|
a7ff1e6f1229
browser_side: prevent default for escape key (cancel HTTPRequest in FF)
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
267 if event.type in ["keydown", "keypress", "keyup"] and event.keyCode == KEY_ESCAPE: |
|
a7ff1e6f1229
browser_side: prevent default for escape key (cancel HTTPRequest in FF)
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
268 #needed to prevent request cancellation in Firefox |
|
a7ff1e6f1229
browser_side: prevent default for escape key (cancel HTTPRequest in FF)
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
269 event.preventDefault() |
|
a7ff1e6f1229
browser_side: prevent default for escape key (cancel HTTPRequest in FF)
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
270 return True |
|
a7ff1e6f1229
browser_side: prevent default for escape key (cancel HTTPRequest in FF)
Goffi <goffi@goffi.org>
parents:
41
diff
changeset
|
271 |
| 119 | 272 def getAvatar(self, jid_str): |
|
479
c21ea1fe3593
browser side: small refactoring to prepare displaying avatars in the contact panel
souliane <souliane@mailoo.org>
parents:
478
diff
changeset
|
273 """Return avatar of a jid if in cache, else ask for it. |
|
c21ea1fe3593
browser side: small refactoring to prepare displaying avatars in the contact panel
souliane <souliane@mailoo.org>
parents:
478
diff
changeset
|
274 |
|
c21ea1fe3593
browser side: small refactoring to prepare displaying avatars in the contact panel
souliane <souliane@mailoo.org>
parents:
478
diff
changeset
|
275 @param jid_str (str): JID of the contact |
|
c21ea1fe3593
browser side: small refactoring to prepare displaying avatars in the contact panel
souliane <souliane@mailoo.org>
parents:
478
diff
changeset
|
276 @return: the URL to the avatar (str) |
|
c21ea1fe3593
browser side: small refactoring to prepare displaying avatars in the contact panel
souliane <souliane@mailoo.org>
parents:
478
diff
changeset
|
277 """ |
| 137 | 278 def dataReceived(result): |
|
202
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
200
diff
changeset
|
279 if 'avatar' in result: |
| 137 | 280 self._entityDataUpdatedCb(jid_str, 'avatar', result['avatar']) |
|
204
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
203
diff
changeset
|
281 else: |
|
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
203
diff
changeset
|
282 self.bridge.call("getCard", None, jid_str) |
|
250
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
283 |
|
204
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
203
diff
changeset
|
284 def avatarError(error_data): |
|
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
203
diff
changeset
|
285 # The jid is maybe not in our roster, we ask for the VCard |
|
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
203
diff
changeset
|
286 self.bridge.call("getCard", None, jid_str) |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
287 |
| 119 | 288 if jid_str not in self.avatars_cache: |
|
204
890776a6fdb7
browser + server: vcard is requested when no avatar data is found in cache
Goffi <goffi@goffi.org>
parents:
203
diff
changeset
|
289 self.bridge.call('getEntityData', (dataReceived, avatarError), jid_str, ['avatar']) |
|
477
fac8e8bc9a1a
browser side: changed default avatar
souliane <souliane@mailoo.org>
parents:
468
diff
changeset
|
290 self.avatars_cache[jid_str] = C.DEFAULT_AVATAR |
| 119 | 291 return self.avatars_cache[jid_str] |
| 292 | |
| 84 | 293 def registerWidget(self, wid): |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
294 log.debug("Registering %s" % wid.getDebugName()) |
| 84 | 295 self.libervia_widgets.add(wid) |
| 296 | |
| 297 def unregisterWidget(self, wid): | |
| 298 try: | |
| 299 self.libervia_widgets.remove(wid) | |
| 300 except KeyError: | |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
301 log.warning('trying to remove a non registered Widget: %s' % wid.getDebugName()) |
|
210
3092f6b1710c
browser side: make the OK button title for group selector configureable + few "cosmetic" changes (PEP 8...)
souliane <souliane@mailoo.org>
parents:
205
diff
changeset
|
302 |
|
326
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
303 def refresh(self): |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
304 """Refresh the general display.""" |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
305 self.panel.refresh() |
|
478
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
306 if self.getCachedParam(C.COMPOSITION_KEY, C.ENABLE_UNIBOX_PARAM) == 'true': |
|
326
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
307 self.uni_box = self.panel.unibox_panel.unibox |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
308 else: |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
309 self.uni_box = None |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
310 for lib_wid in self.libervia_widgets: |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
311 lib_wid.refresh() |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
312 self.resize() |
| 33 | 313 |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
314 def addTab(self, label, wid, select=True): |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
315 """Create a new tab and eventually add a widget in |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
316 @param label: label of the tab |
|
116
aff34642616b
browser side: widgets are now added in a widgetsPanel when a tab is created
Goffi <goffi@goffi.org>
parents:
110
diff
changeset
|
317 @param wid: LiberviaWidget to add |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
318 @param select: True to select the added tab |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
319 """ |
| 467 | 320 widgets_panel = base_widget.WidgetsPanel(self) |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
321 self.tab_panel.add(widgets_panel, label) |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
322 widgets_panel.addWidget(wid) |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
323 if select: |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
324 self.tab_panel.selectTab(self.tab_panel.getWidgetCount() - 1) |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
325 return widgets_panel |
| 33 | 326 |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
327 def addWidget(self, wid, tab_index=None): |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
328 """ Add a widget at the bottom of the current or specified tab |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
329 @param wid: LiberviaWidget to add |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
330 @param tab_index: index of the tab to add the widget to""" |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
331 if tab_index is None or tab_index < 0 or tab_index >= self.tab_panel.getWidgetCount(): |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
332 panel = self.tab_panel.getCurrentPanel() |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
333 else: |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
334 panel = self.tab_panel.tabBar.getTabWidget(tab_index) |
|
200
0f5c2f799913
browser side: clicking on the contacts list (contact item, group or the "contacts" main title) open a discussion or microblog
Goffi <goffi@goffi.org>
parents:
195
diff
changeset
|
335 panel.addWidget(wid) |
|
0f5c2f799913
browser side: clicking on the contacts list (contact item, group or the "contacts" main title) open a discussion or microblog
Goffi <goffi@goffi.org>
parents:
195
diff
changeset
|
336 |
|
328
835a8ae799e7
Add notifications support, fixes bug 7.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
326
diff
changeset
|
337 def displayNotification(self, title, body): |
|
835a8ae799e7
Add notifications support, fixes bug 7.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
326
diff
changeset
|
338 self.notification.notify(title, body) |
|
835a8ae799e7
Add notifications support, fixes bug 7.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
326
diff
changeset
|
339 |
|
494
5d8632a7bfde
browser_side: refactorisation of menus and LiberviaWidget's header
souliane <souliane@mailoo.org>
parents:
483
diff
changeset
|
340 def gotMenus(self, menus): |
|
5d8632a7bfde
browser_side: refactorisation of menus and LiberviaWidget's header
souliane <souliane@mailoo.org>
parents:
483
diff
changeset
|
341 """Put the menus data in cache and build the main menu bar |
|
5d8632a7bfde
browser_side: refactorisation of menus and LiberviaWidget's header
souliane <souliane@mailoo.org>
parents:
483
diff
changeset
|
342 |
|
5d8632a7bfde
browser_side: refactorisation of menus and LiberviaWidget's header
souliane <souliane@mailoo.org>
parents:
483
diff
changeset
|
343 @param menus (list[tuple]): menu data |
|
5d8632a7bfde
browser_side: refactorisation of menus and LiberviaWidget's header
souliane <souliane@mailoo.org>
parents:
483
diff
changeset
|
344 """ |
|
521
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
345 def process(menus, inhibited=None): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
346 for raw_menu in menus: |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
347 id_, type_, path, path_i18n = raw_menu |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
348 if inhibited and path[0] in inhibited: |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
349 continue |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
350 menus_data = self.menus.setdefault(type_, []) |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
351 menus_data.append((id_, path, path_i18n)) |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
352 |
|
494
5d8632a7bfde
browser_side: refactorisation of menus and LiberviaWidget's header
souliane <souliane@mailoo.org>
parents:
483
diff
changeset
|
353 self.menus = {} |
|
521
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
354 inhibited = set() |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
355 extras = [] |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
356 for plugin in self.plugins.values(): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
357 if hasattr(plugin, "inhibitMenus"): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
358 inhibited.update(plugin.inhibitMenus()) |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
359 if hasattr(plugin, "extraMenus"): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
360 extras.extend(plugin.extraMenus()) |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
361 process(menus, inhibited) |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
362 process(extras) |
|
494
5d8632a7bfde
browser_side: refactorisation of menus and LiberviaWidget's header
souliane <souliane@mailoo.org>
parents:
483
diff
changeset
|
363 self.panel.menu.createMenus() |
|
5d8632a7bfde
browser_side: refactorisation of menus and LiberviaWidget's header
souliane <souliane@mailoo.org>
parents:
483
diff
changeset
|
364 |
|
415
fadbba1d793f
server_side: added support for SSL and related parameters:
souliane <souliane@mailoo.org>
parents:
408
diff
changeset
|
365 def _isRegisteredCB(self, result): |
|
fadbba1d793f
server_side: added support for SSL and related parameters:
souliane <souliane@mailoo.org>
parents:
408
diff
changeset
|
366 registered, warning = result |
| 0 | 367 if not registered: |
| 467 | 368 self._register_box = register.RegisterBox(self.logged) |
|
66
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
64
diff
changeset
|
369 self._register_box.centerBox() |
|
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
64
diff
changeset
|
370 self._register_box.show() |
|
415
fadbba1d793f
server_side: added support for SSL and related parameters:
souliane <souliane@mailoo.org>
parents:
408
diff
changeset
|
371 if warning: |
|
fadbba1d793f
server_side: added support for SSL and related parameters:
souliane <souliane@mailoo.org>
parents:
408
diff
changeset
|
372 dialog.InfoDialog(_('Security warning'), warning).show() |
|
fadbba1d793f
server_side: added support for SSL and related parameters:
souliane <souliane@mailoo.org>
parents:
408
diff
changeset
|
373 self._tryAutoConnect(skip_validation=not not warning) |
| 0 | 374 else: |
| 1 | 375 self._register.call('isConnected', self._isConnectedCB) |
| 0 | 376 |
| 1 | 377 def _isConnectedCB(self, connected): |
| 0 | 378 if not connected: |
|
456
da2a7f2b34c9
browser and server sides: use asyncConnect instead of connect
souliane <souliane@mailoo.org>
parents:
455
diff
changeset
|
379 self._register.call('asyncConnect', lambda x: self.logged()) |
| 0 | 380 else: |
| 381 self.logged() | |
| 382 | |
| 383 def logged(self): | |
|
66
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
64
diff
changeset
|
384 if self._register_box: |
|
9d8e79ac4c9c
Login/Register box: integration of Adrien Vigneron's design
Goffi <goffi@goffi.org>
parents:
64
diff
changeset
|
385 self._register_box.hide() |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
386 del self._register_box # don't work if self._register_box is None |
|
210
3092f6b1710c
browser side: make the OK button title for group selector configureable + few "cosmetic" changes (PEP 8...)
souliane <souliane@mailoo.org>
parents:
205
diff
changeset
|
387 |
|
426
77d8f55fc5f0
browser_side: hide the presence/status panel until the connection is made
souliane <souliane@mailoo.org>
parents:
422
diff
changeset
|
388 # display the real presence status panel |
|
77d8f55fc5f0
browser_side: hide the presence/status panel until the connection is made
souliane <souliane@mailoo.org>
parents:
422
diff
changeset
|
389 self.panel.header.remove(self.status_panel) |
|
77d8f55fc5f0
browser_side: hide the presence/status panel until the connection is made
souliane <souliane@mailoo.org>
parents:
422
diff
changeset
|
390 self.status_panel = panels.PresenceStatusPanel(self) |
|
77d8f55fc5f0
browser_side: hide the presence/status panel until the connection is made
souliane <souliane@mailoo.org>
parents:
422
diff
changeset
|
391 self.panel.header.add(self.status_panel) |
|
77d8f55fc5f0
browser_side: hide the presence/status panel until the connection is made
souliane <souliane@mailoo.org>
parents:
422
diff
changeset
|
392 |
| 1 | 393 #it's time to fill the page |
|
11
331c093e4eb3
magicBox is now able to send global microblog
Goffi <goffi@goffi.org>
parents:
9
diff
changeset
|
394 self.bridge.call('getContacts', self._getContactsCB) |
|
218
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
395 self.bridge.call('getParamsUI', self._getParamsUICB) |
|
11
331c093e4eb3
magicBox is now able to send global microblog
Goffi <goffi@goffi.org>
parents:
9
diff
changeset
|
396 self.bridge_signals.call('getSignals', self._getSignalsCB) |
| 19 | 397 #We want to know our own jid |
| 398 self.bridge.call('getProfileJid', self._getProfileJidCB) | |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
399 |
|
242
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
239
diff
changeset
|
400 def domain_cb(value): |
|
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
239
diff
changeset
|
401 self._defaultDomain = value |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
402 log.info("new account domain: %s" % value) |
|
242
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
239
diff
changeset
|
403 |
|
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
239
diff
changeset
|
404 def domain_eb(value): |
|
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
239
diff
changeset
|
405 self._defaultDomain = "libervia.org" |
|
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
239
diff
changeset
|
406 |
|
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
239
diff
changeset
|
407 self.bridge.call("getNewAccountDomain", (domain_cb, domain_eb)) |
|
326
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
408 self.discuss_panel.addWidget(panels.MicroblogPanel(self, [])) |
|
312
b4781a350483
browser_side: display a "New message" button and add a "comment" icon for main entries in MicroblogPanel when the unibox is disabled
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
409 |
|
478
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
410 # get cached params and refresh the display |
|
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
411 def param_cb(cat, name, count): |
|
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
412 count[0] += 1 |
|
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
413 refresh = count[0] == len(C.CACHED_PARAMS) |
|
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
414 return lambda value: self._paramUpdate(name, value, cat, refresh) |
|
312
b4781a350483
browser_side: display a "New message" button and add a "comment" icon for main entries in MicroblogPanel when the unibox is disabled
souliane <souliane@mailoo.org>
parents:
309
diff
changeset
|
415 |
|
478
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
416 count = [0] # used to do something similar to DeferredList |
|
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
417 for cat, name in C.CACHED_PARAMS: |
|
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
418 self.bridge.call('asyncGetParamA', param_cb(cat, name, count), name, cat) |
|
242
a25aa882e09a
browser_side: add context menu for contact:
souliane <souliane@mailoo.org>
parents:
239
diff
changeset
|
419 |
|
415
fadbba1d793f
server_side: added support for SSL and related parameters:
souliane <souliane@mailoo.org>
parents:
408
diff
changeset
|
420 def _tryAutoConnect(self, skip_validation=False): |
|
fadbba1d793f
server_side: added support for SSL and related parameters:
souliane <souliane@mailoo.org>
parents:
408
diff
changeset
|
421 """This method retrieve the eventual URL parameters to auto-connect the user. |
|
fadbba1d793f
server_side: added support for SSL and related parameters:
souliane <souliane@mailoo.org>
parents:
408
diff
changeset
|
422 @param skip_validation: if True, set the form values but do not validate it |
|
fadbba1d793f
server_side: added support for SSL and related parameters:
souliane <souliane@mailoo.org>
parents:
408
diff
changeset
|
423 """ |
|
503
88ece2a00c63
browser_side: display new lines and clickable URLs for headline message
souliane <souliane@mailoo.org>
parents:
500
diff
changeset
|
424 params = strings.getURLParams(Window.getLocation().getSearch()) |
|
250
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
425 if "login" in params: |
|
457
b55bc50756fa
browser side: select the "Login" tab when using auto-connect feature
souliane <souliane@mailoo.org>
parents:
456
diff
changeset
|
426 self._register_box._form.right_side.selectTab(0) |
|
250
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
427 self._register_box._form.login_box.setText(params["login"]) |
|
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
428 self._register_box._form.login_pass_box.setFocus(True) |
|
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
429 if "passwd" in params: |
|
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
430 # try to connect |
|
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
431 self._register_box._form.login_pass_box.setText(params["passwd"]) |
|
415
fadbba1d793f
server_side: added support for SSL and related parameters:
souliane <souliane@mailoo.org>
parents:
408
diff
changeset
|
432 if not skip_validation: |
|
fadbba1d793f
server_side: added support for SSL and related parameters:
souliane <souliane@mailoo.org>
parents:
408
diff
changeset
|
433 self._register_box._form.onLogin(None) |
|
250
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
434 return True |
|
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
435 else: |
|
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
436 # this would eventually set the browser saved password |
|
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
437 Timer(5, lambda: self._register_box._form.login_pass_box.setFocus(True)) |
|
38e6211d36ca
browser_side: added auto-connection with URL parameters:
souliane <souliane@mailoo.org>
parents:
244
diff
changeset
|
438 |
|
316
4148f8f4caa0
browser_side: fix import and method signatures relative to changeset e4f586fc6101
souliane <souliane@mailoo.org>
parents:
313
diff
changeset
|
439 def _actionCb(self, data): |
|
299
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
440 if not data: |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
441 # action was a one shot, nothing to do |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
442 pass |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
443 elif "xmlui" in data: |
|
500
67a4e8383b70
browser side (XMLUI): XMLUI update to follow core changes:
Goffi <goffi@goffi.org>
parents:
495
diff
changeset
|
444 ui = xmlui.create(self, xml_data=data['xmlui']) |
|
67a4e8383b70
browser side (XMLUI): XMLUI update to follow core changes:
Goffi <goffi@goffi.org>
parents:
495
diff
changeset
|
445 ui.show() |
|
495
587fe75d1b16
browser_side: handle menus of type ROOM, SINGLE and ROSTER_JID
souliane <souliane@mailoo.org>
parents:
494
diff
changeset
|
446 elif "public_blog" in data: |
|
587fe75d1b16
browser_side: handle menus of type ROOM, SINGLE and ROSTER_JID
souliane <souliane@mailoo.org>
parents:
494
diff
changeset
|
447 # TODO: use the bare instead of node when all blogs can be retrieved |
|
587fe75d1b16
browser_side: handle menus of type ROOM, SINGLE and ROSTER_JID
souliane <souliane@mailoo.org>
parents:
494
diff
changeset
|
448 node = jid.JID(data['public_blog']).node |
|
587fe75d1b16
browser_side: handle menus of type ROOM, SINGLE and ROSTER_JID
souliane <souliane@mailoo.org>
parents:
494
diff
changeset
|
449 self.addTab("%s's blog" % node, panels.WebPanel(self, "/blog/%s" % node)) |
|
299
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
450 else: |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
451 dialog.InfoDialog("Error", |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
452 "Unmanaged action result", Width="400px").center() |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
453 |
|
316
4148f8f4caa0
browser_side: fix import and method signatures relative to changeset e4f586fc6101
souliane <souliane@mailoo.org>
parents:
313
diff
changeset
|
454 def _actionEb(self, err_data): |
|
299
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
455 err_code, err_obj = err_data |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
456 dialog.InfoDialog("Error", |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
457 str(err_obj), Width="400px").center() |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
458 |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
459 def launchAction(self, callback_id, data): |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
460 """ Launch a dynamic action |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
461 @param callback_id: id of the action to launch |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
462 @param data: data needed only for certain actions |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
463 |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
464 """ |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
465 if data is None: |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
466 data = {} |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
467 self.bridge.call('launchAction', (self._actionCb, self._actionEb), callback_id, data) |
|
e4f586fc6101
server and browser side: updated callback system to follow core changes
Goffi <goffi@goffi.org>
parents:
298
diff
changeset
|
468 |
| 1 | 469 def _getContactsCB(self, contacts_data): |
| 467 | 470 for contact_ in contacts_data: |
| 471 jid, attributes, groups = contact_ | |
|
55
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
472 self._newContactCb(jid, attributes, groups) |
| 0 | 473 |
|
2
669c531a857e
signals handling and first draft of microblogging
Goffi <goffi@goffi.org>
parents:
1
diff
changeset
|
474 def _getSignalsCB(self, signal_data): |
| 99 | 475 self.bridge_signals.call('getSignals', self._getSignalsCB) |
|
548
530f3fc3e3d7
browser_side: fixes signal callback with no argument (e.g disconnected)
souliane <souliane@mailoo.org>
parents:
536
diff
changeset
|
476 if len(signal_data) == 1: |
|
530f3fc3e3d7
browser_side: fixes signal callback with no argument (e.g disconnected)
souliane <souliane@mailoo.org>
parents:
536
diff
changeset
|
477 signal_data.append([]) |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
478 log.debug("Got signal ==> name: %s, params: %s" % (signal_data[0], signal_data[1])) |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
479 name, args = signal_data |
|
4
7325e787c22b
personalEvent management signal first draft, microblogs are now put in a central grid
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
480 if name == 'personalEvent': |
|
7325e787c22b
personalEvent management signal first draft, microblogs are now put in a central grid
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
481 self._personalEventCb(*args) |
| 19 | 482 elif name == 'newMessage': |
| 483 self._newMessageCb(*args) | |
| 20 | 484 elif name == 'presenceUpdate': |
| 485 self._presenceUpdateCb(*args) | |
|
326
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
486 elif name == 'paramUpdate': |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
487 self._paramUpdate(*args) |
| 28 | 488 elif name == 'roomJoined': |
| 489 self._roomJoinedCb(*args) | |
|
275
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
490 elif name == 'roomLeft': |
|
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
491 self._roomLeftCb(*args) |
| 33 | 492 elif name == 'roomUserJoined': |
| 493 self._roomUserJoinedCb(*args) | |
| 494 elif name == 'roomUserLeft': | |
| 495 self._roomUserLeftCb(*args) | |
|
408
ee8ebfe23e16
browser_side: handle the signal "roomUserChangedNick"
souliane <souliane@mailoo.org>
parents:
407
diff
changeset
|
496 elif name == 'roomUserChangedNick': |
|
ee8ebfe23e16
browser_side: handle the signal "roomUserChangedNick"
souliane <souliane@mailoo.org>
parents:
407
diff
changeset
|
497 self._roomUserChangedNickCb(*args) |
|
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
498 elif name == 'askConfirmation': |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
499 self._askConfirmation(*args) |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
500 elif name == 'newAlert': |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
501 self._newAlert(*args) |
|
275
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
502 elif name == 'tarotGamePlayers': |
|
285
4f0c2fea358a
browser_side (plugin radiocol): use the status label to give more information
souliane <souliane@mailoo.org>
parents:
282
diff
changeset
|
503 self._tarotGameStartedCb(True, *args) |
| 36 | 504 elif name == 'tarotGameStarted': |
|
285
4f0c2fea358a
browser_side (plugin radiocol): use the status label to give more information
souliane <souliane@mailoo.org>
parents:
282
diff
changeset
|
505 self._tarotGameStartedCb(False, *args) |
|
37
b306aa090438
Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents:
36
diff
changeset
|
506 elif name == 'tarotGameNew' or \ |
|
38
7bea2ae0c4fb
Tarot game: center_panel layout + chien can now be showed + fixed click event inheritance + card selection first draft
Goffi <goffi@goffi.org>
parents:
37
diff
changeset
|
507 name == 'tarotGameChooseContrat' or \ |
|
39
305e81c7a32c
Tarot game: a game can now be finished
Goffi <goffi@goffi.org>
parents:
38
diff
changeset
|
508 name == 'tarotGameShowCards' or \ |
|
305e81c7a32c
Tarot game: a game can now be finished
Goffi <goffi@goffi.org>
parents:
38
diff
changeset
|
509 name == 'tarotGameInvalidCards' or \ |
|
305e81c7a32c
Tarot game: a game can now be finished
Goffi <goffi@goffi.org>
parents:
38
diff
changeset
|
510 name == 'tarotGameCardsPlayed' or \ |
|
41
7782a786b2f0
Tarot game: score is now shown (need to use XMLUI later)
Goffi <goffi@goffi.org>
parents:
39
diff
changeset
|
511 name == 'tarotGameYourTurn' or \ |
|
7782a786b2f0
Tarot game: score is now shown (need to use XMLUI later)
Goffi <goffi@goffi.org>
parents:
39
diff
changeset
|
512 name == 'tarotGameScore': |
|
37
b306aa090438
Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents:
36
diff
changeset
|
513 self._tarotGameGenericCb(name, args[0], args[1:]) |
|
275
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
514 elif name == 'radiocolPlayers': |
|
285
4f0c2fea358a
browser_side (plugin radiocol): use the status label to give more information
souliane <souliane@mailoo.org>
parents:
282
diff
changeset
|
515 self._radioColStartedCb(True, *args) |
| 127 | 516 elif name == 'radiocolStarted': |
|
285
4f0c2fea358a
browser_side (plugin radiocol): use the status label to give more information
souliane <souliane@mailoo.org>
parents:
282
diff
changeset
|
517 self._radioColStartedCb(False, *args) |
| 128 | 518 elif name == 'radiocolPreload': |
| 519 self._radioColGenericCb(name, args[0], args[1:]) | |
| 130 | 520 elif name == 'radiocolPlay': |
| 521 self._radioColGenericCb(name, args[0], args[1:]) | |
| 522 elif name == 'radiocolNoUpload': | |
| 523 self._radioColGenericCb(name, args[0], args[1:]) | |
| 524 elif name == 'radiocolUploadOk': | |
| 525 self._radioColGenericCb(name, args[0], args[1:]) | |
| 526 elif name == 'radiocolSongRejected': | |
| 527 self._radioColGenericCb(name, args[0], args[1:]) | |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
528 elif name == 'subscribe': |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
529 self._subscribeCb(*args) |
|
55
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
530 elif name == 'contactDeleted': |
|
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
531 self._contactDeletedCb(*args) |
|
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
532 elif name == 'newContact': |
|
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
533 self._newContactCb(*args) |
| 137 | 534 elif name == 'entityDataUpdated': |
| 535 self._entityDataUpdatedCb(*args) | |
|
213
8bbac49765d6
browser side: display the day change in chat window
souliane <souliane@mailoo.org>
parents:
210
diff
changeset
|
536 elif name == 'chatStateReceived': |
|
8bbac49765d6
browser side: display the day change in chat window
souliane <souliane@mailoo.org>
parents:
210
diff
changeset
|
537 self._chatStateReceivedCb(*args) |
| 19 | 538 |
| 467 | 539 def _getParamsUICB(self, xml_ui): |
|
218
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
540 """Hide the parameters item if there's nothing to display""" |
| 467 | 541 if not xml_ui: |
|
218
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
542 self.panel.menu.removeItemParams() |
|
4e6467efd6bf
browser_side: small improvements for parameters panel
souliane <souliane@mailoo.org>
parents:
215
diff
changeset
|
543 |
| 139 | 544 def _ownBlogsFills(self, mblogs): |
| 545 #put our own microblogs in cache, then fill all panels with them | |
| 546 for publisher in mblogs: | |
| 547 for mblog in mblogs[publisher]: | |
| 451 | 548 if 'content' not in mblog: |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
549 log.warning("No content found in microblog [%s]" % mblog) |
| 139 | 550 continue |
|
452
7b6506372466
browser_side: fixes bug introduced with previous changeset (1a0cec9b0f1e)
souliane <souliane@mailoo.org>
parents:
451
diff
changeset
|
551 if 'groups' in mblog: |
| 139 | 552 _groups = set(mblog['groups'].split() if mblog['groups'] else []) |
| 553 else: | |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
554 _groups = None |
| 467 | 555 mblog_entry = panels.MicroblogItem(mblog) |
| 139 | 556 self.mblog_cache.append((_groups, mblog_entry)) |
|
215
e830a0c60d32
server side: added the security_limit to setParam
souliane <souliane@mailoo.org>
parents:
213
diff
changeset
|
557 |
| 139 | 558 if len(self.mblog_cache) > MAX_MBLOG_CACHE: |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
559 del self.mblog_cache[0:len(self.mblog_cache - MAX_MBLOG_CACHE)] |
| 139 | 560 for lib_wid in self.libervia_widgets: |
| 561 if isinstance(lib_wid, panels.MicroblogPanel): | |
| 562 self.FillMicroblogPanel(lib_wid) | |
| 451 | 563 self.initialised = True # initialisation phase is finished here |
| 564 for event_data in self.init_cache: # so we have to send all the cached events | |
|
205
ee744ffed7fc
browser side: events data are cached until initialisation is finished (we get all microblogs)
Goffi <goffi@goffi.org>
parents:
204
diff
changeset
|
565 self._personalEventCb(*event_data) |
|
ee744ffed7fc
browser side: events data are cached until initialisation is finished (we get all microblogs)
Goffi <goffi@goffi.org>
parents:
204
diff
changeset
|
566 del self.init_cache |
| 139 | 567 |
|
468
830b50593597
browser_side: fixes issues from the refactoring
souliane <souliane@mailoo.org>
parents:
467
diff
changeset
|
568 def _getProfileJidCB(self, jid_s): |
|
830b50593597
browser_side: fixes issues from the refactoring
souliane <souliane@mailoo.org>
parents:
467
diff
changeset
|
569 self.whoami = jid.JID(jid_s) |
| 20 | 570 #we can now ask our status |
|
427
b5b440e6ea16
server + browser side, getPresenceStatuses has been renamed
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
571 self.bridge.call('getPresenceStatuses', self._getPresenceStatusesCb) |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
572 #the rooms where we are |
|
122
397a88b340f3
browser: fixed call to getRoomsJoined
Goffi <goffi@goffi.org>
parents:
119
diff
changeset
|
573 self.bridge.call('getRoomsJoined', self._getRoomsJoinedCb) |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
574 #and if there is any subscription request waiting for us |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
575 self.bridge.call('getWaitingSub', self._getWaitingSubCb) |
|
138
008fa8d36602
browser side: our own microblogs are now requested once logged
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
576 #we fill the panels already here |
|
008fa8d36602
browser side: our own microblogs are now requested once logged
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
577 for lib_wid in self.libervia_widgets: |
|
008fa8d36602
browser side: our own microblogs are now requested once logged
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
578 if isinstance(lib_wid, panels.MicroblogPanel): |
|
008fa8d36602
browser side: our own microblogs are now requested once logged
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
579 if lib_wid.accept_all(): |
|
008fa8d36602
browser side: our own microblogs are now requested once logged
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
580 self.bridge.call('getMassiveLastMblogs', lib_wid.massiveInsert, 'ALL', [], 10) |
|
008fa8d36602
browser side: our own microblogs are now requested once logged
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
581 else: |
|
008fa8d36602
browser side: our own microblogs are now requested once logged
Goffi <goffi@goffi.org>
parents:
137
diff
changeset
|
582 self.bridge.call('getMassiveLastMblogs', lib_wid.massiveInsert, 'GROUP', lib_wid.accepted_groups, 10) |
|
229
e632f77c4219
bridge: asyncGetParamA takes a security_limit argument
souliane <souliane@mailoo.org>
parents:
227
diff
changeset
|
583 |
| 139 | 584 #we ask for our own microblogs: |
| 585 self.bridge.call('getMassiveLastMblogs', self._ownBlogsFills, 'JID', [self.whoami.bare], 10) | |
| 20 | 586 |
|
521
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
587 # initialize plugins which waited for the connection to be done |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
588 for plugin in self.plugins.values(): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
589 if hasattr(plugin, 'profileConnected'): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
590 plugin.profileConnected() |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
591 |
|
4
7325e787c22b
personalEvent management signal first draft, microblogs are now put in a central grid
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
592 ## Signals callbacks ## |
|
7325e787c22b
personalEvent management signal first draft, microblogs are now put in a central grid
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
593 |
|
58
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
594 def _personalEventCb(self, sender, event_type, data): |
|
205
ee744ffed7fc
browser side: events data are cached until initialisation is finished (we get all microblogs)
Goffi <goffi@goffi.org>
parents:
204
diff
changeset
|
595 if not self.initialised: |
|
ee744ffed7fc
browser side: events data are cached until initialisation is finished (we get all microblogs)
Goffi <goffi@goffi.org>
parents:
204
diff
changeset
|
596 self.init_cache.append((sender, event_type, data)) |
|
ee744ffed7fc
browser side: events data are cached until initialisation is finished (we get all microblogs)
Goffi <goffi@goffi.org>
parents:
204
diff
changeset
|
597 return |
| 467 | 598 sender = jid.JID(sender).bare |
|
4
7325e787c22b
personalEvent management signal first draft, microblogs are now put in a central grid
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
599 if event_type == "MICROBLOG": |
|
202
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
200
diff
changeset
|
600 if not 'content' in data: |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
601 log.warning("No content found in microblog data") |
|
4
7325e787c22b
personalEvent management signal first draft, microblogs are now put in a central grid
Goffi <goffi@goffi.org>
parents:
2
diff
changeset
|
602 return |
|
202
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
200
diff
changeset
|
603 if 'groups' in data: |
|
16
099c05a0dcab
browser side: microblog panel improvments
Goffi <goffi@goffi.org>
parents:
14
diff
changeset
|
604 _groups = set(data['groups'].split() if data['groups'] else []) |
|
099c05a0dcab
browser side: microblog panel improvments
Goffi <goffi@goffi.org>
parents:
14
diff
changeset
|
605 else: |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
606 _groups = None |
| 467 | 607 mblog_entry = panels.MicroblogItem(data) |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
608 |
| 84 | 609 for lib_wid in self.libervia_widgets: |
| 610 if isinstance(lib_wid, panels.MicroblogPanel): | |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
611 self.addBlogEntry(lib_wid, sender, _groups, mblog_entry) |
|
58
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
612 |
| 139 | 613 if sender == self.whoami.bare: |
|
282
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
614 found = False |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
615 for index in xrange(0, len(self.mblog_cache)): |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
616 entry = self.mblog_cache[index] |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
617 if entry[1].id == mblog_entry.id: |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
618 # replace existing entry |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
619 self.mblog_cache.remove(entry) |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
620 self.mblog_cache.insert(index, (_groups, mblog_entry)) |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
621 found = True |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
622 break |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
623 if not found: |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
624 self.mblog_cache.append((_groups, mblog_entry)) |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
625 if len(self.mblog_cache) > MAX_MBLOG_CACHE: |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
626 del self.mblog_cache[0:len(self.mblog_cache - MAX_MBLOG_CACHE)] |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
627 elif event_type == 'MICROBLOG_DELETE': |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
628 for lib_wid in self.libervia_widgets: |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
629 if isinstance(lib_wid, panels.MicroblogPanel): |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
630 lib_wid.removeEntry(data['type'], data['id']) |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
631 log.debug("%s %s %s" % (self.whoami.bare, sender, data['type'])) |
|
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
632 |
|
282
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
633 if sender == self.whoami.bare and data['type'] == 'main_item': |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
634 for index in xrange(0, len(self.mblog_cache)): |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
635 entry = self.mblog_cache[index] |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
636 if entry[1].id == data['id']: |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
637 self.mblog_cache.remove(entry) |
|
ae3ec654836d
browser_side: added blog item modification/deletion
souliane <souliane@mailoo.org>
parents:
280
diff
changeset
|
638 break |
|
58
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
639 |
|
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
640 def addBlogEntry(self, mblog_panel, sender, _groups, mblog_entry): |
|
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
641 """Check if an entry can go in MicroblogPanel and add to it |
|
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
642 @param mblog_panel: MicroblogPanel instance |
|
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
643 @param sender: jid of the entry sender |
|
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
644 @param _groups: groups which can receive this entry |
| 467 | 645 @param mblog_entry: panels.MicroblogItem instance""" |
|
202
2bc6cf004e61
browser, server: comments handling:
Goffi <goffi@goffi.org>
parents:
200
diff
changeset
|
646 if mblog_entry.type == "comment" or mblog_panel.isJidAccepted(sender) or (_groups == None and self.whoami and sender == self.whoami.bare) \ |
|
64
104e71ce2293
browser side: fixed microblog filtering
Goffi <goffi@goffi.org>
parents:
62
diff
changeset
|
647 or (_groups and _groups.intersection(mblog_panel.accepted_groups)): |
|
58
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
648 mblog_panel.addEntry(mblog_entry) |
|
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
649 |
| 139 | 650 def FillMicroblogPanel(self, mblog_panel): |
|
58
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
651 """Fill a microblog panel with entries in cache |
|
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
652 @param mblog_panel: MicroblogPanel instance |
|
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
653 """ |
| 139 | 654 #XXX: only our own entries are cached |
|
58
4fa3d57f72f8
browser side: microblog entries caching
Goffi <goffi@goffi.org>
parents:
57
diff
changeset
|
655 for cache_entry in self.mblog_cache: |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
656 _groups, mblog_entry = cache_entry |
| 139 | 657 self.addBlogEntry(mblog_panel, self.whoami.bare, *cache_entry) |
| 0 | 658 |
|
163
b887186e8fc8
browser side: get entity's microblogs for newly added contacts
Goffi <goffi@goffi.org>
parents:
158
diff
changeset
|
659 def getEntityMBlog(self, entity): |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
660 log.info("geting mblog for entity [%s]" % (entity,)) |
|
163
b887186e8fc8
browser side: get entity's microblogs for newly added contacts
Goffi <goffi@goffi.org>
parents:
158
diff
changeset
|
661 for lib_wid in self.libervia_widgets: |
|
b887186e8fc8
browser side: get entity's microblogs for newly added contacts
Goffi <goffi@goffi.org>
parents:
158
diff
changeset
|
662 if isinstance(lib_wid, panels.MicroblogPanel): |
|
b887186e8fc8
browser side: get entity's microblogs for newly added contacts
Goffi <goffi@goffi.org>
parents:
158
diff
changeset
|
663 if lib_wid.isJidAccepted(entity): |
|
b887186e8fc8
browser side: get entity's microblogs for newly added contacts
Goffi <goffi@goffi.org>
parents:
158
diff
changeset
|
664 self.bridge.call('getMassiveLastMblogs', lib_wid.massiveInsert, 'JID', [entity], 10) |
|
b887186e8fc8
browser side: get entity's microblogs for newly added contacts
Goffi <goffi@goffi.org>
parents:
158
diff
changeset
|
665 |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
666 def getLiberviaWidget(self, class_, entity, ignoreOtherTabs=True): |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
667 """Get the corresponding panel if it exists. |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
668 @param class_: class of the panel (ChatPanel, MicroblogPanel...) |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
669 @param entity: polymorphic parameter, see class_.matchEntity. |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
670 @param ignoreOtherTabs: if True, the widgets that are not |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
671 contained by the currently selected tab will be ignored |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
672 @return: the existing widget that has been found or None.""" |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
673 selected_tab = self.tab_panel.getCurrentPanel() |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
674 for lib_wid in self.libervia_widgets: |
|
458
1eeed8028199
browser side: rename parameter of getParent / getWidgetPanel from 'verbose' to 'expect'
souliane <souliane@mailoo.org>
parents:
457
diff
changeset
|
675 parent = lib_wid.getWidgetsPanel(expect=False) |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
676 if parent is None or (ignoreOtherTabs and parent != selected_tab): |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
677 # do not return a widget that is not in the currently selected tab |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
678 continue |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
679 if isinstance(lib_wid, class_): |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
680 try: |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
681 if lib_wid.matchEntity(entity): |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
682 log.debug("existing widget found: %s" % lib_wid.getDebugName()) |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
683 return lib_wid |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
684 except AttributeError as e: |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
685 e.stack_list() |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
686 return None |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
687 return None |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
688 |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
689 def getOrCreateLiberviaWidget(self, class_, entity, select=True, new_tab=None): |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
690 """Get the matching LiberviaWidget if it exists, or create a new one. |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
691 @param class_: class of the panel (ChatPanel, MicroblogPanel...) |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
692 @param entity: polymorphic parameter, see class_.matchEntity. |
|
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
693 @param select: if True, select the widget that has been found or created |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
694 @param new_tab: if not None, a widget which is created is created in |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
695 a new tab. In that case new_tab is a unicode to label that new tab. |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
696 If new_tab is not None and a widget is found, no tab is created. |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
697 @return: the newly created wigdet if REUSE_EXISTING_LIBERVIA_WIDGETS |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
698 is set to False or if the widget has not been found, the existing |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
699 widget that has been found otherwise.""" |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
700 lib_wid = None |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
701 tab = None |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
702 if REUSE_EXISTING_LIBERVIA_WIDGETS: |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
703 lib_wid = self.getLiberviaWidget(class_, entity, new_tab is None) |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
704 if lib_wid is None: # create a new widget |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
705 lib_wid = class_.createPanel(self, entity[0] if isinstance(entity, tuple) else entity) |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
706 if new_tab is None: |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
707 self.addWidget(lib_wid) |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
708 else: |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
709 tab = self.addTab(new_tab, lib_wid, False) |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
710 else: # reuse existing widget |
|
458
1eeed8028199
browser side: rename parameter of getParent / getWidgetPanel from 'verbose' to 'expect'
souliane <souliane@mailoo.org>
parents:
457
diff
changeset
|
711 tab = lib_wid.getWidgetsPanel(expect=False) |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
712 if new_tab is None: |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
713 if tab is not None: |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
714 tab.removeWidget(lib_wid) |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
715 self.addWidget(lib_wid) |
|
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
716 if select: |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
717 if new_tab is not None: |
|
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
718 self.tab_panel.selectTab(tab) |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
719 # must be done after the widget is added, |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
720 # for example to scroll to the bottom |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
721 self.setSelected(lib_wid) |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
722 lib_wid.refresh() |
|
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
723 return lib_wid |
|
163
b887186e8fc8
browser side: get entity's microblogs for newly added contacts
Goffi <goffi@goffi.org>
parents:
158
diff
changeset
|
724 |
|
521
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
725 def _newMessageCb(self, from_jid_s, msg, msg_type, to_jid_s, extra): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
726 from_jid = jid.JID(from_jid_s) |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
727 to_jid = jid.JID(to_jid_s) |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
728 for plugin in self.plugins.values(): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
729 if hasattr(plugin, 'messageReceivedTrigger'): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
730 if not plugin.messageReceivedTrigger(from_jid, msg, msg_type, to_jid, extra): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
731 return # plugin returned False to interrupt the process |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
732 self.newMessageCb(from_jid, msg, msg_type, to_jid, extra) |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
733 |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
734 def newMessageCb(self, from_jid, msg, msg_type, to_jid, extra): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
735 other = to_jid if from_jid.bare == self.whoami.bare else from_jid |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
736 lib_wid = self.getLiberviaWidget(panels.ChatPanel, other, ignoreOtherTabs=False) |
|
521
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
737 self.displayNotification(from_jid, msg) |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
738 if msg_type == 'headline' and from_jid.full() == self._defaultDomain: |
|
460
d0cd8ae579f7
browser side: message of type "headline" sent from the host are displayed in a InfoDialog
souliane <souliane@mailoo.org>
parents:
458
diff
changeset
|
739 try: |
|
533
19fc2ebc02dd
browser_side: management of new "info" newMessage type
Goffi <goffi@goffi.org>
parents:
530
diff
changeset
|
740 assert extra['subject'] # subject is defined and not empty |
|
460
d0cd8ae579f7
browser side: message of type "headline" sent from the host are displayed in a InfoDialog
souliane <souliane@mailoo.org>
parents:
458
diff
changeset
|
741 title = extra['subject'] |
|
d0cd8ae579f7
browser side: message of type "headline" sent from the host are displayed in a InfoDialog
souliane <souliane@mailoo.org>
parents:
458
diff
changeset
|
742 except (KeyError, AssertionError): |
|
521
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
743 title = _('Announcement from %s') % from_jid.full() |
|
505
f0b56c022c01
browser_side: use of new XHTML2Text method
Goffi <goffi@goffi.org>
parents:
503
diff
changeset
|
744 msg = strings.addURLToText(html_tools.XHTML2Text(msg)) |
|
460
d0cd8ae579f7
browser side: message of type "headline" sent from the host are displayed in a InfoDialog
souliane <souliane@mailoo.org>
parents:
458
diff
changeset
|
745 dialog.InfoDialog(title, msg).show() |
|
d0cd8ae579f7
browser side: message of type "headline" sent from the host are displayed in a InfoDialog
souliane <souliane@mailoo.org>
parents:
458
diff
changeset
|
746 return |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
747 if lib_wid is not None: |
|
533
19fc2ebc02dd
browser_side: management of new "info" newMessage type
Goffi <goffi@goffi.org>
parents:
530
diff
changeset
|
748 if msg_type == C.MESS_TYPE_INFO: |
|
19fc2ebc02dd
browser_side: management of new "info" newMessage type
Goffi <goffi@goffi.org>
parents:
530
diff
changeset
|
749 lib_wid.printInfo(msg) |
|
19fc2ebc02dd
browser_side: management of new "info" newMessage type
Goffi <goffi@goffi.org>
parents:
530
diff
changeset
|
750 else: |
|
19fc2ebc02dd
browser_side: management of new "info" newMessage type
Goffi <goffi@goffi.org>
parents:
530
diff
changeset
|
751 lib_wid.printMessage(from_jid, msg, extra) |
|
536
048ae7314156
browser_side: temporary way to display the OTR state in the LiberviaWidget header
souliane <souliane@mailoo.org>
parents:
533
diff
changeset
|
752 if 'header_info' in extra: |
|
048ae7314156
browser_side: temporary way to display the OTR state in the LiberviaWidget header
souliane <souliane@mailoo.org>
parents:
533
diff
changeset
|
753 lib_wid.setHeaderInfo(extra['header_info']) |
|
230
266e9678eec0
browser_side: added the flag REUSE_EXISTING_LIBERVIA_WIDGETS
souliane <souliane@mailoo.org>
parents:
229
diff
changeset
|
754 else: |
|
536
048ae7314156
browser_side: temporary way to display the OTR state in the LiberviaWidget header
souliane <souliane@mailoo.org>
parents:
533
diff
changeset
|
755 # FIXME: "info" message and header info will be lost here |
|
455
05e98b8d9f02
browser side: display messages from contacts not in roster
souliane <souliane@mailoo.org>
parents:
452
diff
changeset
|
756 if not self.contact_panel.isContactInRoster(other.bare): |
|
05e98b8d9f02
browser side: display messages from contacts not in roster
souliane <souliane@mailoo.org>
parents:
452
diff
changeset
|
757 self.contact_panel.updateContact(other.bare, {}, [C.GROUP_NOT_IN_ROSTER]) |
|
328
835a8ae799e7
Add notifications support, fixes bug 7.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
326
diff
changeset
|
758 # The message has not been shown, we must indicate it |
| 62 | 759 self.contact_panel.setContactMessageWaiting(other.bare, True) |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
760 |
| 20 | 761 def _presenceUpdateCb(self, entity, show, priority, statuses): |
| 467 | 762 entity_jid = jid.JID(entity) |
|
304
2ab513a47e3b
browser_side: fix presence/status update (do not share between different resources)
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
763 if self.whoami and self.whoami == entity_jid: # XXX: QnD way to get our presence/status |
|
482
437eefa53a01
misc: remove some pylint errors and warnings
souliane <souliane@mailoo.org>
parents:
480
diff
changeset
|
764 assert(isinstance(self.status_panel, panels.PresenceStatusPanel)) |
|
437eefa53a01
misc: remove some pylint errors and warnings
souliane <souliane@mailoo.org>
parents:
480
diff
changeset
|
765 self.status_panel.setPresence(show) # pylint: disable=E1103 |
|
304
2ab513a47e3b
browser_side: fix presence/status update (do not share between different resources)
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
766 if statuses: |
|
482
437eefa53a01
misc: remove some pylint errors and warnings
souliane <souliane@mailoo.org>
parents:
480
diff
changeset
|
767 self.status_panel.setStatus(statuses.values()[0]) # pylint: disable=E1103 |
|
304
2ab513a47e3b
browser_side: fix presence/status update (do not share between different resources)
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
768 else: |
|
2ab513a47e3b
browser_side: fix presence/status update (do not share between different resources)
souliane <souliane@mailoo.org>
parents:
299
diff
changeset
|
769 self.contact_panel.setConnected(entity_jid.bare, entity_jid.resource, show, priority, statuses) |
|
530
1735aaeac652
plugin OTR: forces FINISHED state if we are in ENCRYPTED state on contact disconnection
souliane <souliane@mailoo.org>
parents:
521
diff
changeset
|
770 if show == 'unavailable': # XXX: save some resources as for now we only need 'unavailable' |
|
1735aaeac652
plugin OTR: forces FINISHED state if we are in ENCRYPTED state on contact disconnection
souliane <souliane@mailoo.org>
parents:
521
diff
changeset
|
771 for plugin in self.plugins.values(): |
|
1735aaeac652
plugin OTR: forces FINISHED state if we are in ENCRYPTED state on contact disconnection
souliane <souliane@mailoo.org>
parents:
521
diff
changeset
|
772 if hasattr(plugin, 'presenceReceivedTrigger'): |
|
1735aaeac652
plugin OTR: forces FINISHED state if we are in ENCRYPTED state on contact disconnection
souliane <souliane@mailoo.org>
parents:
521
diff
changeset
|
773 plugin.presenceReceivedTrigger(entity_jid, show, priority, statuses) |
| 28 | 774 |
|
125
f9d63624699f
radio collective integration, first draft
Goffi <goffi@goffi.org>
parents:
122
diff
changeset
|
775 def _roomJoinedCb(self, room_jid, room_nicks, user_nick): |
| 467 | 776 _target = jid.JID(room_jid) |
|
275
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
777 if _target not in self.room_list: |
|
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
778 self.room_list.append(_target) |
|
179
8475a29d7214
closing a group chat widget now leave the muc room (bug 11)
Goffi <goffi@goffi.org>
parents:
171
diff
changeset
|
779 chat_panel = panels.ChatPanel(self, _target, type_='group') |
| 33 | 780 chat_panel.setUserNick(user_nick) |
| 451 | 781 if _target.node.startswith('sat_tarot_'): # XXX: it's not really beautiful, but it works :) |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
782 self.addTab("Tarot", chat_panel) |
| 127 | 783 elif _target.node.startswith('sat_radiocol_'): |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
784 self.addTab("Radio collective", chat_panel) |
| 28 | 785 else: |
|
267
a76243c02074
browser_side: changes regarding widgets and tabs:
souliane <souliane@mailoo.org>
parents:
266
diff
changeset
|
786 self.addTab(_target.node, chat_panel) |
| 33 | 787 chat_panel.setPresents(room_nicks) |
| 788 chat_panel.historyPrint() | |
|
343
b66028d21a1c
browser_side: message box was not displayed on muc opening (when unibox is disabled)
souliane <souliane@mailoo.org>
parents:
340
diff
changeset
|
789 chat_panel.refresh() |
| 33 | 790 |
|
275
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
791 def _roomLeftCb(self, room_jid, room_nicks, user_nick): |
| 467 | 792 # FIXME: room_list contains jid.JID instances so why MUST we do |
| 793 # 'remove(room_jid)' and not 'remove(jid.JID(room_jid))' ????!! | |
|
275
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
794 # This looks like a pyjamas bug --> check/report |
|
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
795 try: |
|
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
796 self.room_list.remove(room_jid) |
|
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
797 except KeyError: |
|
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
798 pass |
|
a763b2ac5d41
bridge + browser_side: bridge signals for games and their callbacks:
souliane <souliane@mailoo.org>
parents:
274
diff
changeset
|
799 |
|
146
d15fbb208ba0
browser side: fixed MUC signals management
Goffi <goffi@goffi.org>
parents:
141
diff
changeset
|
800 def _roomUserJoinedCb(self, room_jid_s, user_nick, user_data): |
| 84 | 801 for lib_wid in self.libervia_widgets: |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
802 if isinstance(lib_wid, panels.ChatPanel) and lib_wid.type == 'group' and lib_wid.target.bare == room_jid_s: |
| 84 | 803 lib_wid.userJoined(user_nick, user_data) |
| 33 | 804 |
|
146
d15fbb208ba0
browser side: fixed MUC signals management
Goffi <goffi@goffi.org>
parents:
141
diff
changeset
|
805 def _roomUserLeftCb(self, room_jid_s, user_nick, user_data): |
| 84 | 806 for lib_wid in self.libervia_widgets: |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
807 if isinstance(lib_wid, panels.ChatPanel) and lib_wid.type == 'group' and lib_wid.target.bare == room_jid_s: |
| 84 | 808 lib_wid.userLeft(user_nick, user_data) |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
809 |
|
408
ee8ebfe23e16
browser_side: handle the signal "roomUserChangedNick"
souliane <souliane@mailoo.org>
parents:
407
diff
changeset
|
810 def _roomUserChangedNickCb(self, room_jid_s, old_nick, new_nick): |
|
ee8ebfe23e16
browser_side: handle the signal "roomUserChangedNick"
souliane <souliane@mailoo.org>
parents:
407
diff
changeset
|
811 """Called when an user joined a MUC room""" |
|
ee8ebfe23e16
browser_side: handle the signal "roomUserChangedNick"
souliane <souliane@mailoo.org>
parents:
407
diff
changeset
|
812 for lib_wid in self.libervia_widgets: |
|
ee8ebfe23e16
browser_side: handle the signal "roomUserChangedNick"
souliane <souliane@mailoo.org>
parents:
407
diff
changeset
|
813 if isinstance(lib_wid, panels.ChatPanel) and lib_wid.type == 'group' and lib_wid.target.bare == room_jid_s: |
|
ee8ebfe23e16
browser_side: handle the signal "roomUserChangedNick"
souliane <souliane@mailoo.org>
parents:
407
diff
changeset
|
814 lib_wid.changeUserNick(old_nick, new_nick) |
|
ee8ebfe23e16
browser_side: handle the signal "roomUserChangedNick"
souliane <souliane@mailoo.org>
parents:
407
diff
changeset
|
815 |
|
285
4f0c2fea358a
browser_side (plugin radiocol): use the status label to give more information
souliane <souliane@mailoo.org>
parents:
282
diff
changeset
|
816 def _tarotGameStartedCb(self, waiting, room_jid_s, referee, players): |
| 84 | 817 for lib_wid in self.libervia_widgets: |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
818 if isinstance(lib_wid, panels.ChatPanel) and lib_wid.type == 'group' and lib_wid.target.bare == room_jid_s: |
|
285
4f0c2fea358a
browser_side (plugin radiocol): use the status label to give more information
souliane <souliane@mailoo.org>
parents:
282
diff
changeset
|
819 lib_wid.startGame("Tarot", waiting, referee, players) |
| 36 | 820 |
|
146
d15fbb208ba0
browser side: fixed MUC signals management
Goffi <goffi@goffi.org>
parents:
141
diff
changeset
|
821 def _tarotGameGenericCb(self, event_name, room_jid_s, args): |
| 84 | 822 for lib_wid in self.libervia_widgets: |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
823 if isinstance(lib_wid, panels.ChatPanel) and lib_wid.type == 'group' and lib_wid.target.bare == room_jid_s: |
|
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
824 getattr(lib_wid.getGame("Tarot"), event_name)(*args) |
|
37
b306aa090438
Tarot game: game launching (first hand showed), and contract selection
Goffi <goffi@goffi.org>
parents:
36
diff
changeset
|
825 |
|
285
4f0c2fea358a
browser_side (plugin radiocol): use the status label to give more information
souliane <souliane@mailoo.org>
parents:
282
diff
changeset
|
826 def _radioColStartedCb(self, waiting, room_jid_s, referee, players, queue_data): |
| 127 | 827 for lib_wid in self.libervia_widgets: |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
828 if isinstance(lib_wid, panels.ChatPanel) and lib_wid.type == 'group' and lib_wid.target.bare == room_jid_s: |
|
285
4f0c2fea358a
browser_side (plugin radiocol): use the status label to give more information
souliane <souliane@mailoo.org>
parents:
282
diff
changeset
|
829 lib_wid.startGame("RadioCol", waiting, referee, players, queue_data) |
|
210
3092f6b1710c
browser side: make the OK button title for group selector configureable + few "cosmetic" changes (PEP 8...)
souliane <souliane@mailoo.org>
parents:
205
diff
changeset
|
830 |
|
146
d15fbb208ba0
browser side: fixed MUC signals management
Goffi <goffi@goffi.org>
parents:
141
diff
changeset
|
831 def _radioColGenericCb(self, event_name, room_jid_s, args): |
| 128 | 832 for lib_wid in self.libervia_widgets: |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
833 if isinstance(lib_wid, panels.ChatPanel) and lib_wid.type == 'group' and lib_wid.target.bare == room_jid_s: |
|
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
834 getattr(lib_wid.getGame("RadioCol"), event_name)(*args) |
| 128 | 835 |
|
427
b5b440e6ea16
server + browser side, getPresenceStatuses has been renamed
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
836 def _getPresenceStatusesCb(self, presence_data): |
| 28 | 837 for entity in presence_data: |
| 838 for resource in presence_data[entity]: | |
| 839 args = presence_data[entity][resource] | |
| 840 self._presenceUpdateCb("%s/%s" % (entity, resource), *args) | |
| 20 | 841 |
|
122
397a88b340f3
browser: fixed call to getRoomsJoined
Goffi <goffi@goffi.org>
parents:
119
diff
changeset
|
842 def _getRoomsJoinedCb(self, room_data): |
| 33 | 843 for room in room_data: |
| 844 self._roomJoinedCb(*room) | |
| 845 | |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
846 def _getWaitingSubCb(self, waiting_sub): |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
847 for sub in waiting_sub: |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
848 self._subscribeCb(waiting_sub[sub], sub) |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
849 |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
850 def _subscribeCb(self, sub_type, entity): |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
851 if sub_type == 'subscribed': |
| 467 | 852 dialog.InfoDialog('Subscription confirmation', 'The contact <b>%s</b> has added you to his/her contact list' % html_tools.html_sanitize(entity)).show() |
|
163
b887186e8fc8
browser side: get entity's microblogs for newly added contacts
Goffi <goffi@goffi.org>
parents:
158
diff
changeset
|
853 self.getEntityMBlog(entity) |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
854 |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
855 elif sub_type == 'unsubscribed': |
| 467 | 856 dialog.InfoDialog('Subscription refusal', 'The contact <b>%s</b> has refused to add you in his/her contact list' % html_tools.html_sanitize(entity)).show() |
|
163
b887186e8fc8
browser side: get entity's microblogs for newly added contacts
Goffi <goffi@goffi.org>
parents:
158
diff
changeset
|
857 #TODO: remove microblogs from panels |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
858 |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
859 elif sub_type == 'subscribe': |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
860 #The user want to subscribe to our presence |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
861 _dialog = None |
| 467 | 862 msg = HTML('The contact <b>%s</b> want to add you in his/her contact list, do you accept ?' % html_tools.html_sanitize(entity)) |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
863 |
| 62 | 864 def ok_cb(ignore): |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
865 self.bridge.call('subscription', None, "subscribed", entity, '', _dialog.getSelectedGroups()) |
| 451 | 866 |
| 62 | 867 def cancel_cb(ignore): |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
868 self.bridge.call('subscription', None, "unsubscribed", entity, '', '') |
|
226
744426c2b699
browser_side, misc: better PEP8 compliance
souliane <souliane@mailoo.org>
parents:
223
diff
changeset
|
869 |
|
227
67e24c342e7f
browser_side: bug fix for changeset 3092f6b1710c
souliane <souliane@mailoo.org>
parents:
226
diff
changeset
|
870 _dialog = dialog.GroupSelector([msg], self.contact_panel.getGroups(), [], "Add", ok_cb, cancel_cb) |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
871 _dialog.setHTML('<b>Add contact request</b>') |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
872 _dialog.show() |
|
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
873 |
|
55
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
874 def _contactDeletedCb(self, entity): |
|
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
875 self.contact_panel.removeContact(entity) |
|
d5266c41ca24
Roster list update, contact deletion + some refactoring
Goffi <goffi@goffi.org>
parents:
54
diff
changeset
|
876 |
|
482
437eefa53a01
misc: remove some pylint errors and warnings
souliane <souliane@mailoo.org>
parents:
480
diff
changeset
|
877 def _newContactCb(self, contact_jid, attributes, groups): |
|
437eefa53a01
misc: remove some pylint errors and warnings
souliane <souliane@mailoo.org>
parents:
480
diff
changeset
|
878 self.contact_panel.updateContact(contact_jid, attributes, groups) |
|
54
f25c4077f6b9
addind contact + subscription management + misc
Goffi <goffi@goffi.org>
parents:
50
diff
changeset
|
879 |
| 137 | 880 def _entityDataUpdatedCb(self, entity_jid_s, key, value): |
| 881 if key == "avatar": | |
|
483
0bbbef1d53a8
server side (blog): use user's avatar a the blog's favicon + small refactorization
souliane <souliane@mailoo.org>
parents:
482
diff
changeset
|
882 avatar = '/' + C.AVATARS_DIR + value |
| 137 | 883 self.avatars_cache[entity_jid_s] = avatar |
|
480
50b286866739
browser side: display avatars in the contact panel
souliane <souliane@mailoo.org>
parents:
479
diff
changeset
|
884 self.contact_panel.updateAvatar(entity_jid_s, avatar) |
| 119 | 885 |
| 886 for lib_wid in self.libervia_widgets: | |
| 887 if isinstance(lib_wid, panels.MicroblogPanel): | |
| 137 | 888 if lib_wid.isJidAccepted(entity_jid_s) or (self.whoami and entity_jid_s == self.whoami.bare): |
| 889 lib_wid.updateValue('avatar', entity_jid_s, avatar) | |
| 119 | 890 |
|
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
891 def _chatStateReceivedCb(self, from_jid_s, state): |
|
213
8bbac49765d6
browser side: display the day change in chat window
souliane <souliane@mailoo.org>
parents:
210
diff
changeset
|
892 """Callback when a new chat state is received. |
|
407
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
893 @param from_jid_s: JID of the contact who sent his state, or '@ALL@' |
|
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
894 @param state: new state (string) |
|
213
8bbac49765d6
browser side: display the day change in chat window
souliane <souliane@mailoo.org>
parents:
210
diff
changeset
|
895 """ |
|
407
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
896 if from_jid_s == '@ALL@': |
|
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
897 target = '@ALL@' |
|
433
bbdbee25123a
import constants.Const as C (according to the coding rules)
souliane <souliane@mailoo.org>
parents:
427
diff
changeset
|
898 nick = C.ALL_OCCUPANTS |
|
407
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
899 else: |
| 467 | 900 from_jid = jid.JID(from_jid_s) |
|
407
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
901 target = from_jid.bare |
|
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
902 nick = from_jid.resource |
|
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
903 |
|
213
8bbac49765d6
browser side: display the day change in chat window
souliane <souliane@mailoo.org>
parents:
210
diff
changeset
|
904 for lib_wid in self.libervia_widgets: |
|
8bbac49765d6
browser side: display the day change in chat window
souliane <souliane@mailoo.org>
parents:
210
diff
changeset
|
905 if isinstance(lib_wid, panels.ChatPanel): |
|
407
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
906 if target == '@ALL' or target == lib_wid.target.bare: |
|
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
907 if lib_wid.type == 'one2one': |
|
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
908 lib_wid.setState(state) |
|
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
909 elif lib_wid.type == 'group': |
|
6a6551de4414
browser_side: display chat states (with symbols) for MUC participants
souliane <souliane@mailoo.org>
parents:
392
diff
changeset
|
910 lib_wid.setState(state, nick=nick) |
| 119 | 911 |
|
251
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
912 def _askConfirmation(self, confirmation_id, confirmation_type, data): |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
913 answer_data = {} |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
914 |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
915 def confirm_cb(result): |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
916 self.bridge.call('confirmationAnswer', None, confirmation_id, result, answer_data) |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
917 |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
918 if confirmation_type == "YES/NO": |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
919 dialog.ConfirmDialog(confirm_cb, text=data["message"], title=data["title"]).show() |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
920 |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
921 def _newAlert(self, message, title, alert_type): |
|
24335e82fef0
plugin XEP-249: added parameter Misc / Auto-join MUC on invitation:
souliane <souliane@mailoo.org>
parents:
250
diff
changeset
|
922 dialog.InfoDialog(title, message).show() |
|
239
b911f2b43fd4
browser_side: added input history in the unibox:
souliane <souliane@mailoo.org>
parents:
235
diff
changeset
|
923 |
|
326
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
924 def _paramUpdate(self, name, value, category, refresh=True): |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
925 """This is called when the paramUpdate signal is received, but also |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
926 during initialization when the UI parameters values are retrieved. |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
927 @param refresh: set to True to refresh the general UI |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
928 """ |
|
478
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
929 for param_cat, param_name in C.CACHED_PARAMS: |
|
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
930 if name == param_name and category == param_cat: |
|
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
931 self.cached_params[(category, name)] = value |
|
326
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
932 if refresh: |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
933 self.refresh() |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
934 break |
|
36927be51481
browser_side: fixed the behavior regarding "Enable unibox" parameter:
souliane <souliane@mailoo.org>
parents:
325
diff
changeset
|
935 |
|
478
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
936 def getCachedParam(self, category, name): |
|
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
937 """Return a parameter cached value (e.g for refreshing the UI) |
|
462
07433bd892ee
server and browser sides: fixes UI parameters initialisation with user values + small refactoring
souliane <souliane@mailoo.org>
parents:
460
diff
changeset
|
938 |
|
478
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
939 @param category (str): the parameter category |
|
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
940 @pram name (str): the parameter name |
|
462
07433bd892ee
server and browser sides: fixes UI parameters initialisation with user values + small refactoring
souliane <souliane@mailoo.org>
parents:
460
diff
changeset
|
941 """ |
|
478
992b900ab876
browser side: rename and refactor constant UI_PARAMS to CACHED_PARAMS, from a dict of dict to a list of 2-tuple
souliane <souliane@mailoo.org>
parents:
477
diff
changeset
|
942 return self.cached_params[(category, name)] if (category, name) in self.cached_params else None |
|
462
07433bd892ee
server and browser sides: fixes UI parameters initialisation with user values + small refactoring
souliane <souliane@mailoo.org>
parents:
460
diff
changeset
|
943 |
|
298
e99f578c7179
browser side: sendMessage alert on error
Goffi <goffi@goffi.org>
parents:
296
diff
changeset
|
944 def sendError(self, errorData): |
|
e99f578c7179
browser side: sendMessage alert on error
Goffi <goffi@goffi.org>
parents:
296
diff
changeset
|
945 dialog.InfoDialog("Error while sending message", |
|
e99f578c7179
browser side: sendMessage alert on error
Goffi <goffi@goffi.org>
parents:
296
diff
changeset
|
946 "Your message can't be sent", Width="400px").center() |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
947 log.error("sendError: %s" % str(errorData)) |
|
298
e99f578c7179
browser side: sendMessage alert on error
Goffi <goffi@goffi.org>
parents:
296
diff
changeset
|
948 |
|
280
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
949 def send(self, targets, text, extra={}): |
|
269
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
950 """Send a message to any target type. |
|
280
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
951 @param targets: list of tuples (type, entities, addr) with: |
|
269
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
952 - type in ("PUBLIC", "GROUP", "COMMENT", "STATUS" , "groupchat" , "chat") |
|
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
953 - entities could be a JID, a list groups, a node hash... depending the target |
|
280
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
954 - addr in ("To", "Cc", "Bcc") - ignore case |
|
269
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
955 @param text: the message content |
|
280
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
956 @param extra: options |
|
269
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
957 """ |
|
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
958 # FIXME: too many magic strings, we should use constants instead |
|
280
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
959 addresses = [] |
|
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
960 for target in targets: |
|
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
961 type_, entities, addr = target[0], target[1], 'to' if len(target) < 3 else target[2].lower() |
|
269
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
962 if type_ in ("PUBLIC", "GROUP"): |
|
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
963 self.bridge.call("sendMblog", None, type_, entities if type_ == "GROUP" else None, text, extra) |
|
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
964 elif type_ == "COMMENT": |
|
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
965 self.bridge.call("sendMblogComment", None, entities, text, extra) |
|
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
966 elif type_ == "STATUS": |
|
482
437eefa53a01
misc: remove some pylint errors and warnings
souliane <souliane@mailoo.org>
parents:
480
diff
changeset
|
967 assert(isinstance(self.status_panel, panels.PresenceStatusPanel)) |
|
437eefa53a01
misc: remove some pylint errors and warnings
souliane <souliane@mailoo.org>
parents:
480
diff
changeset
|
968 self.bridge.call('setStatus', None, self.status_panel.presence, text) # pylint: disable=E1103 |
|
269
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
969 elif type_ in ("groupchat", "chat"): |
|
280
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
970 addresses.append((addr, entities)) |
|
269
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
971 else: |
|
439
d52f529a6d42
browser side: use of new log system (first draft):
Goffi <goffi@goffi.org>
parents:
433
diff
changeset
|
972 log.error("Unknown target type") |
|
280
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
973 if addresses: |
|
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
974 if len(addresses) == 1 and addresses[0][0] == 'to': |
|
521
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
975 to_jid_s = addresses[0][1] |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
976 for plugin in self.plugins.values(): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
977 if hasattr(plugin, 'sendMessageTrigger'): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
978 if not plugin.sendMessageTrigger(jid.JID(to_jid_s), text, type_, extra): |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
979 return # plugin returned False to interrupt the process |
|
69bffcf37ce3
browser_side: add minimal requirements for generic plugins handling
souliane <souliane@mailoo.org>
parents:
520
diff
changeset
|
980 self.bridge.call('sendMessage', (None, self.sendError), to_jid_s, text, '', type_, extra) |
|
280
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
981 else: |
|
1ccdc34cfb60
browser_side: changes related to the implementation of XEP-0033 (addressing)
souliane <souliane@mailoo.org>
parents:
279
diff
changeset
|
982 extra.update({'address': '\n'.join([('%s:%s' % entry) for entry in addresses])}) |
|
298
e99f578c7179
browser side: sendMessage alert on error
Goffi <goffi@goffi.org>
parents:
296
diff
changeset
|
983 self.bridge.call('sendMessage', (None, self.sendError), self.whoami.domain, text, '', type_, extra) |
|
269
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
984 |
|
361
f4efffb9627c
browser_side: the popup notifying the message's recipient is no more dependent to the unibox.
souliane <souliane@mailoo.org>
parents:
349
diff
changeset
|
985 def showWarning(self, type_=None, msg=None): |
|
f4efffb9627c
browser_side: the popup notifying the message's recipient is no more dependent to the unibox.
souliane <souliane@mailoo.org>
parents:
349
diff
changeset
|
986 """Display a popup information message, e.g. to notify the recipient of a message being composed. |
|
f4efffb9627c
browser_side: the popup notifying the message's recipient is no more dependent to the unibox.
souliane <souliane@mailoo.org>
parents:
349
diff
changeset
|
987 If type_ is None, a popup being currently displayed will be hidden. |
|
f4efffb9627c
browser_side: the popup notifying the message's recipient is no more dependent to the unibox.
souliane <souliane@mailoo.org>
parents:
349
diff
changeset
|
988 @type_: a type determining the CSS style to be applied (see WarningPopup.showWarning) |
|
f4efffb9627c
browser_side: the popup notifying the message's recipient is no more dependent to the unibox.
souliane <souliane@mailoo.org>
parents:
349
diff
changeset
|
989 @msg: message to be displayed |
|
f4efffb9627c
browser_side: the popup notifying the message's recipient is no more dependent to the unibox.
souliane <souliane@mailoo.org>
parents:
349
diff
changeset
|
990 """ |
|
f4efffb9627c
browser_side: the popup notifying the message's recipient is no more dependent to the unibox.
souliane <souliane@mailoo.org>
parents:
349
diff
changeset
|
991 if not hasattr(self, "warning_popup"): |
|
f4efffb9627c
browser_side: the popup notifying the message's recipient is no more dependent to the unibox.
souliane <souliane@mailoo.org>
parents:
349
diff
changeset
|
992 self.warning_popup = panels.WarningPopup() |
|
f4efffb9627c
browser_side: the popup notifying the message's recipient is no more dependent to the unibox.
souliane <souliane@mailoo.org>
parents:
349
diff
changeset
|
993 self.warning_popup.showWarning(type_, msg) |
|
f4efffb9627c
browser_side: the popup notifying the message's recipient is no more dependent to the unibox.
souliane <souliane@mailoo.org>
parents:
349
diff
changeset
|
994 |
|
269
9eb9c7d41bdc
browser_side: added generic method "send" in SatWebFrontend
souliane <souliane@mailoo.org>
parents:
267
diff
changeset
|
995 |
| 0 | 996 if __name__ == '__main__': |
| 997 app = SatWebFrontend() | |
| 998 app.onModuleLoad() | |
| 999 pyjd.run() |