Mercurial > libervia-backend

comparison src/plugins/plugin_xep_0048.py @ 1963:a2bc5089c2eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backend, frontends: message refactoring (huge commit): /!\ several features are temporarily disabled, like notifications in frontends next step in refactoring, with the following changes: - jp: updated jp message to follow changes in backend/bridge - jp: added --lang, --subject, --subject_lang, and --type options to jp message + fixed unicode handling for jid - quick_frontend (QuickApp, QuickChat): - follow backend changes - refactored chat, message are now handled in OrderedDict and uid are kept so they can be updated - Message and Occupant classes handle metadata, so frontend just have to display them - Primitivus (Chat): - follow backend/QuickFrontend changes - info & standard messages are handled in the same MessageWidget class - improved/simplified handling of messages, removed update() method - user joined/left messages are merged when next to each other - a separator is shown when message is received while widget is out of focus, so user can quickly see the new messages - affiliation/role are shown (in a basic way for now) in occupants panel - removed "/me" messages handling, as it will be done by a backend plugin - message language is displayed when available (only one language per message for now) - fixed :history and :search commands - core (constants): new constants for messages type, XML namespace, entity type - core: *Message methods renamed to follow new code sytle (e.g. sendMessageToBridge => messageSendToBridge) - core (messages handling): fixed handling of language - core (messages handling): mes_data['from'] and ['to'] are now jid.JID - core (core.xmpp): reorganised message methods, added getNick() method to client.roster - plugin text commands: fixed plugin and adapted to new messages behaviour. client is now used in arguments instead of profile - plugins: added information for cancellation reason in CancelError calls - plugin XEP-0045: various improvments, but this plugin still need work: - trigger is used to avoid message already handled by the plugin to be handled a second time - changed the way to handle history, the last message from DB is checked and we request only messages since this one, in seconds (thanks Poezio folks :)) - subject reception is waited before sending the roomJoined signal, this way we are sure that everything including history is ready - cmd_* method now follow the new convention with client instead of profile - roomUserJoined and roomUserLeft messages are removed, the events are now handled with info message with a "ROOM_USER_JOINED" info subtype - probably other forgotten stuffs :p
author Goffi <goffi@goffi.org>
date Mon, 20 Jun 2016 18:41:53 +0200
parents 2daf7b4c6756
children 1d3f73e065e1
comparison
equal deleted inserted replaced
1962:a45235d8dc93 1963:a2bc5089c2eb
86 for bookmarks in (local, private, pubsub): 86 for bookmarks in (local, private, pubsub):
87 if bookmarks is not None: 87 if bookmarks is not None:
88 for (room_jid, data) in bookmarks[XEP_0048.MUC_TYPE].items(): 88 for (room_jid, data) in bookmarks[XEP_0048.MUC_TYPE].items():
89 if data.get('autojoin', 'false') == 'true': 89 if data.get('autojoin', 'false') == 'true':
90 nick = data.get('nick', client.jid.user) 90 nick = data.get('nick', client.jid.user)
91 self.host.plugins['XEP-0045'].join(room_jid, nick, {}, profile_key=client.profile) 91 self.host.plugins['XEP-0045'].join(client, room_jid, nick, {})
92 92
93 @defer.inlineCallbacks 93 @defer.inlineCallbacks
94 def _getServerBookmarks(self, storage_type, profile): 94 def _getServerBookmarks(self, storage_type, profile):
95 """Get distants bookmarks 95 """Get distants bookmarks
96 96
217 room_jid = jid.JID(room_jid_s) 217 room_jid = jid.JID(room_jid_s)
218 except (KeyError, RuntimeError): 218 except (KeyError, RuntimeError):
219 log.warning(_("No room jid selected")) 219 log.warning(_("No room jid selected"))
220 return {} 220 return {}
221 221
222 d = self.host.plugins['XEP-0045'].join(room_jid, nick, {}, profile_key=profile) 222 client = self.host.getClient(profile)
223 d = self.host.plugins['XEP-0045'].join(client, room_jid, nick, {})
223 def join_eb(failure): 224 def join_eb(failure):
224 log.warning(u"Error while trying to join room: %s" % failure) 225 log.warning(u"Error while trying to join room: {}".format(failure))
225 # FIXME: failure are badly managed in plugin XEP-0045. Plugin XEP-0045 need to be fixed before managing errors correctly here 226 # FIXME: failure are badly managed in plugin XEP-0045. Plugin XEP-0045 need to be fixed before managing errors correctly here
226 return {} 227 return {}
227 d.addCallbacks(lambda dummy: {}, join_eb) 228 d.addCallbacks(lambda dummy: {}, join_eb)
228 return d 229 return d
229 230
415 def _bookmarksAdd(self, type_, location, data, storage_type="auto", profile_key=C.PROF_KEY_NONE): 416 def _bookmarksAdd(self, type_, location, data, storage_type="auto", profile_key=C.PROF_KEY_NONE):
416 if type_ == XEP_0048.MUC_TYPE: 417 if type_ == XEP_0048.MUC_TYPE:
417 location = jid.JID(location) 418 location = jid.JID(location)
418 return self.addBookmark(type_, location, data, storage_type, profile_key) 419 return self.addBookmark(type_, location, data, storage_type, profile_key)
419 420
420 def cmd_bookmark(self, mess_data, profile): 421 def cmd_bookmark(self, client, mess_data):
421 """(Un)bookmark a MUC room 422 """(Un)bookmark a MUC room
422 423
423 @command (group): [autojoin | remove] 424 @command (group): [autojoin | remove]
424 - autojoin: join room automatically on connection 425 - autojoin: join room automatically on connection
425 - remove: remove bookmark(s) for this room 426 - remove: remove bookmark(s) for this room
426 """ 427 """
427 client = self.host.getClient(profile)
428 txt_cmd = self.host.plugins[C.TEXT_CMDS] 428 txt_cmd = self.host.plugins[C.TEXT_CMDS]
429 429
430 options = mess_data["unparsed"].strip().split() 430 options = mess_data["unparsed"].strip().split()
431 if options and options[0] not in ('autojoin', 'remove'): 431 if options and options[0] not in ('autojoin', 'remove'):
432 txt_cmd.feedBack(_("Bad arguments"), mess_data, profile) 432 txt_cmd.feedBack(client, _("Bad arguments"), mess_data)
433 return False 433 return False
434 434
435 room_jid = mess_data["to"].userhostJID() 435 room_jid = mess_data["to"].userhostJID()
436 436
437 if "remove" in options: 437 if "remove" in options:
438 self.removeBookmark(XEP_0048.MUC_TYPE, room_jid, profile_key = profile) 438 self.removeBookmark(XEP_0048.MUC_TYPE, room_jid, profile_key = client.profile)
439 txt_cmd.feedBack(_("All [%s] bookmarks are being removed") % room_jid.full(), mess_data, profile) 439 txt_cmd.feedBack(client, _("All [%s] bookmarks are being removed") % room_jid.full(), mess_data)
440 return False 440 return False
441 441
442 data = { "name": room_jid.user, 442 data = { "name": room_jid.user,
443 "nick": client.jid.user, 443 "nick": client.jid.user,
444 "autojoin": "true" if "autojoin" in options else "false", 444 "autojoin": "true" if "autojoin" in options else "false",
445 } 445 }
446 self.addBookmark(XEP_0048.MUC_TYPE, room_jid, data, profile_key=profile) 446 self.addBookmark(XEP_0048.MUC_TYPE, room_jid, data, profile_key=client.profile)
447 txt_cmd.feedBack(_("Bookmark added"), mess_data, profile) 447 txt_cmd.feedBack(client, _("Bookmark added"), mess_data)
448 448
449 return False 449 return False