Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] 2 commits: DOAP: Add XEP-0054
by Philipp Hörist 12 Oct '20

12 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9a7bce05 by wurstsalat at 2020-10-12T06:27:10+02:00 DOAP: Add XEP-0054 - - - - - 37aff3c4 by Daniel Brötzmann at 2020-10-12T06:27:10+02:00 DOAP: Add XEP-0292 - - - - - 1 changed file: - python-nbxmpp.doap Changes: ===================================== python-nbxmpp.doap ===================================== @@ -87,6 +87,13 @@ <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0054.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.2</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0059.html" /> @@ -279,6 +286,13 @@ <xmpp:version>0.12.0</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0292.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.10</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0308.html" /> View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/90f2d3383ed491ee94f44ef… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/90f2d3383ed491ee94f44ef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ServerInfo: Adapt to nbxmpp changes
by Philipp Hörist 11 Oct '20

11 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8be9e7f4 by lovetox at 2020-10-11T16:56:33+02:00 ServerInfo: Adapt to nbxmpp changes - - - - - 1 changed file: - gajim/gtk/server_info.py Changes: ===================================== gajim/gtk/server_info.py ===================================== @@ -17,7 +17,7 @@ from collections import namedtuple from datetime import timedelta import nbxmpp -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from nbxmpp.namespaces import Namespace from gi.repository import Gtk from gi.repository import Gdk @@ -28,7 +28,6 @@ from gajim.common import ged from gajim.common.helpers import open_uri from gajim.common.i18n import _ -from gajim.gtk.util import ensure_not_destroyed from gajim.gtk.util import get_builder from gajim.gtk.util import EventHelper from gajim.gtk.util import open_window @@ -233,12 +232,14 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): 'days': delta.days, 'hours': hours} self._ui.server_uptime.set_text(uptime) - @ensure_not_destroyed - def _software_version_received(self, result): - if is_error_result(result): + def _software_version_received(self, task): + try: + result = task.finish() + except StanzaError: self.version = _('Unknown') else: self.version = '%s %s' % (result.name, result.version) + self._ui.server_software.set_text(self.version) @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8be9e7f454e5712c40a48e0636747eb2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8be9e7f454e5712c40a48e0636747eb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 7 commits: OMEMO: Use tasks
by Philipp Hörist 11 Oct '20

