Remove not used PEP module code
This commit is contained in:
Philipp Hörist
parent
54a9992696
commit
11c5fd29e5
|
|
@ -683,7 +683,6 @@ class Connection(CommonConnection, ConnectionHandlers):
|
|||
self.disable_reconnect_timer()
|
||||
|
||||
app.interface.music_track_changed(None, None, self.name)
|
||||
self.get_module('PEP').reset_stored_publish()
|
||||
self.get_module('VCardAvatars').avatar_advertised = False
|
||||
|
||||
app.proxy65_manager.disconnect(self.connection)
|
||||
|
|
@ -1621,7 +1620,6 @@ class Connection(CommonConnection, ConnectionHandlers):
|
|||
# Inform GUI we just signed in
|
||||
app.nec.push_incoming_event(NetworkEvent('signed-in', conn=self))
|
||||
modules.send_stored_publish(self.name)
|
||||
self.get_module('PEP').send_stored_publish()
|
||||
self.continue_connect_info = None
|
||||
|
||||
def send_custom_status(self, show, msg, jid):
|
||||
|
|
|
|||
|
|
@ -23,30 +23,18 @@ import logging
|
|||
|
||||
import nbxmpp
|
||||
|
||||
from gajim.common import app
|
||||
from gajim.common.exceptions import StanzaMalformed
|
||||
from gajim.common.nec import NetworkIncomingEvent
|
||||
from gajim.common.const import PEPEventType
|
||||
from gajim.common.types import ConnectionT
|
||||
from gajim.common.types import PEPHandlersDict # pylint: disable=unused-import
|
||||
from gajim.common.types import PEPNotifyCallback
|
||||
from gajim.common.modules.base import BaseModule
|
||||
|
||||
|
||||
log = logging.getLogger('gajim.c.m.pep')
|
||||
|
||||
|
||||
class PEP:
|
||||
class PEP(BaseModule):
|
||||
def __init__(self, con: ConnectionT) -> None:
|
||||
self._con = con
|
||||
self._account = con.name
|
||||
|
||||
self.handlers = [
|
||||
('message', self._pep_event_received,
|
||||
'headline', nbxmpp.NS_PUBSUB_EVENT)
|
||||
]
|
||||
BaseModule.__init__(self, con)
|
||||
|
||||
self.supported = False
|
||||
self._pep_handlers = {} # type: PEPHandlersDict
|
||||
self._store_publish_modules = [] # type: List[Any]
|
||||
|
||||
def pass_disco(self,
|
||||
from_: nbxmpp.JID,
|
||||
|
|
@ -60,177 +48,6 @@ class PEP:
|
|||
log.info('Discovered PEP support: %s', from_)
|
||||
self.supported = True
|
||||
|
||||
def register_pep_handler(
|
||||
self,
|
||||
namespace: str,
|
||||
notify_handler: PEPNotifyCallback) -> None:
|
||||
if namespace in self._pep_handlers:
|
||||
self._pep_handlers[namespace].append(notify_handler)
|
||||
else:
|
||||
self._pep_handlers[namespace] = [notify_handler]
|
||||
|
||||
module_instance = notify_handler.__self__ # type: ignore
|
||||
if module_instance.store_publish:
|
||||
if module_instance not in self._store_publish_modules:
|
||||
self._store_publish_modules.append(module_instance)
|
||||
|
||||
def _pep_event_received(self,
|
||||
_con: ConnectionT,
|
||||
stanza: nbxmpp.Message) -> None:
|
||||
jid = stanza.getFrom()
|
||||
event = stanza.getTag('event', namespace=nbxmpp.NS_PUBSUB_EVENT)
|
||||
items = event.getTag('items')
|
||||
if items is None:
|
||||
log.warning('Malformed PEP event (no items node): %s', stanza)
|
||||
raise nbxmpp.NodeProcessed
|
||||
|
||||
namespace = items.getAttr('node')
|
||||
if namespace is None:
|
||||
log.warning('Malformed PEP event (no node attr): %s', stanza)
|
||||
raise nbxmpp.NodeProcessed
|
||||
|
||||
log.info('PEP notification received: %s %s', jid, namespace)
|
||||
|
||||
handlers = self._pep_handlers.get(namespace, None)
|
||||
if handlers is None:
|
||||
raise nbxmpp.NodeProcessed
|
||||
|
||||
# Check if this is a retraction
|
||||
retract = items.getTag('retract')
|
||||
if retract is not None:
|
||||
id_ = retract.getAttr('id')
|
||||
log.info('Received retract of id: %s', id_)
|
||||
raise nbxmpp.NodeProcessed
|
||||
|
||||
# Check if we have items
|
||||
items_ = items.getTags('item')
|
||||
if items_ is None:
|
||||
log.warning('Malformed PEP event received: %s', stanza)
|
||||
raise nbxmpp.NodeProcessed
|
||||
for handler in handlers:
|
||||
handler(jid, items_[0])
|
||||
raise nbxmpp.NodeProcessed
|
||||
|
||||
def send_stored_publish(self) -> None:
|
||||
for module in self._store_publish_modules:
|
||||
module.send_stored_publish()
|
||||
|
||||
def reset_stored_publish(self) -> None:
|
||||
for module in self._store_publish_modules:
|
||||
module.reset_stored_publish()
|
||||
|
||||
|
||||
class AbstractPEPData:
|
||||
|
||||
type_ = PEPEventType.ABSTRACT
|
||||
|
||||
def __init__(self, data: Any) -> None:
|
||||
self.data = data
|
||||
|
||||
def as_markup_text(self) -> str: # pylint: disable=no-self-use
|
||||
'''SHOULD be implemented by subclasses'''
|
||||
return ''
|
||||
|
||||
def __eq__(self, other: Any) -> bool:
|
||||
return other == self.type_
|
||||
|
||||
def __bool__(self) -> bool:
|
||||
return self.data is not None
|
||||
|
||||
def __str__(self) -> str:
|
||||
return str(self.data)
|
||||
|
||||
|
||||
class AbstractPEPModule:
|
||||
|
||||
name = ''
|
||||
namespace = ''
|
||||
pep_class = AbstractPEPData
|
||||
store_publish = True
|
||||
_log = log
|
||||
|
||||
def __init__(self, con: ConnectionT) -> None:
|
||||
self._con = con
|
||||
self._account = con.name
|
||||
|
||||
self.handlers = [] # type: List[Tuple[Any, ...]]
|
||||
|
||||
self._stored_publish = None
|
||||
|
||||
self._con.get_module('PEP').register_pep_handler(
|
||||
self.namespace, self._pep_notify_received)
|
||||
|
||||
def _pep_notify_received(self, jid: nbxmpp.JID, item: nbxmpp.Node) -> None:
|
||||
try:
|
||||
data = self._extract_info(item)
|
||||
except StanzaMalformed as error:
|
||||
log.warning('%s, %s: %s', jid, error, item)
|
||||
return
|
||||
|
||||
self._log.info('Received: %s %s', jid, data)
|
||||
user_pep = self.pep_class(data)
|
||||
self._notification_received(jid, user_pep)
|
||||
app.nec.push_incoming_event(
|
||||
PEPReceivedEvent(None,
|
||||
conn=self._con,
|
||||
jid=str(jid),
|
||||
pep_type=self.name,
|
||||
user_pep=user_pep))
|
||||
|
||||
def _extract_info(self, item: nbxmpp.Node) -> Any:
|
||||
'''To be implemented by subclasses'''
|
||||
raise NotImplementedError
|
||||
|
||||
def _build_node(self, data: Any) -> nbxmpp.Node:
|
||||
'''To be implemented by subclasses'''
|
||||
raise NotImplementedError
|
||||
|
||||
def _notification_received(self, jid: nbxmpp.JID, user_pep: Any) -> None:
|
||||
for contact in app.contacts.get_contacts(self._account, str(jid)):
|
||||
if user_pep:
|
||||
contact.pep[self.name] = user_pep
|
||||
else:
|
||||
contact.pep.pop(self.name, None)
|
||||
|
||||
if jid == self._con.get_own_jid().getStripped():
|
||||
if user_pep:
|
||||
self._con.pep[self.name] = user_pep
|
||||
else:
|
||||
self._con.pep.pop(self.name, None)
|
||||
|
||||
def send_stored_publish(self) -> None:
|
||||
if self._stored_publish is not None:
|
||||
self._log.info('Send stored publish')
|
||||
self.send(self._stored_publish)
|
||||
self._stored_publish = None
|
||||
|
||||
def reset_stored_publish(self) -> None:
|
||||
self._log.info('Reset stored publish')
|
||||
self._stored_publish = None
|
||||
|
||||
def send(self, data: Any) -> None:
|
||||
if not self._con.get_module('PEP').supported:
|
||||
return
|
||||
|
||||
if self._con.connected == 1:
|
||||
# We are connecting, save activity and send it later
|
||||
self._stored_publish = data
|
||||
return
|
||||
|
||||
if data:
|
||||
self._log.info('Send: %s', data)
|
||||
else:
|
||||
self._log.info('Remove')
|
||||
|
||||
item = self._build_node(data)
|
||||
|
||||
self._con.get_module('PubSub').send_pb_publish(
|
||||
'', self.namespace, item, 'current')
|
||||
|
||||
|
||||
class PEPReceivedEvent(NetworkIncomingEvent):
|
||||
name = 'pep-received'
|
||||
|
||||
|
||||
def get_instance(*args: Any, **kwargs: Any) -> Tuple[PEP, str]:
|
||||
return PEP(*args, **kwargs), 'PEP'
|
||||
|
|
|
|||
|
|
@ -94,7 +94,8 @@ from gajim.common.connection_handlers_events import (
|
|||
from gajim.common.modules.httpupload import HTTPUploadProgressEvent
|
||||
from gajim.common.connection import Connection
|
||||
from gajim.common.file_props import FilesProp
|
||||
from gajim.common.const import AvatarSize, SSLError, PEPEventType
|
||||
from gajim.common.const import AvatarSize
|
||||
from gajim.common.const import SSLError
|
||||
|
||||
from gajim import roster_window
|
||||
from gajim.common import ged
|
||||
|
|
|
|||
|
|
@ -2620,15 +2620,6 @@ class RosterWindow:
|
|||
for jid in obj.jid_list:
|
||||
self.remove_contact(jid, obj.conn.name, backend=True)
|
||||
|
||||
def _nec_pep_received(self, obj):
|
||||
if obj.user_pep.type_ != PEPEventType.LOCATION:
|
||||
return
|
||||
|
||||
if obj.jid == app.get_jid_from_account(obj.conn.name):
|
||||
self.draw_account(obj.conn.name)
|
||||
|
||||
self.draw_pep(obj.jid, obj.conn.name, obj.pep_type)
|
||||
|
||||
def _on_mood_received(self, event):
|
||||
if event.is_self_message:
|
||||
self.draw_account(event.account)
|
||||
|
|
@ -5828,8 +5819,6 @@ class RosterWindow:
|
|||
self._nec_connection_type)
|
||||
app.ged.register_event_handler('agent-removed', ged.GUI1,
|
||||
self._nec_agent_removed)
|
||||
app.ged.register_event_handler('pep-received', ged.GUI1,
|
||||
self._nec_pep_received)
|
||||
app.ged.register_event_handler('nickname-received', ged.GUI1,
|
||||
self._on_nickname_received)
|
||||
app.ged.register_event_handler('mood-received', ged.GUI1,
|
||||
|
|
|
|||
Loading…
Reference in New Issue