Commits October 2019

commits@gajim.org

1 participants
53 discussions

[Git][gajim/python-nbxmpp][master] ChatMarkers: Remove unnecessary code
by Philipp Hörist 06 Oct '19

06 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9126550b by Philipp Hörist at 2019-10-06T07:41:28Z ChatMarkers: Remove unnecessary code - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -604,24 +604,6 @@ class MessageProperties: def is_marker(self): return self.marker is not None - @property - def is_acknowledged_marker(self): - if self.marker is None: - return False - return self.marker.is_acknowledged - - @property - def is_received_marker(self): - if self.marker is None: - return False - return self.marker.is_received - - @property - def is_displayed_marker(self): - if self.marker is None: - return False - return self.marker.is_displayed - class IqProperties: def __init__(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/9126550bdb60bee275c98c87ac… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/9126550bdb60bee275c98c87ac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MAM: Simplify _parse_chat_attrs()
by Philipp Hörist 05 Oct '19

05 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 13acb5af by Philipp Hörist at 2019-10-05T22:00:16Z MAM: Simplify _parse_chat_attrs() This became more simple due to nbxmpp changes - - - - - 1 changed file: - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -174,7 +174,7 @@ class MAM(BaseModule): if groupchat: event_attrs.update(self._parse_gc_attrs(properties)) else: - event_attrs.update(self._parse_chat_attrs(stanza, properties)) + event_attrs.update(self._parse_chat_attrs(properties)) stanza_id, message_id = self._get_unique_id(properties) @@ -243,17 +243,13 @@ class MAM(BaseModule): 'real_jid': real_jid, 'kind': KindConstant.GC_MSG} - def _parse_chat_attrs(self, stanza, properties): - frm = properties.jid - to = stanza.getTo() - if frm.bareMatch(self._con.get_own_jid()): - with_ = to + def _parse_chat_attrs(self, properties): + if properties.from_.bareMatch(self._con.get_own_jid()): kind = KindConstant.CHAT_MSG_SENT else: - with_ = frm kind = KindConstant.CHAT_MSG_RECV - return {'with_': with_, + return {'with_': properties.jid, 'nick': None, 'kind': kind} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/13acb5af7da8ecbe495bf96055f5f4cb2f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/13acb5af7da8ecbe495bf96055f5f4cb2f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Determine remote jid correctly in all cases
by Philipp Hörist 05 Oct '19

05 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ff8e7bb6 by Philipp Hörist at 2019-10-05T11:16:42Z Determine remote jid correctly in all cases - - - - - 6a89fcfb by Philipp Hörist at 2019-10-05T21:52:59Z Message Properties: Expose from and to attribute - - - - - 2 changed files: - nbxmpp/modules/message.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/message.py ===================================== @@ -40,7 +40,23 @@ class BaseMessage: def _process_message_base(self, _con, stanza, properties): properties.type = self._parse_type(stanza) - properties.jid = stanza.getFrom() + + # Determine remote JID + if properties.is_carbon_message and properties.carbon.is_sent: + properties.jid = stanza.getTo() + + elif properties.is_mam_message and not properties.type.is_groupchat: + own_jid = self._client.get_bound_jid() + if own_jid.bareMatch(stanza.getFrom()): + properties.jid = stanza.getTo() + else: + properties.jid = stanza.getFrom() + + else: + properties.jid = stanza.getFrom() + + properties.from_ = stanza.getFrom() + properties.to = stanza.getTo() properties.id = stanza.getID() properties.self_message = self._parse_self_message(stanza, properties) ===================================== nbxmpp/structs.py ===================================== @@ -495,6 +495,8 @@ class MessageProperties: self.type = MessageType.NORMAL self.id = None self.stanza_id = None + self.from_ = None + self.to = None self.jid = None self.subject = None self.body = None View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/35cb5c69d84938bec1c2eeab8… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/35cb5c69d84938bec1c2eeab8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Plugins: Fix registering modules on enabling account
by Philipp Hörist 05 Oct '19

05 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8409f5e7 by Philipp Hörist at 2019-10-05T12:08:07Z Plugins: Fix registering modules on enabling account - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -553,10 +553,10 @@ class PluginManager(metaclass=Singleton): ''' for plugin in self.plugins: if not plugin.active: - return + continue if not hasattr(plugin, 'modules'): - return + continue for module in plugin.modules: instance, name = module.get_instance(con) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8409f5e70ec2ec005849acd41483458d2d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8409f5e70ec2ec005849acd41483458d2d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Adapt to nbxmpp carbon data changes
by Philipp Hörist 04 Oct '19

04 Oct '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0c3ed72e by Philipp Hörist at 2019-10-04T21:08:25Z Adapt to nbxmpp carbon data changes - - - - - 58df7d42 by Philipp Hörist at 2019-10-04T21:08:25Z Check if Soup is available at startup - - - - - 48cf6366 by Philipp Hörist at 2019-10-04T21:08:25Z Update README.md Add Soup to runtime requirements - - - - - 3 changed files: - README.md - gajim/common/modules/message.py - gajim/gajim.py Changes: ===================================== README.md ===================================== @@ -12,6 +12,7 @@ - python3-css-parser - python3-keyring - python3-precis-i18n +- gir1.2-soup-2.4 ### Optional Runtime Requirements ===================================== gajim/common/modules/message.py ===================================== @@ -69,9 +69,7 @@ class Message(BaseModule): stanza=stanza, account=self._account)) - forwarded = properties.carbon_type is not None - sent = properties.carbon_type == 'sent' - if sent: + if properties.is_carbon_message and properties.carbon.is_sent: # Ugly, we treat the from attr as the remote jid, # to make that work with sent carbons we have to do this. # TODO: Check where in Gajim and plugins we depend on that behavior @@ -157,8 +155,8 @@ class Message(BaseModule): 'id_': properties.id, 'encrypted': False, 'additional_data': additional_data, - 'forwarded': forwarded, - 'sent': sent, + 'forwarded': properties.is_carbon_message, + 'sent': properties.is_carbon_message and properties.carbon.is_sent, 'fjid': fjid, 'jid': jid, 'resource': resource, ===================================== gajim/gajim.py ===================================== @@ -67,12 +67,16 @@ def _init_gui(gui): def _init_gtk(): import gi - gi.require_version('GLib', '2.0') - gi.require_version('Gio', '2.0') - gi.require_version('Gtk', '3.0') - gi.require_version('Gdk', '3.0') - gi.require_version('GObject', '2.0') - gi.require_version('Pango', '1.0') + try: + gi.require_version('GLib', '2.0') + gi.require_version('Gio', '2.0') + gi.require_version('Gtk', '3.0') + gi.require_version('Gdk', '3.0') + gi.require_version('GObject', '2.0') + gi.require_version('Pango', '1.0') + gi.require_version('Soup', '2.4') + except ValueError as error: + sys.exit('Missing dependency: %s' % error) from gi.repository import Gtk gtk_ver = '%s.%s.%s' % (Gtk.get_major_version(), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b8116f40028cc82b43a66331e2f0b1400… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b8116f40028cc82b43a66331e2f0b1400… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Carbons: Use namedtuple for carbon data
by Philipp Hörist 04 Oct '19

04 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 35cb5c69 by Philipp Hörist at 2019-10-04T19:10:52Z Carbons: Use namedtuple for carbon data - - - - - 3 changed files: - nbxmpp/dispatcher.py - nbxmpp/modules/misc.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -560,7 +560,7 @@ class XMPPDispatcher(PlugIn): # Unwrap carbon try: - stanza, properties.carbon_type = unwrap_carbon(stanza, own_jid) + stanza, properties.carbon = unwrap_carbon(stanza, own_jid) except InvalidFrom as exc: log.warning(exc) return ===================================== nbxmpp/modules/misc.py ===================================== @@ -27,6 +27,7 @@ from nbxmpp.protocol import InvalidFrom from nbxmpp.protocol import InvalidStanza from nbxmpp.protocol import Message from nbxmpp.structs import MAMData +from nbxmpp.structs import CarbonData from nbxmpp.modules.delay import parse_delay @@ -70,7 +71,7 @@ def unwrap_carbon(stanza, own_jid): # there is no need to process the received carbon raise NodeProcessed('Drop MUC-PM "received"-Carbon') - return message, type_ + return message, CarbonData(type=type_) def unwrap_mam(stanza, own_jid): ===================================== nbxmpp/structs.py ===================================== @@ -472,13 +472,26 @@ class MAMData(namedtuple('MAMData', 'id query_id archive namespace timestamp')): return self.namespace == NS_MAM_2 +class CarbonData(namedtuple('MAMData', 'type')): + + __slots__ = [] + + @property + def is_sent(self): + return self.type == 'sent' + + @property + def is_received(self): + return self.type == 'received' + + class Properties: pass class MessageProperties: def __init__(self): - self.carbon_type = None + self.carbon = None self.type = MessageType.NORMAL self.id = None self.stanza_id = None @@ -542,6 +555,10 @@ class MessageProperties: def is_pubsub_event(self): return self.pubsub_event is not None + @property + def is_carbon_message(self): + return self.carbon is not None + @property def is_mam_message(self): return self.mam is not None View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/35cb5c69d84938bec1c2eeab82… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/35cb5c69d84938bec1c2eeab82… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix S5B to IBB fallback. Fixes #9692, #9784
by Yann Leboulanger 03 Oct '19

03 Oct '19

Yann Leboulanger pushed to branch master at gajim / gajim Commits: b8116f40 by Yann Leboulanger at 2019-10-03T21:00:04Z fix S5B to IBB fallback. Fixes #9692, #9784 - - - - - 3 changed files: - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_session.py Changes: ===================================== gajim/common/jingle_content.py ===================================== @@ -88,7 +88,7 @@ class JingleContent: 'session-terminate': [], 'transport-info': [self.__on_transport_info], 'transport-replace': [self.__on_transport_replace], - 'transport-accept': [], + 'transport-accept': [self.__on_transport_replace], 'transport-reject': [], 'iq-result': [], 'iq-error': [], ===================================== gajim/common/jingle_ft.py ===================================== @@ -312,7 +312,7 @@ class JingleFileTransfer(JingleContent): def __on_iq_result(self, stanza, content, error, action): log.info("__on_iq_result") - if self.state == State.NOT_STARTED: + if self.state in (State.NOT_STARTED, State.CAND_RECEIVED): self.__state_changed(State.INITIALIZED) elif self.state == State.CAND_SENT_AND_RECEIVED: if not self.nominated_cand['our-cand'] and \ ===================================== gajim/common/jingle_session.py ===================================== @@ -140,7 +140,9 @@ class JingleSession: 'transport-info': [self.__ack, self.__broadcast], 'transport-replace': [self.__ack, self.__broadcast, self.__on_transport_replace], #TODO - 'transport-accept': [self.__ack], #TODO + 'transport-accept': [self.__ack, self.__on_session_accept, + self.__on_content_accept, + self.__broadcast], 'transport-reject': [self.__ack], #TODO 'iq-result': [self.__broadcast], 'iq-error': [self.__on_error], @@ -244,8 +246,9 @@ class JingleSession: Currently used for transport replacement ''' content = self.contents[(creator, name)] - transport.set_sid(content.transport.sid) - transport.set_file_props(content.transport.file_props) + file_props = content.transport.file_props + file_props.transport_sid = transport.sid + transport.set_file_props(file_props) content.transport = transport # The content will have to be resend now that it is modified content.sent = False @@ -410,12 +413,13 @@ class JingleSession: # Anyway, content's transport is not modifiable yet pass elif transport_ns == nbxmpp.NS_JINGLE_IBB: - transport = JingleTransportIBB() + transport = JingleTransportIBB(node=content.getTag( + 'transport')) self.modify_content(creator, name, transport) self.state = JingleStates.PENDING self.contents[(creator, name)].state = State.TRANSPORT_REPLACE self.__ack(stanza, jingle, error, action) - self.__session_accept() + self.__transport_accept(transport) else: stanza, jingle = self.__make_jingle('transport-reject') content = jingle.setTag('content', attrs={'creator': creator, @@ -834,3 +838,12 @@ class JingleSession: conn=self.connection, jingle_session=self, media=media)) + + def __transport_accept(self, transport): + assert self.state != JingleStates.ENDED + stanza, jingle = self.__make_jingle('transport-accept') + self.__append_contents(jingle) + self.__broadcast(stanza, jingle, None, 'transport-accept') + self.connection.connection.send(stanza) + self.collect_iq_id(stanza.getID()) + self.state = JingleStates.ACTIVE View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8116f40028cc82b43a66331e2f0b14002… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8116f40028cc82b43a66331e2f0b14002… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] Fix some errors
by Philipp Hörist 02 Oct '19

02 Oct '19

Philipp Hörist pushed to branch chat_markers at gajim / gajim Commits: 263c5f2c by Philipp Hörist at 2019-10-02T20:47:45Z Fix some errors - - - - - 3 changed files: - gajim/chat_control_base.py - gajim/common/modules/chat_markers.py - gajim/gui_interface.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1071,7 +1071,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): event_type.type_, self.contact.jid) event = event_type(text, subject, self, msg_log_id, - msg_id=message_id, + message_id=message_id, show_in_roster=show_in_roster, show_in_systray=show_in_systray) app.events.add_event(self.account, full_jid, event) ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -36,21 +36,29 @@ class ChatMarkers(BaseModule): priority=48), ] - def _process_message_marker(self, _con, stanza, properties): + def _process_message_marker(self, _con, _stanza, properties): if not properties.is_displayed_marker: return if properties.type.is_error: return - self._log.info('Displayed: %s, id: %s', - properties.jid, properties.marker.id) + if (not properties.type.is_groupchat and + properties.carbon_type != 'sent'): + # Only act on displayed marker received by own devices for now + return + + self._log.info('%s: %s %s', + properties.jid, + properties.marker.type, + properties.marker.id) app.nec.push_outgoing_event( NetworkEvent('displayed-marker-received', account=self._account, jid=properties.jid, type=properties.type, + is_muc_pm=properties.is_muc_pm, marker_id=properties.marker.id)) def send_marker(self, jid, marker, id_, is_gc): ===================================== gajim/gui_interface.py ===================================== @@ -287,40 +287,46 @@ class Interface: def handle_event_chat_marker_received(self, event): if event.type.is_groupchat: - types = ['printed_gc_msg', 'printed_marked_gc_msg'] - control = app.interface.msg_win_mgr.get_control(event.jid, - event.account) - if not control: - if event.jid in app.interface.minimized_controls[event.account]: - control = app.interface.minimized_controls[event.account][event.jid] - if not control: + control = self.get_groupchat_control(event.account, event.jid) + if control is None: + log.warning('Groupchat control not found') + return + + con = app.connections[event.account] + manager = con.get_module('MUC').get_manager() + + muc_data = manager.get(event.jid.getBare()) + if muc_data is None: + log.warning('Unknown MUC') return - if obj.resource != control.nick: + + if event.jid.getResource() != muc_data.nick: return - event_jid = event.jid - else: + jid = event.jid.getBare() + types = ['printed_gc_msg', 'printed_marked_gc_msg'] + else: types = ['chat', 'pm', 'printed_chat', 'printed_pm'] - if event.properties.carbon_type != 'sent': - return + jid = event.jid.getBare() + if event.is_muc_pm: + jid = event.jid - control = app.interface.msg_win_mgr.get_control(event.jid, - event.account) - if not control: - control = app.interface.msg_win_mgr.get_gc_control( - event.jid, event.account) - event_jid = event.jid + control = app.interface.msg_win_mgr.get_control(jid, event.account) # Compare with control.last_msg_id. - events_ = app.events.get_events(event.account, event_jid, types) + breakpoint() + events_ = app.events.get_events(event.account, jid, types) if not events_: + log.warning('No Events') return - if events_[-1].msg_id != event.marker_id: + + if events_[-1].message_id != event.marker_id: return - if not app.events.remove_events(event.account, event_jid, types=types): + + if not app.events.remove_events(event.account, jid, types=types): # There were events to remove - if control: + if control is None: control.redraw_after_event_removed(event.jid) def handle_event_msgerror(self, obj): @@ -1488,6 +1494,12 @@ class Interface: ### Methods for opening new messages controls ################################################################################ + def get_groupchat_control(self, account, room_jid): + control = self.minimized_controls[account].get(room_jid) + if control is None: + control = self.msg_win_mgr.get_gc_control(room_jid, account) + return control + def show_groupchat(self, account, room_jid): minimized_control = self.minimized_controls[account].get(room_jid) if minimized_control is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/263c5f2cc46d593b7263badf1789439d85… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/263c5f2cc46d593b7263badf1789439d85… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] ChatMarkers: Fix parsing errors
by Philipp Hörist 02 Oct '19

