libervia-backend: src/plugins/plugin_xep

comparison src/plugins/plugin_xep_0045.py @ 916:1a759096ccbd

core: use of Const for profile_key + replaced '@DEFAULT@' default profile_key by '@NONE@'

author	Goffi <goffi@goffi.org>
date	Fri, 21 Mar 2014 16:27:09 +0100
parents	1fe00f0c9a91
children	d609581bf74a

comparison

equal deleted inserted replaced

-:6f96ee4d8cc0
+:1a759096ccbd
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from sat.core.i18n import _
+from sat.core.constants import Const as C
 from logging import debug, info, warning, error
 from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 from sat.core import exceptions
 mess = _("Error while joining the room %s" % room_jid.userhost())
 error(mess)
 self.host.bridge.newAlert(mess, _("Group chat error"), "ERROR", profile)
 raise failure
-def getRoomsJoined(self, profile_key='@DEFAULT@'):
+def getRoomsJoined(self, profile_key=C.PROF_KEY_NONE):
 """Return room where user is"""
 profile = self.host.memory.getProfileName(profile_key)
 result = []
 if not self.__check_profile(profile):
 return result
 for room in self.clients[profile].joined_rooms.values():
 result.append((room.roomJID.userhost(), [user.nick for user in room.roster.values()], room.nick))
 return result
-def getRoomNick(self, room_jid_s, profile_key='@DEFAULT@'):
+def getRoomNick(self, room_jid_s, profile_key=C.PROF_KEY_NONE):
 """return nick used in room by user
 @param room_jid_s: unicode room id
 @profile_key: profile
 @return: nick or empty string in case of error"""
 profile = self.host.memory.getProfileName(profile_key)
 missing.append(user)
 else:
 nicks.append(nick)
 return nicks, missing
-def _configureRoom(self, room_jid_s, profile_key='@NONE@'):
+def _configureRoom(self, room_jid_s, profile_key=C.PROF_KEY_NONE):
 d = self.configureRoom(jid.JID(room_jid_s), profile_key)
 d.addCallback(lambda xmlui: xmlui.toXml())
 return d
-def configureRoom(self, room_jid, profile_key='@NONE@'):
+def configureRoom(self, room_jid, profile_key=C.PROF_KEY_NONE):
 """ return the room configuration form
 @param room: jid of the room to configure
 @param profile_key: %(doc_profile_key)s
 @return: configuration form as XMLUI
 raise exceptions.ProfileUnknownError("Unknown or disconnected profile")
 if room_jid.userhost() not in self.clients[profile].joined_rooms:
 raise UnknownRoom("This room has not been joined")
 return self.clients[profile].joined_rooms[room_jid.userhost()].inRoster(muc.User(nick))
-def getRoomsSubjects(self, profile_key='@DEFAULT@'):
+def getRoomsSubjects(self, profile_key=C.PROF_KEY_NONE):
 """Return received subjects of rooms"""
 profile = self.host.memory.getProfileName(profile_key)
 if not self.__check_profile(profile):
 return []
 return self.clients[profile].rec_subjects.values()
 #to manage this, but this hack fill do it for test purpose
 muc_service = service
 break
 return muc_service
-def getUniqueName(self, muc_service="", profile_key='@DEFAULT@'):
+def getUniqueName(self, muc_service="", profile_key=C.PROF_KEY_NONE):
 """Return unique name for room, avoiding collision
 @param muc_service: leave empty string to use the default service
 @return: unique room userhost, or '' if an error occured.
 """
 #TODO: we should use #RFC-0045 10.1.4 when available here
 error(_("Can't find a MUC service"))
 return ""
 muc_service = muc_service.userhost()
 return "%s@%s" % (room_name, muc_service)
-def join(self, room_jid, nick, options, profile_key='@DEFAULT@'):
+def join(self, room_jid, nick, options, profile_key=C.PROF_KEY_NONE):
 def _errDeferred(exc_obj=Exception, txt='Error while joining room'):
 d = defer.Deferred()
 d.errback(exc_obj(txt))
 return d
 # FIXME: how to set the cancel method on the Deferred created by wokkel?
 # This happens when the room is not reachable, e.g. no internet connection:
 # > /usr/local/lib/python2.7/dist-packages/twisted/internet/defer.py(480)_startRunCallbacks()
 # -> raise AlreadyCalledError(extra)
-def _join(self, room_jid_s, nick, options={}, profile_key='@DEFAULT@'):
+def _join(self, room_jid_s, nick, options={}, profile_key=C.PROF_KEY_NONE):
 """join method used by bridge: use the join method, but doesn't return any deferred
 @return the room userhost (given value or unique generated name)
 """
 profile = self.host.memory.getProfileName(profile_key)
 if not self.__check_profile(profile):
 raise exceptions.ProfileUnknownError("Unknown or disconnected profile")
 if room_jid.userhost() not in self.clients[profile].joined_rooms:
 raise UnknownRoom("This room has not been joined")
 return self.clients[profile].subject(room_jid, subject)
-def mucNick(self, room_jid_s, nick, profile_key='@DEFAULT@'):
+def mucNick(self, room_jid_s, nick, profile_key=C.PROF_KEY_NONE):
 """Change nickname in a room"""
 return self.nick(jid.JID(room_jid_s), nick, profile_key)
-def mucLeave(self, room_jid_s, profile_key='@DEFAULT@'):
+def mucLeave(self, room_jid_s, profile_key=C.PROF_KEY_NONE):
 """Leave a room"""
 return self.leave(jid.JID(room_jid_s), profile_key)
 def getHandler(self, profile):
 self.clients[profile] = SatMUCClient(self)

Mercurial > libervia-backend

comparison src/plugins/plugin_xep_0045.py @ 916:1a759096ccbd