libervia-backend: sat/plugins/plugin_xep

annotate sat/plugins/plugin_xep_0045.py @ 3002:6acaa8244220

plugin 0249: fixed invitation handling + some improvments: - properly retrieve payload by namespace - now use a trigger instead of observer, so the message workflow is stopped if an invitation is found - namespace is registered fix 241

author	Goffi <goffi@goffi.org>
date	Sun, 14 Jul 2019 11:23:25 +0200
parents	94708a7d3ecf
children	c8c68a3b0a79

rev	line source
1934 2daf7b4c6756 use of /usr/bin/env instead of /usr/bin/python in shebang Goffi <goffi@goffi.org> parents: 1891 diff changeset	1 #!/usr/bin/env python2
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	2 # -- coding: utf-8 --
f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	3
609 84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 599 diff changeset	4 # SAT plugin for managing xep-0045
2771 003b8b4b56a7 date update Goffi <goffi@goffi.org> parents: 2728 diff changeset	5 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org)
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	6
609 84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 599 diff changeset	7 # This program is free software: you can redistribute it and/or modify
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 599 diff changeset	8 # it under the terms of the GNU Affero General Public License as published by
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 599 diff changeset	9 # the Free Software Foundation, either version 3 of the License, or
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 599 diff changeset	10 # (at your option) any later version.
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	11
609 84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 599 diff changeset	12 # This program is distributed in the hope that it will be useful,
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 599 diff changeset	13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 599 diff changeset	14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 599 diff changeset	15 # GNU Affero General Public License for more details.
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	16
609 84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 599 diff changeset	17 # You should have received a copy of the GNU Affero General Public License
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 599 diff changeset	18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	19
1068 1513511a0586 plugin XEP-0045: room configuration returns a success or failure message souliane <souliane@mailoo.org> parents: 1007 diff changeset	20 from sat.core.i18n import _, D_
916 1a759096ccbd core: use of Const for profile_key + replaced '@DEFAULT@' default profile_key by '@NONE@' Goffi <goffi@goffi.org> parents: 811 diff changeset	21 from sat.core.constants import Const as C
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 950 diff changeset	22 from sat.core.log import getLogger
301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 950 diff changeset	23 log = getLogger(__name__)
507 f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	24 from twisted.internet import defer
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	25 from twisted.words.protocols.jabber import jid
1986 fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	26 from twisted.python import failure
505 2402668b5d05 plugin xep-0045: nick change management Goffi <goffi@goffi.org> parents: 488 diff changeset	27
2402668b5d05 plugin xep-0045: nick change management Goffi <goffi@goffi.org> parents: 488 diff changeset	28 from sat.core import exceptions
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	29 from sat.memory import memory
505 2402668b5d05 plugin xep-0045: nick change management Goffi <goffi@goffi.org> parents: 488 diff changeset	30
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	31 import time
319 5bb1cfc105d0 plugin xep-0045: misc improvments Goffi <goffi@goffi.org> parents: 291 diff changeset	32 import uuid
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	33
1466 2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	34 from wokkel import muc, disco, iwokkel
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	35 from sat.tools import xml_tools
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	36
1466 2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	37 from zope.interface import implements
2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	38
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	39 # XXX: mam and rsm come from sat_tmp.wokkel
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	40 from wokkel import rsm
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	41 from wokkel import mam
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	42
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	43
f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	44 PLUGIN_INFO = {
2145 33c8c4973743 core (plugins): added missing contants + use of new constants in PLUGIN_INFO Goffi <goffi@goffi.org> parents: 2144 diff changeset	45 C.PI_NAME: "XEP-0045 Plugin",
33c8c4973743 core (plugins): added missing contants + use of new constants in PLUGIN_INFO Goffi <goffi@goffi.org> parents: 2144 diff changeset	46 C.PI_IMPORT_NAME: "XEP-0045",
33c8c4973743 core (plugins): added missing contants + use of new constants in PLUGIN_INFO Goffi <goffi@goffi.org> parents: 2144 diff changeset	47 C.PI_TYPE: "XEP",
33c8c4973743 core (plugins): added missing contants + use of new constants in PLUGIN_INFO Goffi <goffi@goffi.org> parents: 2144 diff changeset	48 C.PI_PROTOCOLS: ["XEP-0045"],
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	49 C.PI_DEPENDENCIES: ["XEP-0359"],
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	50 C.PI_RECOMMENDATIONS: [C.TEXT_CMDS, u"XEP-0313"],
2145 33c8c4973743 core (plugins): added missing contants + use of new constants in PLUGIN_INFO Goffi <goffi@goffi.org> parents: 2144 diff changeset	51 C.PI_MAIN: "XEP_0045",
33c8c4973743 core (plugins): added missing contants + use of new constants in PLUGIN_INFO Goffi <goffi@goffi.org> parents: 2144 diff changeset	52 C.PI_HANDLER: "yes",
33c8c4973743 core (plugins): added missing contants + use of new constants in PLUGIN_INFO Goffi <goffi@goffi.org> parents: 2144 diff changeset	53 C.PI_DESCRIPTION: _("""Implementation of Multi-User Chat""")
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	54 }
f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	55
1466 2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	56 NS_MUC = 'http://jabber.org/protocol/muc'
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	57 AFFILIATIONS = ('owner', 'admin', 'member', 'none', 'outcast')
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	58 ROOM_USER_JOINED = 'ROOM_USER_JOINED'
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	59 ROOM_USER_LEFT = 'ROOM_USER_LEFT'
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	60 OCCUPANT_KEYS = ('nick', 'entity', 'affiliation', 'role')
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	61 ROOM_STATE_OCCUPANTS = "occupants"
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	62 ROOM_STATE_SELF_PRESENCE = "self-presence"
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	63 ROOM_STATE_LIVE = "live"
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	64 ROOM_STATES = (ROOM_STATE_OCCUPANTS, ROOM_STATE_SELF_PRESENCE, ROOM_STATE_LIVE)
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	65 HISTORY_LEGACY = u"legacy"
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	66 HISTORY_MAM = u"mam"
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	67
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	68
1407 77f07ea90420 plugin XEP-0045, quick_frontend, primitivus: replace C.DEFAULT_MUC by bridge method getDefaultMUC (value is defined in plugin XEP-0045 and can be overriden with the config file) souliane <souliane@mailoo.org> parents: 1396 diff changeset	69 CONFIG_SECTION = u'plugin muc'
77f07ea90420 plugin XEP-0045, quick_frontend, primitivus: replace C.DEFAULT_MUC by bridge method getDefaultMUC (value is defined in plugin XEP-0045 and can be overriden with the config file) souliane <souliane@mailoo.org> parents: 1396 diff changeset	70
77f07ea90420 plugin XEP-0045, quick_frontend, primitivus: replace C.DEFAULT_MUC by bridge method getDefaultMUC (value is defined in plugin XEP-0045 and can be overriden with the config file) souliane <souliane@mailoo.org> parents: 1396 diff changeset	71 default_conf = {"default_muc": u'sat@chat.jabberfr.org'}
77f07ea90420 plugin XEP-0045, quick_frontend, primitivus: replace C.DEFAULT_MUC by bridge method getDefaultMUC (value is defined in plugin XEP-0045 and can be overriden with the config file) souliane <souliane@mailoo.org> parents: 1396 diff changeset	72
594 e629371a28d3 Fix pep8 support in src/plugins. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 588 diff changeset	73
2066 09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	74 class AlreadyJoined(exceptions.ConflictError):
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	75
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	76 def __init__(self, room):
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	77 super(AlreadyJoined, self).__init__()
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	78 self.room = room
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	79
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	80
588 beaf6bec2fcd Remove every old-style class. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	81 class XEP_0045(object):
2046 b99bd02ea643 plugin XEP-0045, XEP-0054, XEP-0096: deprecated bridge method are not used anymore Goffi <goffi@goffi.org> parents: 2028 diff changeset	82 # TODO: handle invitations
2461 34cb8b713370 plugin XEP-0045: added mucNickGet to retrieve our nickname in a MUC room Goffi <goffi@goffi.org> parents: 2414 diff changeset	83 # FIXME: this plugin need a good cleaning, join method is messy
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	84
f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	85 def __init__(self, host):
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 950 diff changeset	86 log.info(_("Plugin XEP_0045 initialization"))
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	87 self.host = host
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	88 self._sessions = memory.Sessions()
2066 09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	89 host.bridge.addMethod("mucJoin", ".plugin", in_sign='ssa{ss}s', out_sign='(bsa{sa{ss}}sss)', method=self._join, async=True) # return same arguments as mucRoomJoined + a boolean set to True is the room was already joined (first argument)
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	90 host.bridge.addMethod("mucNick", ".plugin", in_sign='sss', out_sign='', method=self._nick)
2461 34cb8b713370 plugin XEP-0045: added mucNickGet to retrieve our nickname in a MUC room Goffi <goffi@goffi.org> parents: 2414 diff changeset	91 host.bridge.addMethod("mucNickGet", ".plugin", in_sign='ss', out_sign='s', method=self._getRoomNick)
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	92 host.bridge.addMethod("mucLeave", ".plugin", in_sign='ss', out_sign='', method=self._leave, async=True)
2844 fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	93 host.bridge.addMethod("mucOccupantsGet", ".plugin", in_sign='ss', out_sign='a{sa{ss}}', method=self._getRoomOccupants)
2021 6c51e8f17c92 plugin XEP-0045: added bridge method to change subject Goffi <goffi@goffi.org> parents: 1992 diff changeset	94 host.bridge.addMethod("mucSubject", ".plugin", in_sign='sss', out_sign='', method=self._subject)
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	95 host.bridge.addMethod("mucGetRoomsJoined", ".plugin", in_sign='s', out_sign='a(sa{sa{ss}}ss)', method=self._getRoomsJoined)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	96 host.bridge.addMethod("mucGetUniqueRoomName", ".plugin", in_sign='ss', out_sign='s', method=self._getUniqueName)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	97 host.bridge.addMethod("mucConfigureRoom", ".plugin", in_sign='ss', out_sign='s', method=self._configureRoom, async=True)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	98 host.bridge.addMethod("mucGetDefaultService", ".plugin", in_sign='', out_sign='s', method=self.getDefaultMUC)
2468 8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	99 host.bridge.addMethod("mucGetService", ".plugin", in_sign='ss', out_sign='s', method=self._getMUCService, async=True)
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	100 host.bridge.addSignal("mucRoomJoined", ".plugin", signature='sa{sa{ss}}sss') # args: room_jid, occupants, user_nick, subject, profile
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	101 host.bridge.addSignal("mucRoomLeft", ".plugin", signature='ss') # args: room_jid, profile
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	102 host.bridge.addSignal("mucRoomUserChangedNick", ".plugin", signature='ssss') # args: room_jid, old_nick, new_nick, profile
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	103 host.bridge.addSignal("mucRoomNewSubject", ".plugin", signature='sss') # args: room_jid, subject, profile
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	104 self.__submit_conf_id = host.registerCallback(self._submitConfiguration, with_data=True)
1990 dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	105 self._room_join_id = host.registerCallback(self._UIRoomJoinCb, with_data=True)
1538 55967cf161b1 reverted patch ad4ec8d9235e: there must not be security limit on room configuration Goffi <goffi@goffi.org> parents: 1466 diff changeset	106 host.importMenu((D_("MUC"), D_("configure")), self._configureRoomMenu, security_limit=0, help_string=D_("Configure Multi-User Chat room"), type_=C.MENU_ROOM)
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	107 try:
1992 d5befe7253aa plugin XEP-0045: fixed typo in text commands Goffi <goffi@goffi.org> parents: 1990 diff changeset	108 self.text_cmds = self.host.plugins[C.TEXT_CMDS]
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	109 except KeyError:
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	110 log.info(_(u"Text commands not available"))
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	111 else:
1992 d5befe7253aa plugin XEP-0045: fixed typo in text commands Goffi <goffi@goffi.org> parents: 1990 diff changeset	112 self.text_cmds.registerTextCommands(self)
d5befe7253aa plugin XEP-0045: fixed typo in text commands Goffi <goffi@goffi.org> parents: 1990 diff changeset	113 self.text_cmds.addWhoIsCb(self._whois, 100)
507 f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	114
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	115 self._mam = self.host.plugins.get(u"XEP-0313")
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	116 self._si = self.host.plugins[u"XEP-0359"]
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	117
1239 b6dbac8ee485 plugin XEP-0045: handle MUC presence souliane <souliane@mailoo.org> parents: 1199 diff changeset	118 host.trigger.add("presence_available", self.presenceTrigger)
2822 5284be4c601b plugin XEP-0045: cache presences if they are received before the room is fully joined: Goffi <goffi@goffi.org> parents: 2815 diff changeset	119 host.trigger.add("presence_received", self.presenceReceivedTrigger)
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	120 host.trigger.add("MessageReceived", self.messageReceivedTrigger, priority=1000000)
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	121 host.trigger.add("message_parse", self._message_parseTrigger)
1239 b6dbac8ee485 plugin XEP-0045: handle MUC presence souliane <souliane@mailoo.org> parents: 1199 diff changeset	122
2144 1d3f73e065e1 core, jp: component handling + client handling refactoring: Goffi <goffi@goffi.org> parents: 2066 diff changeset	123 def profileConnected(self, client):
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	124 def assign_service(service):
e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	125 client.muc_service = service
2468 8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	126 return self.getMUCService(client).addCallback(assign_service)
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	127
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	128 def _message_parseTrigger(self, client, message_elt, data):
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	129 """Add stanza-id from the room if present"""
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	130 if message_elt.getAttribute(u"type") != C.MESS_TYPE_GROUPCHAT:
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	131 return True
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	132
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	133 # stanza_id will not be filled by parseMessage because the emitter
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	134 # is the room and not our server, so we have to parse it here
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	135 room_jid = data[u"from"].userhostJID()
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	136 stanza_id = self._si.getStanzaId(message_elt, room_jid)
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	137 if stanza_id:
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	138 data[u"extra"][u"stanza_id"] = stanza_id
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	139
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	140 def messageReceivedTrigger(self, client, message_elt, post_treat):
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	141 if message_elt.getAttribute("type") == C.MESS_TYPE_GROUPCHAT:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	142 if message_elt.subject or message_elt.delay:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	143 return False
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	144 from_jid = jid.JID(message_elt['from'])
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	145 room_jid = from_jid.userhostJID()
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	146 if room_jid in client._muc_client.joined_rooms:
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	147 room = client._muc_client.joined_rooms[room_jid]
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	148 if room.state != ROOM_STATE_LIVE:
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	149 if getattr(room, "_history_type", HISTORY_LEGACY) == HISTORY_LEGACY:
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	150 # With MAM history, order is different, and we can get live
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	151 # messages before history is complete, so this is not a warning
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	152 # but an expected case.
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	153 # On the other hand, with legacy history, it's not normal.
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	154 log.warning(_(
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	155 u"Received non delayed message in a room before its "
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	156 u"initialisation: state={state}, msg={msg}").format(
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	157 state=room.state,
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	158 msg=message_elt.toXml()))
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	159 room._cache.append(message_elt)
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	160 return False
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	161 else:
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	162 log.warning(u"Received groupchat message for a room which has not been "
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	163 u"joined, ignoring it: {}".format(message_elt.toXml()))
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	164 return False
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	165 return True
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	166
2844 fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	167 def getRoom(self, client, room_jid):
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	168 """Retrieve Room instance from its jid
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	169
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	170 @param room_jid(jid.JID): jid of the room
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	171 @raise exceptions.NotFound: the room has not been joined
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	172 """
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	173 try:
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	174 return client._muc_client.joined_rooms[room_jid]
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	175 except KeyError:
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	176 raise exceptions.NotFound(_(u"This room has not been joined"))
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	177
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	178 def checkRoomJoined(self, client, room_jid):
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	179 """Check that given room has been joined in current session
1083 e8731b02f5ea plugin XEP-0045: small refactorization + clean on profile's disconnection souliane <souliane@mailoo.org> parents: 1082 diff changeset	180
e8731b02f5ea plugin XEP-0045: small refactorization + clean on profile's disconnection souliane <souliane@mailoo.org> parents: 1082 diff changeset	181 @param room_jid (JID): room JID
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	182 """
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	183 if room_jid not in client._muc_client.joined_rooms:
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	184 raise exceptions.NotFound(_(u"This room has not been joined"))
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	185
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	186 def isJoinedRoom(self, client, room_jid):
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	187 """Tell if a jid is a known and joined room
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	188
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	189 @room_jid(jid.JID): jid of the room
1083 e8731b02f5ea plugin XEP-0045: small refactorization + clean on profile's disconnection souliane <souliane@mailoo.org> parents: 1082 diff changeset	190 """
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	191 try:
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	192 self.checkRoomJoined(client, room_jid)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	193 except exceptions.NotFound:
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	194 return False
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	195 else:
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	196 return True
1083 e8731b02f5ea plugin XEP-0045: small refactorization + clean on profile's disconnection souliane <souliane@mailoo.org> parents: 1082 diff changeset	197
2066 09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	198 def _getRoomJoinedArgs(self, room, profile):
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	199 return [
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	200 room.roomJID.userhost(),
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	201 XEP_0045._getOccupants(room),
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	202 room.nick,
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	203 room.subject,
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	204 profile
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	205 ]
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	206
1990 dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	207 def _UIRoomJoinCb(self, data, profile):
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	208 room_jid = jid.JID(data['index'])
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	209 client = self.host.getClient(profile)
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	210 self.join(client, room_jid)
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	211 return {}
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	212
1986 fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	213 def _passwordUICb(self, data, client, room_jid, nick):
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	214 """Called when the user has given room password (or cancelled)"""
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	215 if C.bool(data.get(C.XMLUI_DATA_CANCELLED, "false")):
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	216 log.info(u"room join for {} is cancelled".format(room_jid.userhost()))
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	217 raise failure.Failure(exceptions.CancelError(D_(u"Room joining cancelled by user")))
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	218 password = data[xml_tools.formEscape('password')]
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	219 return client._muc_client.join(room_jid, nick, password).addCallbacks(self._joinCb, self._joinEb, (client, room_jid, nick), errbackArgs=(client, room_jid, nick, password))
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	220
1990 dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	221 def _showListUI(self, items, client, service):
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	222 xmlui = xml_tools.XMLUI(title=D_('Rooms in {}'.format(service.full())))
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	223 adv_list = xmlui.changeContainer('advanced_list', columns=1, selectable='single', callback_id=self._room_join_id)
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	224 items = sorted(items, key=lambda i: i.name.lower())
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	225 for item in items:
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	226 adv_list.setRowIndex(item.entity.full())
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	227 xmlui.addText(item.name)
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	228 adv_list.end()
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	229 self.host.actionNew({'xmlui': xmlui.toXml()}, profile=client.profile)
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	230
1986 fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	231 def _joinCb(self, room, client, room_jid, nick):
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	232 """Called when the user is in the requested room"""
452 fd455b3ca6d4 plugin XEP-0045: room unlocking fix Goffi <goffi@goffi.org> parents: 451 diff changeset	233 if room.locked:
1358 bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	234 # FIXME: the current behaviour is to create an instant room
bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	235 # and send the signal only when the room is unlocked
bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	236 # a proper configuration management should be done
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	237 log.debug(_(u"room locked !"))
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	238 d = client._muc_client.configure(room.roomJID, {})
2990 6959c71ab8bf plugin XEP-0045: log "failure" on configure error Goffi <goffi@goffi.org> parents: 2986 diff changeset	239 d.addErrback(self.host.logErrback,
6959c71ab8bf plugin XEP-0045: log "failure" on configure error Goffi <goffi@goffi.org> parents: 2986 diff changeset	240 msg=_(u'Error while configuring the room: {failure_}'))
2066 09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	241 return room.fully_joined
319 5bb1cfc105d0 plugin xep-0045: misc improvments Goffi <goffi@goffi.org> parents: 291 diff changeset	242
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	243 def _joinEb(self, failure, client, room_jid, nick, password):
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	244 """Called when something is going wrong when joining the room"""
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	245 try:
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	246 condition = failure.value.condition
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	247 except AttributeError:
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	248 msg_suffix = ''
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	249 else:
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	250 if condition == 'conflict':
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	251 # we have a nickname conflict, we try again with "_" suffixed to current nickname
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	252 nick += '_'
1986 fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	253 return client._muc_client.join(room_jid, nick, password).addCallbacks(self._joinCb, self._joinEb, (client, room_jid, nick), errbackArgs=(client, room_jid, nick, password))
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	254 elif condition == 'not-allowed':
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	255 # room is restricted, we need a password
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	256 password_ui = xml_tools.XMLUI("form", title=D_(u'Room {} is restricted').format(room_jid.userhost()), submit_id='')
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	257 password_ui.addText(D_("This room is restricted, please enter the password"))
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	258 password_ui.addPassword('password')
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	259 d = xml_tools.deferXMLUI(self.host, password_ui, profile=client.profile)
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	260 d.addCallback(self._passwordUICb, client, room_jid, nick)
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	261 return d
fbd313cfd40b plugin xep-0045: ask for password when getting a "not-allowed" error Goffi <goffi@goffi.org> parents: 1984 diff changeset	262
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	263 msg_suffix = ' with condition "{}"'.format(failure.value.condition)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	264
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	265 mess = D_(u"Error while joining the room {room}{suffix}".format(
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	266 room = room_jid.userhost(), suffix = msg_suffix))
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 950 diff changeset	267 log.error(mess)
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	268 xmlui = xml_tools.note(mess, D_(u"Group chat error"), level=C.XMLUI_DATA_LVL_ERROR)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	269 self.host.actionNew({'xmlui': xmlui.toXml()}, profile=client.profile)
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	270
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	271 @staticmethod
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	272 def _getOccupants(room):
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	273 """Get occupants of a room in a form suitable for bridge"""
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	274 return {u.nick: {k:unicode(getattr(u,k) or '') for k in OCCUPANT_KEYS} for u in room.roster.values()}
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	275
2844 fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	276 def _getRoomOccupants(self, room_jid_s, profile_key):
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	277 client = self.host.getClient(profile_key)
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	278 room_jid = jid.JID(room_jid_s)
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	279 return self.getRoomOccupants(client, room_jid)
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	280
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	281 def getRoomOccupants(self, client, room_jid):
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	282 room = self.getRoom(client, room_jid)
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	283 return self._getOccupants(room)
fa1cc09df195 plugin XEP-0045: added getRoomOccupants/mucOccupantsGet method to retrieve occupants of a joined room. Goffi <goffi@goffi.org> parents: 2827 diff changeset	284
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	285 def _getRoomsJoined(self, profile_key=C.PROF_KEY_NONE):
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	286 client = self.host.getClient(profile_key)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	287 return self.getRoomsJoined(client)
1392 c7082457d03f memory, plugin XEP-0045: getMainResource returns None when asking a MUC entity + fixes /whois on a MUC (bare) entity souliane <souliane@mailoo.org> parents: 1384 diff changeset	288
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	289 def getRoomsJoined(self, client):
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	290 """Return rooms where user is"""
78 ace2af8abc5a Added method to know which MUC are joined, and which subjects were received. Goffi <goffi@goffi.org> parents: 77 diff changeset	291 result = []
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	292 for room in client._muc_client.joined_rooms.values():
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	293 if room.state == ROOM_STATE_LIVE:
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	294 result.append((room.roomJID.userhost(), self._getOccupants(room), room.nick, room.subject))
78 ace2af8abc5a Added method to know which MUC are joined, and which subjects were received. Goffi <goffi@goffi.org> parents: 77 diff changeset	295 return result
ace2af8abc5a Added method to know which MUC are joined, and which subjects were received. Goffi <goffi@goffi.org> parents: 77 diff changeset	296
2461 34cb8b713370 plugin XEP-0045: added mucNickGet to retrieve our nickname in a MUC room Goffi <goffi@goffi.org> parents: 2414 diff changeset	297 def _getRoomNick(self, room_jid_s, profile_key=C.PROF_KEY_NONE):
34cb8b713370 plugin XEP-0045: added mucNickGet to retrieve our nickname in a MUC room Goffi <goffi@goffi.org> parents: 2414 diff changeset	298 client = self.host.getClient(profile_key)
34cb8b713370 plugin XEP-0045: added mucNickGet to retrieve our nickname in a MUC room Goffi <goffi@goffi.org> parents: 2414 diff changeset	299 return self.getRoomNick(client, jid.JID(room_jid_s))
34cb8b713370 plugin XEP-0045: added mucNickGet to retrieve our nickname in a MUC room Goffi <goffi@goffi.org> parents: 2414 diff changeset	300
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	301 def getRoomNick(self, client, room_jid):
93 2f87651a5ad8 Tarot game: basic trick Goffi <goffi@goffi.org> parents: 91 diff changeset	302 """return nick used in room by user
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	303
1358 bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	304 @param room_jid (jid.JID): JID of the room
93 2f87651a5ad8 Tarot game: basic trick Goffi <goffi@goffi.org> parents: 91 diff changeset	305 @profile_key: profile
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	306 @return: nick or empty string in case of error
2461 34cb8b713370 plugin XEP-0045: added mucNickGet to retrieve our nickname in a MUC room Goffi <goffi@goffi.org> parents: 2414 diff changeset	307 @raise exceptions.Notfound: use has not joined the room
715 f47d7c09c60b plugins XEP-0045: added methods to get room nicks and "MUC user left" trigger souliane <souliane@mailoo.org> parents: 713 diff changeset	308 """
2461 34cb8b713370 plugin XEP-0045: added mucNickGet to retrieve our nickname in a MUC room Goffi <goffi@goffi.org> parents: 2414 diff changeset	309 self.checkRoomJoined(client, room_jid)
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	310 return client._muc_client.joined_rooms[room_jid].nick
715 f47d7c09c60b plugins XEP-0045: added methods to get room nicks and "MUC user left" trigger souliane <souliane@mailoo.org> parents: 713 diff changeset	311
916 1a759096ccbd core: use of Const for profile_key + replaced '@DEFAULT@' default profile_key by '@NONE@' Goffi <goffi@goffi.org> parents: 811 diff changeset	312 def _configureRoom(self, room_jid_s, profile_key=C.PROF_KEY_NONE):
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	313 client = self.host.getClient(profile_key)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	314 d = self.configureRoom(client, jid.JID(room_jid_s))
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	315 d.addCallback(lambda xmlui: xmlui.toXml())
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	316 return d
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	317
1094 4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	318 def _configureRoomMenu(self, menu_data, profile):
4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	319 """Return room configuration form
1135 3158f9e08760 plugin OTR: a warning is logged when Account is instancied with a bare jid. Goffi <goffi@goffi.org> parents: 1101 diff changeset	320
1094 4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	321 @param menu_data: %(menu_data)s
4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	322 @param profile: %(doc_profile)s
4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	323 """
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	324 client = self.host.getClient(profile)
1094 4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	325 try:
4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	326 room_jid = jid.JID(menu_data['room_jid'])
4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	327 except KeyError:
4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	328 log.error(_("room_jid key is not present !"))
4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	329 return defer.fail(exceptions.DataError)
1358 bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	330
1094 4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	331 def xmluiReceived(xmlui):
2584 f8e4d855001e plugin XEP-0045: display a note when no configuration is available on the room Goffi <goffi@goffi.org> parents: 2583 diff changeset	332 if not xmlui:
f8e4d855001e plugin XEP-0045: display a note when no configuration is available on the room Goffi <goffi@goffi.org> parents: 2583 diff changeset	333 msg = D_(u"No configuration available for this room")
f8e4d855001e plugin XEP-0045: display a note when no configuration is available on the room Goffi <goffi@goffi.org> parents: 2583 diff changeset	334 return {"xmlui": xml_tools.note(msg).toXml()}
1094 4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	335 return {"xmlui": xmlui.toXml()}
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	336 return self.configureRoom(client, room_jid).addCallback(xmluiReceived)
1094 4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	337
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	338 def configureRoom(self, client, room_jid):
1094 4286a19e9e8a pluging XEP-0045: configure room dynamic menu Goffi <goffi@goffi.org> parents: 1083 diff changeset	339 """return the room configuration form
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	340
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	341 @param room: jid of the room to configure
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	342 @return: configuration form as XMLUI
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	343 """
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	344 self.checkRoomJoined(client, room_jid)
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	345
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	346 def config2XMLUI(result):
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	347 if not result:
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	348 return ""
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	349 session_id, session_data = self._sessions.newSession(profile=client.profile)
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	350 session_data["room_jid"] = room_jid
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	351 xmlui = xml_tools.dataForm2XMLUI(result, submit_id=self.__submit_conf_id)
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	352 xmlui.session_id = session_id
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	353 return xmlui
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	354
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	355 d = client._muc_client.getConfiguration(room_jid)
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	356 d.addCallback(config2XMLUI)
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	357 return d
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	358
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	359 def _submitConfiguration(self, raw_data, profile):
2583 8378806a70fe plugin XEP-0045: fixed room configuration cancellation Goffi <goffi@goffi.org> parents: 2581 diff changeset	360 cancelled = C.bool(raw_data.get("cancelled", C.BOOL_FALSE))
8378806a70fe plugin XEP-0045: fixed room configuration cancellation Goffi <goffi@goffi.org> parents: 2581 diff changeset	361 if cancelled:
8378806a70fe plugin XEP-0045: fixed room configuration cancellation Goffi <goffi@goffi.org> parents: 2581 diff changeset	362 return defer.succeed({})
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	363 client = self.host.getClient(profile)
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	364 try:
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	365 session_data = self._sessions.profileGet(raw_data["session_id"], profile)
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	366 except KeyError:
1068 1513511a0586 plugin XEP-0045: room configuration returns a success or failure message souliane <souliane@mailoo.org> parents: 1007 diff changeset	367 log.warning(D_("Session ID doesn't exist, session has probably expired."))
1513511a0586 plugin XEP-0045: room configuration returns a success or failure message souliane <souliane@mailoo.org> parents: 1007 diff changeset	368 _dialog = xml_tools.XMLUI('popup', title=D_('Room configuration failed'))
1513511a0586 plugin XEP-0045: room configuration returns a success or failure message souliane <souliane@mailoo.org> parents: 1007 diff changeset	369 _dialog.addText(D_("Session ID doesn't exist, session has probably expired."))
1513511a0586 plugin XEP-0045: room configuration returns a success or failure message souliane <souliane@mailoo.org> parents: 1007 diff changeset	370 return defer.succeed({'xmlui': _dialog.toXml()})
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	371
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	372 data = xml_tools.XMLUIResult2DataFormResult(raw_data)
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	373 d = client._muc_client.configure(session_data['room_jid'], data)
1068 1513511a0586 plugin XEP-0045: room configuration returns a success or failure message souliane <souliane@mailoo.org> parents: 1007 diff changeset	374 _dialog = xml_tools.XMLUI('popup', title=D_('Room configuration succeed'))
1513511a0586 plugin XEP-0045: room configuration returns a success or failure message souliane <souliane@mailoo.org> parents: 1007 diff changeset	375 _dialog.addText(D_("The new settings have been saved."))
1513511a0586 plugin XEP-0045: room configuration returns a success or failure message souliane <souliane@mailoo.org> parents: 1007 diff changeset	376 d.addCallback(lambda ignore: {'xmlui': _dialog.toXml()})
801 02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	377 del self._sessions[raw_data["session_id"]]
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	378 return d
02ee9ef95277 plugin XEP-0045, primitivus: added MUC configuration Goffi <goffi@goffi.org> parents: 791 diff changeset	379
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	380 def isNickInRoom(self, client, room_jid, nick):
522 3446ce33247d plugin XEP-0045: added isNickInRoom method Goffi <goffi@goffi.org> parents: 519 diff changeset	381 """Tell if a nick is currently present in a room"""
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	382 self.checkRoomJoined(client, room_jid)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	383 return client._muc_client.joined_rooms[room_jid].inRoster(muc.User(nick))
78 ace2af8abc5a Added method to know which MUC are joined, and which subjects were received. Goffi <goffi@goffi.org> parents: 77 diff changeset	384
2468 8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	385 def _getMUCService(self, jid_=None, profile=C.PROF_KEY_NONE):
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	386 client = self.host.getClient(profile)
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	387 d = self.getMUCService(client, jid_ or None)
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	388 d.addCallback(lambda service_jid: service_jid.full() if service_jid is not None else u'')
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	389 return d
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	390
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	391 @defer.inlineCallbacks
2468 8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	392 def getMUCService(self, client, jid_=None):
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	393 """Return first found MUC service of an entity
e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	394
e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	395 @param jid_: entity which may have a MUC service, or None for our own server
2468 8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	396 @return (jid.JID, None): found service jid or None
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	397 """
2468 8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	398 if jid_ is None:
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	399 try:
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	400 muc_service = client.muc_service
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	401 except AttributeError:
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	402 pass
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	403 else:
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	404 # we have a cached value, we return it
8f14c1865e9e plugin XEP-0045: new mucGetService bridge method to retrieve MUC service of the server. Goffi <goffi@goffi.org> parents: 2461 diff changeset	405 defer.returnValue(muc_service)
2148 a543eda2c923 core (memory/disco): getInfos now handle node + use client instead of profile in many methods Goffi <goffi@goffi.org> parents: 2145 diff changeset	406 services = yield self.host.findServiceEntities(client, "conference", "text", jid_)
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	407 for service in services:
1358 bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	408 if ".irc." not in service.userhost():
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	409 # FIXME:
e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	410 # This ugly hack is here to avoid an issue with openfire: the IRC gateway
e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	411 # use "conference/text" identity (instead of "conference/irc")
712 f610864eb7a5 plugins (MUC, tools, games): generalize the generation of a unique room name when joining a MUC and no room is specified: souliane <souliane@mailoo.org> parents: 609 diff changeset	412 muc_service = service
f610864eb7a5 plugins (MUC, tools, games): generalize the generation of a unique room name when joining a MUC and no room is specified: souliane <souliane@mailoo.org> parents: 609 diff changeset	413 break
2613 9680cd958529 plugin XEP-0045: fixed crash when muc service is not found Goffi <goffi@goffi.org> parents: 2584 diff changeset	414 else:
9680cd958529 plugin XEP-0045: fixed crash when muc service is not found Goffi <goffi@goffi.org> parents: 2584 diff changeset	415 muc_service = None
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	416 defer.returnValue(muc_service)
712 f610864eb7a5 plugins (MUC, tools, games): generalize the generation of a unique room name when joining a MUC and no room is specified: souliane <souliane@mailoo.org> parents: 609 diff changeset	417
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	418 def _getUniqueName(self, muc_service="", profile_key=C.PROF_KEY_NONE):
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	419 client = self.host.getClient(profile_key)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	420 return self.getUniqueName(client, muc_service or None).full()
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	421
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	422 def getUniqueName(self, client, muc_service=None):
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	423 """Return unique name for a room, avoiding collision
e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	424
1356 c01cbd8fc8dd plugin XEP-0045: make joinMUC asynchronous and fixes its handler souliane <souliane@mailoo.org> parents: 1315 diff changeset	425 @param muc_service (jid.JID) : leave empty string to use the default service
c01cbd8fc8dd plugin XEP-0045: make joinMUC asynchronous and fixes its handler souliane <souliane@mailoo.org> parents: 1315 diff changeset	426 @return: jid.JID (unique room bare JID)
712 f610864eb7a5 plugins (MUC, tools, games): generalize the generation of a unique room name when joining a MUC and no room is specified: souliane <souliane@mailoo.org> parents: 609 diff changeset	427 """
1358 bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	428 # TODO: we should use #RFC-0045 10.1.4 when available here
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	429 room_name = unicode(uuid.uuid4())
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	430 if muc_service is None:
e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	431 try:
e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	432 muc_service = client.muc_service
e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	433 except AttributeError:
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	434 raise exceptions.NotReady(u"Main server MUC service has not been checked yet")
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	435 if muc_service is None:
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 950 diff changeset	436 log.warning(_("No MUC service found on main server"))
944 e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	437 raise exceptions.FeatureNotFound
e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	438
e1842ebcb2f3 core, plugin XEP-0115: discovery refactoring: Goffi <goffi@goffi.org> parents: 928 diff changeset	439 muc_service = muc_service.userhost()
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	440 return jid.JID(u"{}@{}".format(room_name, muc_service))
319 5bb1cfc105d0 plugin xep-0045: misc improvments Goffi <goffi@goffi.org> parents: 291 diff changeset	441
1407 77f07ea90420 plugin XEP-0045, quick_frontend, primitivus: replace C.DEFAULT_MUC by bridge method getDefaultMUC (value is defined in plugin XEP-0045 and can be overriden with the config file) souliane <souliane@mailoo.org> parents: 1396 diff changeset	442 def getDefaultMUC(self):
77f07ea90420 plugin XEP-0045, quick_frontend, primitivus: replace C.DEFAULT_MUC by bridge method getDefaultMUC (value is defined in plugin XEP-0045 and can be overriden with the config file) souliane <souliane@mailoo.org> parents: 1396 diff changeset	443 """Return the default MUC.
77f07ea90420 plugin XEP-0045, quick_frontend, primitivus: replace C.DEFAULT_MUC by bridge method getDefaultMUC (value is defined in plugin XEP-0045 and can be overriden with the config file) souliane <souliane@mailoo.org> parents: 1396 diff changeset	444
77f07ea90420 plugin XEP-0045, quick_frontend, primitivus: replace C.DEFAULT_MUC by bridge method getDefaultMUC (value is defined in plugin XEP-0045 and can be overriden with the config file) souliane <souliane@mailoo.org> parents: 1396 diff changeset	445 @return: unicode
77f07ea90420 plugin XEP-0045, quick_frontend, primitivus: replace C.DEFAULT_MUC by bridge method getDefaultMUC (value is defined in plugin XEP-0045 and can be overriden with the config file) souliane <souliane@mailoo.org> parents: 1396 diff changeset	446 """
77f07ea90420 plugin XEP-0045, quick_frontend, primitivus: replace C.DEFAULT_MUC by bridge method getDefaultMUC (value is defined in plugin XEP-0045 and can be overriden with the config file) souliane <souliane@mailoo.org> parents: 1396 diff changeset	447 return self.host.memory.getConfig(CONFIG_SECTION, 'default_muc', default_conf['default_muc'])
77f07ea90420 plugin XEP-0045, quick_frontend, primitivus: replace C.DEFAULT_MUC by bridge method getDefaultMUC (value is defined in plugin XEP-0045 and can be overriden with the config file) souliane <souliane@mailoo.org> parents: 1396 diff changeset	448
2066 09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	449 def _join_eb(self, failure_, client):
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	450 failure_.trap(AlreadyJoined)
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	451 room = failure_.value.room
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	452 return [True] + self._getRoomJoinedArgs(room, client.profile)
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	453
2028 70bd7b242a9e plugin XEP-0045: fixed options parameter handling in bridge callback Goffi <goffi@goffi.org> parents: 2021 diff changeset	454 def _join(self, room_jid_s, nick, options, profile_key=C.PROF_KEY_NONE):
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	455 """join method used by bridge
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	456
2461 34cb8b713370 plugin XEP-0045: added mucNickGet to retrieve our nickname in a MUC room Goffi <goffi@goffi.org> parents: 2414 diff changeset	457 @return (tuple): already_joined boolean + room joined arguments (see [_getRoomJoinedArgs])
712 f610864eb7a5 plugins (MUC, tools, games): generalize the generation of a unique room name when joining a MUC and no room is specified: souliane <souliane@mailoo.org> parents: 609 diff changeset	458 """
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	459 client = self.host.getClient(profile_key)
1356 c01cbd8fc8dd plugin XEP-0045: make joinMUC asynchronous and fixes its handler souliane <souliane@mailoo.org> parents: 1315 diff changeset	460 if room_jid_s:
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	461 muc_service = client.muc_service
1356 c01cbd8fc8dd plugin XEP-0045: make joinMUC asynchronous and fixes its handler souliane <souliane@mailoo.org> parents: 1315 diff changeset	462 try:
c01cbd8fc8dd plugin XEP-0045: make joinMUC asynchronous and fixes its handler souliane <souliane@mailoo.org> parents: 1315 diff changeset	463 room_jid = jid.JID(room_jid_s)
c01cbd8fc8dd plugin XEP-0045: make joinMUC asynchronous and fixes its handler souliane <souliane@mailoo.org> parents: 1315 diff changeset	464 except (RuntimeError, jid.InvalidFormat, AttributeError):
2170 d246666ebe25 i18n: updated sat.po Goffi <goffi@goffi.org> parents: 2149 diff changeset	465 return defer.fail(jid.InvalidFormat(_(u"Invalid room identifier: {room_id}'. Please give a room short or full identifier like 'room' or 'room@{muc_service}'.").format(
d246666ebe25 i18n: updated sat.po Goffi <goffi@goffi.org> parents: 2149 diff changeset	466 room_id=room_jid_s,
d246666ebe25 i18n: updated sat.po Goffi <goffi@goffi.org> parents: 2149 diff changeset	467 muc_service=unicode(muc_service))))
1384 73f8582c7c99 plugins XEP-0045, XEP-0249: allow to join / invite without specifying the JID's host part (use client's values) souliane <souliane@mailoo.org> parents: 1381 diff changeset	468 if not room_jid.user:
73f8582c7c99 plugins XEP-0045, XEP-0249: allow to join / invite without specifying the JID's host part (use client's values) souliane <souliane@mailoo.org> parents: 1381 diff changeset	469 room_jid.user, room_jid.host = room_jid.host, muc_service
1356 c01cbd8fc8dd plugin XEP-0045: make joinMUC asynchronous and fixes its handler souliane <souliane@mailoo.org> parents: 1315 diff changeset	470 else:
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	471 room_jid = self.getUniqueName(profile_key=client.profile)
743 5a131930348d plugin XEP-0045: remove redondant errback from _join souliane <souliane@mailoo.org> parents: 742 diff changeset	472 # TODO: error management + signal in bridge
2028 70bd7b242a9e plugin XEP-0045: fixed options parameter handling in bridge callback Goffi <goffi@goffi.org> parents: 2021 diff changeset	473 d = self.join(client, room_jid, nick, options or None)
2066 09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	474 d.addCallback(lambda room: [False] + self._getRoomJoinedArgs(room, client.profile))
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	475 d.addErrback(self._join_eb, client)
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	476 return d
505 2402668b5d05 plugin xep-0045: nick change management Goffi <goffi@goffi.org> parents: 488 diff changeset	477
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	478 def join(self, client, room_jid, nick=None, options=None):
757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	479 if not nick:
757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	480 nick = client.jid.user
757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	481 if options is None:
757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	482 options = {}
1977 bdc6a5b07922 plugin XEP-0045: fixed calls to join, nick, kick, ban and affiliate Goffi <goffi@goffi.org> parents: 1970 diff changeset	483 if room_jid in client._muc_client.joined_rooms:
2066 09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	484 room = client._muc_client.joined_rooms[room_jid]
3002 6acaa8244220 plugin 0249: fixed invitation handling + some improvments: Goffi <goffi@goffi.org> parents: 2994 diff changeset	485 log.info(_(u'{profile} is already in room {room_jid}').format(
6acaa8244220 plugin 0249: fixed invitation handling + some improvments: Goffi <goffi@goffi.org> parents: 2994 diff changeset	486 profile=client.profile, room_jid = room_jid.userhost()))
2066 09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	487 return defer.fail(AlreadyJoined(room))
3002 6acaa8244220 plugin 0249: fixed invitation handling + some improvments: Goffi <goffi@goffi.org> parents: 2994 diff changeset	488 log.info(_(u"[{profile}] is joining room {room} with nick {nick}").format(
6acaa8244220 plugin 0249: fixed invitation handling + some improvments: Goffi <goffi@goffi.org> parents: 2994 diff changeset	489 profile=client.profile, room=room_jid.userhost(), nick=nick))
1977 bdc6a5b07922 plugin XEP-0045: fixed calls to join, nick, kick, ban and affiliate Goffi <goffi@goffi.org> parents: 1970 diff changeset	490
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	491 password = options.get("password")
1977 bdc6a5b07922 plugin XEP-0045: fixed calls to join, nick, kick, ban and affiliate Goffi <goffi@goffi.org> parents: 1970 diff changeset	492
3002 6acaa8244220 plugin 0249: fixed invitation handling + some improvments: Goffi <goffi@goffi.org> parents: 2994 diff changeset	493 d = client._muc_client.join(room_jid, nick, password)
6acaa8244220 plugin 0249: fixed invitation handling + some improvments: Goffi <goffi@goffi.org> parents: 2994 diff changeset	494 d.addCallbacks(self._joinCb, self._joinEb,
6acaa8244220 plugin 0249: fixed invitation handling + some improvments: Goffi <goffi@goffi.org> parents: 2994 diff changeset	495 (client, room_jid, nick),
6acaa8244220 plugin 0249: fixed invitation handling + some improvments: Goffi <goffi@goffi.org> parents: 2994 diff changeset	496 errbackArgs=(client, room_jid, nick, password))
6acaa8244220 plugin 0249: fixed invitation handling + some improvments: Goffi <goffi@goffi.org> parents: 2994 diff changeset	497 return d
1977 bdc6a5b07922 plugin XEP-0045: fixed calls to join, nick, kick, ban and affiliate Goffi <goffi@goffi.org> parents: 1970 diff changeset	498
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	499 def _nick(self, room_jid_s, nick, profile_key=C.PROF_KEY_NONE):
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	500 client = self.host.getClient(profile_key)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	501 return self.nick(client, jid.JID(room_jid_s), nick)
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	502
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	503 def nick(self, client, room_jid, nick):
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	504 """Change nickname in a room"""
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	505 self.checkRoomJoined(client, room_jid)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	506 return client._muc_client.nick(room_jid, nick)
507 f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	507
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	508 def _leave(self, room_jid, profile_key):
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	509 client = self.host.getClient(profile_key)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	510 return self.leave(client, jid.JID(room_jid))
515 29b5ef129488 plugin XEP-0045, plugin text commands: added '/title' command Goffi <goffi@goffi.org> parents: 509 diff changeset	511
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	512 def leave(self, client, room_jid):
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	513 self.checkRoomJoined(client, room_jid)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	514 return client._muc_client.leave(room_jid)
505 2402668b5d05 plugin xep-0045: nick change management Goffi <goffi@goffi.org> parents: 488 diff changeset	515
2021 6c51e8f17c92 plugin XEP-0045: added bridge method to change subject Goffi <goffi@goffi.org> parents: 1992 diff changeset	516 def _subject(self, room_jid_s, new_subject, profile_key):
6c51e8f17c92 plugin XEP-0045: added bridge method to change subject Goffi <goffi@goffi.org> parents: 1992 diff changeset	517 client = self.host.getClient(profile_key)
6c51e8f17c92 plugin XEP-0045: added bridge method to change subject Goffi <goffi@goffi.org> parents: 1992 diff changeset	518 return self.subject(client, jid.JID(room_jid_s), new_subject)
6c51e8f17c92 plugin XEP-0045: added bridge method to change subject Goffi <goffi@goffi.org> parents: 1992 diff changeset	519
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	520 def subject(self, client, room_jid, subject):
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	521 self.checkRoomJoined(client, room_jid)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	522 return client._muc_client.subject(room_jid, subject)
507 f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	523
2144 1d3f73e065e1 core, jp: component handling + client handling refactoring: Goffi <goffi@goffi.org> parents: 2066 diff changeset	524 def getHandler(self, client):
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	525 # create a MUC client and associate it with profile' session
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	526 muc_client = client._muc_client = SatMUCClient(self)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	527 return muc_client
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	528
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	529 def kick(self, client, nick, room_jid, options=None):
2689 d715d912afac plugin XEP-0199: implementation of XMPP Ping Goffi <goffi@goffi.org> parents: 2613 diff changeset	530 """Kick a participant from the room
d715d912afac plugin XEP-0199: implementation of XMPP Ping Goffi <goffi@goffi.org> parents: 2613 diff changeset	531
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	532 @param nick (str): nick of the user to kick
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	533 @param room_jid_s (JID): jid of the room
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	534 @param options (dict): attribute with extra info (reason, password) as in #XEP-0045
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	535 """
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	536 if options is None:
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	537 options = {}
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	538 self.checkRoomJoined(client, room_jid)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	539 return client._muc_client.kick(room_jid, nick, reason=options.get('reason', None))
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	540
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	541 def ban(self, client, entity_jid, room_jid, options=None):
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	542 """Ban an entity from the room
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	543
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	544 @param entity_jid (JID): bare jid of the entity to be banned
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	545 @param room_jid (JID): jid of the room
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	546 @param options: attribute with extra info (reason, password) as in #XEP-0045
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	547 """
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	548 self.checkRoomJoined(client, room_jid)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	549 if options is None:
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	550 options = {}
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	551 assert not entity_jid.resource
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	552 assert not room_jid.resource
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	553 return client._muc_client.ban(room_jid, entity_jid, reason=options.get('reason', None))
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	554
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	555 def affiliate(self, client, entity_jid, room_jid, options):
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	556 """Change the affiliation of an entity
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	557
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	558 @param entity_jid (JID): bare jid of the entity
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	559 @param room_jid_s (JID): jid of the room
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	560 @param options: attribute with extra info (reason, nick) as in #XEP-0045
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	561 """
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	562 self.checkRoomJoined(client, room_jid)
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	563 assert not entity_jid.resource
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	564 assert not room_jid.resource
200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	565 assert 'affiliation' in options
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	566 # TODO: handles reason and nick
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	567 return client._muc_client.modifyAffiliationList(room_jid, [entity_jid], options['affiliation'])
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	568
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	569 # Text commands #
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	570
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	571 def cmd_nick(self, client, mess_data):
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	572 """change nickname
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	573
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	574 @command (group): new_nick
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	575 - new_nick: new nick to use
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	576 """
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	577 nick = mess_data["unparsed"].strip()
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	578 if nick:
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	579 room = mess_data["to"]
1977 bdc6a5b07922 plugin XEP-0045: fixed calls to join, nick, kick, ban and affiliate Goffi <goffi@goffi.org> parents: 1970 diff changeset	580 self.nick(client, room, nick)
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	581
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	582 return False
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	583
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	584 def cmd_join(self, client, mess_data):
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	585 """join a new room
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	586
1381 0d12d4e32664 plugin XEP-0045: /join text command can be used in all contexts, not only group Goffi <goffi@goffi.org> parents: 1371 diff changeset	587 @command (all): JID
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	588 - JID: room to join (on the same service if full jid is not specified)
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	589 """
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	590 if mess_data["unparsed"].strip():
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	591 room_jid = self.text_cmds.getRoomJID(mess_data["unparsed"].strip(), mess_data["to"].host)
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	592 nick = (self.getRoomNick(client, room_jid) or
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	593 client.jid.user)
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	594 self.join(client, room_jid, nick, {})
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	595
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	596 return False
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	597
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	598 def cmd_leave(self, client, mess_data):
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	599 """quit a room
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	600
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	601 @command (group): [ROOM_JID]
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	602 - ROOM_JID: jid of the room to live (current room if not specified)
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	603 """
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	604 if mess_data["unparsed"].strip():
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	605 room = self.text_cmds.getRoomJID(mess_data["unparsed"].strip(), mess_data["to"].host)
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	606 else:
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	607 room = mess_data["to"]
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	608
1977 bdc6a5b07922 plugin XEP-0045: fixed calls to join, nick, kick, ban and affiliate Goffi <goffi@goffi.org> parents: 1970 diff changeset	609 self.leave(client, room)
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	610
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	611 return False
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	612
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	613 def cmd_part(self, client, mess_data):
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	614 """just a synonym of /leave
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	615
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	616 @command (group): [ROOM_JID]
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	617 - ROOM_JID: jid of the room to live (current room if not specified)
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	618 """
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	619 return self.cmd_leave(client, mess_data)
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	620
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	621 def cmd_kick(self, client, mess_data):
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	622 """kick a room member
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	623
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	624 @command (group): ROOM_NICK
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	625 - ROOM_NICK: the nick of the person to kick
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	626 """
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	627 options = mess_data["unparsed"].strip().split()
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	628 try:
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	629 nick = options[0]
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	630 assert self.isNickInRoom(client, mess_data["to"], nick)
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	631 except (IndexError, AssertionError):
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	632 feedback = _(u"You must provide a member's nick to kick.")
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	633 self.text_cmds.feedBack(client, feedback, mess_data)
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	634 return False
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	635
1977 bdc6a5b07922 plugin XEP-0045: fixed calls to join, nick, kick, ban and affiliate Goffi <goffi@goffi.org> parents: 1970 diff changeset	636 d = self.kick(client, nick, mess_data["to"], {} if len(options) == 1 else {'reason': options[1]})
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	637
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	638 def cb(__):
1890 0a45bc8e7cf4 plugin XEP-0045: fixed feedback for /kick /ban and /afficiliate commands which should not be public Goffi <goffi@goffi.org> parents: 1789 diff changeset	639 feedback_msg = _(u'You have kicked {}').format(nick)
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	640 if len(options) > 1:
1890 0a45bc8e7cf4 plugin XEP-0045: fixed feedback for /kick /ban and /afficiliate commands which should not be public Goffi <goffi@goffi.org> parents: 1789 diff changeset	641 feedback_msg += _(u' for the following reason: {}').format(options[1])
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	642 self.text_cmds.feedBack(client, feedback_msg, mess_data)
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	643 return True
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	644 d.addCallback(cb)
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	645 return d
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	646
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	647 def cmd_ban(self, client, mess_data):
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	648 """ban an entity from the room
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	649
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	650 @command (group): (JID) [reason]
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	651 - JID: the JID of the entity to ban
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	652 - reason: the reason why this entity is being banned
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	653 """
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	654 options = mess_data["unparsed"].strip().split()
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	655 try:
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	656 jid_s = options[0]
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	657 entity_jid = jid.JID(jid_s).userhostJID()
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	658 assert(entity_jid.user)
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	659 assert(entity_jid.host)
1742 244a605623d6 complete the Exception's list when catching JID error: souliane <souliane@mailoo.org> parents: 1700 diff changeset	660 except (RuntimeError, jid.InvalidFormat, AttributeError, IndexError, AssertionError):
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	661 feedback = _(u"You must provide a valid JID to ban, like in '/ban contact@example.net'")
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	662 self.text_cmds.feedBack(client, feedback, mess_data)
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	663 return False
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	664
1977 bdc6a5b07922 plugin XEP-0045: fixed calls to join, nick, kick, ban and affiliate Goffi <goffi@goffi.org> parents: 1970 diff changeset	665 d = self.ban(client, entity_jid, mess_data["to"], {} if len(options) == 1 else {'reason': options[1]})
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	666
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	667 def cb(__):
1890 0a45bc8e7cf4 plugin XEP-0045: fixed feedback for /kick /ban and /afficiliate commands which should not be public Goffi <goffi@goffi.org> parents: 1789 diff changeset	668 feedback_msg = _(u'You have banned {}').format(entity_jid)
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	669 if len(options) > 1:
1890 0a45bc8e7cf4 plugin XEP-0045: fixed feedback for /kick /ban and /afficiliate commands which should not be public Goffi <goffi@goffi.org> parents: 1789 diff changeset	670 feedback_msg += _(u' for the following reason: {}').format(options[1])
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	671 self.text_cmds.feedBack(client, feedback_msg, mess_data)
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	672 return True
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	673 d.addCallback(cb)
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	674 return d
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	675
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	676 def cmd_affiliate(self, client, mess_data):
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	677 """affiliate an entity to the room
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	678
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	679 @command (group): (JID) [owner\|admin\|member\|none\|outcast]
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	680 - JID: the JID of the entity to affiliate
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	681 - owner: grant owner privileges
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	682 - admin: grant admin privileges
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	683 - member: grant member privileges
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	684 - none: reset entity privileges
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	685 - outcast: ban entity
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	686 """
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	687 options = mess_data["unparsed"].strip().split()
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	688 try:
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	689 jid_s = options[0]
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	690 entity_jid = jid.JID(jid_s).userhostJID()
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	691 assert(entity_jid.user)
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	692 assert(entity_jid.host)
1742 244a605623d6 complete the Exception's list when catching JID error: souliane <souliane@mailoo.org> parents: 1700 diff changeset	693 except (RuntimeError, jid.InvalidFormat, AttributeError, IndexError, AssertionError):
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	694 feedback = _(u"You must provide a valid JID to affiliate, like in '/affiliate contact@example.net member'")
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	695 self.text_cmds.feedBack(client, feedback, mess_data)
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	696 return False
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	697
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	698 affiliation = options[1] if len(options) > 1 else 'none'
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	699 if affiliation not in AFFILIATIONS:
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	700 feedback = _(u"You must provide a valid affiliation: %s") % ' '.join(AFFILIATIONS)
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	701 self.text_cmds.feedBack(client, feedback, mess_data)
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	702 return False
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	703
1977 bdc6a5b07922 plugin XEP-0045: fixed calls to join, nick, kick, ban and affiliate Goffi <goffi@goffi.org> parents: 1970 diff changeset	704 d = self.affiliate(client, entity_jid, mess_data["to"], {'affiliation': affiliation})
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	705
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	706 def cb(__):
1890 0a45bc8e7cf4 plugin XEP-0045: fixed feedback for /kick /ban and /afficiliate commands which should not be public Goffi <goffi@goffi.org> parents: 1789 diff changeset	707 feedback_msg = _(u'New affiliation for %(entity)s: %(affiliation)s').format(entity=entity_jid, affiliation=affiliation)
1989 757c512fe06c plugin XEP-0045: various fixes/improvments: Goffi <goffi@goffi.org> parents: 1986 diff changeset	708 self.text_cmds.feedBack(client, feedback_msg, mess_data)
1082 246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	709 return True
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	710 d.addCallback(cb)
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	711 return d
246712d2e7bc plugin XEP-0045, text_commands: add some commands: souliane <souliane@mailoo.org> parents: 1068 diff changeset	712
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	713 def cmd_title(self, client, mess_data):
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	714 """change room's subject
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	715
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	716 @command (group): title
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	717 - title: new room subject
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	718 """
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	719 subject = mess_data["unparsed"].strip()
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	720
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	721 if subject:
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	722 room = mess_data["to"]
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	723 self.subject(client, room, subject)
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	724
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	725 return False
d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	726
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	727 def cmd_topic(self, client, mess_data):
1371 876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	728 """just a synonym of /title
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	729
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	730 @command (group): title
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	731 - title: new room subject
876c9fbd0b3d plugin text command, XEP-0045, XEP-0048, XEP-0249: removed feedBackWrongContext which is no more usefull with new _contextValid method Goffi <goffi@goffi.org> parents: 1358 diff changeset	732 """
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	733 return self.cmd_title(client, mess_data)
926 d609581bf74a plugin text commands: refactoring, text now only contain main commands, and other plugin can add commands themselve: Goffi <goffi@goffi.org> parents: 916 diff changeset	734
1990 dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	735 def cmd_list(self, client, mess_data):
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	736 """list available rooms in a muc server
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	737
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	738 @command (all): [MUC_SERVICE]
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	739 - MUC_SERVICE: service to request
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	740 empty value will request room's service for a room,
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	741 or user's server default MUC service in a one2one chat
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	742 """
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	743 unparsed = mess_data["unparsed"].strip()
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	744 try:
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	745 service = jid.JID(unparsed)
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	746 except RuntimeError:
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	747 if mess_data['type'] == C.MESS_TYPE_GROUPCHAT:
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	748 room_jid = mess_data["to"]
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	749 service = jid.JID(room_jid.host)
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	750 elif client.muc_service is not None:
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	751 service = client.muc_service
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	752 else:
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	753 msg = D_(u"No known default MUC service".format(unparsed))
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	754 self.text_cmds.feedBack(client, msg, mess_data)
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	755 return False
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	756 except jid.InvalidFormat:
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	757 msg = D_(u"{} is not a valid JID!".format(unparsed))
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	758 self.text_cmds.feedBack(client, msg, mess_data)
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	759 return False
2148 a543eda2c923 core (memory/disco): getInfos now handle node + use client instead of profile in many methods Goffi <goffi@goffi.org> parents: 2145 diff changeset	760 d = self.host.getDiscoItems(client, service)
1990 dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	761 d.addCallback(self._showListUI, client, service)
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	762
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	763 return False
dfbe0bb056dc plugin XEP-0045: added /list text command: Goffi <goffi@goffi.org> parents: 1989 diff changeset	764
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	765 def _whois(self, client, whois_msg, mess_data, target_jid):
1199 96fb74a4714d misc: fixed some typos Matteo Cypriani <mcy@lm7.fr> parents: 1135 diff changeset	766 """ Add MUC user information to whois """
928 73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	767 if mess_data['type'] != "groupchat":
73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	768 return
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	769 if target_jid.userhostJID() not in client._muc_client.joined_rooms:
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 950 diff changeset	770 log.warning(_("This room has not been joined"))
928 73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	771 return
1392 c7082457d03f memory, plugin XEP-0045: getMainResource returns None when asking a MUC entity + fixes /whois on a MUC (bare) entity souliane <souliane@mailoo.org> parents: 1384 diff changeset	772 if not target_jid.resource:
c7082457d03f memory, plugin XEP-0045: getMainResource returns None when asking a MUC entity + fixes /whois on a MUC (bare) entity souliane <souliane@mailoo.org> parents: 1384 diff changeset	773 return
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	774 user = client._muc_client.joined_rooms[target_jid.userhostJID()].getUser(target_jid.resource)
928 73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	775 whois_msg.append(_("Nickname: %s") % user.nick)
73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	776 if user.entity:
73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	777 whois_msg.append(_("Entity: %s") % user.entity)
1083 e8731b02f5ea plugin XEP-0045: small refactorization + clean on profile's disconnection souliane <souliane@mailoo.org> parents: 1082 diff changeset	778 if user.affiliation != 'none':
928 73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	779 whois_msg.append(_("Affiliation: %s") % user.affiliation)
1083 e8731b02f5ea plugin XEP-0045: small refactorization + clean on profile's disconnection souliane <souliane@mailoo.org> parents: 1082 diff changeset	780 if user.role != 'none':
928 73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	781 whois_msg.append(_("Role: %s") % user.role)
73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	782 if user.status:
73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	783 whois_msg.append(_("Status: %s") % user.status)
73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	784 if user.show:
73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	785 whois_msg.append(_("Show: %s") % user.show)
73873e9b56f7 plugin XEP-0045: added user information to /whois text command Goffi <goffi@goffi.org> parents: 926 diff changeset	786
1239 b6dbac8ee485 plugin XEP-0045: handle MUC presence souliane <souliane@mailoo.org> parents: 1199 diff changeset	787 def presenceTrigger(self, presence_elt, client):
b6dbac8ee485 plugin XEP-0045: handle MUC presence souliane <souliane@mailoo.org> parents: 1199 diff changeset	788 # XXX: shouldn't it be done by the server ?!!
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	789 muc_client = client._muc_client
1358 bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	790 for room_jid, room in muc_client.joined_rooms.iteritems():
2815 27d9d25ec3cd plugin XEP-0045: fixed issue with deepcopy by using new xml_tools.elementCopy method Goffi <goffi@goffi.org> parents: 2794 diff changeset	791 elt = xml_tools.elementCopy(presence_elt)
1358 bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	792 elt['to'] = room_jid.userhost() + '/' + room.nick
1239 b6dbac8ee485 plugin XEP-0045: handle MUC presence souliane <souliane@mailoo.org> parents: 1199 diff changeset	793 client.presence.send(elt)
b6dbac8ee485 plugin XEP-0045: handle MUC presence souliane <souliane@mailoo.org> parents: 1199 diff changeset	794 return True
b6dbac8ee485 plugin XEP-0045: handle MUC presence souliane <souliane@mailoo.org> parents: 1199 diff changeset	795
2822 5284be4c601b plugin XEP-0045: cache presences if they are received before the room is fully joined: Goffi <goffi@goffi.org> parents: 2815 diff changeset	796 def presenceReceivedTrigger(self, client, entity, show, priority, statuses):
5284be4c601b plugin XEP-0045: cache presences if they are received before the room is fully joined: Goffi <goffi@goffi.org> parents: 2815 diff changeset	797 entity_bare = entity.userhostJID()
5284be4c601b plugin XEP-0045: cache presences if they are received before the room is fully joined: Goffi <goffi@goffi.org> parents: 2815 diff changeset	798 muc_client = client._muc_client
5284be4c601b plugin XEP-0045: cache presences if they are received before the room is fully joined: Goffi <goffi@goffi.org> parents: 2815 diff changeset	799 if entity_bare in muc_client.joined_rooms:
2991 f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	800 # presence is already handled in (un)availableReceived
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	801 return False
2822 5284be4c601b plugin XEP-0045: cache presences if they are received before the room is fully joined: Goffi <goffi@goffi.org> parents: 2815 diff changeset	802 return True
5284be4c601b plugin XEP-0045: cache presences if they are received before the room is fully joined: Goffi <goffi@goffi.org> parents: 2815 diff changeset	803
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	804
1970 200cd707a46d plugin XEP-0045, quick_frontend + primitivus (chat): cleaning of XEP-0045 (first pass): Goffi <goffi@goffi.org> parents: 1963 diff changeset	805 class SatMUCClient(muc.MUCClient):
1466 2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	806 implements(iwokkel.IDisco)
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	807
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	808 def __init__(self, plugin_parent):
f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	809 self.plugin_parent = plugin_parent
f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	810 muc.MUCClient.__init__(self)
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	811 self._changing_nicks = set() # used to keep trace of who is changing nick,
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	812 # and to discard userJoinedRoom signal in this case
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	813 print "init SatMUCClient OK"
515 29b5ef129488 plugin XEP-0045, plugin text commands: added '/title' command Goffi <goffi@goffi.org> parents: 509 diff changeset	814
1358 bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	815 @property
bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	816 def joined_rooms(self):
bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	817 return self._rooms
bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	818
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	819 @property
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	820 def host(self):
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	821 return self.plugin_parent.host
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	822
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	823 @property
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	824 def client(self):
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	825 return self.parent
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	826
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	827 @property
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	828 def _mam(self):
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	829 return self.plugin_parent._mam
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	830
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	831 @property
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	832 def _si(self):
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	833 return self.plugin_parent._si
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	834
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	835 def changeRoomState(self, room, new_state):
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	836 """Check that room is in expected state, and change it
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	837
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	838 @param new_state: one of ROOM_STATE_*
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	839 """
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	840 new_state_idx = ROOM_STATES.index(new_state)
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	841 if new_state_idx == -1:
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	842 raise exceptions.InternalError("unknown room state")
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	843 if new_state_idx < 1:
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	844 raise exceptions.InternalError("unexpected new room state ({room}): {state}".format(
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	845 room=room.userhost(),
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	846 state=new_state))
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	847 expected_state = ROOM_STATES[new_state_idx-1]
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	848 if room.state != expected_state:
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	849 log.error(_(
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	850 u"room {room} is not in expected state: room is in state {current_state} "
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	851 u"while we were expecting {expected_state}").format(
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	852 room=room.userhost(),
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	853 current_state=room.state,
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	854 expected_state=expected_state))
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	855 room.state = new_state
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	856
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	857 def _addRoom(self, room):
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	858 super(SatMUCClient, self)._addRoom(room)
2066 09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	859 room._roster_ok = False # True when occupants list has been fully received
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	860 room.state = ROOM_STATE_OCCUPANTS
2066 09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	861 # FIXME: check if history_d is not redundant with fully_joined
09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	862 room.fully_joined = defer.Deferred() # called when everything is OK
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	863 # cache data until room is ready
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	864 # list of elements which will be re-injected in stream
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	865 room._cache = []
2822 5284be4c601b plugin XEP-0045: cache presences if they are received before the room is fully joined: Goffi <goffi@goffi.org> parents: 2815 diff changeset	866 # we only need to keep last presence status for each jid, so a dict is suitable
5284be4c601b plugin XEP-0045: cache presences if they are received before the room is fully joined: Goffi <goffi@goffi.org> parents: 2815 diff changeset	867 room._cache_presence = {}
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	868
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	869 @defer.inlineCallbacks
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	870 def _joinLegacy(self, client, room_jid, nick, password):
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	871 """Join room an retrieve history with legacy method"""
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	872 mess_data_list = yield self.host.memory.historyGet(room_jid,
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	873 client.jid.userhostJID(),
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	874 limit=1,
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	875 between=True,
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	876 profile=client.profile)
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	877 if mess_data_list:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	878 timestamp = mess_data_list[0][1]
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	879 # we use seconds since last message to get backlog without duplicates
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	880 # and we remove 1 second to avoid getting the last message again
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	881 seconds = int(time.time() - timestamp) - 1
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	882 else:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	883 seconds = None
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	884
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	885 room = yield super(SatMUCClient, self).join(
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	886 room_jid, nick, muc.HistoryOptions(seconds=seconds), password)
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	887 # used to send bridge signal once backlog are written in history
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	888 room._history_type = HISTORY_LEGACY
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	889 room._history_d = defer.Deferred()
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	890 room._history_d.callback(None)
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	891 defer.returnValue(room)
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	892
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	893 @defer.inlineCallbacks
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	894 def _joinMAM(self, client, room_jid, nick, password):
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	895 """Join room and retrieve history using MAM"""
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	896 room = yield super(SatMUCClient, self).join(
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	897 # we don't want any history from room as we'll get it with MAM
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	898 room_jid, nick, muc.HistoryOptions(maxStanzas=0), password=password)
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	899 room._history_type = HISTORY_MAM
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	900 room._history_d = defer.Deferred()
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	901
2826 177f11163ed0 plugin XEP-0045: fixed message type filtering when getting last stanza_id to retrieve history with MAM Goffi <goffi@goffi.org> parents: 2822 diff changeset	902 last_mess = yield self.host.memory.historyGet(
177f11163ed0 plugin XEP-0045: fixed message type filtering when getting last stanza_id to retrieve history with MAM Goffi <goffi@goffi.org> parents: 2822 diff changeset	903 room_jid,
177f11163ed0 plugin XEP-0045: fixed message type filtering when getting last stanza_id to retrieve history with MAM Goffi <goffi@goffi.org> parents: 2822 diff changeset	904 None,
177f11163ed0 plugin XEP-0045: fixed message type filtering when getting last stanza_id to retrieve history with MAM Goffi <goffi@goffi.org> parents: 2822 diff changeset	905 limit=1,
177f11163ed0 plugin XEP-0045: fixed message type filtering when getting last stanza_id to retrieve history with MAM Goffi <goffi@goffi.org> parents: 2822 diff changeset	906 between=False,
177f11163ed0 plugin XEP-0045: fixed message type filtering when getting last stanza_id to retrieve history with MAM Goffi <goffi@goffi.org> parents: 2822 diff changeset	907 filters={
177f11163ed0 plugin XEP-0045: fixed message type filtering when getting last stanza_id to retrieve history with MAM Goffi <goffi@goffi.org> parents: 2822 diff changeset	908 u'types': C.MESS_TYPE_GROUPCHAT,
177f11163ed0 plugin XEP-0045: fixed message type filtering when getting last stanza_id to retrieve history with MAM Goffi <goffi@goffi.org> parents: 2822 diff changeset	909 u'last_stanza_id': True},
177f11163ed0 plugin XEP-0045: fixed message type filtering when getting last stanza_id to retrieve history with MAM Goffi <goffi@goffi.org> parents: 2822 diff changeset	910 profile=client.profile)
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	911 if last_mess:
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	912 stanza_id = last_mess[0][-1][u'stanza_id']
2718 bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	913 rsm_req = rsm.RSMRequest(max_=100, after=stanza_id)
2724 35a0ab3032bb plugin XEP-0045: don't loop when initiating MAM archive Goffi <goffi@goffi.org> parents: 2723 diff changeset	914 no_loop=False
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	915 else:
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	916 log.info(u"We have no MAM archive for room {room_jid}.".format(
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	917 room_jid=room_jid))
2718 bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	918 # we don't want the whole archive if we have no archive yet
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	919 # as it can be huge
2723 c6be5962752d plugin XEP-0045: request 50 last MAM messages if new archive Goffi <goffi@goffi.org> parents: 2718 diff changeset	920 rsm_req = rsm.RSMRequest(max_=50, before=u'')
2724 35a0ab3032bb plugin XEP-0045: don't loop when initiating MAM archive Goffi <goffi@goffi.org> parents: 2723 diff changeset	921 no_loop=True
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	922
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	923 mam_req = mam.MAMRequest(rsm_=rsm_req)
2718 bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	924 complete = False
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	925 count = 0
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	926 while not complete:
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	927 mam_data = yield self._mam.getArchives(client, mam_req,
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	928 service=room_jid)
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	929 elt_list, rsm_response, mam_response = mam_data
2724 35a0ab3032bb plugin XEP-0045: don't loop when initiating MAM archive Goffi <goffi@goffi.org> parents: 2723 diff changeset	930 complete = True if no_loop else mam_response[u"complete"]
2718 bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	931 # we update MAM request for next iteration
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	932 mam_req.rsm.after = rsm_response.last
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	933
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	934 if not elt_list:
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	935 break
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	936 else:
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	937 count += len(elt_list)
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	938
2718 bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	939 for mess_elt in elt_list:
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	940 try:
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	941 fwd_message_elt = self._mam.getMessageFromResult(
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	942 client, mess_elt, mam_req, service=room_jid)
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	943 except exceptions.DataError:
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	944 continue
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	945 if fwd_message_elt.getAttribute(u"to"):
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	946 log.warning(
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	947 u'Forwarded message element has a "to" attribute while it is '
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	948 u'forbidden by specifications')
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	949 fwd_message_elt[u"to"] = client.jid.full()
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	950 mess_data = client.messageProt.parseMessage(fwd_message_elt)
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	951 # we attache parsed message data to element, to avoid parsing
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	952 # again in _addToHistory
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	953 fwd_message_elt._mess_data = mess_data
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	954 # and we inject to MUC workflow
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	955 client._muc_client._onGroupChat(fwd_message_elt)
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	956
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	957 if not count:
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	958 log.info(_(u"No message received while offline in {room_jid}".format(
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	959 room_jid=room_jid)))
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	960 else:
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	961 log.info(
2718 bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	962 _(u"We have received {num_mess} message(s) in {room_jid} while "
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	963 u"offline.")
bb6adaa580ee plugin XEP-0313, XEP-0045: loop MAM requests until whole archive is retrieved: Goffi <goffi@goffi.org> parents: 2715 diff changeset	964 .format(num_mess=count, room_jid=room_jid))
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	965
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	966 # for legacy history, the following steps are done in receivedSubject but for MAM
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	967 # the order is different (we have to join then get MAM archive, so subject
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	968 # is received before archive), so we change state and add the callbacks here.
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	969 self.changeRoomState(room, ROOM_STATE_LIVE)
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	970 room._history_d.addCallbacks(self._historyCb, self._historyEb, [room],
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	971 errbackArgs=[room])
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	972
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	973 # callback is done now that all needed Deferred have been added to _history_d
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	974 room._history_d.callback(None)
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	975
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	976 defer.returnValue(room)
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	977
2728 1b11da85492c plugin XEP-0045: fixed bad MAM detection on join Goffi <goffi@goffi.org> parents: 2724 diff changeset	978 @defer.inlineCallbacks
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	979 def join(self, room_jid, nick, password=None):
2827 9a3b99acad91 plugin XEP-0045: fixed item-not-found exception when creating a room: Goffi <goffi@goffi.org> parents: 2826 diff changeset	980 room_service = jid.JID(room_jid.host)
9a3b99acad91 plugin XEP-0045: fixed item-not-found exception when creating a room: Goffi <goffi@goffi.org> parents: 2826 diff changeset	981 has_mam = yield self.host.hasFeature(self.client, mam.NS_MAM, room_service)
2728 1b11da85492c plugin XEP-0045: fixed bad MAM detection on join Goffi <goffi@goffi.org> parents: 2724 diff changeset	982 if not self._mam or not has_mam:
1b11da85492c plugin XEP-0045: fixed bad MAM detection on join Goffi <goffi@goffi.org> parents: 2724 diff changeset	983 room = yield self._joinLegacy(self.client, room_jid, nick, password)
1b11da85492c plugin XEP-0045: fixed bad MAM detection on join Goffi <goffi@goffi.org> parents: 2724 diff changeset	984 defer.returnValue(room)
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	985 else:
2728 1b11da85492c plugin XEP-0045: fixed bad MAM detection on join Goffi <goffi@goffi.org> parents: 2724 diff changeset	986 room = yield self._joinMAM(self.client, room_jid, nick, password)
1b11da85492c plugin XEP-0045: fixed bad MAM detection on join Goffi <goffi@goffi.org> parents: 2724 diff changeset	987 defer.returnValue(room)
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	988
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	989 ## presence/roster ##
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	990
1891 b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	991 def availableReceived(self, presence):
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	992 """
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	993 Available presence was received.
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	994 """
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	995 # XXX: we override MUCClient.availableReceived to fix bugs
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	996 # (affiliation and role are not set)
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	997
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	998 room, user = self._getRoomUser(presence)
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	999
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1000 if room is None:
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1001 return
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1002
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1003 if user is None:
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1004 nick = presence.sender.resource
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1005 if not nick:
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1006 log.warning(_(u"missing nick in presence: {xml}").format(
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1007 xml = presence.toElement().toXml()))
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1008 return
1891 b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1009 user = muc.User(nick, presence.entity)
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1010
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1011 # Update user data
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1012 user.role = presence.role
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1013 user.affiliation = presence.affiliation
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1014 user.status = presence.status
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1015 user.show = presence.show
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1016
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1017 if room.inRoster(user):
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1018 self.userUpdatedStatus(room, user, presence.show, presence.status)
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1019 else:
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1020 room.addUser(user)
b91c8637c656 plugin XEP-0045: overriden availableReceived method of MUCClient to work around a bug in Wokkel (affiliation and role are not set). TODO: propose a patch upstream Goffi <goffi@goffi.org> parents: 1890 diff changeset	1021 self.userJoinedRoom(room, user)
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1022
507 f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1023 def unavailableReceived(self, presence):
1358 bf3f669a6052 plugins XEP-0045, XEP-0249, parrot: use JID instead of unicode in many methods + class attributes souliane <souliane@mailoo.org> parents: 1356 diff changeset	1024 # XXX: we override this method to manage nickname change
507 f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1025 """
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1026 Unavailable presence was received.
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1027
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1028 If this was received from a MUC room occupant JID, that occupant has
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1029 left the room.
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1030 """
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1031 room, user = self._getRoomUser(presence)
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1032
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1033 if room is None or user is None:
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1034 return
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1035
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1036 room.removeUser(user)
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1037
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1038 if muc.STATUS_CODE.NEW_NICK in presence.mucStatuses:
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1039 self._changing_nicks.add(presence.nick)
507 f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1040 self.userChangedNick(room, user, presence.nick)
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1041 else:
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1042 self._changing_nicks.discard(presence.nick)
507 f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1043 self.userLeftRoom(room, user)
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1044
74 6e3a06b4dd36 plugin xep-0045: added roomUserJoined and roomUserLeft signals Goffi <goffi@goffi.org> parents: 73 diff changeset	1045 def userJoinedRoom(self, room, user):
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1046 if user.nick == room.nick:
2994 94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1047 # we have received our own nick,
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1048 # this mean that the full room roster was received
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1049 self.changeRoomState(room, ROOM_STATE_SELF_PRESENCE)
2994 94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1050 log.debug(u"room {room} joined with nick {nick}".format(
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1051 room=room.occupantJID.userhost(), nick=user.nick))
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1052 # we set type so we don't have to use a deferred
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1053 # with disco to check entity type
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1054 self.host.memory.updateEntityData(
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1055 room.roomJID, C.ENTITY_TYPE, C.ENTITY_TYPE_MUC,
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1056 profile_key=self.client.profile)
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1057 elif room.state not in (ROOM_STATE_OCCUPANTS, ROOM_STATE_LIVE):
2994 94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1058 log.warning(
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1059 u"Received user presence data in a room before its initialisation "
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1060 u"(current state: {state}),"
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1061 u"this is not standard! Ignoring it: {room} ({nick})".format(
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1062 state=room.state,
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1063 room=room.roomJID.userhost(),
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1064 nick=user.nick))
1984 de4fac507dc4 xep-0045: ignore non standard presence received between own presence and room subject Goffi <goffi@goffi.org> parents: 1977 diff changeset	1065 return
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1066 else:
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1067 if not room.fully_joined.called:
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1068 return
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1069 try:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1070 self._changing_nicks.remove(user.nick)
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1071 except KeyError:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1072 # this is a new user
2994 94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1073 log.debug(_(u"user {nick} has joined room {room_id}").format(
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1074 nick=user.nick, room_id=room.occupantJID.userhost()))
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1075 if not self.host.trigger.point(
94708a7d3ecf core, plugin XEP-0045: fixed message type autodetection + ENTITY_TYPE_MUC constant: Goffi <goffi@goffi.org> parents: 2991 diff changeset	1076 "MUC user joined", room, user, self.client.profile):
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1077 return
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1078
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1079 extra = {'info_type': ROOM_USER_JOINED,
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1080 'user_affiliation': user.affiliation,
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1081 'user_role': user.role,
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1082 'user_nick': user.nick
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1083 }
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1084 if user.entity is not None:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1085 extra['user_entity'] = user.entity.full()
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1086 mess_data = { # dict is similar to the one used in client.onMessage
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1087 "from": room.roomJID,
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1088 "to": self.client.jid,
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1089 "uid": unicode(uuid.uuid4()),
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1090 "message": {'': D_(u"=> {} has joined the room").format(user.nick)},
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1091 "subject": {},
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1092 "type": C.MESS_TYPE_INFO,
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1093 "extra": extra,
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1094 "timestamp": time.time(),
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1095 }
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1096 # FIXME: we disable presence in history as it's taking a lot of space
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1097 # while not indispensable. In the future an option may allow
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1098 # to re-enable it
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1099 # self.client.messageAddToHistory(mess_data)
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1100 self.client.messageSendToBridge(mess_data)
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1101
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	1102
74 6e3a06b4dd36 plugin xep-0045: added roomUserJoined and roomUserLeft signals Goffi <goffi@goffi.org> parents: 73 diff changeset	1103 def userLeftRoom(self, room, user):
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1104 if not self.host.trigger.point("MUC user left", room, user, self.client.profile):
715 f47d7c09c60b plugins XEP-0045: added methods to get room nicks and "MUC user left" trigger souliane <souliane@mailoo.org> parents: 713 diff changeset	1105 return
507 f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1106 if user.nick == room.nick:
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1107 # we left the room
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1108 room_jid_s = room.roomJID.userhost()
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1109 log.info(_(u"Room ({room}) left ({profile})").format(
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1110 room = room_jid_s, profile = self.client.profile))
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1111 self.host.memory.delEntityCache(room.roomJID, profile_key=self.client.profile)
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1112 self.host.bridge.mucRoomLeft(room.roomJID.userhost(), self.client.profile)
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1113 elif room.state != ROOM_STATE_LIVE:
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1114 log.warning(u"Received user presence data in a room before its initialisation (current state: {state}),"
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1115 "this is not standard! Ignoring it: {room} ({nick})".format(
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1116 state=room.state,
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1117 room=room.roomJID.userhost(),
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1118 nick=user.nick))
1984 de4fac507dc4 xep-0045: ignore non standard presence received between own presence and room subject Goffi <goffi@goffi.org> parents: 1977 diff changeset	1119 return
507 f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1120 else:
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1121 if not room.fully_joined.called:
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1122 return
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1123 log.debug(_(u"user {nick} left room {room_id}").format(nick=user.nick, room_id=room.occupantJID.userhost()))
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1124 extra = {'info_type': ROOM_USER_LEFT,
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1125 'user_affiliation': user.affiliation,
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1126 'user_role': user.role,
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1127 'user_nick': user.nick
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1128 }
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1129 if user.entity is not None:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1130 extra['user_entity'] = user.entity.full()
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1131 mess_data = { # dict is similar to the one used in client.onMessage
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1132 "from": room.roomJID,
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1133 "to": self.client.jid,
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1134 "uid": unicode(uuid.uuid4()),
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1135 "message": {'': D_(u"<= {} has left the room").format(user.nick)},
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1136 "subject": {},
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1137 "type": C.MESS_TYPE_INFO,
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1138 "extra": extra,
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1139 "timestamp": time.time(),
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1140 }
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1141 # FIXME: disable history, see userJoinRoom comment
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1142 # self.client.messageAddToHistory(mess_data)
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1143 self.client.messageSendToBridge(mess_data)
507 f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1144
f98bef71a918 frontends, core, plugin XEP-0045: leave implementation + better nick change Goffi <goffi@goffi.org> parents: 505 diff changeset	1145 def userChangedNick(self, room, user, new_nick):
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1146 self.host.bridge.mucRoomUserChangedNick(room.roomJID.userhost(), user.nick, new_nick, self.client.profile)
72 f271fff3a713 MUC implementation: first draft Goffi <goffi@goffi.org> parents: diff changeset	1147
77 1ae680f9682e wix: MUC groupchat management + short nick shown in chat window instead of full jid when possible Goffi <goffi@goffi.org> parents: 76 diff changeset	1148 def userUpdatedStatus(self, room, user, show, status):
2991 f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1149 entity = jid.JID(tuple=(room.roomJID.user, room.roomJID.host, user.nick))
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1150 if hasattr(room, "_cache_presence"):
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1151 # room has a cache for presence, meaning it has not been fully
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1152 # joined yet. So we put presence in cache, and stop workflow.
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1153 # Or delete current presence and continue workflow if it's an
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1154 # "unavailable" presence
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1155 cache = room._cache_presence
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1156 cache[entity] = {
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1157 "room": room,
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1158 "user": user,
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1159 "show": show,
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1160 "status": status,
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1161 }
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1162 return
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1163 statuses = {C.PRESENCE_STATUSES_DEFAULT: status or ''}
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1164 self.host.bridge.presenceUpdate(
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1165 entity.full(), show or '', 0, statuses, self.client.profile)
77 1ae680f9682e wix: MUC groupchat management + short nick shown in chat window instead of full jid when possible Goffi <goffi@goffi.org> parents: 76 diff changeset	1166
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1167 ## messages ##
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1168
1256 4b27b9bf31b0 plugin XEP-0045: use HISTORY_LIMIT param to retrieve the MUC history souliane <souliane@mailoo.org> parents: 1250 diff changeset	1169 def receivedGroupChat(self, room, user, body):
1409 3265a2639182 massive (preventive) addition of 'u' (unicode) before the strings passed to logging functions souliane <souliane@mailoo.org> parents: 1407 diff changeset	1170 log.debug(u'receivedGroupChat: room=%s user=%s body=%s' % (room.roomJID.full(), user, body))
1256 4b27b9bf31b0 plugin XEP-0045: use HISTORY_LIMIT param to retrieve the MUC history souliane <souliane@mailoo.org> parents: 1250 diff changeset	1171
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1172 def _addToHistory(self, __, user, message):
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1173 try:
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1174 # message can be already parsed (with MAM), in this case mess_data
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1175 # it attached to the element
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1176 mess_data = message.element._mess_data
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1177 except AttributeError:
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1178 mess_data = self.client.messageProt.parseMessage(message.element)
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1179 if mess_data[u'message'] or mess_data[u'subject']:
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1180 return self.host.memory.addToHistory(self.client, mess_data)
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1181 else:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1182 return defer.succeed(None)
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1183
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1184 def _addToHistoryEb(self, failure):
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1185 failure.trap(exceptions.CancelError)
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1186
1256 4b27b9bf31b0 plugin XEP-0045: use HISTORY_LIMIT param to retrieve the MUC history souliane <souliane@mailoo.org> parents: 1250 diff changeset	1187 def receivedHistory(self, room, user, message):
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1188 """Called when history (backlog) message are received
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1189
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1190 we check if message is not already in our history
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1191 and add it if needed
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1192 @param room(muc.Room): room instance
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1193 @param user(muc.User, None): the user that sent the message
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1194 None if the message come from the room
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1195 @param message(muc.GroupChat): the parsed message
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1196 """
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1197 if room.state != ROOM_STATE_SELF_PRESENCE:
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1198 log.warning(_(
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1199 u"received history in unexpected state in room {room} (state: "
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1200 u"{state})").format(room = room.roomJID.userhost(),
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1201 state = room.state))
2794 33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1202 if not hasattr(room, "_history_d"):
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1203 # XXX: this hack is due to buggy behaviour seen in the wild because of the
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1204 # "mod_delay" prosody module being activated. This module add an
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1205 # unexpected <delay> elements which break our workflow.
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1206 log.warning(_(u"storing the unexpected message anyway, to avoid loss"))
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1207 # we have to restore URI which are stripped by wokkel parsing
2979 f44a95f566d2 core, plugin XEP-0045: fix crashes when changing URIs: Goffi <goffi@goffi.org> parents: 2844 diff changeset	1208 for c in message.element.elements():
2794 33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1209 if c.uri is None:
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1210 c.uri = C.NS_CLIENT
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1211 mess_data = self.client.messageProt.parseMessage(message.element)
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1212 message.element._mess_data = mess_data
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1213 self._addToHistory(None, user, message)
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1214 if mess_data[u'message'] or mess_data[u'subject']:
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1215 self.host.bridge.messageNew(
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1216 *self.client.messageGetBridgeArgs(mess_data),
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1217 profile=self.client.profile
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1218 )
33fa70c102de plugin XEP-0045: fixed crash when <delay> is used at an unexpected time. Goffi <goffi@goffi.org> parents: 2771 diff changeset	1219 return
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1220 room._history_d.addCallback(self._addToHistory, user, message)
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1221 room._history_d.addErrback(self._addToHistoryEb)
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1222
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1223 ## subject ##
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1224
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1225 def groupChatReceived(self, message):
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1226 """
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1227 A group chat message has been received from a MUC room.
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1228
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1229 There are a few event methods that may get called here.
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1230 L{receivedGroupChat}, L{receivedSubject} or L{receivedHistory}.
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1231 """
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1232 # We override this method to fix subject handling
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1233 # FIXME: remove this merge fixed upstream
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1234 room, user = self._getRoomUser(message)
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1235
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1236 if room is None:
2986 37b55d87d027 plugin XEP-0045: added a warning if a message is discarded because the room has not been found Goffi <goffi@goffi.org> parents: 2979 diff changeset	1237 log.warning(u"No room found for message: {message}"
37b55d87d027 plugin XEP-0045: added a warning if a message is discarded because the room has not been found Goffi <goffi@goffi.org> parents: 2979 diff changeset	1238 .format(message=message.toElement().toXml()))
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1239 return
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1240
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1241 if message.subject is not None:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1242 self.receivedSubject(room, user, message.subject)
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1243 elif message.delay is None:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1244 self.receivedGroupChat(room, user, message)
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1245 else:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1246 self.receivedHistory(room, user, message)
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1247
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1248 def subject(self, room, subject):
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1249 return muc.MUCClientProtocol.subject(self, room, subject)
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1250
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1251 def _historyCb(self, __, room):
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1252 """Called when history have been written to database and subject is received
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1253
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1254 this method will finish joining by:
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1255 - sending message to bridge
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1256 - calling fully_joined deferred
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1257 - sending stanza put in cache
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1258 - cleaning variables not needed anymore
395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1259 """
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1260 args = self.plugin_parent._getRoomJoinedArgs(room, self.client.profile)
2066 09c18fcd8225 plugin XEP-0045, quick frontend (app,chat): various chat improvments: Goffi <goffi@goffi.org> parents: 2058 diff changeset	1261 self.host.bridge.mucRoomJoined(*args)
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1262 room.fully_joined.callback(room)
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1263 del room._history_d
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1264 del room._history_type
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1265 cache = room._cache
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1266 del room._cache
2822 5284be4c601b plugin XEP-0045: cache presences if they are received before the room is fully joined: Goffi <goffi@goffi.org> parents: 2815 diff changeset	1267 cache_presence = room._cache_presence
5284be4c601b plugin XEP-0045: cache presences if they are received before the room is fully joined: Goffi <goffi@goffi.org> parents: 2815 diff changeset	1268 del room._cache_presence
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1269 for elem in cache:
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1270 self.client.xmlstream.dispatch(elem)
2991 f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1271 for presence_data in cache_presence.itervalues():
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1272 if not presence_data[u'show'] and not presence_data[u'status']:
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1273 # occupants are already sent in mucRoomJoined, so if we don't have
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1274 # extra information like show or statuses, we can discard the signal
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1275 continue
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1276 else:
f4590ca2acff plugin XEP-0045: avoid sending useless presence signals: Goffi <goffi@goffi.org> parents: 2990 diff changeset	1277 self.userUpdatedStatus(**presence_data)
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1278
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1279 def _historyEb(self, failure_, room):
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1280 log.error(u"Error while managing history: {}".format(failure_))
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1281 self._historyCb(None, room)
1256 4b27b9bf31b0 plugin XEP-0045: use HISTORY_LIMIT param to retrieve the MUC history souliane <souliane@mailoo.org> parents: 1250 diff changeset	1282
405 10b4f577d0c0 MUC update to follow wokkel's MUC branch update Goffi <goffi@goffi.org> parents: 372 diff changeset	1283 def receivedSubject(self, room, user, subject):
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1284 # when subject is received, we know that we have whole roster and history
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1285 # cf. http://xmpp.org/extensions/xep-0045.html#enter-subject
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1286 room.subject = subject # FIXME: subject doesn't handle xml:lang
2581 395a3d1c2888 plugin XEP-0045: fixed joining workflow: Goffi <goffi@goffi.org> parents: 2562 diff changeset	1287 if room.state != ROOM_STATE_LIVE:
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1288 if room._history_type == HISTORY_LEGACY:
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1289 self.changeRoomState(room, ROOM_STATE_LIVE)
b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1290 room._history_d.addCallbacks(self._historyCb, self._historyEb, [room], errbackArgs=[room])
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1291 else:
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1292 # the subject has been changed
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1293 log.debug(_(u"New subject for room ({room_id}): {subject}").format(room_id = room.roomJID.full(), subject = subject))
2715 b35c84ea73cf plugin XEP-0045: MAM implementation for MUC Goffi <goffi@goffi.org> parents: 2689 diff changeset	1294 self.host.bridge.mucRoomNewSubject(room.roomJID.userhost(), subject, self.client.profile)
1963 a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1295
a2bc5089c2eb backend, frontends: message refactoring (huge commit): Goffi <goffi@goffi.org> parents: 1934 diff changeset	1296 ## disco ##
1466 2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	1297
2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	1298 def getDiscoInfo(self, requestor, target, nodeIdentifier=''):
2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	1299 return [disco.DiscoFeature(NS_MUC)]
2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	1300
2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	1301 def getDiscoItems(self, requestor, target, nodeIdentifier=''):
2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	1302 # TODO: manage room queries ? Bad for privacy, must be disabled by default
2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	1303 # see XEP-0045 § 6.7
2184d5f496b5 plugin XEP-0045: added disco announce Goffi <goffi@goffi.org> parents: 1417 diff changeset	1304 return []

Mercurial > libervia-backend

annotate sat/plugins/plugin_xep_0045.py @ 3002:6acaa8244220