libervia-backend: src/core/sat

comparison src/core/sat_main.py @ 346:ca3a041fed30

core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update

author	Goffi <goffi@goffi.org>
date	Sat, 28 May 2011 20:28:21 +0200
parents	9eebdc655b8b
children	ea3e1b82dd79

comparison

equal deleted inserted replaced

-:e6047415868d
+:ca3a041fed30
 from twisted.words.xish import domish
 from twisted.internet import reactor
 from wokkel import compat
+from wokkel.xmppim import RosterItem
 from sat.bridge.DBus import DBusBridge
 import logging
 from logging import debug, info, error
 self.bridge.register("getParamsCategories", self.memory.getParamsCategories)
 self.bridge.register("getHistory", self.memory.getHistory)
 self.bridge.register("setPresence", self.setPresence)
 self.bridge.register("subscription", self.subscription)
 self.bridge.register("addContact", self.addContact)
+self.bridge.register("updateContact", self.updateContact)
 self.bridge.register("delContact", self.delContact)
 self.bridge.register("isConnected", self.isConnected)
 self.bridge.register("launchAction", self.launchAction)
 self.bridge.register("confirmationAnswer", self.confirmationAnswer)
 self.bridge.register("getProgress", self.getProgress)
 if plugin[1].is_handler:
 plugin[1].getHandler(profile).setHandlerParent(current)
 current.startService()
-def disconnect(self, profile_key='@DEFAULT@'):
+def disconnect(self, profile_key):
 """disconnect from jabber server"""
 if (not self.isConnected(profile_key)):
 info(_("not connected !"))
 return
 profile = self.memory.getProfileName(profile_key)
 server = self.memory.getParamA("Server", "Connection", profile_key=profile)
 self.registerNewAccount(user, password, None, server, id=action_id)
 else:
 self.actionResult(action_id, "SUPPRESS", {})
-def submitForm(self, action, target, fields, profile_key='@DEFAULT@'):
+def submitForm(self, action, target, fields, profile_key):
 """submit a form
 @param target: target jid where we are submitting
 @param fields: list of tuples (name, value)
 @return: tuple: (id, deferred)
 """
 deferred = iq.send(target)
 return (iq['id'], deferred)
 ## Client management ##
-def setParam(self, name, value, category, profile_key='@DEFAULT@'):
+def setParam(self, name, value, category, profile_key):
 """set wanted paramater and notice observers"""
 info (_("setting param: %(name)s=%(value)s in category %(category)s") % {'name':name, 'value':value, 'category':category})
 self.memory.setParam(name, value, category, profile_key)
-def isConnected(self, profile_key='@DEFAULT@'):
+def isConnected(self, profile_key):
 """Return connection status of profile
 @param profile_key: key_word or profile name to determine profile name
 @return True if connected
 """
 profile = self.memory.getProfileName(profile_key)
 return
 if not self.profiles.has_key(profile):
 return False
 return self.profiles[profile].isConnected()
-def launchAction(self, type, data, profile_key='@DEFAULT@'):
+def launchAction(self, type, data, profile_key):
 """Launch a specific action asked by client
 @param type: action type (button)
 @param data: needed data to launch the action
 @return: action id for result, or empty string in case or error
 del statuses['']
 self.bridge.presenceUpdate(self.profiles[profile].jid.full(),  show,
 int(priority), statuses, profile)
-def subscription(self, subs_type, raw_jid, profile_key='@DEFAULT@'):
+def subscription(self, subs_type, raw_jid, profile_key):
 """Called to manage subscription
 @param subs_type: subsciption type (cf RFC 3921)
 @param raw_jid: unicode entity's jid
 @param profile_key: profile"""
 profile = self.memory.getProfileName(profile_key)
 debug (_('subsciption request [%(subs_type)s] for %(jid)s') % {'subs_type':subs_type, 'jid':to_jid.full()})
 if subs_type=="subscribe":
 self.profiles[profile].presence.subscribe(to_jid)
 elif subs_type=="subscribed":
 self.profiles[profile].presence.subscribed(to_jid)
-contact = self.memory.getContact(to_jid)
-if not contact or not bool(contact['to']): #we automatically subscribe to 'to' presence
-debug(_('sending automatic "to" subscription request'))
-self.subscription('subscribe', to_jid.userhost())
 elif subs_type=="unsubscribe":
 self.profiles[profile].presence.unsubscribe(to_jid)
 elif subs_type=="unsubscribed":
 self.profiles[profile].presence.unsubscribed(to_jid)
+def addContact(self, to, profile_key):
-def addContact(self, to, profile_key='@DEFAULT@'):
 """Add a contact in roster list"""
 profile = self.memory.getProfileName(profile_key)
 assert(profile)
 to_jid=jid.JID(to)
 #self.profiles[profile].roster.addItem(to_jid) XXX: disabled (cf http://wokkel.ik.nu/ticket/56))
 self.profiles[profile].presence.subscribe(to_jid)
-def delContact(self, to, profile_key='@DEFAULT@'):
+def updateContact(self, to, name, groups, profile_key):
+"""update a contact in roster list"""
+profile = self.memory.getProfileName(profile_key)
+assert(profile)
+to_jid = jid.JID(to)
+groups = set(groups)
+roster_item = RosterItem(to_jid)
+roster_item.name = name or None
+roster_item.groups = set(groups)
+self.profiles[profile].roster.updateItem(roster_item)
+def delContact(self, to, profile_key):
 """Remove contact from roster list"""
 profile = self.memory.getProfileName(profile_key)
 assert(profile)
 to_jid=jid.JID(to)
 self.profiles[profile].roster.removeItem(to_jid)

Mercurial > libervia-backend

comparison src/core/sat_main.py @ 346:ca3a041fed30