11 Oct '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0a3564f7 by lovetox at 2020-10-11T11:01:01+02:00 OMEMO: Use tasks - - - - - 8e99facd by lovetox at 2020-10-11T14:55:41+02:00 Activity: Use tasks - - - - - dd866a27 by lovetox at 2020-10-11T15:04:57+02:00 Location: Use tasks - - - - - 3cde9d30 by lovetox at 2020-10-11T15:05:11+02:00 Mood: Use tasks - - - - - a3ff92d5 by lovetox at 2020-10-11T15:05:27+02:00 Nickname: Use tasks - - - - - 04069afc by lovetox at 2020-10-11T15:05:46+02:00 Tune: Use tasks - - - - - 90f2d338 by lovetox at 2020-10-11T16:55:00+02:00 SoftwareVersion: Use tasks - - - - - 7 changed files: - nbxmpp/modules/activity.py - nbxmpp/modules/location.py - nbxmpp/modules/mood.py - nbxmpp/modules/nickname.py - nbxmpp/modules/omemo.py - nbxmpp/modules/software_version.py - nbxmpp/modules/tune.py Changes: ===================================== nbxmpp/modules/activity.py ===================================== @@ -22,6 +22,8 @@ from nbxmpp.structs import StanzaHandler from nbxmpp.structs import ActivityData from nbxmpp.const import ACTIVITIES from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import finalize +from nbxmpp.task import iq_request_task class Activity(BaseModule): @@ -87,7 +89,10 @@ class Activity(BaseModule): return sub.getName() return None + @iq_request_task def set_activity(self, data): + task = yield + item = Node('activity', {'xmlns': Namespace.ACTIVITY}) if data is not None and data.activity: activity_node = item.addChild(data.activity) @@ -96,4 +101,6 @@ class Activity(BaseModule): if data.text: item.addChild('text', payload=data.text) - self.publish(Namespace.ACTIVITY, item, id_='current') + result = yield self.publish(Namespace.ACTIVITY, item, id_='current') + + yield finalize(task, result) ===================================== nbxmpp/modules/location.py ===================================== @@ -21,6 +21,8 @@ from nbxmpp.structs import StanzaHandler from nbxmpp.structs import LocationData from nbxmpp.const import LOCATION_DATA from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import finalize +from nbxmpp.task import iq_request_task class Location(BaseModule): @@ -67,7 +69,10 @@ class Location(BaseModule): properties.pubsub_event = pubsub_event + @iq_request_task def set_location(self, data): + task = yield + item = Node('geoloc', {'xmlns': Namespace.LOCATION}) if data is not None: data = data._asdict() @@ -75,4 +80,6 @@ class Location(BaseModule): if value is not None: item.addChild(tag, payload=value) - self.publish(Namespace.LOCATION, item, id_='current') + result = yield self.publish(Namespace.LOCATION, item, id_='current') + + yield finalize(task, result) ===================================== nbxmpp/modules/mood.py ===================================== @@ -22,6 +22,8 @@ from nbxmpp.structs import StanzaHandler from nbxmpp.structs import MoodData from nbxmpp.const import MOODS from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import finalize +from nbxmpp.task import iq_request_task class Mood(BaseModule): @@ -77,7 +79,10 @@ class Mood(BaseModule): properties.pubsub_event = pubsub_event + @iq_request_task def set_mood(self, data): + task = yield + item = Node('mood', {'xmlns': Namespace.MOOD}) if data is not None and data.mood: item.addChild(data.mood) @@ -85,4 +90,6 @@ class Mood(BaseModule): if data.text: item.addChild('text', payload=data.text) - self.publish(Namespace.MOOD, item, id_='current') + result = yield self.publish(Namespace.MOOD, item, id_='current') + + yield finalize(task, result) ===================================== nbxmpp/modules/nickname.py ===================================== @@ -20,6 +20,8 @@ from nbxmpp.protocol import Node from nbxmpp.structs import StanzaHandler from nbxmpp.const import PresenceType from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import finalize +from nbxmpp.task import iq_request_task class Nickname(BaseModule): @@ -88,9 +90,14 @@ class Nickname(BaseModule): return None return nickname.getData() or None + @iq_request_task def set_nickname(self, nickname): + task = yield + item = Node('nick', {'xmlns': Namespace.NICK}) if nickname is not None: item.addData(nickname) - self.publish(Namespace.NICK, item, id_='current') + result = yield self.publish(Namespace.NICK, item, id_='current') + + yield finalize(task, result) ===================================== nbxmpp/modules/omemo.py ===================================== @@ -19,25 +19,24 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import Node from nbxmpp.protocol import Message -from nbxmpp.protocol import isResultNode -from nbxmpp.protocol import StanzaMalformed -from nbxmpp.util import call_on_response -from nbxmpp.util import callback from nbxmpp.util import b64decode from nbxmpp.util import b64encode -from nbxmpp.util import raise_error from nbxmpp.util import from_xs_boolean from nbxmpp.structs import StanzaHandler from nbxmpp.structs import OMEMOMessage from nbxmpp.structs import OMEMOBundle -from nbxmpp.modules.pubsub import get_pubsub_request from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import finalize +from nbxmpp.modules.util import raise_if_error +from nbxmpp.task import iq_request_task +from nbxmpp.errors import MalformedStanzaError class OMEMO(BaseModule): _depends = { - 'publish': 'PubSub' + 'publish': 'PubSub', + 'request_items': 'PubSub', } def __init__(self, client): @@ -57,82 +56,13 @@ class OMEMO(BaseModule): def _process_omemo_message(self, _client, stanza, properties): try: - properties.omemo = self._parse_omemo_message(stanza) + properties.omemo = _parse_omemo_message(stanza) self._log.info('Received message') - except StanzaMalformed as error: + except MalformedStanzaError as error: self._log.warning(error) self._log.warning(stanza) return - @staticmethod - def _parse_omemo_message(stanza): - ''' - <message> - <encrypted xmlns='eu.siacs.conversations.axolotl'> - <header sid='27183'> - <key rid='31415'>BASE64ENCODED...</key> - <key prekey="true" rid='12321'>BASE64ENCODED...</key> -  - <iv>BASE64ENCODED...</iv> - </header> - <payload>BASE64ENCODED</payload> - </encrypted> - <store xmlns='urn:xmpp:hints'/> - </message> - ''' - encrypted = stanza.getTag('encrypted', namespace=Namespace.OMEMO_TEMP) - if encrypted is None: - raise StanzaMalformed('No encrypted node found') - - header = encrypted.getTag('header') - if header is None: - raise StanzaMalformed('header node not found') - - try: - sid = int(header.getAttr('sid')) - except Exception as error: - raise StanzaMalformed('sid attr not found') - - iv_node = header.getTag('iv') - try: - iv = b64decode(iv_node.getData(), bytes) - except Exception as error: - raise StanzaMalformed('failed to decode iv: %s' % error) - - payload = None - payload_node = encrypted.getTag('payload') - if payload_node is not None: - try: - payload = b64decode(payload_node.getData(), bytes) - except Exception as error: - raise StanzaMalformed('failed to decode payload: %s' % error) - - key_nodes = header.getTags('key') - if not key_nodes: - raise StanzaMalformed('no keys found') - - keys = {} - for kn in key_nodes: - rid = kn.getAttr('rid') - if rid is None: - raise StanzaMalformed('rid not found') - - prekey = kn.getAttr('prekey') - if prekey is None: - prekey = False - else: - try: - prekey = from_xs_boolean(prekey) - except ValueError as error: - raise StanzaMalformed(error) - - try: - keys[int(rid)] = (b64decode(kn.getData(), bytes), prekey) - except Exception as error: - raise StanzaMalformed('failed to decode key: %s' % error) - - return OMEMOMessage(sid=sid, iv=iv, keys=keys, payload=payload) - def _process_omemo_devicelist(self, _client, stanza, properties): if not properties.is_pubsub_event: return @@ -146,8 +76,8 @@ class OMEMO(BaseModule): return try: - devices = self._parse_devicelist(item) - except StanzaMalformed as error: + devices = _parse_devicelist(item) + except MalformedStanzaError as error: self._log.warning(error) self._log.warning(stanza) raise NodeProcessed @@ -163,232 +93,328 @@ class OMEMO(BaseModule): properties.pubsub_event = pubsub_event - @staticmethod - def _parse_devicelist(item): - ''' - <items node='eu.siacs.conversations.axolotl.devicelist'> - <item id='current'> - <list xmlns='eu.siacs.conversations.axolotl'> - <device id='12345' /> - <device id='4223' /> - </list> - </item> - </items> - ''' - list_node = item.getTag('list', namespace=Namespace.OMEMO_TEMP) - if list_node is None: - raise StanzaMalformed('No list node found') - - if not list_node.getChildren(): - return [] - - result = [] - devices_nodes = list_node.getChildren() - for dn in devices_nodes: - _id = dn.getAttr('id') - if _id: - result.append(int(_id)) - - return result - - def set_devicelist(self, devicelist=None): - item = Node('list', attrs={'xmlns': Namespace.OMEMO_TEMP}) - for device in devicelist: - item.addChild('device').setAttr('id', device) + @iq_request_task + def set_devicelist(self, devicelist=None, public=True): + task = yield self._log.info('Set devicelist: %s', devicelist) - self.publish(Namespace.OMEMO_TEMP_DL, item, id_='current') + access_model = 'open' if public else 'presence' + + options = { + 'pubsub#persist_items': 'true', + 'pubsub#access_model': access_model, + } + + result = yield self.publish(Namespace.OMEMO_TEMP_DL, + _make_devicelist(devicelist), + id_='current', + options=options, + force_node_options=True) - @call_on_response('_devicelist_received') + yield finalize(task, result) + + @iq_request_task def request_devicelist(self, jid=None): - if jid is None: - jid = self._client.get_bound_jid().bare - self._log.info('Request devicelist from: %s', jid) - return get_pubsub_request(jid, Namespace.OMEMO_TEMP_DL, max_items=1) - - @callback - def _devicelist_received(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - - pubsub_node = stanza.getTag('pubsub') - items_node = pubsub_node.getTag('items') - item = items_node.getTag('item') - if item is None: - return [] + task = yield - try: - return self._parse_devicelist(item) - except StanzaMalformed as error: - return raise_error(self._log.warning, stanza, - 'stanza-malformed', str(error)) + items = yield self.request_items(Namespace.OMEMO_TEMP_DL, + max_items=1, + jid=jid) + + raise_if_error(items) + + if items is None: + yield task.set_result(None) + + yield _parse_devicelist(items[0]) + + @iq_request_task + def set_bundle(self, bundle, device_id, public=True): + task = yield - def set_bundle(self, bundle, device_id): - item = self._create_bundle(bundle) self._log.info('Set bundle') - node = '%s:%s' % (Namespace.OMEMO_TEMP_BUNDLE, device_id) - - self.publish(node, item, id_='current') - - @staticmethod - def _create_bundle(bundle): - ''' - <publish node='eu.siacs.conversations.axolotl.bundles:31415'> - <item id='current'> - <bundle xmlns='eu.siacs.conversations.axolotl'> - <signedPreKeyPublic signedPreKeyId='1'> - BASE64ENCODED... - </signedPreKeyPublic> - <signedPreKeySignature> - BASE64ENCODED... - </signedPreKeySignature> - <identityKey> - BASE64ENCODED... - </identityKey> - <prekeys> - <preKeyPublic preKeyId='1'> - BASE64ENCODED... - </preKeyPublic> - <preKeyPublic preKeyId='2'> - BASE64ENCODED... - </preKeyPublic> - <preKeyPublic preKeyId='3'> - BASE64ENCODED... - </preKeyPublic> -  - </prekeys> - </bundle> - </item> - </publish> - ''' - bundle_node = Node('bundle', attrs={'xmlns': Namespace.OMEMO_TEMP}) - prekey_pub_node = bundle_node.addChild( - 'signedPreKeyPublic', - attrs={'signedPreKeyId': bundle.spk['id']}) - prekey_pub_node.addData(b64encode(bundle.spk['key'])) - - prekey_sig_node = bundle_node.addChild('signedPreKeySignature') - prekey_sig_node.addData(b64encode(bundle.spk_signature)) - - identity_key_node = bundle_node.addChild('identityKey') - identity_key_node.addData(b64encode(bundle.ik)) - - prekeys = bundle_node.addChild('prekeys') - for key in bundle.otpks: - pre_key_public = prekeys.addChild('preKeyPublic', - attrs={'preKeyId': key['id']}) - pre_key_public.addData(b64encode(key['key'])) - return bundle_node - - @call_on_response('_bundle_received') + access_model = 'open' if public else 'presence' + + options = { + 'pubsub#persist_items': 'true', + 'pubsub#access_model': access_model, + } + + result = yield self.publish( + f'{Namespace.OMEMO_TEMP_BUNDLE}:{device_id}', + _make_bundle(bundle), + id_='current', + options=options, + force_node_options=True) + + yield finalize(task, result) + + @iq_request_task def request_bundle(self, jid, device_id): + task = yield + self._log.info('Request bundle from: %s %s', jid, device_id) - node = '%s:%s' % (Namespace.OMEMO_TEMP_BUNDLE, device_id) - return get_pubsub_request(jid, node, max_items=1) - @callback - def _bundle_received(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) + items = yield self.request_items( + f'{Namespace.OMEMO_TEMP_BUNDLE}:{device_id}', + max_items=1, + jid=jid) - pubsub_node = stanza.getTag('pubsub') - items_node = pubsub_node.getTag('items') - item = items_node.getTag('item') + raise_if_error(items) - try: - return self._parse_bundle(item) - except StanzaMalformed as error: - return raise_error(self._log.warning, stanza, - 'stanza-malformed', str(error)) - - @staticmethod - def _parse_bundle(item): - ''' - <item id='current'> - <bundle xmlns='eu.siacs.conversations.axolotl'> - <signedPreKeyPublic signedPreKeyId='1'> - BASE64ENCODED... - </signedPreKeyPublic> - <signedPreKeySignature> - BASE64ENCODED... - </signedPreKeySignature> - <identityKey> - BASE64ENCODED... - </identityKey> - <prekeys> - <preKeyPublic preKeyId='1'> - BASE64ENCODED... - </preKeyPublic> - <preKeyPublic preKeyId='2'> - BASE64ENCODED... - </preKeyPublic> - <preKeyPublic preKeyId='3'> - BASE64ENCODED... - </preKeyPublic> -  - </prekeys> - </bundle> - </item> - ''' - if item is None: - raise StanzaMalformed('No item in node found') + if items is None: + yield task.set_result(None) + + yield _parse_bundle(items[0]) - bundle = item.getTag('bundle', namespace=Namespace.OMEMO_TEMP) - if bundle is None: - raise StanzaMalformed('No bundle node found') - result = {} - signed_prekey_node = bundle.getTag('signedPreKeyPublic') +def _parse_omemo_message(stanza): + ''' + <message> + <encrypted xmlns='eu.siacs.conversations.axolotl'> + <header sid='27183'> + <key rid='31415'>BASE64ENCODED...</key> + <key prekey="true" rid='12321'>BASE64ENCODED...</key> +  + <iv>BASE64ENCODED...</iv> + </header> + <payload>BASE64ENCODED</payload> + </encrypted> + <store xmlns='urn:xmpp:hints'/> + </message> + ''' + encrypted = stanza.getTag('encrypted', namespace=Namespace.OMEMO_TEMP) + if encrypted is None: + raise MalformedStanzaError('No encrypted node found', stanza) + + header = encrypted.getTag('header') + if header is None: + raise MalformedStanzaError('header node not found', stanza) + + try: + sid = int(header.getAttr('sid')) + except Exception as error: + raise MalformedStanzaError('sid attr not found', stanza) + + iv_node = header.getTag('iv') + try: + iv = b64decode(iv_node.getData(), bytes) + except Exception as error: + raise MalformedStanzaError('failed to decode iv: %s' % error, stanza) + + payload = None + payload_node = encrypted.getTag('payload') + if payload_node is not None: try: - result['spk'] = {'key': b64decode(signed_prekey_node.getData(), - bytes)} + payload = b64decode(payload_node.getData(), bytes) except Exception as error: - raise StanzaMalformed('Failed to decode ' - 'signedPreKeyPublic: %s' % error) + raise MalformedStanzaError('failed to decode payload: %s' % error, + stanza) + + key_nodes = header.getTags('key') + if not key_nodes: + raise MalformedStanzaError('no keys found', stanza) + + keys = {} + for kn in key_nodes: + rid = kn.getAttr('rid') + if rid is None: + raise MalformedStanzaError('rid not found', stanza) + + prekey = kn.getAttr('prekey') + if prekey is None: + prekey = False + else: + try: + prekey = from_xs_boolean(prekey) + except ValueError as error: + raise MalformedStanzaError(error, stanza) - signed_prekey_id = signed_prekey_node.getAttr('signedPreKeyId') try: - result['spk']['id'] = int(signed_prekey_id) + keys[int(rid)] = (b64decode(kn.getData(), bytes), prekey) except Exception as error: - raise StanzaMalformed('Invalid signedPreKeyId: %s' % error) + raise MalformedStanzaError('failed to decode key: %s' % error, + stanza) + + return OMEMOMessage(sid=sid, iv=iv, keys=keys, payload=payload) - signed_signature_node = bundle.getTag('signedPreKeySignature') + +def _parse_bundle(item): + ''' + <item id='current'> + <bundle xmlns='eu.siacs.conversations.axolotl'> + <signedPreKeyPublic signedPreKeyId='1'> + BASE64ENCODED... + </signedPreKeyPublic> + <signedPreKeySignature> + BASE64ENCODED... + </signedPreKeySignature> + <identityKey> + BASE64ENCODED... + </identityKey> + <prekeys> + <preKeyPublic preKeyId='1'> + BASE64ENCODED... + </preKeyPublic> + <preKeyPublic preKeyId='2'> + BASE64ENCODED... + </preKeyPublic> + <preKeyPublic preKeyId='3'> + BASE64ENCODED... + </preKeyPublic> +  + </prekeys> + </bundle> + </item> + ''' + if item is None: + raise MalformedStanzaError('No item in node found', item) + + bundle = item.getTag('bundle', namespace=Namespace.OMEMO_TEMP) + if bundle is None: + raise MalformedStanzaError('No bundle node found', item) + + result = {} + signed_prekey_node = bundle.getTag('signedPreKeyPublic') + try: + result['spk'] = {'key': b64decode(signed_prekey_node.getData(), + bytes)} + except Exception as error: + error = 'Failed to decode signedPreKeyPublic: %s' % error + raise MalformedStanzaError(error, item) + + signed_prekey_id = signed_prekey_node.getAttr('signedPreKeyId') + try: + result['spk']['id'] = int(signed_prekey_id) + except Exception as error: + raise MalformedStanzaError('Invalid signedPreKeyId: %s' % error, item) + + signed_signature_node = bundle.getTag('signedPreKeySignature') + try: + result['spk_signature'] = b64decode(signed_signature_node.getData(), + bytes) + except Exception as error: + error = 'Failed to decode signedPreKeySignature: %s' % error + raise MalformedStanzaError(error, item) + + identity_key_node = bundle.getTag('identityKey') + try: + result['ik'] = b64decode(identity_key_node.getData(), bytes) + except Exception as error: + error = 'Failed to decode IdentityKey: %s' % error + raise MalformedStanzaError(error, item) + + prekeys = bundle.getTag('prekeys') + if prekeys is None or not prekeys.getChildren(): + raise MalformedStanzaError('No prekeys node found', item) + + result['otpks'] = [] + for prekey in prekeys.getChildren(): try: - result['spk_signature'] = b64decode(signed_signature_node.getData(), - bytes) + id_ = int(prekey.getAttr('preKeyId')) except Exception as error: - raise StanzaMalformed('Failed to decode ' - 'signedPreKeySignature: %s' % error) + raise MalformedStanzaError('Invalid prekey: %s' % error, item) - identity_key_node = bundle.getTag('identityKey') try: - result['ik'] = b64decode(identity_key_node.getData(), bytes) + key = b64decode(prekey.getData(), bytes) except Exception as error: - raise StanzaMalformed('Failed to decode ' - 'signedPreKeySignature: %s' % error) + raise MalformedStanzaError( + 'Failed to decode preKeyPublic: %s' % error, item) - prekeys = bundle.getTag('prekeys') - if prekeys is None or not prekeys.getChildren(): - raise StanzaMalformed('No prekeys node found') + result['otpks'].append({'key': key, 'id': id_}) - result['otpks'] = [] - for prekey in prekeys.getChildren(): - try: - id_ = int(prekey.getAttr('preKeyId')) - except Exception as error: - raise StanzaMalformed('Invalid prekey: %s' % error) + return OMEMOBundle(**result) - try: - key = b64decode(prekey.getData(), bytes) - except Exception as error: - raise StanzaMalformed( - 'Failed to decode preKeyPublic: %s' % error) - result['otpks'].append({'key': key, 'id': id_}) +def _make_bundle(bundle): + ''' + <publish node='eu.siacs.conversations.axolotl.bundles:31415'> + <item id='current'> + <bundle xmlns='eu.siacs.conversations.axolotl'> + <signedPreKeyPublic signedPreKeyId='1'> + BASE64ENCODED... + </signedPreKeyPublic> + <signedPreKeySignature> + BASE64ENCODED... + </signedPreKeySignature> + <identityKey> + BASE64ENCODED... + </identityKey> + <prekeys> + <preKeyPublic preKeyId='1'> + BASE64ENCODED... + </preKeyPublic> + <preKeyPublic preKeyId='2'> + BASE64ENCODED... + </preKeyPublic> + <preKeyPublic preKeyId='3'> + BASE64ENCODED... + </preKeyPublic> +  + </prekeys> + </bundle> + </item> + </publish> + ''' + bundle_node = Node('bundle', attrs={'xmlns': Namespace.OMEMO_TEMP}) + prekey_pub_node = bundle_node.addChild( + 'signedPreKeyPublic', + attrs={'signedPreKeyId': bundle.spk['id']}) + prekey_pub_node.addData(b64encode(bundle.spk['key'])) + + prekey_sig_node = bundle_node.addChild('signedPreKeySignature') + prekey_sig_node.addData(b64encode(bundle.spk_signature)) + + identity_key_node = bundle_node.addChild('identityKey') + identity_key_node.addData(b64encode(bundle.ik)) + + prekeys = bundle_node.addChild('prekeys') + for key in bundle.otpks: + pre_key_public = prekeys.addChild('preKeyPublic', + attrs={'preKeyId': key['id']}) + pre_key_public.addData(b64encode(key['key'])) + return bundle_node + + +def _make_devicelist(devicelist): + if devicelist is None: + devicelist = [] + + devicelist_node = Node('list', attrs={'xmlns': Namespace.OMEMO_TEMP}) + for device in devicelist: + devicelist_node.addChild('device').setAttr('id', device) + + return devicelist_node + + +def _parse_devicelist(item): + ''' + <items node='eu.siacs.conversations.axolotl.devicelist'> + <item id='current'> + <list xmlns='eu.siacs.conversations.axolotl'> + <device id='12345' /> + <device id='4223' /> + </list> + </item> + </items> + ''' + list_node = item.getTag('list', namespace=Namespace.OMEMO_TEMP) + if list_node is None: + raise MalformedStanzaError('No list node found', item) + + if not list_node.getChildren(): + return [] + + result = [] + devices_nodes = list_node.getChildren() + for dn in devices_nodes: + _id = dn.getAttr('id') + if _id: + result.append(int(_id)) - return OMEMOBundle(**result) + return result def create_omemo_message(stanza, omemo_message, store_hint=True, ===================================== nbxmpp/modules/software_version.py ===================================== @@ -17,16 +17,15 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Iq -from nbxmpp.protocol import isResultNode from nbxmpp.protocol import ErrorNode from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import ERR_SERVICE_UNAVAILABLE from nbxmpp.structs import SoftwareVersionResult from nbxmpp.structs import StanzaHandler -from nbxmpp.util import call_on_response -from nbxmpp.util import callback -from nbxmpp.util import raise_error from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import raise_if_error +from nbxmpp.task import iq_request_task +from nbxmpp.errors import MalformedStanzaError class SoftwareVersion(BaseModule): @@ -50,32 +49,17 @@ class SoftwareVersion(BaseModule): def disable(self): self._enabled = False - @call_on_response('_software_version_received') + @iq_request_task def request_software_version(self, jid): - self._log.info('Request software version for %s', jid) - return Iq(typ='get', to=jid, queryNS=Namespace.VERSION) - - @callback - def _software_version_received(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) + _task = yield - try: - return SoftwareVersionResult(*self._parse_info(stanza)) - except Exception as error: - self._log.warning(error) - return raise_error(self._log.warning, stanza, 'stanza-malformed') + self._log.info('Request software version for %s', jid) - @staticmethod - def _parse_info(stanza): - name = stanza.getQueryChild('name').getData() - version = stanza.getQueryChild('version').getData() + result = yield Iq(typ='get', to=jid, queryNS=Namespace.VERSION) - os_info = stanza.getQueryChild('os') - if os_info is not None: - os_info = os_info.getData() + raise_if_error(result) - return name, version, os_info + yield _parse_info(result) def set_software_version(self, name, version, os=None): self._name, self._version, self._os = name, version, os @@ -102,3 +86,21 @@ class SoftwareVersion(BaseModule): self._client.send_stanza(iq) raise NodeProcessed + + +def _parse_info(stanza): + try: + name = stanza.getQueryChild('name').getData() + except Exception: + raise MalformedStanzaError('name node missing', stanza) + + try: + version = stanza.getQueryChild('version').getData() + except Exception: + raise MalformedStanzaError('version node missing', stanza) + + os_info = stanza.getQueryChild('os') + if os_info is not None: + os_info = os_info.getData() + + return SoftwareVersionResult(name, version, os_info) ===================================== nbxmpp/modules/tune.py ===================================== @@ -21,6 +21,8 @@ from nbxmpp.structs import StanzaHandler from nbxmpp.structs import TuneData from nbxmpp.const import TUNE_DATA from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import finalize +from nbxmpp.task import iq_request_task class Tune(BaseModule): @@ -67,7 +69,10 @@ class Tune(BaseModule): properties.pubsub_event = pubsub_event + @iq_request_task def set_tune(self, data): + task = yield + item = Node('tune', {'xmlns': Namespace.TUNE}) if data is not None: data = data._asdict() @@ -75,4 +80,6 @@ class Tune(BaseModule): if value is not None: item.addChild(tag, payload=value) - self.publish(Namespace.TUNE, item, id_='current') + result = yield self.publish(Namespace.TUNE, item, id_='current') + + yield finalize(task, result) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e89b53c16ba16dacae5e7bc… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e89b53c16ba16dacae5e7bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] 6 commits: Preferences: Add setting to disable metacontacts
by Daniel Brötzmann 11 Oct '20

11 Oct '20

Daniel Brötzmann pushed to branch chat_markers at gajim / gajim Commits: 39805924 by lovetox at 2020-10-11T07:46:16+02:00 Preferences: Add setting to disable metacontacts - - - - - 362c3d01 by lovetox at 2020-10-11T10:26:41+02:00 PEPConfig: Fix task callback - - - - - bb740ca4 by lovetox at 2020-10-11T10:27:59+02:00 Remove unused import - - - - - 159be3fa by André Apitzsch at 2020-10-11T12:28:05+02:00 Fix format of translatable strings - - - - - fc8b5f28 by Yann Leboulanger at 2020-10-11T15:09:41+02:00 Add Chat Markers (XEP-0333) - - - - - 01e60650 by wurstsalat at 2020-10-11T15:09:41+02:00 Improvements - - - - - 27 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/const.py - gajim/common/events.py - gajim/common/jingle_rtp.py - gajim/common/modules/__init__.py - + gajim/common/modules/chat_markers.py - gajim/common/modules/message.py - gajim/common/modules/metacontacts.py - gajim/common/setting_values.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/conversation_textview.py - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/about.py - gajim/gtk/add_contact.py - gajim/gtk/bookmarks.py - gajim/gtk/filetransfer.py - gajim/gtk/groupchat_settings.py - gajim/gtk/history_sync.py - gajim/gtk/pep_config.py - gajim/gtk/preferences.py - gajim/gtk/roster_item_exchange.py - gajim/gtk/start_chat.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -123,7 +123,7 @@ class ChatControl(ChatControlBase): # Menu for the HeaderBar self.control_menu = gui_menu_builder.get_singlechat_menu( - self.control_id, self.account, self.contact.jid) + self.control_id, self.account, self.contact.jid, self._type) # Settings menu self.xml.settings_menu.set_menu_model(self.control_menu) @@ -228,6 +228,7 @@ class ChatControl(ChatControlBase): ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), ('decrypted-message-received', ged.GUI1, self._on_decrypted_message_received), ('receipt-received', ged.GUI1, self._receipt_received), + ('displayed-received', ged.GUI1, self._displayed_received), ('message-error', ged.GUI1, self._on_message_error), ('zeroconf-error', ged.GUI1, self._on_zeroconf_error), ]) @@ -271,6 +272,15 @@ class ChatControl(ChatControlBase): act.connect('change-state', self._on_send_chatstate) self.parent_win.window.add_action(act) + marker = self.contact.settings.get('send_marker') + + act = Gio.SimpleAction.new_stateful( + f'send-marker-{self.control_id}', + None, + GLib.Variant.new_boolean(marker)) + act.connect('change-state', self._on_send_marker) + self.parent_win.window.add_action(act) + def update_actions(self): win = self.parent_win.window online = app.account_is_connected(self.account) @@ -363,6 +373,7 @@ class ChatControl(ChatControlBase): 'information-', 'start-call-', 'send-chatstate-', + 'send-marker', ] for action in actions: self.parent_win.window.remove_action(f'{action}{self.control_id}') @@ -435,6 +446,10 @@ class ChatControl(ChatControlBase): action.set_state(param) self.contact.settings.set('send_chatstate', param.get_string()) + def _on_send_marker(self, action, param): + action.set_state(param) + self.contact.settings.set('send_marker', param.get_boolean()) + def subscribe_events(self): """ Register listeners to the events class @@ -643,6 +658,10 @@ class ChatControl(ChatControlBase): def _receipt_received(self, event): self.conv_textview.show_receipt(event.receipt_id) + @event_filter(['account', 'jid']) + def _displayed_received(self, event): + self.conv_textview.show_displayed(event.marker_id) + @event_filter(['account', 'jid']) def _on_zeroconf_error(self, event): self.add_status_message(event.message) @@ -1384,6 +1403,14 @@ class ChatControl(ChatControlBase): self.set_session(event.session) if message_ids: app.storage.archive.set_read_messages(message_ids) + + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None app.events.remove_events(self.account, jid_with_resource, types=[str(self._type)]) ===================================== gajim/chat_control_base.py ===================================== @@ -214,6 +214,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.received_history_pos = 0 self.orig_msg = None + # For XEP-0333 + self.last_msg_id = None + self.correcting = False self.last_sent_msg = None @@ -1154,6 +1157,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if restored: return + if message_id: + self.last_msg_id = message_id + if kind == 'incoming': if (not self._type.is_groupchat or self.contact.can_notify() or @@ -1198,7 +1204,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): event = event_type(text, subject, - self, msg_log_id, + self, + msg_log_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) @@ -1334,7 +1342,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): _('Privacy'), _('Warning'), _('If you send a file to <b>%s</b>, your real XMPP ' - 'address will be revealed.' % gc_contact.name), + 'address will be revealed.') % gc_contact.name, [DialogButton.make('Cancel'), DialogButton.make( 'OK', @@ -1350,7 +1358,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): jid = self.contact.jid if self.conv_textview.autoscroll: # we are at the end - type_ = ['printed_%s' % self._type] + type_ = [f'printed_{self._type}'] if self._type.is_groupchat: type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] if not app.events.remove_events(self.account, @@ -1358,6 +1366,12 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): types=type_): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> marker + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None # send chatstate inactive to the one we're leaving # and active to the one we visit if self.msg_textview.has_text(): @@ -1386,20 +1400,27 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): types_list = [] if self._type.is_groupchat: types_list = ['printed_gc_msg', 'gc_msg', 'printed_marked_gc_msg'] - else: # Not a GC - types_list = ['printed_%s' % self._type, str(self._type)] + else: + types_list = [f'printed_{self._type}', str(self._type)] if not app.events.get_events(self.account, jid, types_list): return if not self.parent_win: return - if self.parent_win.get_active_control() == self and \ - self.parent_win.window.is_active(): + if (self.parent_win.get_active_control() == self and + self.parent_win.window.is_active()): # we are at the end if not app.events.remove_events( self.account, jid, types=types_list): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> tag + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_scrollbar_button_release(self, scrollbar, event): if event.get_button()[1] != 1: @@ -1464,6 +1485,8 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): We just removed a 'printed_*' event, redraw contact in roster or gc_roster and titles in roster and msg_win """ + if not self.parent_win: # minimized groupchat + return self.parent_win.redraw_tab(self) self.parent_win.show_title() # TODO : get the contact and check get_show_in_roster() ===================================== gajim/common/const.py ===================================== @@ -970,6 +970,7 @@ COMMON_FEATURES = [ Namespace.SECLABEL, Namespace.CONFERENCE, Namespace.CORRECT, + Namespace.CHATMARKERS, Namespace.EME, Namespace.XHTML_IM, Namespace.HASHES_2, ===================================== gajim/common/events.py ===================================== @@ -91,13 +91,14 @@ class PmEvent(ChatEvent): class PrintedChatEvent(Event): type_ = 'printed_chat' def __init__(self, message, subject, control, msg_log_id, time_=None, - show_in_roster=False, show_in_systray=True): + message_id=None, show_in_roster=False, show_in_systray=True): Event.__init__(self, time_, show_in_roster=show_in_roster, show_in_systray=show_in_systray) self.message = message self.subject = subject self.control = control self.msg_log_id = msg_log_id + self.message_id = message_id class PrintedGcMsgEvent(PrintedChatEvent): type_ = 'printed_gc_msg' ===================================== gajim/common/jingle_rtp.py ===================================== @@ -130,7 +130,7 @@ class JingleRTPContent(JingleContent): None, conn=self.session.connection, level='error', - pri_txt=_('%s configuration error' % text), + pri_txt=_('%s configuration error') % text, sec_txt=_('Couldn’t set up %(text)s. Check your ' 'configuration.\nPipeline:\n%(pipeline)s\n' 'Error:\n%(error)s') % { ===================================== gajim/common/modules/__init__.py ===================================== @@ -40,6 +40,7 @@ MODULES = [ 'bookmarks', 'caps', 'carbons', + 'chat_markers', 'chatstates', 'delimiter', 'discovery', ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -0,0 +1,113 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# Chat Markers (XEP-0333) + +import nbxmpp +from nbxmpp.namespaces import Namespace +from nbxmpp.structs import StanzaHandler + +from gajim.common import app +from gajim.common.nec import NetworkEvent +from gajim.common.modules.base import BaseModule + + +class ChatMarkers(BaseModule): + + _nbxmpp_extends = 'ChatMarkers' + + def __init__(self, con): + BaseModule.__init__(self, con) + + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_chat_marker, + ns=Namespace.CHATMARKERS, + priority=47), + ] + + def _process_chat_marker(self, _con, _stanza, properties): + if not properties.is_marker or not properties.marker.is_displayed: + return + + if properties.type.is_error: + return + + if properties.type.is_groupchat: + manager = self._con.get_module('MUC').get_manager() + muc_data = manager.get(properties.muc_jid) + if muc_data is None: + return + + if properties.muc_nickname != muc_data.nick: + return + + self._raise_event('read-state-sync', properties) + return + + if properties.is_carbon_message and properties.carbon.is_sent: + self._raise_event('read-state-sync', properties) + return + + if properties.is_mam_message: + if properties.from_.bareMatch(self._con.get_own_jid()): + return + + self._raise_event('displayed-received', properties) + + def _raise_event(self, name, properties): + self._log.info('%s: %s %s', + name, + properties.jid, + properties.marker.id) + + jid = properties.jid + if not properties.is_muc_pm and not properties.type.is_groupchat: + jid = properties.jid.bare + + app.nec.push_outgoing_event( + NetworkEvent(name, + account=self._account, + jid=jid, + properties=properties, + type=properties.type, + is_muc_pm=properties.is_muc_pm, + marker_id=properties.marker.id)) + + def _send_marker(self, contact, marker, id_, type_): + jid = contact.jid + if contact.is_pm_contact: + jid = app.get_jid_without_resource(contact.jid) + + if type_ in ('gc', 'pm'): + if not app.settings.get_group_chat_setting( + self._account, jid, 'send_marker'): + return + else: + if not app.settings.get_contact_setting( + self._account, jid, 'send_marker'): + return + + typ = 'groupchat' if type_ == 'gc' else 'chat' + message = nbxmpp.Message(to=contact.jid, typ=typ) + message.setMarker(marker, id_) + self._log.info('Send %s: %s', marker, contact.jid) + self._nbxmpp().send(message) + + def send_displayed_marker(self, contact, id_, type_): + self._send_marker(contact, 'displayed', id_, str(type_)) + + +def get_instance(*args, **kwargs): + return ChatMarkers(*args, **kwargs), 'ChatMarkers' ===================================== gajim/common/modules/message.py ===================================== @@ -305,6 +305,8 @@ class Message(BaseModule): stanza.setID(message.message_id) stanza.setOriginID(message.message_id) + stanza.setMarkable() + if message.label: stanza.addChild(node=message.label) @@ -347,6 +349,10 @@ class Message(BaseModule): stanza.setTag('no-store', namespace=Namespace.MSG_HINTS) + # XEP-0333 + if message.message: + stanza.setMarkable() + # Add other nodes if message.nodes is not None: for node in message.nodes: ===================================== gajim/common/modules/metacontacts.py ===================================== @@ -30,6 +30,10 @@ class MetaContacts(BaseModule): self.available = False def get_metacontacts(self): + if not app.settings.get('metacontacts_enabled'): + self._con.connect_machine() + return + self._log.info('Request') node = nbxmpp.Node('storage', attrs={'xmlns': 'storage:metacontacts'}) iq = nbxmpp.Iq('get', Namespace.PRIVATE, payload=node) ===================================== gajim/common/setting_values.py ===================================== @@ -139,6 +139,7 @@ APP_SETTINGS = { 'chat_merge_consecutive_nickname': False, 'chat_merge_consecutive_nickname_indent': ' ', 'ctrl_tab_go_to_next_composing': True, + 'metacontacts_enabled': True, 'confirm_metacontacts': '', 'confirm_block': '', 'enable_negative_priority': False, @@ -254,12 +255,15 @@ ACCOUNT_SETTINGS = { 'filetransfer_preference': 'httpupload', 'send_chatstate_default': 'composing_only', 'gc_send_chatstate_default': 'composing_only', + 'send_marker_default': True, + 'gc_send_marker_default': True, 'chat_history_max_age': -1, }, 'contact': { 'speller_language': '', 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', }, @@ -271,6 +275,7 @@ ACCOUNT_SETTINGS = { 'minimize_on_autojoin': True, 'minimize_on_close': True, 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', 'sync_threshold': HAS_APP_DEFAULT, }, ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -261,7 +261,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): if result is False: app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Could not start local service'), - msg=_('Unable to bind to port %d.' % self.port))) + msg=_('Unable to bind to port %d.') % self.port)) else: # result is None app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Could not start local service'), ===================================== gajim/conversation_textview.py ===================================== @@ -38,6 +38,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.i18n import Q_ from gajim.common.helpers import AdditionalDataDict from gajim.common.const import StyleAttr from gajim.common.const import Trust @@ -311,6 +312,12 @@ class ConversationTextview(GObject.GObject): return line.set_receipt() + def show_displayed(self, id_): + line = self._get_message_line(id_) + if line is None: + return + line.set_displayed() + def show_error(self, id_, error): line = self._get_message_line(id_) if line is None: @@ -1194,16 +1201,27 @@ class MessageLine: self.timestamp = timestamp self.start_mark = start_mark self._has_receipt = False + self._has_displayed = False self._message_icons = message_icons @property def has_receipt(self): return self._has_receipt + @property + def has_displayed(self): + return self._has_displayed + def set_receipt(self): self._has_receipt = True + if self._has_displayed: + return self._message_icons.set_receipt_icon_visible(True) + def set_displayed(self): + self._has_displayed = True + self._message_icons.set_displayed_icon_visible(True) + def set_correction(self, tooltip): self._message_icons.set_correction_icon_visible(True) self._message_icons.set_correction_tooltip(tooltip) @@ -1222,12 +1240,12 @@ class MessageIcons(Gtk.Box): 'document-edit-symbolic', Gtk.IconSize.MENU) self._correction_image.set_no_show_all(True) - self._receipt_image = Gtk.Image.new_from_icon_name( + self._marker_image = Gtk.Image.new_from_icon_name( 'emblem-ok-symbolic', Gtk.IconSize.MENU) - self._receipt_image.get_style_context().add_class( + self._marker_image.get_style_context().add_class( 'receipt-received-color') - self._receipt_image.set_tooltip_text(_('Received')) - self._receipt_image.set_no_show_all(True) + self._marker_image.set_tooltip_text(_('Received')) + self._marker_image.set_no_show_all(True) self._error_image = Gtk.Image.new_from_icon_name( 'dialog-warning-symbolic', Gtk.IconSize.MENU) @@ -1235,14 +1253,22 @@ class MessageIcons(Gtk.Box): self._error_image.set_no_show_all(True) self.add(self._correction_image) - self.add(self._receipt_image) + self.add(self._marker_image) self.add(self._error_image) self.show_all() def set_receipt_icon_visible(self, visible): if not app.settings.get('positive_184_ack'): return - self._receipt_image.set_visible(visible) + self._marker_image.set_visible(visible) + + def set_displayed_icon_visible(self, visible): + self._marker_image.set_visible(visible) + self._marker_image.get_style_context().remove_class( + 'receipt-received-color') + self._marker_image.get_style_context().add_class( + 'displayed-received-color') + self._marker_image.set_tooltip_text(Q_('?Message state:Read')) def set_correction_icon_visible(self, visible): self._correction_image.set_visible(visible) ===================================== gajim/data/style/gajim.css ===================================== @@ -295,6 +295,7 @@ button.flat.link { padding: 0; border: 0; } /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } +.displayed-received-color { color: rgb(0, 141, 242); } /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} ===================================== gajim/groupchat_control.py ===================================== @@ -495,7 +495,7 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] message_id = con.get_module('MUC').invite(self.room_jid, contact_jid) self.add_info_message( - _('%s has been invited to this group chat' % contact_jid), + _('%s has been invited to this group chat') % contact_jid, message_id=message_id) def _on_destroy_room(self, _action, _param): @@ -591,7 +591,7 @@ class GroupchatControl(ChatControlBase): try: task.finish() except Exception as error: - self.add_info_message(_('Avatar upload failed: %s' % error)) + self.add_info_message(_('Avatar upload failed: %s') % error) else: self.add_info_message(_('Avatar upload successful')) @@ -612,7 +612,7 @@ class GroupchatControl(ChatControlBase): def _on_kick(self, _action, param): nick = param.get_string() self._kick_nick = nick - self.xml.kick_label.set_text(_('Kick %s' % nick)) + self.xml.kick_label.set_text(_('Kick %s') % nick) self.xml.kick_reason_entry.grab_focus() self.xml.kick_participant_button.grab_default() self._show_page('kick') @@ -621,7 +621,7 @@ class GroupchatControl(ChatControlBase): jid = param.get_string() self._ban_jid = jid nick = app.get_nick_from_jid(jid) - self.xml.ban_label.set_text(_('Ban %s' % nick)) + self.xml.ban_label.set_text(_('Ban %s') % nick) self.xml.ban_reason_entry.grab_focus() self.xml.ban_participant_button.grab_default() self._show_page('ban') @@ -656,6 +656,17 @@ class GroupchatControl(ChatControlBase): self.update_actions() self.set_lock_image() self.draw_banner_text() + type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] + if not app.events.remove_events(self.account, + self.get_full_jid(), + types=type_): + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_roster_row_activated(self, _roster, nick): self._start_private_message(nick) @@ -799,12 +810,12 @@ class GroupchatControl(ChatControlBase): tim=event.properties.timestamp, displaymarking=event.displaymarking, correct_id=event.correct_id, - message_id=event.properties.id, + message_id=event.properties.stanza_id.id, additional_data=event.additional_data) event.needs_highlight = self.needs_visual_notification(event.msgtxt) def on_private_message(self, nick, sent, msg, tim, session, additional_data, - msg_log_id=None, displaymarking=None): + message_id, msg_log_id=None, displaymarking=None): # Do we have a queue? fjid = self.room_jid + '/' + nick @@ -817,7 +828,9 @@ class GroupchatControl(ChatControlBase): session=session, displaymarking=displaymarking, sent_forwarded=sent, - additional_data=additional_data) + additional_data=additional_data, + message_id=message_id) + app.events.add_event(self.account, fjid, event) if allow_popup_window(self.account): @@ -1055,6 +1068,7 @@ class GroupchatControl(ChatControlBase): event.properties.timestamp, self.session, event.additional_data, + event.properties.id, msg_log_id=event.msg_log_id, displaymarking=event.displaymarking) ===================================== gajim/gtk/about.py ===================================== @@ -49,8 +49,8 @@ class AboutDialog(Gtk.AboutDialog): comments = [] comments.append(_('A GTK XMPP client')) - comments.append(_('GTK Version: %s' % gtk_ver)) - comments.append(_('GLib Version: %s' % glib_ver)) + comments.append(_('GTK Version: %s') % gtk_ver) + comments.append(_('GLib Version: %s') % glib_ver) comments.append(_('PyGObject Version: %s') % gobject_ver) comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) ===================================== gajim/gtk/add_contact.py ===================================== @@ -258,7 +258,7 @@ class AddNewContactWindow(Gtk.ApplicationWindow, EventHelper): if not jid: ErrorDialog( _('%s Missing') % self.uid_label.get_text(), - _('You must supply the %s of the new contact.' % + (_('You must supply the %s of the new contact.') % self.uid_label.get_text()) ) return ===================================== gajim/gtk/bookmarks.py ===================================== @@ -45,7 +45,7 @@ class Bookmarks(Gtk.ApplicationWindow): self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) - self.set_title(_('Bookmarks for %s' % app.get_account_label(account))) + self.set_title(_('Bookmarks for %s') % app.get_account_label(account)) self.set_default_size(700, 500) self.account = account ===================================== gajim/gtk/filetransfer.py ===================================== @@ -396,7 +396,7 @@ class FileTransfersWindow: file_name = GLib.markup_escape_text( os.path.basename(file_path)) ErrorDialog( - _('Cannot overwrite existing file \'%s\'' % file_name), + _('Cannot overwrite existing file \'%s\'') % file_name, _('A file with this name already exists and you do ' 'not have permission to overwrite it.')) return ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -71,6 +71,12 @@ class GroupChatSettings(SettingsBox): 'send_chatstate', props={'entries': chat_state}), + Setting(SettingKind.SWITCH, + _('Send Chat Markers'), + SettingType.GROUP_CHAT, + 'send_marker', + desc=_('Let others know if you read up to this point')), + Setting(SettingKind.POPOVER, _('Sync Threshold'), SettingType.GROUP_CHAT, ===================================== gajim/gtk/history_sync.py ===================================== @@ -248,11 +248,11 @@ class DownloadHistoryPage(Gtk.Box): self.received += 1 if self.count: self.progress.set_fraction(self.received / self.count) - self.progress.set_text(_('%(received)s of %(max)s' % { - 'received': self.received, 'max': self.count})) + self.progress.set_text(_('%(received)s of %(max)s') % { + 'received': self.received, 'max': self.count}) else: self.progress.pulse() - self.progress.set_text(_('Downloaded %s messages' % self.received)) + self.progress.set_text(_('Downloaded %s messages') % self.received) def finished(self): self.progress.set_fraction(1) @@ -273,7 +273,7 @@ class SummaryPage(Gtk.Box): def finished(self): received = self.assistant.download_history.received self.label.set_text(_('Finished synchronising chat history:\n' - '%s messages downloaded' % received)) + '%s messages downloaded') % received) def nothing_to_do(self): self.label.set_text(_('Gajim is fully synchronised with the archive.')) ===================================== gajim/gtk/pep_config.py ===================================== @@ -14,7 +14,7 @@ from gi.repository import Gdk from gi.repository import Gtk -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from gajim.common import app from gajim.common import ged @@ -85,9 +85,11 @@ class PEPConfig(Gtk.ApplicationWindow, EventHelper): self._con.get_module('Discovery').disco_items( jid, callback=self._items_received) - def _items_received(self, result): - if is_error_result(result): - ErrorDialog('Error', to_user_string(result)) + def _items_received(self, task): + try: + result = task.finish() + except StanzaError as error: + ErrorDialog('Error', to_user_string(error)) return jid = result.jid.bare ===================================== gajim/gtk/preferences.py ===================================== @@ -249,6 +249,11 @@ class ContactList(PreferenceBox): 'mergeaccounts', callback=self._on_merge_accounts), + Setting(SettingKind.SWITCH, + _('Enable Metacontacts'), + SettingType.CONFIG, + 'metacontacts_enabled'), + Setting(SettingKind.SWITCH, _('Show Avatars'), SettingType.CONFIG, ===================================== gajim/gtk/roster_item_exchange.py ===================================== @@ -194,7 +194,7 @@ class RosterItemExchangeWindow(Gtk.ApplicationWindow): count += 1 # It is selected message = _('%s suggested me to add you to my ' - 'contact list.' % self.jid_from) + 'contact list.') % self.jid_from # Keep same groups and same nickname groups = model[iter_][3].split(', ') if groups == ['']: ===================================== gajim/gtk/start_chat.py ===================================== @@ -652,7 +652,7 @@ class ContactRow(Gtk.ListBoxRow): if show_account: account_badge = generate_account_badge(account) account_badge.set_tooltip_text( - _('Account: %s' % self.account_label)) + _('Account: %s') % self.account_label) account_badge.set_halign(Gtk.Align.END) account_badge.set_valign(Gtk.Align.START) account_badge.set_hexpand(True) ===================================== gajim/gui_interface.py ===================================== @@ -242,6 +242,37 @@ class Interface: if ctrl and ctrl.session and len(obj.contact_list) > 1: ctrl.remove_session(ctrl.session) + def handle_event_read_state_sync(self, event): + if event.type.is_groupchat: + control = app.get_groupchat_control( + event.account, event.jid.bare) + if control is None: + log.warning('Groupchat control not found') + return + + jid = event.jid.bare + types = ['printed_gc_msg', 'printed_marked_gc_msg'] + + else: + types = ['chat', 'pm', 'printed_chat', 'printed_pm'] + 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, jid, types) + if not events_: + log.warning('No Events') + return + + if events_[-1].message_id != event.marker_id: + return + + if not app.events.remove_events(event.account, jid, types=types): + # There were events to remove + if control is not None: + control.redraw_after_event_removed(event.jid) + @staticmethod def handle_event_msgsent(obj): if not obj.play_sound: @@ -926,7 +957,7 @@ class Interface: if helpers.allow_showing_notification(account): heading = _('Incoming Call') contact = app.get_name_from_jid(account, event.jid) - text = _('%s is calling' % contact) + text = _('%s is calling') % contact app.notification.popup( heading, event.fjid, @@ -1060,6 +1091,7 @@ class Interface: 'unsubscribed-presence-received': [ self.handle_event_unsubscribed_presence], 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], + 'read-state-sync': [self.handle_event_read_state_sync], } def register_core_handlers(self): @@ -1983,7 +2015,7 @@ class Interface: _('Update Available'), _('Gajim Update Available'), _('There is an update available for Gajim ' - '(latest version: %s)' % str(latest_version)), + '(latest version: %s)') % str(latest_version), _('_Do not show again'), [DialogButton.make('Cancel', text=_('_Later'), ===================================== gajim/gui_menu_builder.py ===================================== @@ -511,12 +511,13 @@ def get_transport_menu(contact, account): return menu -def get_singlechat_menu(control_id, account, jid): +def get_singlechat_menu(control_id, account, jid, type_): singlechat_menu = [ (_('Send File'), [ ('win.send-file-httpupload-', _('Upload File…')), ('win.send-file-jingle-', _('Send File Directly…')), ]), + ('win.send-marker-', _('Send Read Markers')), (_('Send Chatstate'), ['chatstate']), ('win.invite-contacts-', _('Invite Contacts…')), ('win.add-to-roster-', _('Add to Contact List…')), @@ -545,6 +546,9 @@ def get_singlechat_menu(control_id, account, jid): for item in preset: if isinstance(item[1], str): action_name, label = item + if action_name == 'win.send-marker-' and type_ == 'pm': + continue + if action_name == 'app.browse-history': menuitem = Gio.MenuItem.new(label, action_name) dict_ = {'account': GLib.Variant('s', account), ===================================== gajim/roster_window.py ===================================== @@ -66,7 +66,6 @@ from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import ConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputDialog -from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.add_contact import AddNewContactWindow @@ -3664,11 +3663,7 @@ class RosterWindow: con_dest = app.connections[account_dest] if (not con_source.get_module('MetaContacts').available or not con_dest.get_module('MetaContacts').available): - WarningDialog(_('Metacontacts storage not supported by ' - 'your server'), - _('Your server does not support storing metacontacts ' - 'information. So this information will not be saved on next ' - 'reconnection.')) + return def merge_contacts(is_checked=None): contacts = 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/082588d1bab56882fb48d1648f2182c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/082588d1bab56882fb48d1648f2182c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix format of translatable strings
by Philipp Hörist 11 Oct '20

11 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 159be3fa by André Apitzsch at 2020-10-11T12:28:05+02:00 Fix format of translatable strings - - - - - 12 changed files: - gajim/chat_control_base.py - gajim/common/jingle_rtp.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/groupchat_control.py - gajim/gtk/about.py - gajim/gtk/add_contact.py - gajim/gtk/bookmarks.py - gajim/gtk/filetransfer.py - gajim/gtk/history_sync.py - gajim/gtk/roster_item_exchange.py - gajim/gtk/start_chat.py - gajim/gui_interface.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1334,7 +1334,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): _('Privacy'), _('Warning'), _('If you send a file to <b>%s</b>, your real XMPP ' - 'address will be revealed.' % gc_contact.name), + 'address will be revealed.') % gc_contact.name, [DialogButton.make('Cancel'), DialogButton.make( 'OK', ===================================== gajim/common/jingle_rtp.py ===================================== @@ -130,7 +130,7 @@ class JingleRTPContent(JingleContent): None, conn=self.session.connection, level='error', - pri_txt=_('%s configuration error' % text), + pri_txt=_('%s configuration error') % text, sec_txt=_('Couldn’t set up %(text)s. Check your ' 'configuration.\nPipeline:\n%(pipeline)s\n' 'Error:\n%(error)s') % { ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -261,7 +261,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): if result is False: app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Could not start local service'), - msg=_('Unable to bind to port %d.' % self.port))) + msg=_('Unable to bind to port %d.') % self.port)) else: # result is None app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Could not start local service'), ===================================== gajim/groupchat_control.py ===================================== @@ -495,7 +495,7 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] message_id = con.get_module('MUC').invite(self.room_jid, contact_jid) self.add_info_message( - _('%s has been invited to this group chat' % contact_jid), + _('%s has been invited to this group chat') % contact_jid, message_id=message_id) def _on_destroy_room(self, _action, _param): @@ -591,7 +591,7 @@ class GroupchatControl(ChatControlBase): try: task.finish() except Exception as error: - self.add_info_message(_('Avatar upload failed: %s' % error)) + self.add_info_message(_('Avatar upload failed: %s') % error) else: self.add_info_message(_('Avatar upload successful')) @@ -612,7 +612,7 @@ class GroupchatControl(ChatControlBase): def _on_kick(self, _action, param): nick = param.get_string() self._kick_nick = nick - self.xml.kick_label.set_text(_('Kick %s' % nick)) + self.xml.kick_label.set_text(_('Kick %s') % nick) self.xml.kick_reason_entry.grab_focus() self.xml.kick_participant_button.grab_default() self._show_page('kick') @@ -621,7 +621,7 @@ class GroupchatControl(ChatControlBase): jid = param.get_string() self._ban_jid = jid nick = app.get_nick_from_jid(jid) - self.xml.ban_label.set_text(_('Ban %s' % nick)) + self.xml.ban_label.set_text(_('Ban %s') % nick) self.xml.ban_reason_entry.grab_focus() self.xml.ban_participant_button.grab_default() self._show_page('ban') ===================================== gajim/gtk/about.py ===================================== @@ -49,8 +49,8 @@ class AboutDialog(Gtk.AboutDialog): comments = [] comments.append(_('A GTK XMPP client')) - comments.append(_('GTK Version: %s' % gtk_ver)) - comments.append(_('GLib Version: %s' % glib_ver)) + comments.append(_('GTK Version: %s') % gtk_ver) + comments.append(_('GLib Version: %s') % glib_ver) comments.append(_('PyGObject Version: %s') % gobject_ver) comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) ===================================== gajim/gtk/add_contact.py ===================================== @@ -258,7 +258,7 @@ class AddNewContactWindow(Gtk.ApplicationWindow, EventHelper): if not jid: ErrorDialog( _('%s Missing') % self.uid_label.get_text(), - _('You must supply the %s of the new contact.' % + (_('You must supply the %s of the new contact.') % self.uid_label.get_text()) ) return ===================================== gajim/gtk/bookmarks.py ===================================== @@ -45,7 +45,7 @@ class Bookmarks(Gtk.ApplicationWindow): self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) - self.set_title(_('Bookmarks for %s' % app.get_account_label(account))) + self.set_title(_('Bookmarks for %s') % app.get_account_label(account)) self.set_default_size(700, 500) self.account = account ===================================== gajim/gtk/filetransfer.py ===================================== @@ -396,7 +396,7 @@ class FileTransfersWindow: file_name = GLib.markup_escape_text( os.path.basename(file_path)) ErrorDialog( - _('Cannot overwrite existing file \'%s\'' % file_name), + _('Cannot overwrite existing file \'%s\'') % file_name, _('A file with this name already exists and you do ' 'not have permission to overwrite it.')) return ===================================== gajim/gtk/history_sync.py ===================================== @@ -248,11 +248,11 @@ class DownloadHistoryPage(Gtk.Box): self.received += 1 if self.count: self.progress.set_fraction(self.received / self.count) - self.progress.set_text(_('%(received)s of %(max)s' % { - 'received': self.received, 'max': self.count})) + self.progress.set_text(_('%(received)s of %(max)s') % { + 'received': self.received, 'max': self.count}) else: self.progress.pulse() - self.progress.set_text(_('Downloaded %s messages' % self.received)) + self.progress.set_text(_('Downloaded %s messages') % self.received) def finished(self): self.progress.set_fraction(1) @@ -273,7 +273,7 @@ class SummaryPage(Gtk.Box): def finished(self): received = self.assistant.download_history.received self.label.set_text(_('Finished synchronising chat history:\n' - '%s messages downloaded' % received)) + '%s messages downloaded') % received) def nothing_to_do(self): self.label.set_text(_('Gajim is fully synchronised with the archive.')) ===================================== gajim/gtk/roster_item_exchange.py ===================================== @@ -194,7 +194,7 @@ class RosterItemExchangeWindow(Gtk.ApplicationWindow): count += 1 # It is selected message = _('%s suggested me to add you to my ' - 'contact list.' % self.jid_from) + 'contact list.') % self.jid_from # Keep same groups and same nickname groups = model[iter_][3].split(', ') if groups == ['']: ===================================== gajim/gtk/start_chat.py ===================================== @@ -652,7 +652,7 @@ class ContactRow(Gtk.ListBoxRow): if show_account: account_badge = generate_account_badge(account) account_badge.set_tooltip_text( - _('Account: %s' % self.account_label)) + _('Account: %s') % self.account_label) account_badge.set_halign(Gtk.Align.END) account_badge.set_valign(Gtk.Align.START) account_badge.set_hexpand(True) ===================================== gajim/gui_interface.py ===================================== @@ -926,7 +926,7 @@ class Interface: if helpers.allow_showing_notification(account): heading = _('Incoming Call') contact = app.get_name_from_jid(account, event.jid) - text = _('%s is calling' % contact) + text = _('%s is calling') % contact app.notification.popup( heading, event.fjid, @@ -1983,7 +1983,7 @@ class Interface: _('Update Available'), _('Gajim Update Available'), _('There is an update available for Gajim ' - '(latest version: %s)' % str(latest_version)), + '(latest version: %s)') % str(latest_version), _('_Do not show again'), [DialogButton.make('Cancel', text=_('_Later'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/159be3faf58225bb7e1b5de119f66cdb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/159be3faf58225bb7e1b5de119f66cdb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 11 Oct '20

11 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: bb740ca4 by lovetox at 2020-10-11T10:27:59+02:00 Remove unused import - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -66,7 +66,6 @@ from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import ConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputDialog -from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.add_contact import AddNewContactWindow View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bb740ca431b9216f639ed901de056570… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bb740ca431b9216f639ed901de056570… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PEPConfig: Fix task callback
by Philipp Hörist 11 Oct '20

11 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 362c3d01 by lovetox at 2020-10-11T10:26:41+02:00 PEPConfig: Fix task callback - - - - - 1 changed file: - gajim/gtk/pep_config.py Changes: ===================================== gajim/gtk/pep_config.py ===================================== @@ -14,7 +14,7 @@ from gi.repository import Gdk from gi.repository import Gtk -from nbxmpp.util import is_error_result +from nbxmpp.errors import StanzaError from gajim.common import app from gajim.common import ged @@ -85,9 +85,11 @@ class PEPConfig(Gtk.ApplicationWindow, EventHelper): self._con.get_module('Discovery').disco_items( jid, callback=self._items_received) - def _items_received(self, result): - if is_error_result(result): - ErrorDialog('Error', to_user_string(result)) + def _items_received(self, task): + try: + result = task.finish() + except StanzaError as error: + ErrorDialog('Error', to_user_string(error)) return jid = result.jid.bare View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/362c3d01222c3be73d99dc762ad64ab8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/362c3d01222c3be73d99dc762ad64ab8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Add setting to disable metacontacts
by Philipp Hörist 11 Oct '20

11 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 39805924 by lovetox at 2020-10-11T07:46:16+02:00 Preferences: Add setting to disable metacontacts - - - - - 4 changed files: - gajim/common/modules/metacontacts.py - gajim/common/setting_values.py - gajim/gtk/preferences.py - gajim/roster_window.py Changes: ===================================== gajim/common/modules/metacontacts.py ===================================== @@ -30,6 +30,10 @@ class MetaContacts(BaseModule): self.available = False def get_metacontacts(self): + if not app.settings.get('metacontacts_enabled'): + self._con.connect_machine() + return + self._log.info('Request') node = nbxmpp.Node('storage', attrs={'xmlns': 'storage:metacontacts'}) iq = nbxmpp.Iq('get', Namespace.PRIVATE, payload=node) ===================================== gajim/common/setting_values.py ===================================== @@ -139,6 +139,7 @@ APP_SETTINGS = { 'chat_merge_consecutive_nickname': False, 'chat_merge_consecutive_nickname_indent': ' ', 'ctrl_tab_go_to_next_composing': True, + 'metacontacts_enabled': True, 'confirm_metacontacts': '', 'confirm_block': '', 'enable_negative_priority': False, ===================================== gajim/gtk/preferences.py ===================================== @@ -249,6 +249,11 @@ class ContactList(PreferenceBox): 'mergeaccounts', callback=self._on_merge_accounts), + Setting(SettingKind.SWITCH, + _('Enable Metacontacts'), + SettingType.CONFIG, + 'metacontacts_enabled'), + Setting(SettingKind.SWITCH, _('Show Avatars'), SettingType.CONFIG, ===================================== gajim/roster_window.py ===================================== @@ -3664,11 +3664,7 @@ class RosterWindow: con_dest = app.connections[account_dest] if (not con_source.get_module('MetaContacts').available or not con_dest.get_module('MetaContacts').available): - WarningDialog(_('Metacontacts storage not supported by ' - 'your server'), - _('Your server does not support storing metacontacts ' - 'information. So this information will not be saved on next ' - 'reconnection.')) + return def merge_contacts(is_checked=None): contacts = 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/39805924fcac5dc9b12939430a03f371… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/39805924fcac5dc9b12939430a03f371… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] 7 commits: Jingle AV: Fix some strings
by Daniel Brötzmann 10 Oct '20

10 Oct '20

Daniel Brötzmann pushed to branch chat_markers at gajim / gajim Commits: 7233552e by Daniel Brötzmann at 2020-10-09T09:58:29+02:00 Jingle AV: Fix some strings - - - - - 35e6548f by Daniel Brötzmann at 2020-10-09T18:42:03+02:00 Don’t use f-strings for translatable strings - - - - - 79ca7c18 by wurstsalat at 2020-10-10T12:18:06+02:00 ChatControl: Fix invitation handling via message bar - - - - - 1e17633d by wurstsalat at 2020-10-10T12:19:19+02:00 ChatControl: Order message bar buttons correctly - - - - - 27f2ce46 by wurstsalat at 2020-10-10T17:17:57+02:00 Make GenericName 'XMPP Chat Client' - - - - - 6d1c7c66 by Yann Leboulanger at 2020-10-10T17:21:16+02:00 Add Chat Markers (XEP-0333) - - - - - 082588d1 by wurstsalat at 2020-10-10T17:21:16+02:00 Improvements - - - - - 16 changed files: - data/org.gajim.Gajim.desktop.in - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/const.py - gajim/common/events.py - gajim/common/jingle_rtp.py - gajim/common/modules/__init__.py - + gajim/common/modules/chat_markers.py - gajim/common/modules/message.py - gajim/common/setting_values.py - gajim/conversation_textview.py - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/groupchat_settings.py - gajim/gui_interface.py - gajim/gui_menu_builder.py Changes: ===================================== data/org.gajim.Gajim.desktop.in ===================================== @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Network;InstantMessaging;GTK;Chat; Name=Gajim -GenericName=XMPP IM Client +GenericName=XMPP Chat Client Comment=A fully-featured XMPP chat client #Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=chat;messaging;im;xmpp;bonjour;voip; ===================================== gajim/chat_control.py ===================================== @@ -123,7 +123,7 @@ class ChatControl(ChatControlBase): # Menu for the HeaderBar self.control_menu = gui_menu_builder.get_singlechat_menu( - self.control_id, self.account, self.contact.jid) + self.control_id, self.account, self.contact.jid, self._type) # Settings menu self.xml.settings_menu.set_menu_model(self.control_menu) @@ -228,6 +228,7 @@ class ChatControl(ChatControlBase): ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), ('decrypted-message-received', ged.GUI1, self._on_decrypted_message_received), ('receipt-received', ged.GUI1, self._receipt_received), + ('displayed-received', ged.GUI1, self._displayed_received), ('message-error', ged.GUI1, self._on_message_error), ('zeroconf-error', ged.GUI1, self._on_zeroconf_error), ]) @@ -271,6 +272,15 @@ class ChatControl(ChatControlBase): act.connect('change-state', self._on_send_chatstate) self.parent_win.window.add_action(act) + marker = self.contact.settings.get('send_marker') + + act = Gio.SimpleAction.new_stateful( + f'send-marker-{self.control_id}', + None, + GLib.Variant.new_boolean(marker)) + act.connect('change-state', self._on_send_marker) + self.parent_win.window.add_action(act) + def update_actions(self): win = self.parent_win.window online = app.account_is_connected(self.account) @@ -363,6 +373,7 @@ class ChatControl(ChatControlBase): 'information-', 'start-call-', 'send-chatstate-', + 'send-marker', ] for action in actions: self.parent_win.window.remove_action(f'{action}{self.control_id}') @@ -435,6 +446,10 @@ class ChatControl(ChatControlBase): action.set_state(param) self.contact.settings.set('send_chatstate', param.get_string()) + def _on_send_marker(self, action, param): + action.set_state(param) + self.contact.settings.set('send_marker', param.get_boolean()) + def subscribe_events(self): """ Register listeners to the events class @@ -643,6 +658,10 @@ class ChatControl(ChatControlBase): def _receipt_received(self, event): self.conv_textview.show_receipt(event.receipt_id) + @event_filter(['account', 'jid']) + def _displayed_received(self, event): + self.conv_textview.show_displayed(event.marker_id) + @event_filter(['account', 'jid']) def _on_zeroconf_error(self, event): self.add_status_message(event.message) @@ -1384,6 +1403,14 @@ class ChatControl(ChatControlBase): self.set_session(event.session) if message_ids: app.storage.archive.set_read_messages(message_ids) + + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None app.events.remove_events(self.account, jid_with_resource, types=[str(self._type)]) @@ -1510,13 +1537,15 @@ class ChatControl(ChatControlBase): markup += '\n%s: %s' % ( _('Size'), GLib.format_size_full(file_props.size, units)) - b1 = Gtk.Button.new_with_mnemonic(_('_Accept')) - b1.connect('clicked', self._on_accept_file_request, file_props) - b2 = Gtk.Button.new_with_mnemonic(_('_Decline')) - b2.connect('clicked', self._on_cancel_file_request, file_props) + button_decline = Gtk.Button.new_with_mnemonic(_('_Decline')) + button_decline.connect( + 'clicked', self._on_cancel_file_request, file_props) + button_accept = Gtk.Button.new_with_mnemonic(_('_Accept')) + button_accept.connect( + 'clicked', self._on_accept_file_request, file_props) self._add_info_bar_message( markup, - [b1, b2], + [button_decline, button_accept], file_props, Gtk.MessageType.QUESTION) @@ -1570,13 +1599,13 @@ class ChatControl(ChatControlBase): markup = '<b>%s</b>\n%s' % (_('Group Chat Invitation'), event.muc) if event.reason: markup += '\n(%s)' % event.reason - b1 = Gtk.Button.new_with_mnemonic(_('_Accept')) - b1.connect('clicked', self._on_accept_gc_invitation, event) - b2 = Gtk.Button.new_with_mnemonic(_('_Decline')) - b2.connect('clicked', self._on_cancel_gc_invitation, event) + button_decline = Gtk.Button.new_with_mnemonic(_('_Decline')) + button_decline.connect('clicked', self._on_cancel_gc_invitation, event) + button_accept = Gtk.Button.new_with_mnemonic(_('_Accept')) + button_accept.connect('clicked', self._on_accept_gc_invitation, event) self._add_info_bar_message( markup, - [b1, b2], + [button_decline, button_accept], (event.muc, event.reason), Gtk.MessageType.QUESTION) @@ -1688,7 +1717,7 @@ class ChatControl(ChatControlBase): if ev.muc == ib_msg[2][0]: self.info_bar_queue.remove(ib_msg) removed = True - if ev.type_ == 'jingle-incoming': + elif ev.type_ == 'jingle-incoming': # TODO: Need to be more specific here? self.info_bar_queue.remove(ib_msg) removed = True ===================================== gajim/chat_control_base.py ===================================== @@ -214,6 +214,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.received_history_pos = 0 self.orig_msg = None + # For XEP-0333 + self.last_msg_id = None + self.correcting = False self.last_sent_msg = None @@ -1154,6 +1157,10 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if restored: return + if message_id: + print('Setting last_msg_id: ', message_id) + self.last_msg_id = message_id + if kind == 'incoming': if (not self._type.is_groupchat or self.contact.can_notify() or @@ -1198,7 +1205,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): event = event_type(text, subject, - self, msg_log_id, + self, + msg_log_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) @@ -1350,7 +1359,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): jid = self.contact.jid if self.conv_textview.autoscroll: # we are at the end - type_ = ['printed_%s' % self._type] + type_ = [f'printed_{self._type}'] if self._type.is_groupchat: type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] if not app.events.remove_events(self.account, @@ -1358,6 +1367,12 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): types=type_): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> marker + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None # send chatstate inactive to the one we're leaving # and active to the one we visit if self.msg_textview.has_text(): @@ -1386,20 +1401,27 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): types_list = [] if self._type.is_groupchat: types_list = ['printed_gc_msg', 'gc_msg', 'printed_marked_gc_msg'] - else: # Not a GC - types_list = ['printed_%s' % self._type, str(self._type)] + else: + types_list = [f'printed_{self._type}', str(self._type)] if not app.events.get_events(self.account, jid, types_list): return if not self.parent_win: return - if self.parent_win.get_active_control() == self and \ - self.parent_win.window.is_active(): + if (self.parent_win.get_active_control() == self and + self.parent_win.window.is_active()): # we are at the end if not app.events.remove_events( self.account, jid, types=types_list): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> tag + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_scrollbar_button_release(self, scrollbar, event): if event.get_button()[1] != 1: @@ -1464,6 +1486,8 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): We just removed a 'printed_*' event, redraw contact in roster or gc_roster and titles in roster and msg_win """ + if not self.parent_win: # minimized groupchat + return self.parent_win.redraw_tab(self) self.parent_win.show_title() # TODO : get the contact and check get_show_in_roster() ===================================== gajim/common/const.py ===================================== @@ -970,6 +970,7 @@ COMMON_FEATURES = [ Namespace.SECLABEL, Namespace.CONFERENCE, Namespace.CORRECT, + Namespace.CHATMARKERS, Namespace.EME, Namespace.XHTML_IM, Namespace.HASHES_2, ===================================== gajim/common/events.py ===================================== @@ -91,13 +91,14 @@ class PmEvent(ChatEvent): class PrintedChatEvent(Event): type_ = 'printed_chat' def __init__(self, message, subject, control, msg_log_id, time_=None, - show_in_roster=False, show_in_systray=True): + message_id=None, show_in_roster=False, show_in_systray=True): Event.__init__(self, time_, show_in_roster=show_in_roster, show_in_systray=show_in_systray) self.message = message self.subject = subject self.control = control self.msg_log_id = msg_log_id + self.message_id = message_id class PrintedGcMsgEvent(PrintedChatEvent): type_ = 'printed_gc_msg' ===================================== gajim/common/jingle_rtp.py ===================================== @@ -130,11 +130,13 @@ class JingleRTPContent(JingleContent): None, conn=self.session.connection, level='error', - pri_txt=_(f'{text.capitalize()} configuration error'), - sec_txt=_( - f'Couldn’t set up {text}. Check your configuration.\n' - f'Pipeline was:\n{pipeline}\n' - f'Error was:\n{err}'))) + pri_txt=_('%s configuration error' % text), + sec_txt=_('Couldn’t set up %(text)s. Check your ' + 'configuration.\nPipeline:\n%(pipeline)s\n' + 'Error:\n%(error)s') % { + 'text': text, + 'pipeline': pipeline, + 'error': str(err)})) raise JingleContentSetupException def add_remote_candidates(self, candidates): ===================================== gajim/common/modules/__init__.py ===================================== @@ -40,6 +40,7 @@ MODULES = [ 'bookmarks', 'caps', 'carbons', + 'chat_markers', 'chatstates', 'delimiter', 'discovery', ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -0,0 +1,113 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# Chat Markers (XEP-0333) + +import nbxmpp +from nbxmpp.namespaces import Namespace +from nbxmpp.structs import StanzaHandler + +from gajim.common import app +from gajim.common.nec import NetworkEvent +from gajim.common.modules.base import BaseModule + + +class ChatMarkers(BaseModule): + + _nbxmpp_extends = 'ChatMarkers' + + def __init__(self, con): + BaseModule.__init__(self, con) + + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_chat_marker, + ns=Namespace.CHATMARKERS, + priority=47), + ] + + def _process_chat_marker(self, _con, _stanza, properties): + if not properties.is_marker or not properties.marker.is_displayed: + return + + if properties.type.is_error: + return + + if properties.type.is_groupchat: + manager = self._con.get_module('MUC').get_manager() + muc_data = manager.get(properties.muc_jid) + if muc_data is None: + return + + if properties.muc_nickname != muc_data.nick: + return + + self._raise_event('read-state-sync', properties) + return + + if properties.is_carbon_message and properties.carbon.is_sent: + self._raise_event('read-state-sync', properties) + return + + if properties.is_mam_message: + if properties.from_.bareMatch(self._con.get_own_jid()): + return + + self._raise_event('displayed-received', properties) + + def _raise_event(self, name, properties): + self._log.info('%s: %s %s', + name, + properties.jid, + properties.marker.id) + + jid = properties.jid + if not properties.is_muc_pm and not properties.type.is_groupchat: + jid = properties.jid.bare + + app.nec.push_outgoing_event( + NetworkEvent(name, + account=self._account, + jid=jid, + properties=properties, + type=properties.type, + is_muc_pm=properties.is_muc_pm, + marker_id=properties.marker.id)) + + def _send_marker(self, contact, marker, id_, type_): + jid = contact.jid + if contact.is_pm_contact: + jid = app.get_jid_without_resource(contact.jid) + + if type_ in ('gc', 'pm'): + if not app.settings.get_group_chat_setting( + self._account, jid, 'send_marker'): + return + else: + if not app.settings.get_contact_setting( + self._account, jid, 'send_marker'): + return + + typ = 'groupchat' if type_ == 'gc' else 'chat' + message = nbxmpp.Message(to=contact.jid, typ=typ) + message.setMarker(marker, id_) + self._log.info('Send %s: %s', marker, contact.jid) + self._nbxmpp().send(message) + + def send_displayed_marker(self, contact, id_, type_): + self._send_marker(contact, 'displayed', id_, type_) + + +def get_instance(*args, **kwargs): + return ChatMarkers(*args, **kwargs), 'ChatMarkers' ===================================== gajim/common/modules/message.py ===================================== @@ -305,6 +305,8 @@ class Message(BaseModule): stanza.setID(message.message_id) stanza.setOriginID(message.message_id) + stanza.setMarkable() + if message.label: stanza.addChild(node=message.label) @@ -347,6 +349,10 @@ class Message(BaseModule): stanza.setTag('no-store', namespace=Namespace.MSG_HINTS) + # XEP-0333 + if message.message: + stanza.setMarkable() + # Add other nodes if message.nodes is not None: for node in message.nodes: ===================================== gajim/common/setting_values.py ===================================== @@ -254,12 +254,15 @@ ACCOUNT_SETTINGS = { 'filetransfer_preference': 'httpupload', 'send_chatstate_default': 'composing_only', 'gc_send_chatstate_default': 'composing_only', + 'send_marker_default': False, + 'gc_send_marker_default': False, 'chat_history_max_age': -1, }, 'contact': { 'speller_language': '', 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', }, @@ -271,6 +274,7 @@ ACCOUNT_SETTINGS = { 'minimize_on_autojoin': True, 'minimize_on_close': True, 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', 'sync_threshold': HAS_APP_DEFAULT, }, ===================================== gajim/conversation_textview.py ===================================== @@ -38,6 +38,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.i18n import Q_ from gajim.common.helpers import AdditionalDataDict from gajim.common.const import StyleAttr from gajim.common.const import Trust @@ -311,6 +312,12 @@ class ConversationTextview(GObject.GObject): return line.set_receipt() + def show_displayed(self, id_): + line = self._get_message_line(id_) + if line is None: + return + line.set_displayed() + def show_error(self, id_, error): line = self._get_message_line(id_) if line is None: @@ -1194,16 +1201,27 @@ class MessageLine: self.timestamp = timestamp self.start_mark = start_mark self._has_receipt = False + self._has_displayed = False self._message_icons = message_icons @property def has_receipt(self): return self._has_receipt + @property + def has_displayed(self): + return self._has_displayed + def set_receipt(self): self._has_receipt = True + if self._has_displayed: + return self._message_icons.set_receipt_icon_visible(True) + def set_displayed(self): + self._has_displayed = True + self._message_icons.set_displayed_icon_visible(True) + def set_correction(self, tooltip): self._message_icons.set_correction_icon_visible(True) self._message_icons.set_correction_tooltip(tooltip) @@ -1222,12 +1240,12 @@ class MessageIcons(Gtk.Box): 'document-edit-symbolic', Gtk.IconSize.MENU) self._correction_image.set_no_show_all(True) - self._receipt_image = Gtk.Image.new_from_icon_name( + self._marker_image = Gtk.Image.new_from_icon_name( 'emblem-ok-symbolic', Gtk.IconSize.MENU) - self._receipt_image.get_style_context().add_class( + self._marker_image.get_style_context().add_class( 'receipt-received-color') - self._receipt_image.set_tooltip_text(_('Received')) - self._receipt_image.set_no_show_all(True) + self._marker_image.set_tooltip_text(_('Received')) + self._marker_image.set_no_show_all(True) self._error_image = Gtk.Image.new_from_icon_name( 'dialog-warning-symbolic', Gtk.IconSize.MENU) @@ -1235,14 +1253,22 @@ class MessageIcons(Gtk.Box): self._error_image.set_no_show_all(True) self.add(self._correction_image) - self.add(self._receipt_image) + self.add(self._marker_image) self.add(self._error_image) self.show_all() def set_receipt_icon_visible(self, visible): if not app.settings.get('positive_184_ack'): return - self._receipt_image.set_visible(visible) + self._marker_image.set_visible(visible) + + def set_displayed_icon_visible(self, visible): + self._marker_image.set_visible(visible) + self._marker_image.get_style_context().remove_class( + 'receipt-received-color') + self._marker_image.get_style_context().add_class( + 'displayed-received-color') + self._marker_image.set_tooltip_text(Q_('?Message state:Read')) def set_correction_icon_visible(self, visible): self._correction_image.set_visible(visible) ===================================== gajim/data/style/gajim.css ===================================== @@ -295,6 +295,7 @@ button.flat.link { padding: 0; border: 0; } /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } +.displayed-received-color { color: rgb(0, 141, 242); } /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} ===================================== gajim/groupchat_control.py ===================================== @@ -495,7 +495,7 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] message_id = con.get_module('MUC').invite(self.room_jid, contact_jid) self.add_info_message( - _(f'{contact_jid} has been invited to this group chat'), + _('%s has been invited to this group chat' % contact_jid), message_id=message_id) def _on_destroy_room(self, _action, _param): @@ -591,7 +591,7 @@ class GroupchatControl(ChatControlBase): try: task.finish() except Exception as error: - self.add_info_message(_(f'Avatar upload failed: {error}')) + self.add_info_message(_('Avatar upload failed: %s' % error)) else: self.add_info_message(_('Avatar upload successful')) @@ -785,6 +785,8 @@ class GroupchatControl(ChatControlBase): @event_filter(['account', 'room_jid']) def _on_gc_message_received(self, event): + print('_on_gc_message_received') + print(event.properties.stanza_id.id) if event.properties.muc_nickname is None: # message from server self.add_message(event.msgtxt, @@ -804,7 +806,7 @@ class GroupchatControl(ChatControlBase): event.needs_highlight = self.needs_visual_notification(event.msgtxt) def on_private_message(self, nick, sent, msg, tim, session, additional_data, - msg_log_id=None, displaymarking=None): + message_id, msg_log_id=None, displaymarking=None): # Do we have a queue? fjid = self.room_jid + '/' + nick @@ -817,7 +819,9 @@ class GroupchatControl(ChatControlBase): session=session, displaymarking=displaymarking, sent_forwarded=sent, - additional_data=additional_data) + additional_data=additional_data, + message_id=message_id) + app.events.add_event(self.account, fjid, event) if allow_popup_window(self.account): @@ -1055,6 +1059,7 @@ class GroupchatControl(ChatControlBase): event.properties.timestamp, self.session, event.additional_data, + event.properties.id, msg_log_id=event.msg_log_id, displaymarking=event.displaymarking) ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -71,6 +71,12 @@ class GroupChatSettings(SettingsBox): 'send_chatstate', props={'entries': chat_state}), + Setting(SettingKind.SWITCH, + _('Send Chat Markers'), + SettingType.GROUP_CHAT, + 'send_marker', + desc=_('Let others know if you read up to this point')), + Setting(SettingKind.POPOVER, _('Sync Threshold'), SettingType.GROUP_CHAT, ===================================== gajim/gui_interface.py ===================================== @@ -242,6 +242,42 @@ class Interface: if ctrl and ctrl.session and len(obj.contact_list) > 1: ctrl.remove_session(ctrl.session) + def handle_event_read_state_sync(self, event): + if event.type.is_groupchat: + control = app.get_groupchat_control( + event.account, event.jid.bare) + if control is None: + log.warning('Groupchat control not found') + return + + jid = event.jid.bare + types = ['printed_gc_msg', 'printed_marked_gc_msg'] + + else: + types = ['chat', 'pm', 'printed_chat', 'printed_pm'] + 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, jid, types) + if not events_: + log.warning('No Events') + return + + print('marker ids') + print('event.marker_id') + print(event.marker_id) + print('events_[-1].message_id') + print(events_[-1].message_id) + if events_[-1].message_id != event.marker_id: + return + + if not app.events.remove_events(event.account, jid, types=types): + # There were events to remove + if control is not None: + control.redraw_after_event_removed(event.jid) + @staticmethod def handle_event_msgsent(obj): if not obj.play_sound: @@ -389,7 +425,8 @@ class Interface: if helpers.allow_showing_notification(event.account): contact_name = event.get_inviter_name() event_type = _('Group Chat Invitation') - text = _(f'{contact_name} invited you to {event.info.muc_name}') + text = _('%(contact)s invited you to %(chat)s') % { + 'contact': contact_name, 'chat': event.info.muc_name} app.notification.popup(event_type, str(event.from_), event.account, @@ -924,7 +961,8 @@ class Interface: if helpers.allow_showing_notification(account): heading = _('Incoming Call') - text = _(f'{app.get_name_from_jid(account, event.jid)} is calling') + contact = app.get_name_from_jid(account, event.jid) + text = _('%s is calling' % contact) app.notification.popup( heading, event.fjid, @@ -1058,6 +1096,7 @@ class Interface: 'unsubscribed-presence-received': [ self.handle_event_unsubscribed_presence], 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], + 'read-state-sync': [self.handle_event_read_state_sync], } def register_core_handlers(self): ===================================== gajim/gui_menu_builder.py ===================================== @@ -511,12 +511,13 @@ def get_transport_menu(contact, account): return menu -def get_singlechat_menu(control_id, account, jid): +def get_singlechat_menu(control_id, account, jid, type_): singlechat_menu = [ (_('Send File'), [ ('win.send-file-httpupload-', _('Upload File…')), ('win.send-file-jingle-', _('Send File Directly…')), ]), + ('win.send-marker-', _('Send Read Markers')), (_('Send Chatstate'), ['chatstate']), ('win.invite-contacts-', _('Invite Contacts…')), ('win.add-to-roster-', _('Add to Contact List…')), @@ -545,6 +546,9 @@ def get_singlechat_menu(control_id, account, jid): for item in preset: if isinstance(item[1], str): action_name, label = item + if action_name == 'win.send-marker-' and type_ == 'pm': + continue + if action_name == 'app.browse-history': menuitem = Gio.MenuItem.new(label, action_name) dict_ = {'account': GLib.Variant('s', account), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c9d685f59f4634d5806502c10da854c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c9d685f59f4634d5806502c10da854c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make GenericName 'XMPP Chat Client'
by Daniel Brötzmann 10 Oct '20

10 Oct '20

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 27f2ce46 by wurstsalat at 2020-10-10T17:17:57+02:00 Make GenericName 'XMPP Chat Client' - - - - - 1 changed file: - data/org.gajim.Gajim.desktop.in Changes: ===================================== data/org.gajim.Gajim.desktop.in ===================================== @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Network;InstantMessaging;GTK;Chat; Name=Gajim -GenericName=XMPP IM Client +GenericName=XMPP Chat Client Comment=A fully-featured XMPP chat client #Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=chat;messaging;im;xmpp;bonjour;voip; View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/27f2ce46bf977cfafbc473f9ea17b245… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/27f2ce46bf977cfafbc473f9ea17b245… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits