Mercurial > libervia-backend
comparison src/memory/memory.py @ 1963:a2bc5089c2eb
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 | 633b5c21aefd |
| children | 200cd707a46d |
comparison
equal
deleted
inserted
replaced
| 1962:a45235d8dc93 | 1963:a2bc5089c2eb |
|---|---|
| 511 ## History ## | 511 ## History ## |
| 512 | 512 |
| 513 def addToHistory(self, client, data): | 513 def addToHistory(self, client, data): |
| 514 return self.storage.addToHistory(data, client.profile) | 514 return self.storage.addToHistory(data, client.profile) |
| 515 | 515 |
| 516 def _historyGet(self, from_jid_s, to_jid_s, limit=C.HISTORY_LIMIT_NONE, between=True, search=None, profile=C.PROF_KEY_NONE): | |
| 517 return self.historyGet(jid.JID(from_jid_s), jid.JID(to_jid_s), limit, between, search, profile) | |
| 518 | |
| 516 def historyGet(self, from_jid, to_jid, limit=C.HISTORY_LIMIT_NONE, between=True, search=None, profile=C.PROF_KEY_NONE): | 519 def historyGet(self, from_jid, to_jid, limit=C.HISTORY_LIMIT_NONE, between=True, search=None, profile=C.PROF_KEY_NONE): |
| 517 """Retrieve messages in history | 520 """Retrieve messages in history |
| 518 | 521 |
| 519 @param from_jid (JID): source JID (full, or bare for catchall) | 522 @param from_jid (JID): source JID (full, or bare for catchall) |
| 520 @param to_jid (JID): dest JID (full, or bare for catchall) | 523 @param to_jid (JID): dest JID (full, or bare for catchall) |
| 523 - C.HISTORY_LIMIT_NONE or None for unlimited | 526 - C.HISTORY_LIMIT_NONE or None for unlimited |
| 524 - C.HISTORY_LIMIT_DEFAULT to use the HISTORY_LIMIT parameter value | 527 - C.HISTORY_LIMIT_DEFAULT to use the HISTORY_LIMIT parameter value |
| 525 @param between (bool): confound source and dest (ignore the direction) | 528 @param between (bool): confound source and dest (ignore the direction) |
| 526 @param search (str): pattern to filter the history results | 529 @param search (str): pattern to filter the history results |
| 527 @param profile (str): %(doc_profile)s | 530 @param profile (str): %(doc_profile)s |
| 528 @return: list of message data as in [messageNew] | 531 @return (D(list)): list of message data as in [messageNew] |
| 529 """ | 532 """ |
| 530 assert profile != C.PROF_KEY_NONE | 533 assert profile != C.PROF_KEY_NONE |
| 531 if limit == C.HISTORY_LIMIT_DEFAULT: | 534 if limit == C.HISTORY_LIMIT_DEFAULT: |
| 532 limit = int(self.getParamA(C.HISTORY_LIMIT, 'General', profile_key=profile)) | 535 limit = int(self.getParamA(C.HISTORY_LIMIT, 'General', profile_key=profile)) |
| 533 elif limit == C.HISTORY_LIMIT_NONE: | 536 elif limit == C.HISTORY_LIMIT_NONE: |
| 534 limit = None | 537 limit = None |
| 535 if limit == 0: | 538 if limit == 0: |
| 536 return defer.succeed([]) | 539 return defer.succeed([]) |
| 537 return self.storage.historyGet(jid.JID(from_jid), jid.JID(to_jid), limit, between, search, profile) | 540 return self.storage.historyGet(from_jid, to_jid, limit, between, search, profile) |
| 538 | 541 |
| 539 ## Statuses ## | 542 ## Statuses ## |
| 540 | 543 |
| 541 def _getPresenceStatuses(self, profile_key): | 544 def _getPresenceStatuses(self, profile_key): |
| 542 ret = self.getPresenceStatuses(profile_key) | 545 ret = self.getPresenceStatuses(profile_key) |