02 Oct '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8984a362 by Philipp Hörist at 2019-10-02T19:27:27Z ChatMarkers: Fix parsing errors - - - - - 1 changed file: - nbxmpp/modules/chat_markers.py Changes: ===================================== nbxmpp/modules/chat_markers.py ===================================== @@ -21,7 +21,7 @@ from nbxmpp.protocol import NS_CHATMARKERS from nbxmpp.structs import StanzaHandler from nbxmpp.structs import ChatMarker -log = logging.getLogger('nbxmpp.m.chat_marker') +log = logging.getLogger('nbxmpp.m.chat_markers') class ChatMarkers: @@ -36,18 +36,19 @@ class ChatMarkers: @staticmethod def _process_message_marker(_con, stanza, properties): - type_ = stanza.getTag('received', NS_CHATMARKERS) - if type_ is not None: - type_ = stanza.getTag('displayed', NS_CHATMARKERS) + type_ = stanza.getTag('received', namespace=NS_CHATMARKERS) + if type_ is None: + type_ = stanza.getTag('displayed', namespace=NS_CHATMARKERS) if type_ is None: - type_ = stanza.getTag('acknowledged', NS_CHATMARKERS) + type_ = stanza.getTag('acknowledged', namespace=NS_CHATMARKERS) if type_ is None: return + name = type_.getName() id_ = type_.getAttr('id') if id_ is None: log.warning('Chatmarker without id') log.warning(stanza) return - properties.marker = ChatMarker(type_, id_) + properties.marker = ChatMarker(name, id_) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/8984a362f3aebb370403f8df0b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/8984a362f3aebb370403f8df0b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] remove not needed change
by Philipp Hörist 01 Oct '19

01 Oct '19

Philipp Hörist pushed to branch chat_markers at gajim / gajim Commits: f7fce220 by Philipp Hörist at 2019-10-01T21:44:06Z remove not needed change - - - - - 1 changed file: - gajim/common/modules/message.py Changes: ===================================== gajim/common/modules/message.py ===================================== @@ -173,7 +173,7 @@ class Message(BaseModule): 'timestamp': properties.timestamp, 'delayed': properties.user_timestamp is not None, 'muc_pm': properties.is_muc_pm, - 'gc_control': gc_control, + 'gc_control': gc_control } app.nec.push_incoming_event(NetworkEvent('update-client-info', View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f7fce2209a15072d3d05f621e68baf8da5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f7fce2209a15072d3d05f621e68baf8da5… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2019