Commits January 2020

commits@gajim.org

1 participants
39 discussions

[Git][gajim/gajim][master] Roster: Show group chat description instead of topic
by Philipp Hörist 31 Jan '20

31 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9a8ca991 by Daniel Brötzmann at 2020-01-31T15:04:23+01:00 Roster: Show group chat description instead of topic - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== @@ -1205,17 +1205,23 @@ class RosterWindow: # add status msg, if not empty, under contact name in # the treeview - if contact.status and app.config.get('show_status_msgs_in_roster'): - status = contact.status.strip() - if status != '': - status = helpers.reduce_chars_newlines(status, - max_lines=1) - # escape markup entities and make them small - - # italic - name += ('\n<span size="small" style="italic" ' - 'alpha="70%">{}</span>'.format( - GLib.markup_escape_text(status))) + if app.config.get('show_status_msgs_in_roster'): + status_span = '\n<span size="small" style="italic" ' \ + 'alpha="70%">{}</span>' + if contact.is_groupchat: + disco_info = app.logger.get_last_disco_info(contact.jid) + if disco_info is not None: + description = disco_info.muc_description + if description: + name += status_span.format( + GLib.markup_escape_text(description)) + elif contact.status: + status = contact.status.strip() + if status != '': + status = helpers.reduce_chars_newlines( + status, max_lines=1) + name += status_span.format( + GLib.markup_escape_text(status)) icon_name = helpers.get_icon_name_to_show(contact, account) # look if another resource has awaiting events View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9a8ca9918cc9e9952ea08f97295e56437d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9a8ca9918cc9e9952ea08f97295e56437d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use GSound to play sound on Linux
by Philipp Hörist 31 Jan '20

31 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6dacbe4c by André at 2020-01-31T14:55:45+01:00 Use GSound to play sound on Linux - - - - - 6 changed files: - README.md - flatpak/org.gajim.Gajim.yaml - gajim/common/app.py - gajim/common/config.py - gajim/common/helpers.py - gajim/gui_interface.py Changes: ===================================== README.md ===================================== @@ -25,6 +25,7 @@ - gir1.2-gupnpigd-1.0 for better NAT traversing - gir1.2-networkmanager-1.0 for network lose detection - gir1.2-geoclue-2.0 for sharing your location +- gir1.2-gsound-1.0 for sound on Linux ### Compile-time Requirements ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -166,6 +166,13 @@ modules: url: https://files.pythonhosted.org/packages/b6/ec/9abe8377d9819fc0383992aaa1b8c… sha256: dc9f9fb0c080af9454adce9cc1ddcd718309f3a99ca05186f65e9f6b0654dcd9 + - name: gsound + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/gsound.git + tag: 1.0.2 + commit: a86946b494aa32782b3f6334344d07b5c11d5219 + - name: gspell cleanup: - /bin ===================================== gajim/common/app.py ===================================== @@ -144,6 +144,8 @@ socks5queue = None gupnp_igd = None +gsound_ctx = None + gajim_identity = DiscoIdentity(category='client', type='pc', name='Gajim') @@ -197,6 +199,7 @@ _dependencies = { 'GEOCLUE': False, 'UPNP': False, 'PYCURL': False, + 'GSOUND': False, 'GSPELL': False, 'IDLE': False, } @@ -298,6 +301,21 @@ def detect_dependencies(): except Exception: pass + # GSOUND + try: + gi.require_version('GSound', '1.0') + from gi.repository import GLib + from gi.repository import GSound + global gsound_ctx + gsound_ctx = GSound.Context() + try: + gsound_ctx.init() + _dependencies['GSOUND'] = True + except GLib.Error as error: + log('gajim').error(error) + except (ImportError, ValueError): + pass + # GSPELL try: gi.require_version('Gspell', '1') ===================================== gajim/common/config.py ===================================== @@ -115,8 +115,6 @@ class Config: 'show_ascii_formatting_chars': [opt_bool, True, _('If enabled, do not ' 'remove */_ . So *abc* will be bold but with * * not removed.')], 'sounds_on': [opt_bool, True], - # 'aplay', 'play', 'esdplay', 'artsplay' detected first time only - 'soundplayer': [opt_str, ''], 'gc_refer_to_nick_char': [opt_str, ',', _('Character to add after nickname when using nickname completion (tab) in group chat.')], 'gc_proposed_nick_char': [opt_str, '_', _('Character to propose to add after desired nickname when nickname is already used in group chat.')], 'msgwin-max-state': [opt_bool, False], ===================================== gajim/common/helpers.py ===================================== @@ -42,7 +42,6 @@ import socket import time import logging import json -import shutil import copy import collections from collections import defaultdict @@ -453,27 +452,6 @@ def get_uf_chatstate(chatstate): return _('has closed the chat window or tab') return '' -def find_soundplayer(): - if sys.platform in ('win32', 'darwin'): - return - - if app.config.get('soundplayer') != '': - return - - commands = ('aucat', 'paplay', 'aplay', 'play', 'ossplay') - for command in commands: - if shutil.which(command) is not None: - if command == 'paplay': - command += ' -n gajim --property=media.role=event' - elif command in ('aplay', 'play'): - command += ' -q' - elif command == 'ossplay': - command += ' -qq' - elif command == 'aucat': - command += ' -i' - app.config.set('soundplayer', command) - break - def exec_command(command, use_shell=False, posix=True): """ execute a command. if use_shell is True, we run the command as is it was @@ -702,28 +680,11 @@ def play_sound_file(path_to_soundfile): sound.initWithContentsOfFile_byReference_(path_to_soundfile, True) sound.play() - elif app.config.get('soundplayer') == '': + elif app.is_installed('GSOUND'): try: - import wave - import ossaudiodev - except Exception: - log.exception('Sound Playback Error') - return - - def _oss_play(): - sndfile = wave.open(path_to_soundfile, 'rb') - nc, sw, fr, nf, _comptype, _compname = sndfile.getparams() - dev = ossaudiodev.open('/dev/dsp', 'w') - dev.setparameters(sw * 8, nc, fr) - dev.write(sndfile.readframes(nf)) - sndfile.close() - dev.close() - app.thread_interface(_oss_play) - - else: - player = app.config.get('soundplayer') - command = build_command(player, path_to_soundfile) - exec_command(command) + app.gsound_ctx.play_simple({'media.filename' : path_to_soundfile}) + except GLib.Error as error: + log.error('Could not play sound: %s', error.message) def get_global_show(): maxi = 0 ===================================== gajim/gui_interface.py ===================================== @@ -2221,8 +2221,6 @@ class Interface: # get transports type from DB app.transport_type = app.logger.get_transports_type() - helpers.find_soundplayer() - self.last_ftwindow_update = 0 self.music_track_changed_signal = None View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6dacbe4c6b1acb27a3425d49d470e82e5e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6dacbe4c6b1acb27a3425d49d470e82e5e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Remove unused code
by Philipp Hörist 30 Jan '20

30 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d4053801 by Philipp Hörist at 2020-01-30T22:29:35+01:00 Remove unused code - - - - - a5c13198 by Philipp Hörist at 2020-01-30T22:29:35+01:00 MUC: Store service jid in MUC module - light refactoring of code which uses the service jid - - - - - 7aab19fb by Philipp Hörist at 2020-01-30T22:29:35+01:00 Remove unused code - - - - - 60182967 by Philipp Hörist at 2020-01-30T22:29:35+01:00 Reduce usage of the server_resource variable - - - - - 12 changed files: - gajim/common/app.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/jingle_session.py - gajim/common/modules/bytestream.py - gajim/common/modules/discovery.py - gajim/common/modules/muc.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/gtk/groupchat_creation.py - gajim/gtk/server_info.py - gajim/gtk/tooltips.py - gajim/roster_window.py Changes: ===================================== gajim/common/app.py ===================================== @@ -598,8 +598,6 @@ def get_name_from_jid(account, jid): actor = jid return actor -def get_muc_domain(account): - return connections[account].muc_jid.get('jabber', None) def get_recent_groupchats(account): recent_groupchats = config.get_per( ===================================== gajim/common/connection.py ===================================== @@ -112,10 +112,8 @@ class CommonConnection: self.agent_registrations = {} self.roster_supported = True - self.addressing_supported = False self.avatar_conversion = False - self.muc_jid = {} # jid of muc server for each transport type self._stun_servers = [] # STUN servers of our jabber server # Tracks the calls of the connect_machine() method @@ -167,13 +165,6 @@ class CommonConnection: def get_status(self): return app.SHOW_LIST[self.connected] - def check_jid(self, jid): - """ - This function must be implemented by derived classes. It has to return - the valid jid, or raise a helpers.InvalidFormat exception - """ - raise NotImplementedError - def new_account(self, name, config, sync=False): """ To be implemented by derived classes @@ -304,9 +295,6 @@ class Connection(CommonConnection, ConnectionHandlers): 'client_cert') self.client_cert_passphrase = '' - def check_jid(self, jid): - return helpers.parse_jid(jid) - def get_own_jid(self, warn=False): """ Return the last full JID we received on a bind event. @@ -1259,8 +1247,7 @@ class Connection(CommonConnection, ConnectionHandlers): cfg_proxies = app.config.get_per('accounts', self.name, 'file_transfer_proxies') - our_jid = helpers.parse_jid(app.get_jid_from_account(self.name) + \ - '/' + self.server_resource) + our_jid = self.get_own_jid() testit = app.config.get_per('accounts', self.name, 'test_ft_proxies_on_startup') if cfg_proxies: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -131,7 +131,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): if self.jingle_content.getAttr('creator') == 'initiator': file_tag = desc.getTag('file') self.file_props.sender = self.fjid - self.file_props.receiver = self.conn.get_module('Bytestream')._ft_get_our_jid() + self.file_props.receiver = self.conn.get_own_jid() else: file_tag = desc.getTag('file') h = file_tag.getTag('hash') @@ -142,7 +142,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): file_info = self.conn.get_module('Jingle').get_file_info( pjid, hash_=h, name=n, account=self.conn.name) self.file_props.file_name = file_info['file-name'] - self.file_props.sender = self.conn.get_module('Bytestream')._ft_get_our_jid() + self.file_props.sender = self.conn.get_own_jid() self.file_props.receiver = self.fjid self.file_props.type_ = 's' for child in file_tag.getChildren(): ===================================== gajim/common/jingle_session.py ===================================== @@ -88,9 +88,7 @@ class JingleSession: self.contents = {} # negotiated contents self.connection = con # connection to use # our full jid - self.ourjid = app.get_jid_from_account(self.connection.name) - if con.server_resource: - self.ourjid = self.ourjid + '/' + con.server_resource + self.ourjid = str(self.connection.get_own_jid()) self.peerjid = jid # jid we connect to # jid we use as the initiator self.initiator = self.ourjid if weinitiate else self.peerjid ===================================== gajim/common/modules/bytestream.py ===================================== @@ -113,13 +113,6 @@ class Bytestream(BaseModule): default=self._account, testit=testit) raise nbxmpp.NodeProcessed - def _ft_get_our_jid(self): - if self._account == 'Local': - return app.get_jid_from_account(self._account) - our_jid = app.get_jid_from_account(self._account) - resource = self._con.server_resource - return our_jid + '/' + resource - def _ft_get_receiver_jid(self, file_props): if self._account == 'Local': return file_props.receiver.jid ===================================== gajim/common/modules/discovery.py ===================================== @@ -147,9 +147,6 @@ class Discovery(BaseModule): if nbxmpp.NS_REGISTER in result.features: self._con.register_supported = True - if nbxmpp.NS_ADDRESS in result.features: - self._con.addressing_supported = True - self._con.connect_machine(restart=True) def _parse_transports(self, info): ===================================== gajim/common/modules/muc.py ===================================== @@ -117,6 +117,15 @@ class MUC(BaseModule): self._rejoin_muc = set() self._join_timeouts = {} self._rejoin_timeouts = {} + self._muc_service_jid = None + + @property + def supported(self): + return self._muc_service_jid is not None + + @property + def service_jid(self): + return self._muc_service_jid def get_manager(self): return self._manager @@ -129,8 +138,7 @@ class MUC(BaseModule): continue if nbxmpp.NS_MUC in info.features: self._log.info('Discovered MUC: %s', info.jid) - # TODO: make this nicer - self._con.muc_jid['jabber'] = str(info.jid) + self._muc_service_jid = info.jid raise nbxmpp.NodeProcessed def join(self, muc_data): ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -101,9 +101,6 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): self.username = app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'name') - def check_jid(self, jid): - return jid - def get_own_jid(self, *args, **kwargs): return nbxmpp.JID(self.username + '@' + self.host) ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -61,6 +61,10 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): self.show_all() self.set_focus(self._ui.address_entry) + def _get_muc_service_jid(self): + con = app.connections[self._account] + return str(con.get_module('MUC').service_jid or 'muc.example.com') + def _fill_account_combo(self, account): accounts = app.get_enabled_accounts_with_labels(connected_only=True) account_liststore = self._ui.account_combo.get_model() @@ -91,7 +95,7 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): def _fill_placeholders(self): placeholder = random.choice(MUC_CREATION_EXAMPLES) - server = app.get_muc_domain(self._account) or 'muc.example.com' + server = self._get_muc_service_jid() self._ui.name_entry.set_placeholder_text( placeholder[0] + _(' (optional)...')) @@ -116,7 +120,7 @@ class CreateGroupchatWindow(Gtk.ApplicationWindow): model = entry.get_completion().get_model() model.clear() - server = app.get_muc_domain(self._account) or 'muc.example.com' + server = self._get_muc_service_jid() model.append(['%s@%s' % (text, server)]) def _validate_jid(self, text): ===================================== gajim/gtk/server_info.py ===================================== @@ -283,7 +283,8 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): return [ Feature('XEP-0016: Privacy Lists', con.get_module('PrivacyLists').supported), - Feature('XEP-0045: Multi-User Chat', con.muc_jid), + Feature('XEP-0045: Multi-User Chat', + con.get_module('MUC').supported), Feature('XEP-0054: vcard-temp', con.get_module('VCardTemp').supported), Feature('XEP-0163: Personal Eventing Protocol', ===================================== gajim/gtk/tooltips.py ===================================== @@ -327,7 +327,7 @@ class RosterTooltip(StatusTable): name=account_name, show=connection.get_status(), status=connection.status, - resource=connection.server_resource, + resource=connection.get_own_jid().getResource(), priority=connection.priority) contacts.append(contact) ===================================== gajim/roster_window.py ===================================== @@ -1839,9 +1839,7 @@ class RosterWindow: if account not in app.groups: app.groups[account] = {} - self_jid = app.get_jid_from_account(account) - if app.connections[account].server_resource: - self_jid += '/' + app.connections[account].server_resource + self_jid = str(app.connections[account].get_own_jid()) if account != app.ZEROCONF_ACC_NAME: array[self_jid] = {'name': app.nicks[account], 'groups': ['self_contact'], @@ -2180,7 +2178,7 @@ class RosterWindow: if account not in app.contacts.get_accounts(): return child_iterA = self._get_account_iter(account, self.model) - self_resource = app.connections[account].server_resource + self_resource = app.connections[account].get_own_jid().getResource() self_contact = app.contacts.get_contact(account, app.get_jid_from_account(account), resource=self_resource) if self_contact: @@ -2553,14 +2551,11 @@ class RosterWindow: account = obj.conn.name self_jid = app.get_jid_from_account(account) if self_jid not in app.contacts.get_jid_list(account): - resource = '' - if app.connections[account].server_resource: - resource = app.connections[account].server_resource sha = app.config.get_per('accounts', account, 'avatar_sha') contact = app.contacts.create_contact( jid=self_jid, account=account, name=app.nicks[account], groups=['self_contact'], show='offline', sub='both', - ask='none', resource=resource, avatar_sha=sha) + ask='none', avatar_sha=sha) app.contacts.add_contact(account, contact) self.add_contact(self_jid, account) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4ef838344744ce4d60e30ea34e97d0019… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4ef838344744ce4d60e30ea34e97d0019… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Themes: Set default style value when adding a setting
by Philipp Hörist 29 Jan '20

29 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4ef83834 by Daniel Brötzmann at 2020-01-29T22:54:36+01:00 Themes: Set default style value when adding a setting - - - - - 1 changed file: - gajim/gtk/themes.py Changes: ===================================== gajim/gtk/themes.py ===================================== @@ -256,10 +256,16 @@ class Themes(Gtk.ApplicationWindow): if first is None: self._on_add_new_theme() + # Don't add an option twice for option in self._ui.option_listbox.get_children(): if option == row: return - row = Option(row.option, None) + + # Get default value if it exists + value = app.css_config.get_value( + row.option.selector, row.option.attr) + + row = Option(row.option, value) self._ui.option_listbox.add(row) self._ui.option_popover.popdown() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4ef838344744ce4d60e30ea34e97d00198… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4ef838344744ce4d60e30ea34e97d00198… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: ChatControl: Remove dim-label class for status label
by Philipp Hörist 29 Jan '20

29 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8c4f9db2 by Daniel Brötzmann at 2020-01-29T22:49:51+01:00 ChatControl: Remove dim-label class for status label - - - - - efe338be by Daniel Brötzmann at 2020-01-29T22:49:53+01:00 CSS Colors: Improve contrast and unify colors - - - - - 115e2769 by Daniel Brötzmann at 2020-01-29T22:49:53+01:00 HistoryWindow: Improve search highlight color - - - - - 6 changed files: - gajim/data/gui/chat_control.ui - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim-dark.css - gajim/data/style/gajim.css - gajim/gtk/history.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -429,9 +429,6 @@ <property name="ellipsize">end</property> <property name="xalign">0</property> <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> - <style> - <class name="dim-label"/> - </style> </object> <packing> <property name="left_attach">1</property> ===================================== gajim/data/style/default-dark.css ===================================== @@ -1,30 +1,52 @@ + .gajim-incoming-nickname { - color: rgb(207, 49, 47) - } + color: rgb(210, 75, 75) +} .gajim-outgoing-nickname { - color: rgb(38, 139, 210) - } + color: rgb(40, 140, 210) +} +.gajim-outgoing-message-text { + color: rgb(200, 200, 200) +} +.gajim-status-message { + color: rgb(140, 175, 210) +} .gajim-url { - color: rgb(53, 132, 228) - } + color: rgb(60, 135, 220) +} .gajim-highlight-message { - color: rgb(245, 121, 0) - } -.gajim-msg-correcting text { - background: rgb(131, 148, 150) - } -.gajim-status-message { - color: rgb(115, 210, 22) - } + color: rgb(210, 70, 30) +} +.gajim-state-tab-muc-directed-msg { + color: rgb(210, 70, 30) +} +.gajim-state-tab-muc-msg { + color: rgb(80, 95, 230) +} +.gajim-roster-disconnected { + background: rgb(80, 30, 30) +} +.gajim-roster-connected { + background: rgb(30, 80, 50) +} .gajim-state-composing { - color: rgb(0, 139, 0) - } + color: rgb(90, 180, 90) +} .gajim-state-inactive { color: rgb(158, 158, 158) - } +} .gajim-state-gone { color: rgb(128, 128, 128) - } +} .gajim-state-paused { - color: rgb(0, 0, 205) - } + color: rgb(20, 210, 160) +} +.gajim-message-placeholder { + color: rgb(195, 195, 195) +} +.gajim-msg-correcting text { + background: rgb(100, 100, 50) +} +.gajim-search-highlight { + color: rgb(30, 80, 80) +} ===================================== gajim/data/style/default.css ===================================== @@ -1 +1,52 @@ - .gajim-incoming-nickname { color: rgb(164, 0, 0) } .gajim-outgoing-nickname { color: rgb(52, 101, 164) } .gajim-outgoing-message-text { color: rgb(85, 87, 83) } .gajim-status-message { color: rgb(78, 154, 6) } .gajim-url { color: rgb(32, 74, 135) } .gajim-highlight-message { color: rgb(255, 128, 128) } .gajim-roster-disconnected { background: rgb(171 ,97 ,97) } .gajim-roster-connected { background: rgb(173, 195, 198) } .gajim-state-composing { color: rgb(0, 139, 0) } .gajim-state-inactive { color: rgb(158, 158, 158) } .gajim-state-gone { color: rgb(128, 128, 128) } .gajim-state-paused { color: rgb(0, 0, 205) } .gajim-message-placeholder { color: rgb(195, 195, 192) } \ No newline at end of file + +.gajim-incoming-nickname { + color: rgb(200, 40, 40) +} +.gajim-outgoing-nickname { + color: rgb(50, 90, 140) +} +.gajim-outgoing-message-text { + color: rgb(85, 85, 85) +} +.gajim-status-message { + color: rgb(100, 130, 160) +} +.gajim-url { + color: rgb(30, 75, 135) +} +.gajim-highlight-message { + color: rgb(210, 70, 30) +} +.gajim-state-tab-muc-directed-msg { + color: rgb(210, 70, 30) +} +.gajim-state-tab-muc-msg { + color: rgb(40, 40, 200) +} +.gajim-roster-disconnected { + background: rgb(230, 170, 170) +} +.gajim-roster-connected { + background: rgb(160, 200, 170) +} +.gajim-state-composing { + color: rgb(40, 140, 40) +} +.gajim-state-inactive { + color: rgb(158, 158, 158) +} +.gajim-state-gone { + color: rgb(128, 128, 128) +} +.gajim-state-paused { + color: rgb(20, 160, 120) +} +.gajim-message-placeholder { + color: rgb(170, 170, 170) +} +.gajim-msg-correcting text { + background: rgb(240, 230, 170) +} +.gajim-search-highlight { + color: rgb(170, 220, 220) +} ===================================== gajim/data/style/gajim-dark.css ===================================== @@ -1,2 +1 @@ /* Gajim Dark Application CSS File */ - ===================================== gajim/data/style/gajim.css ===================================== @@ -1,15 +1,5 @@ /* Gajim Application CSS File */ -.gajim-msg-correcting text { - background: rgb(238, 232, 170) - } -.gajim-state-tab-muc-directed-msg { - color: rgb(238, 0, 0) - } -.gajim-state-tab-muc-msg { - color: rgb(0, 0, 205) - } - .chatcontrol-actionbar-button { padding: 0px 5px 0px 5px; background-color: @theme_base_color; ===================================== gajim/gtk/history.py ===================================== @@ -87,7 +87,7 @@ class HistoryWindow(Gtk.ApplicationWindow): self._ui.scrolledwindow.add(self.history_textview.tv) self.history_buffer = self.history_textview.tv.get_buffer() highlight_color = app.css_config.get_value( - '.gajim-highlight-message', StyleAttr.COLOR) + '.gajim-search-highlight', StyleAttr.COLOR) self.history_buffer.create_tag('highlight', background=highlight_color) self.history_buffer.create_tag('invisible', invisible=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7ba0cfcbdc6f3d8dd90f8e00fbc50ee4c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7ba0cfcbdc6f3d8dd90f8e00fbc50ee4c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused imports
by Philipp Hörist 29 Jan '20

29 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ba0cfcb by Philipp Hörist at 2020-01-29T22:46:38+01:00 Remove unused imports - - - - - 1 changed file: - gajim/common/modules/message.py Changes: ===================================== gajim/common/modules/message.py ===================================== @@ -23,7 +23,6 @@ from nbxmpp.util import generate_id from gajim.common import app from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict -from gajim.common.helpers import validate_jid from gajim.common.const import KindConstant from gajim.common.modules.base import BaseModule from gajim.common.modules.util import get_eme_message @@ -31,8 +30,6 @@ from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml -from gajim.common.connection_handlers_events import InformationEvent -from gajim.common.connection_handlers_events import MessageSentEvent class Message(BaseModule): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ba0cfcbdc6f3d8dd90f8e00fbc50ee4c5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ba0cfcbdc6f3d8dd90f8e00fbc50ee4c5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor sending messages
by Philipp Hörist 29 Jan '20

29 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2f7ca557 by Philipp Hörist at 2020-01-29T22:37:33+01:00 Refactor sending messages - Move stanza building and message logging code into message module - Don't use event flow to create and send messages - Remove resource lock - Properly support sending a message to multiple recipients - - - - - 15 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/exceptions.py - gajim/common/helpers.py - gajim/common/modules/chatstates.py - gajim/common/modules/httpupload.py - gajim/common/modules/message.py - gajim/common/structs.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/groupchat_control.py - gajim/gtk/single_message.py - gajim/privatechat_control.py - gajim/remote_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -587,8 +587,8 @@ class ChatControl(ChatControlBase): if not event.message: return - self.last_sent_msg = event.stanza_id - message_id = event.msg_iq.getID() + self.last_sent_msg = event.message_id + message_id = event.message_id if event.label: displaymarking = event.label.getTag('displaymarking') @@ -919,8 +919,12 @@ class ChatControl(ChatControlBase): fixed.set_no_show_all(True) self.close_jingle_content(jingle_type) - def send_message(self, message, xhtml=None, - process_commands=True, attention=False): + def send_message(self, + message, + xhtml=None, + process_commands=True, + attention=False, + is_muc_pm=False): """ Send a message to contact """ @@ -941,7 +945,8 @@ class ChatControl(ChatControlBase): type_='chat', xhtml=xhtml, process_commands=process_commands, - attention=attention) + attention=attention, + is_muc_pm=is_muc_pm) def get_our_nick(self): return app.nicks[self.account] ===================================== gajim/chat_control_base.py ===================================== @@ -43,8 +43,8 @@ from gajim.common.i18n import _ from gajim.common.nec import EventHelper from gajim.common.helpers import AdditionalDataDict from gajim.common.contacts import GC_Contact -from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.common.const import Chatstate +from gajim.common.structs import OutgoingMessage from gajim import gtkgui_helpers @@ -273,7 +273,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): ('ping-error', ged.GUI1, self._nec_ping), ('sec-catalog-received', ged.GUI1, self._sec_labels_received), ('style-changed', ged.GUI1, self._style_changed), - ('message-outgoing', ged.OUT_GUI1, self._nec_message_outgoing), ]) # pylint: enable=line-too-long @@ -451,38 +450,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): def _nec_ping(self, obj): raise NotImplementedError - def _nec_message_outgoing(self, obj): - # Send the given message to the active tab. - # Doesn't return None if error - if obj.control != self: - return - - obj.message = helpers.remove_invalid_xml_chars(obj.message) - - conn = app.connections[self.account] - - if not self.session: - if (not obj.resource and - obj.jid != app.get_jid_from_account(self.account)): - if self.resource: - obj.resource = self.resource - else: - obj.resource = self.contact.resource - sess = conn.find_controlless_session(obj.jid, resource=obj.resource) - - if self.resource: - obj.jid += '/' + self.resource - - if not sess: - if self._type.is_privatechat: - sess = conn.make_new_session(obj.jid, type_='pm') - else: - sess = conn.make_new_session(obj.jid) - - self.set_session(sess) - - obj.session = self.session - def setup_seclabel(self): self.xml.label_selector.hide() self.xml.label_selector.set_no_show_all(True) @@ -1014,7 +981,8 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): resource=None, xhtml=None, process_commands=True, - attention=False): + attention=False, + is_muc_pm=False): """ Send the given message to the active tab. Doesn't return None if error """ @@ -1035,22 +1003,23 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): chatstate = con.get_module('Chatstate').get_active_chatstate( self.contact) - event = MessageOutgoingEvent(None, - account=self.account, - jid=self.contact.jid, - message=message, - type_=type_, - chatstate=chatstate, - resource=resource, - user_nick=self.user_nick, - label=label, - control=self, - attention=attention, - correct_id=correct_id, - automatic_message=False, - encryption=self.encryption) - event.additional_data.set_value('gajim', 'xhtml', xhtml) - app.nec.push_outgoing_event(event) + message_ = OutgoingMessage(account=self.account, + jid=self.contact.jid, + message=message, + type_=type_, + is_muc_pm=is_muc_pm, + chatstate=chatstate, + resource=resource, + user_nick=self.user_nick, + label=label, + control=self, + attention=attention, + correct_id=correct_id, + automatic_message=False, + encryption=self.encryption, + xhtml=xhtml) + + con.send_message(message_) # Record the history of sent messages self.save_message(message, 'sent') ===================================== gajim/common/connection.py ===================================== @@ -48,7 +48,6 @@ import OpenSSL.crypto import nbxmpp from nbxmpp.const import Realm from nbxmpp.const import Event -from nbxmpp.util import generate_id from gajim import common from gajim.common import helpers @@ -56,20 +55,16 @@ from gajim.common import app from gajim.common import passwords from gajim.common import idle from gajim.common import modules -from gajim.common import ged from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.nec import NetworkEvent -from gajim.common.contacts import GC_Contact from gajim.common.connection_handlers import ConnectionHandlers from gajim.common.connection_handlers_events import OurShowEvent from gajim.common.connection_handlers_events import InformationEvent -from gajim.common.connection_handlers_events import StanzaMessageOutgoingEvent -from gajim.common.connection_handlers_events import GcStanzaMessageOutgoingEvent +from gajim.common.connection_handlers_events import MessageSentEvent from gajim.common.connection_handlers_events import ConnectionLostEvent from gajim.common.connection_handlers_events import NewAccountConnectedEvent from gajim.common.connection_handlers_events import NewAccountNotConnectedEvent -from gajim.common.connection_handlers_events import MessageSentEvent if sys.platform in ('win32', 'darwin'): import certifi @@ -179,171 +174,6 @@ class CommonConnection: """ raise NotImplementedError - def _prepare_message(self, obj): - - if not self.connection or not self.is_connected: - return 1 - - if isinstance(obj.jid, list): - for jid in obj.jid: - try: - self.check_jid(jid) - except helpers.InvalidFormat: - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='invalid-jid', args=jid)) - return - else: - try: - self.check_jid(obj.jid) - except helpers.InvalidFormat: - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='invalid-jid', args=obj.jid)) - return - - if not obj.message and obj.chatstate is None: - return - - self._build_message_stanza(obj) - - def _build_message_stanza(self, obj): - if obj.jid == app.get_jid_from_account(self.name): - fjid = obj.jid - else: - fjid = obj.get_full_jid() - - xhtml = obj.additional_data.get_value('gajim', 'xhtml', None) - - if obj.type_ == 'chat': - msg_iq = nbxmpp.Message(body=obj.message, - typ=obj.type_, - xhtml=xhtml) - else: - if obj.subject: - msg_iq = nbxmpp.Message(body=obj.message, - typ='normal', - subject=obj.subject, - xhtml=xhtml) - else: - msg_iq = nbxmpp.Message(body=obj.message, - typ='normal', - xhtml=xhtml) - - if obj.correct_id: - msg_iq.setTag('replace', attrs={'id': obj.correct_id}, - namespace=nbxmpp.NS_CORRECT) - - # XEP-0359 - obj.stanza_id = generate_id() - msg_iq.setID(obj.stanza_id) - if obj.message: - msg_iq.setOriginID(obj.stanza_id) - - if obj.label: - msg_iq.addChild(node=obj.label) - - # XEP-0172: user_nickname - if obj.user_nick: - msg_iq.setTag('nick', namespace=nbxmpp.NS_NICK).setData( - obj.user_nick) - - # XEP-0203 - if obj.delayed: - our_jid = app.get_jid_from_account(self.name) + '/' + \ - self.server_resource - timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(obj.delayed)) - msg_iq.addChild('delay', namespace=nbxmpp.NS_DELAY2, - attrs={'from': our_jid, 'stamp': timestamp}) - - # XEP-0224 - if obj.attention: - msg_iq.setTag('attention', namespace=nbxmpp.NS_ATTENTION) - - if isinstance(obj.jid, list): - if self.addressing_supported: - msg_iq.setTo(app.config.get_per('accounts', self.name, 'hostname')) - addresses = msg_iq.addChild('addresses', - namespace=nbxmpp.NS_ADDRESS) - for j in obj.jid: - addresses.addChild('address', - attrs={'type': 'to', 'jid': j}) - else: - iqs = [] - for j in obj.jid: - iq = nbxmpp.Message(node=msg_iq) - iq.setTo(j) - iqs.append(iq) - msg_iq = iqs - else: - msg_iq.setTo(fjid) - r_ = obj.resource - if not r_ and obj.jid != fjid: # Only if we're not in a pm - r_ = app.get_resource_from_jid(fjid) - if r_: - contact = app.contacts.get_contact(self.name, obj.jid, r_) - else: - contact = app.contacts.get_contact_with_highest_priority( - self.name, obj.jid) - - # Mark Message as MUC PM - if isinstance(contact, GC_Contact): - msg_iq.setTag('x', namespace=nbxmpp.NS_MUC_USER) - - # chatstates - if peer supports xep85, send chatstates - # please note that the only valid tag inside a message containing a - # <body> tag is the active event - if obj.chatstate is not None: - msg_iq.setTag(obj.chatstate, namespace=nbxmpp.NS_CHATSTATES) - if not obj.message: - msg_iq.setTag('no-store', - namespace=nbxmpp.NS_MSG_HINTS) - - # XEP-0184 - if obj.jid != app.get_jid_from_account(self.name): - if obj.message and obj.type_ != 'groupchat': - msg_iq.setReceiptRequest() - - if obj.session: - # XEP-0201 - obj.session.last_send = time.time() - msg_iq.setThread(obj.session.thread_id) - - self._push_stanza_message_outgoing(obj, msg_iq) - - def _push_stanza_message_outgoing(self, obj, msg_iq): - obj.conn = self - if isinstance(msg_iq, list): - for iq in msg_iq: - obj.msg_iq = iq - app.nec.push_incoming_event( - StanzaMessageOutgoingEvent(None, **vars(obj))) - else: - obj.msg_iq = msg_iq - app.nec.push_incoming_event( - StanzaMessageOutgoingEvent(None, **vars(obj))) - - def log_message(self, obj, jid): - if not obj.is_loggable: - return - - if obj.session and not obj.session.is_loggable(): - return - - if not app.config.should_log(self.name, jid): - return - - if obj.message is None: - return - - app.logger.insert_into_logs(self.name, - jid, - obj.timestamp, - obj.kind, - message=obj.message, - subject=obj.subject, - additional_data=obj.additional_data, - message_id=obj.stanza_id, - stanza_id=obj.stanza_id) - def new_account(self, name, config, sync=False): """ To be implemented by derived classes @@ -466,26 +296,8 @@ class Connection(CommonConnection, ConnectionHandlers): # Register all modules modules.register_modules(self) - app.ged.register_event_handler('message-outgoing', ged.OUT_CORE, - self._nec_message_outgoing) - app.ged.register_event_handler('gc-message-outgoing', ged.OUT_CORE, - self._nec_gc_message_outgoing) - app.ged.register_event_handler('gc-stanza-message-outgoing', ged.OUT_CORE, - self._nec_gc_stanza_message_outgoing) - app.ged.register_event_handler('stanza-message-outgoing', - ged.OUT_CORE, self._nec_stanza_message_outgoing) - # END __init__ - def cleanup(self): - modules.unregister_modules(self) - app.ged.remove_event_handler('message-outgoing', ged.OUT_CORE, - self._nec_message_outgoing) - app.ged.remove_event_handler('gc-message-outgoing', ged.OUT_CORE, - self._nec_gc_message_outgoing) - app.ged.remove_event_handler('gc-stanza-message-outgoing', ged.OUT_CORE, - self._nec_gc_stanza_message_outgoing) - app.ged.remove_event_handler('stanza-message-outgoing', ged.OUT_CORE, - self._nec_stanza_message_outgoing) + pass def get_config_values_or_default(self): self.client_cert = app.config.get_per('accounts', self.name, @@ -1518,48 +1330,61 @@ class Connection(CommonConnection, ConnectionHandlers): app.nec.push_incoming_event(OurShowEvent(None, conn=self, show=show)) - def _nec_message_outgoing(self, obj): - if obj.account != self.name: + def send_stanza(self, stanza): + """ + Send a stanza untouched + """ + if not self.connection: return + self.connection.send(stanza) - self._prepare_message(obj) + def send_message(self, message): + if not app.account_is_connected(self.name): + log.warning('Trying to send message while offline') + return - def _nec_stanza_message_outgoing(self, obj): - if obj.conn.name != self.name: + stanza = self.get_module('Message').build_message_stanza(message) + message.stanza = stanza + if message.require_encryption: + # TODO: Make extension point return encrypted message + + extension = 'encrypt' + if message.is_groupchat: + extension = 'gc_encrypt' + app.plugin_manager.extension_point(extension + message.encryption, + self, + message, + self._send_message) return - config_key = '%s-%s' % (self.name, obj.jid) - encryption = app.config.get_per('encryption', config_key, 'encryption') - if encryption: - app.plugin_manager.extension_point( - 'encrypt' + encryption, self, obj, self.send_message) - if not obj.additional_data.get_value('encrypted', 'name', False): - # Dont propagate event - return True - else: - self.send_message(obj) + self._send_message(message) - def send_message(self, obj): - obj.timestamp = time.time() - obj.stanza_id = self.connection.send(obj.msg_iq, now=obj.now) + def _send_message(self, message): + message.set_sent_timestamp() + message.message_id = self.connection.send(message.stanza) - app.nec.push_incoming_event(MessageSentEvent(None, **vars(obj))) + app.nec.push_incoming_event(MessageSentEvent(None, **vars(message))) - if isinstance(obj.jid, list): - for j in obj.jid: - if obj.session is None: - obj.session = self.get_or_create_session(j, '') - self.log_message(obj, j) - else: - self.log_message(obj, obj.jid) + if message.is_groupchat: + return - def send_stanza(self, stanza): - """ - Send a stanza untouched - """ - if not self.connection: + self.get_module('Message').log_message(message) + + def send_messages(self, jids, message): + if not app.account_is_connected(self.name): + log.warning('Trying to send message while offline') return - self.connection.send(stanza) + + if message.require_encryption: + raise ValueError('Encryption for multi recipient ' + 'messages not supported') + + for jid in jids: + message = message.copy() + message.jid = jid + stanza = self.get_module('Message').build_message_stanza(message) + message.stanza = stanza + self._send_message(message) def send_new_account_infos(self, form, is_form): if is_form: @@ -1615,62 +1440,6 @@ class Connection(CommonConnection, ConnectionHandlers): show=show, caps=ptype != 'unavailable') - def _nec_gc_message_outgoing(self, obj): - if obj.account != self.name: - return - if not app.account_is_connected(self.name): - return - - xhtml = obj.additional_data.get_value('gajim', 'xhtml', None) - msg_iq = nbxmpp.Message(obj.jid, - obj.message, - typ='groupchat', - xhtml=xhtml) - - obj.stanza_id = generate_id() - msg_iq.setID(obj.stanza_id) - if obj.message: - msg_iq.setOriginID(obj.stanza_id) - - if obj.correct_id: - msg_iq.setTag('replace', attrs={'id': obj.correct_id}, - namespace=nbxmpp.NS_CORRECT) - - if obj.chatstate is not None: - msg_iq.setTag(obj.chatstate, namespace=nbxmpp.NS_CHATSTATES) - if not obj.message: - msg_iq.setTag('no-store', namespace=nbxmpp.NS_MSG_HINTS) - if obj.label is not None: - msg_iq.addChild(node=obj.label) - - obj.msg_iq = msg_iq - obj.conn = self - app.nec.push_incoming_event(GcStanzaMessageOutgoingEvent(None, **vars(obj))) - - def _nec_gc_stanza_message_outgoing(self, obj): - if obj.conn.name != self.name: - return - - config_key = '%s-%s' % (self.name, obj.jid) - encryption = app.config.get_per('encryption', config_key, 'encryption') - if encryption: - app.plugin_manager.extension_point( - 'gc_encrypt' + encryption, self, obj, self.send_gc_message) - else: - self.send_gc_message(obj) - - def send_gc_message(self, obj): - obj.stanza_id = self.connection.send(obj.msg_iq) - app.nec.push_incoming_event(MessageSentEvent( - None, - conn=self, - account=self.name, - jid=obj.jid, - message=obj.message, - automatic_message=obj.automatic_message, - stanza_id=obj.stanza_id, - additional_data=obj.additional_data)) - def unregister_account(self, callback): if not app.account_is_connected(self.name): return ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -27,8 +27,7 @@ from gajim.common import helpers from gajim.common import app from gajim.common import i18n from gajim.common.i18n import _ -from gajim.common.helpers import AdditionalDataDict -from gajim.common.const import KindConstant, SSLError +from gajim.common.const import SSLError from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.file_props import FilesProp @@ -464,73 +463,6 @@ class NotificationEvent(nec.NetworkIncomingEvent): self.popup_text = pres_obj.status self.popup_event_type = _('Contact Signed Out') -class MessageOutgoingEvent(nec.NetworkOutgoingEvent): - name = 'message-outgoing' - - def init(self): - self.additional_data = AdditionalDataDict() - self.message = None - self.type_ = 'chat' - self.kind = None - self.timestamp = None - self.subject = '' - self.chatstate = None - self.stanza_id = None - self.resource = None - self.user_nick = None - self.label = None - self.session = None - self.delayed = None - self.callback = None - self.callback_args = [] - self.now = False - self.is_loggable = True - self.control = None - self.attention = False - self.correct_id = None - self.automatic_message = True - - def get_full_jid(self): - if self.resource: - return self.jid + '/' + self.resource - if self.session: - return self.session.get_to() - return self.jid - - def generate(self): - if self.type_ == 'chat': - self.kind = KindConstant.CHAT_MSG_SENT - else: - self.kind = KindConstant.SINGLE_MSG_SENT - return True - -class StanzaMessageOutgoingEvent(nec.NetworkOutgoingEvent): - name = 'stanza-message-outgoing' - - -class GcStanzaMessageOutgoingEvent(nec.NetworkOutgoingEvent): - name = 'gc-stanza-message-outgoing' - - -class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): - name = 'gc-message-outgoing' - - def init(self): - self.additional_data = AdditionalDataDict() - self.message = '' - self.chatstate = None - self.stanza_id = None - self.label = None - self.callback = None - self.callback_args = [] - self.is_loggable = True - self.control = None - self.correct_id = None - self.automatic_message = True - - def generate(self): - return True - class InformationEvent(nec.NetworkIncomingEvent): name = 'information' ===================================== gajim/common/exceptions.py ===================================== @@ -148,3 +148,6 @@ class StanzaMalformed(Exception): self._msg = '{}\n{}'.format(message, stanza) def __str__(self): return self._msg + +class SendMessageError(Exception): + pass ===================================== gajim/common/helpers.py ===================================== @@ -43,6 +43,7 @@ import time import logging import json import shutil +import copy import collections from collections import defaultdict import random @@ -1411,6 +1412,9 @@ class AdditionalDataDict(collections.UserDict): except KeyError: return + def copy(self): + return copy.deepcopy(self) + def save_roster_position(window): if not app.config.get('save-roster-position'): ===================================== gajim/common/modules/chatstates.py ===================================== @@ -30,9 +30,8 @@ from gi.repository import GLib from gajim.common import app from gajim.common.nec import NetworkEvent from gajim.common.const import Chatstate as State +from gajim.common.structs import OutgoingMessage from gajim.common.modules.base import BaseModule -from gajim.common.connection_handlers_events import MessageOutgoingEvent -from gajim.common.connection_handlers_events import GcMessageOutgoingEvent from gajim.common.types import ContactT from gajim.common.types import ConnectionT @@ -272,17 +271,7 @@ class Chatstate(BaseModule): self._log.info('Send last state: %-10s - %s', State.ACTIVE, contact.jid) - event_attrs = {'account': self._account, - 'jid': contact.jid, - 'chatstate': str(State.ACTIVE)} - - if contact.is_groupchat: - if contact.is_connected: - app.nec.push_outgoing_event( - GcMessageOutgoingEvent(None, **event_attrs)) - else: - app.nec.push_outgoing_event( - MessageOutgoingEvent(None, **event_attrs)) + self._send_chatstate(contact, str(State.ACTIVE)) self._chatstates.pop(contact.jid, None) self._last_mouse_activity.pop(contact.jid, None) @@ -317,20 +306,20 @@ class Chatstate(BaseModule): self._log.info('Send: %-10s - %s', state, contact.jid) - event_attrs = {'account': self._account, - 'jid': contact.jid, - 'chatstate': str(state)} - - if contact.is_groupchat: - if contact.is_connected: - app.nec.push_outgoing_event( - GcMessageOutgoingEvent(None, **event_attrs)) - else: - app.nec.push_outgoing_event( - MessageOutgoingEvent(None, **event_attrs)) + self._send_chatstate(contact, str(state)) self._chatstates[contact.jid] = state + def _send_chatstate(self, contact, chatstate): + type_ = 'groupchat' if contact.is_groupchat else 'chat' + message = OutgoingMessage(account=self._account, + jid=contact.jid, + message=None, + type_=type_, + chatstate=chatstate) + + self._con.send_message(message) + @ensure_enabled def set_mouse_activity(self, contact: ContactT, was_paused: bool) -> None: if self._get_chatstate_setting(contact) == 'disabled': ===================================== gajim/common/modules/httpupload.py ===================================== @@ -20,22 +20,19 @@ import io from urllib.parse import urlparse import mimetypes -import nbxmpp from nbxmpp import NS_HTTPUPLOAD_0 from nbxmpp.util import is_error_result from gi.repository import GLib from gi.repository import Soup from gajim.common import app -from gajim.common import ged from gajim.common.i18n import _ from gajim.common.helpers import get_tls_error_phrase from gajim.common.const import FTState from gajim.common.filetransfer import FileTransfer from gajim.common.modules.base import BaseModule +from gajim.common.structs import OutgoingMessage from gajim.common.connection_handlers_events import InformationEvent -from gajim.common.connection_handlers_events import MessageOutgoingEvent -from gajim.common.connection_handlers_events import GcMessageOutgoingEvent class HTTPUpload(BaseModule): @@ -50,19 +47,11 @@ class HTTPUpload(BaseModule): self.httpupload_namespace = None self.max_file_size = None # maximum file size in bytes - self._text = [] self._queued_messages = {} self._session = Soup.Session() self._session.props.ssl_strict = False self._session.props.user_agent = 'Gajim %s' % app.version - # pylint: disable=line-too-long - self.register_events([ - ('stanza-message-outgoing', ged.OUT_PREGUI, self._handle_outgoing_stanza), - ('gc-stanza-message-outgoing', ged.OUT_PREGUI, self._handle_outgoing_stanza), - ]) - # pylint: enable=line-too-long - def pass_disco(self, info): if not info.has_httpupload: return @@ -84,18 +73,6 @@ class HTTPUpload(BaseModule): for ctrl in app.interface.msg_win_mgr.get_controls(acct=self._account): ctrl.update_actions() - def _handle_outgoing_stanza(self, event): - if event.conn.name != self._account: - return - body = event.msg_iq.getTagData('body') - if body and body in self._text: - self._text.remove(body) - # Add oob information before sending message to recipient, - # to distinguish HTTP File Upload Link from pasted URL - oob = event.msg_iq.addChild('x', namespace=nbxmpp.NS_X_OOB) - oob.addChild('url').setData(body) - event.additional_data.set_value('gajim', 'oob_url', body) - def check_file_before_transfer(self, path, encryption, contact, groupchat=False): if not path or not os.path.exists(path): @@ -258,23 +235,18 @@ class HTTPUpload(BaseModule): if message.props.status_code in (Soup.Status.OK, Soup.Status.CREATED): self._log.info('Upload completed successfully') uri = transfer.get_transformed_uri() - self._text.append(uri) + type_ = 'chat' if transfer.is_groupchat: - app.nec.push_outgoing_event( - GcMessageOutgoingEvent(None, - account=self._account, - jid=transfer.contact.jid, - message=uri, - automatic_message=False)) - else: - app.nec.push_outgoing_event( - MessageOutgoingEvent(None, - account=self._account, - jid=transfer.contact.jid, - message=uri, - type_='chat', - automatic_message=False)) + type_ = 'groupchat' + + message = OutgoingMessage(account=self._account, + jid=transfer.contact.jid, + message=uri, + type_=type_, + oob_url=uri) + + self._con.send_message(message) else: phrase = Soup.Status.get_phrase(message.props.status_code) ===================================== gajim/common/modules/message.py ===================================== @@ -18,10 +18,12 @@ import time import nbxmpp from nbxmpp.structs import StanzaHandler +from nbxmpp.util import generate_id from gajim.common import app from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict +from gajim.common.helpers import validate_jid from gajim.common.const import KindConstant from gajim.common.modules.base import BaseModule from gajim.common.modules.util import get_eme_message @@ -29,6 +31,8 @@ from gajim.common.modules.security_labels import parse_securitylabel from gajim.common.modules.misc import parse_correction from gajim.common.modules.misc import parse_oob from gajim.common.modules.misc import parse_xhtml +from gajim.common.connection_handlers_events import InformationEvent +from gajim.common.connection_handlers_events import MessageSentEvent class Message(BaseModule): @@ -280,6 +284,88 @@ class Message(BaseModule): # stanza-id not added by the archive, ignore it. return None, None + def build_message_stanza(self, message): + own_jid = self._con.get_own_jid() + + stanza = nbxmpp.Message(to=message.jid, + body=message.message, + typ=message.type_, + subject=message.subject, + xhtml=message.xhtml) + + if message.correct_id: + stanza.setTag('replace', attrs={'id': message.correct_id}, + namespace=nbxmpp.NS_CORRECT) + + # XEP-0359 + message.message_id = generate_id() + stanza.setID(message.message_id) + stanza.setOriginID(message.message_id) + + if message.label: + stanza.addChild(node=message.label) + + # XEP-0172: user_nickname + if message.user_nick: + stanza.setTag('nick', namespace=nbxmpp.NS_NICK).setData( + message.user_nick) + + # XEP-0203 + # TODO: Seems delayed is not set anywhere + if message.delayed: + timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(message.delayed)) + stanza.addChild('delay', + namespace=nbxmpp.NS_DELAY2, + attrs={'from': str(own_jid), 'stamp': timestamp}) + + # XEP-0224 + if message.attention: + stanza.setTag('attention', namespace=nbxmpp.NS_ATTENTION) + + # XEP-0066 + if message.oob_url is not None: + oob = stanza.addChild('x', namespace=nbxmpp.NS_X_OOB) + oob.addChild('url').setData(message.oob_url) + + # XEP-0184 + if not own_jid.bareMatch(message.jid): + if message.message and not message.is_groupchat: + stanza.setReceiptRequest() + + # Mark Message as MUC PM + if message.is_muc_pm: + stanza.setTag('x', namespace=nbxmpp.NS_MUC_USER) + + # XEP-0085 + if message.chatstate is not None: + stanza.setTag(message.chatstate, namespace=nbxmpp.NS_CHATSTATES) + if not message.message: + stanza.setTag('no-store', + namespace=nbxmpp.NS_MSG_HINTS) + + return stanza + + def log_message(self, message): + if not message.is_loggable: + return + + if not app.config.should_log(self._account, message.jid): + return + + if message.message is None: + return + + app.logger.insert_into_logs(self._account, + message.jid, + message.timestamp, + message.kind, + message=message.message, + subject=message.subject, + additional_data=message.additional_data, + message_id=message.message_id, + stanza_id=message.message_id) + def get_instance(*args, **kwargs): return Message(*args, **kwargs), 'Message' ===================================== gajim/common/structs.py ===================================== @@ -12,11 +12,13 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import time from collections import namedtuple from nbxmpp.protocol import JID from gajim.common.const import MUCJoinedState +from gajim.common.const import KindConstant URI = namedtuple('URI', 'type action data') URI.__new__.__defaults__ = (None, None) # type: ignore @@ -48,3 +50,122 @@ class MUCData: @property def config(self): return self._config + + +class OutgoingMessage: + def __init__(self, + account, + jid, + message, + type_, + subject=None, + is_muc_pm=False, + chatstate=None, + resource=None, + user_nick=None, + label=None, + control=None, + attention=None, + correct_id=None, + automatic_message=False, + encryption=None, + oob_url=None, + xhtml=None): + + if type_ not in ('chat', 'groupchat', 'normal', 'headline'): + raise ValueError('Unknown message type: %s' % type_) + + if not message and chatstate is None: + raise ValueError('Trying to send message without content') + + self.account = account + self.jid = jid + self.message = message + self.type_ = type_ + + if type_ == 'chat': + self.kind = KindConstant.CHAT_MSG_SENT + elif type_ == 'groupchat': + self.kind = KindConstant.GC_MSG + elif type_ == 'normal': + self.kind = KindConstant.SINGLE_MSG_SENT + else: + raise ValueError('Unknown message type') + + from gajim.common.helpers import AdditionalDataDict + self.additional_data = AdditionalDataDict() + + self.subject = subject + self.is_muc_pm = is_muc_pm + self.chatstate = chatstate + self.resource = resource + self.user_nick = user_nick + self.label = label + self.control = control + self.attention = attention + self.correct_id = correct_id + self.automatic_message = automatic_message + self.encryption = encryption + + self.oob_url = oob_url + + if oob_url is not None: + self.additional_data.set_value('gajim', 'oob_url', oob_url) + + self.xhtml = xhtml + + if xhtml is not None: + self.additional_data.set_value('gajim', 'xhtml', xhtml) + + self.timestamp = None + self.message_id = None + self.stanza = None + self.session = None + self.delayed = None # TODO never set + + self.is_loggable = True + + def copy(self): + message = OutgoingMessage(self.account, + self.jid, + self.message, + self.type_) + for name, value in vars(self).items(): + setattr(message, name, value) + message.additional_data = self.additional_data.copy() + return message + + @property + def is_groupchat(self): + return self.type_ == 'groupchat' + + @property + def is_chat(self): + return self.type_ == 'chat' + + @property + def is_normal(self): + return self.type_ == 'normal' + + def set_sent_timestamp(self): + if self.is_groupchat: + return + self.timestamp = time.time() + + @property + def is_encrypted(self): + return bool(self.additional_data.get_value('encrypted', 'name', False)) + + @property + def require_encryption(self): + return bool(self.encryption) + + @property + def msg_iq(self): + # Backwards compatibility for plugins + return self.stanza + + @msg_iq.setter + def msg_iq(self, value): + # Backwards compatibility for plugins + self.stanza = value ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -36,7 +36,6 @@ import nbxmpp from gi.repository import GLib from gajim.common import app -from gajim.common import ged from gajim.common import modules from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ @@ -71,11 +70,6 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): # Register all modules modules.register_modules(self) - app.ged.register_event_handler('message-outgoing', ged.OUT_CORE, - self._nec_message_outgoing) - app.ged.register_event_handler('stanza-message-outgoing', ged.OUT_CORE, - self._nec_stanza_message_outgoing) - def get_config_values_or_default(self): """ Get name, host, port from config, or create zeroconf account with default @@ -407,45 +401,36 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): title=_('Could not change status of account "%s"') % self.name, msg=_('Please check if avahi-daemon is running.'))) - def _nec_message_outgoing(self, obj): - if obj.account != self.name: - return - self._prepare_message(obj) - - def _nec_stanza_message_outgoing(self, obj): - if obj.conn.name != self.name: - return - + def send_message(self, message): def on_send_ok(stanza_id): - app.nec.push_incoming_event(MessageSentEvent(None, **vars(obj))) - self.log_message(obj, obj.jid) + app.nec.push_incoming_event(MessageSentEvent(None, **vars(message))) + self.get_module('Message').log_message(message, message.jid) def on_send_not_ok(reason): reason += ' ' + _('Your message could not be sent.') app.nec.push_incoming_event(NetworkEvent( 'zeroconf-error', account=self.name, - jid=obj.jid, + jid=message.jid, message=reason)) - # Dont propagate event - return True - - obj.timestamp = time.time() - ret = self.connection.send( - obj.msg_iq, obj.message is not None, - on_ok=on_send_ok, on_not_ok=on_send_not_ok) - - if ret == -1: - # Contact Offline - error_message = _( - 'Contact is offline. Your message could not be sent.') - app.nec.push_incoming_event(NetworkEvent( - 'zeroconf-error', - account=self.name, - jid=obj.jid, - message=error_message)) - # Dont propagate event - return True + + def _send(message): + ret = self.connection.send( + message.stanza, message.message is not None, + on_ok=on_send_ok, on_not_ok=on_send_not_ok) + message.timestamp = time.time() + + if ret == -1: + # Contact Offline + error_message = _( + 'Contact is offline. Your message could not be sent.') + app.nec.push_incoming_event(NetworkEvent( + 'zeroconf-error', + account=self.name, + jid=message.jid, + message=error_message)) + + self.get_module('Message').prepare_message(message, _send) def send_stanza(self, stanza): # send a stanza untouched ===================================== gajim/groupchat_control.py ===================================== @@ -56,11 +56,11 @@ from gajim.common.const import AvatarSize from gajim.common.i18n import _ from gajim.common.const import Chatstate from gajim.common.const import MUCJoinedState +from gajim.common.structs import OutgoingMessage from gajim.chat_control_base import ChatControlBase from gajim.command_system.implementation.hosts import GroupChatCommands -from gajim.common.connection_handlers_events import GcMessageOutgoingEvent from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import NewConfirmationCheckDialog @@ -215,7 +215,7 @@ class GroupchatControl(ChatControlBase): ('update-room-avatar', ged.GUI1, self._on_update_room_avatar), ('signed-in', ged.GUI1, self._on_signed_in), ('decrypted-message-received', ged.GUI2, self._on_decrypted_message_received), - ('gc-stanza-message-outgoing', ged.OUT_POSTCORE, self._on_message_sent), + ('message-sent', ged.OUT_POSTCORE, self._on_message_sent), ('bookmarks-received', ged.GUI2, self._on_bookmarks_received), ]) # pylint: enable=line-too-long @@ -1544,7 +1544,7 @@ class GroupchatControl(ChatControlBase): return # we'll save sent message text when we'll receive it in # _nec_gc_message_received - self.last_sent_msg = event.stanza_id + self.last_sent_msg = event.message_id if self.correcting: self.correcting = False gtkgui_helpers.remove_css_class( @@ -1585,16 +1585,15 @@ class GroupchatControl(ChatControlBase): self.contact) # Send the message - event = GcMessageOutgoingEvent(None, - account=self.account, - jid=self.room_jid, - message=message, - label=label, - chatstate=chatstate, - correct_id=correct_id, - automatic_message=False) - event.additional_data.set_value('gajim', 'xhtml', xhtml) - app.nec.push_outgoing_event(event) + message_ = OutgoingMessage(account=self.account, + jid=self.room_jid, + message=message, + type_='groupchat', + label=label, + chatstate=chatstate, + correct_id=correct_id) + message_.additional_data.set_value('gajim', 'xhtml', xhtml) + con.send_message(message_) self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus() ===================================== gajim/gtk/single_message.py ===================================== @@ -22,7 +22,7 @@ from gajim import vcard from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ -from gajim.common.connection_handlers_events import MessageOutgoingEvent +from gajim.common.structs import OutgoingMessage from gajim.conversation_textview import ConversationTextview @@ -250,13 +250,13 @@ class SingleMessageWindow(Gtk.ApplicationWindow): recipient_list.append(to_whom_jid) - app.nec.push_outgoing_event(MessageOutgoingEvent( - None, - account=self.account, - jid=recipient_list, - message=message, - type_='normal', - subject=subject)) + message = OutgoingMessage(account=self.account, + jid=None, + message=message, + type_='normal', + subject=subject) + con = app.connections[self.account] + con.send_messages(recipient_list, message) self._ui.subject_entry.set_text('') # we sent ok, clear the subject self._message_tv_buffer.set_text('') # we sent ok, clear the textview ===================================== gajim/privatechat_control.py ===================================== @@ -206,7 +206,8 @@ class PrivateChatControl(ChatControl): ChatControl.send_message(self, message, xhtml=xhtml, process_commands=process_commands, - attention=attention) + attention=attention, + is_muc_pm=True) def update_ui(self): if self.gc_contact.presence.is_unavailable: ===================================== gajim/remote_control.py ===================================== @@ -32,8 +32,8 @@ from gajim.common import app from gajim.common import helpers from gajim.gtk.add_contact import AddNewContactWindow from gajim.common import ged -from gajim.common.connection_handlers_events import MessageOutgoingEvent -from gajim.common.connection_handlers_events import GcMessageOutgoingEvent +from gajim.common.structs import OutgoingMessage + log = logging.getLogger('gajim.remote_control') @@ -329,7 +329,7 @@ class GajimRemote(Server): chatstate = obj.chatstate except AttributeError: chatstate = '' - self.raise_signal('MessageSent', (obj.conn.name, [ + self.raise_signal('MessageSent', (obj.account, [ obj.jid, obj.message, chatstate])) def on_time(self, obj): @@ -520,15 +520,12 @@ class GajimRemote(Server): if ctrl: ctrl.send_message(message) else: - app.nec.push_outgoing_event( - MessageOutgoingEvent( - None, - account=connected_account, - jid=jid, - message=message, - type_=type_, - control=ctrl)) - + message_ = OutgoingMessage(account=connected_account, + jid=jid, + message=message, + type_=type_, + control=ctrl) + connection.send_message(message_) return True return False @@ -554,12 +551,12 @@ class GajimRemote(Server): return False connected_account = self._get_account_for_groupchat(account, room_jid) if connected_account: - app.nec.push_outgoing_event( - GcMessageOutgoingEvent( - None, - account=connected_account, - jid=room_jid, - message=message)) + message_ = OutgoingMessage(account=connected_account, + jid=room_jid, + message=message, + type_='groupchat') + con = app.connections[connected_account] + con.send_message(message_) return True return False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2f7ca55710e73e3f5bf504e19f7d1b71cf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2f7ca55710e73e3f5bf504e19f7d1b71cf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] README: Fix typos and link to wiki
by Philipp Hörist 29 Jan '20

29 Jan '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d3db1faf by Daniel Brötzmann at 2020-01-29T08:40:35+01:00 README: Fix typos and link to wiki - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -1,6 +1,6 @@ # Welcome to python-nbxmpp -`python-nbxmpp` is a Python library that provides a way for Python applications to use the Jabber/XMPP network in a non-blocking way. This library was initialy a fork of `xmpppy`, but is now using non-blocking sockets. +`python-nbxmpp` is a Python library that provides a way for Python applications to use the Jabber/XMPP network in a non-blocking way. This library was initially a fork of `xmpppy`, but is now using non-blocking sockets. ## Features @@ -9,8 +9,8 @@ * Supports connection via proxies * Supports TLS * Supports [BOSH (XEP-0124)](https://xmpp.org/extensions/xep-0124.html) -* Supports [Stream Managemen (XEP-0198)](https://xmpp.org/extensions/xep-0198.html) -* List of [supported XEPs](./Supported-XEPs-in-python-nbxmpp/) +* Supports [Stream Management (XEP-0198)](https://xmpp.org/extensions/xep-0198.html) +* List of [supported XEPs](https://dev.gajim.org/gajim/python-nbxmpp/-/wikis/Supported-XEPs-in-p… ## Starting Points View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d3db1fafa9b6693e3e6ef9561b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d3db1fafa9b6693e3e6ef9561b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StartChat: Load contacts incremental
by Philipp Hörist 28 Jan '20

28 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 904c6209 by Philipp Hörist at 2020-01-28T23:05:47+01:00 StartChat: Load contacts incremental - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -59,6 +59,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self._destroyed = False self._search_stopped = False self._redirected = False + self._source_id = None self._ui = get_builder('start_chat_dialog.ui') self.add(self._ui.stack) @@ -67,9 +68,11 @@ class StartChatDialog(Gtk.ApplicationWindow): self.new_contact_rows = {} self.new_groupchat_rows = {} self._accounts = app.get_enabled_accounts_with_labels() + + rows = [] self._add_accounts() - self._add_contacts() - self._add_groupchats() + self._add_contacts(rows) + self._add_groupchats(rows) self._ui.search_entry.connect('search-changed', self._on_search_changed) @@ -81,7 +84,6 @@ class StartChatDialog(Gtk.ApplicationWindow): 'stop-search', lambda *args: self._ui.search_entry.set_text('')) self._ui.listbox.set_filter_func(self._filter_func, None) - self._ui.listbox.set_sort_func(self._sort_func, None) self._ui.listbox.connect('row-activated', self._on_row_activated) self._global_search_listbox = GlobalSearch() @@ -99,6 +101,9 @@ class StartChatDialog(Gtk.ApplicationWindow): self._ui.connect_signals(self) self.show_all() + if rows: + self._load_contacts(rows) + def set_search_text(self, text): self._ui.search_entry.set_text(text) @@ -109,7 +114,7 @@ class StartChatDialog(Gtk.ApplicationWindow): for account in self._accounts: self._ui.account_store.append([None, *account]) - def _add_contacts(self): + def _add_contacts(self, rows): show_account = len(self._accounts) > 1 for account, _label in self._accounts: self.new_contact_rows[account] = None @@ -118,11 +123,10 @@ class StartChatDialog(Gtk.ApplicationWindow): account, jid) if contact.is_groupchat: continue - row = ContactRow(account, contact, jid, - contact.get_shown_name(), show_account) - self._ui.listbox.add(row) + rows.append(ContactRow(account, contact, jid, + contact.get_shown_name(), show_account)) - def _add_groupchats(self): + def _add_groupchats(self, rows): show_account = len(self._accounts) > 1 for account, _label in self._accounts: self.new_groupchat_rows[account] = None @@ -131,8 +135,21 @@ class StartChatDialog(Gtk.ApplicationWindow): for bookmark in bookmarks: jid = str(bookmark.jid) name = get_groupchat_name(con, jid) - row = ContactRow(account, None, jid, name, show_account, True) - self._ui.listbox.add(row) + rows.append(ContactRow(account, None, jid, + name, show_account, True)) + + def _load_contacts(self, rows): + generator = self._incremental_add(rows) + self._source_id = GLib.idle_add(lambda: next(generator, False), + priority=GLib.PRIORITY_LOW) + + def _incremental_add(self, rows): + for row in rows: + self._ui.listbox.add(row) + yield True + + self._ui.listbox.set_sort_func(self._sort_func, None) + self._source_id = None def _on_page_changed(self, stack, _param): if stack.get_visible_child_name() == 'account': @@ -562,6 +579,8 @@ class StartChatDialog(Gtk.ApplicationWindow): user_data=(con, True)) def _destroy(self, *args): + if self._source_id is not None: + GLib.source_remove(self._source_id) self._destroyed = True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/904c6209df9225b82185f074cb5dae724d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/904c6209df9225b82185f074cb5dae724d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Add invite page
by Philipp Hörist 27 Jan '20

27 Jan '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d5e74812 by Daniel Brötzmann at 2020-01-27T22:07:46+01:00 Groupchat: Add invite page - - - - - 5 changed files: - gajim/data/gui/groupchat_control.ui - + gajim/data/gui/groupchat_invite.ui - gajim/groupchat_control.py - + gajim/gtk/groupchat_invite.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1691,6 +1691,84 @@ <property name="position">12</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid" id="invite_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="border_width">18</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="invite_button"> + <property name="label" translatable="yes">_Invite</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_invite_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="name">invite</property> + <property name="position">13</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/data/gui/groupchat_invite.ui ===================================== @@ -0,0 +1,238 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkListStore" id="account_store"> + <columns> +  + <column type="GdkPixbuf"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkBox" id="contacts_placeholder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">avatar-default-symbolic</property> + <property name="icon_size">6</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">No contacts left. +You can also type an XMPP address.</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max_width_chars">35</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <object class="GtkGrid" id="invite_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">24</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Invitees</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Contacts</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="invitees"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkListBox" id="invitees_listbox"> + <property name="name">StartChatListBox</property> + <property name="width_request">300</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">False</property> + <property name="selection_mode">browse</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="width_request">300</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="is_focus">True</property> + <property name="hexpand">True</property> + <property name="primary_icon_name">edit-find-symbolic</property> + <property name="primary_icon_activatable">False</property> + <property name="primary_icon_sensitive">False</property> + <property name="placeholder_text" translatable="yes">Search contacts...</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkListBox" id="contacts_listbox"> + <property name="name">StartChatListBox</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="selection_mode">browse</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <object class="GtkBox" id="invitees_placeholder"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">contact-new-symbolic</property> + <property name="icon_size">6</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Click on contacts you would like to invite to this group chat.</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max_width_chars">35</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/groupchat_control.py ===================================== @@ -71,6 +71,7 @@ from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.dataform import DataFormWidget from gajim.gtk.groupchat_info import GroupChatInfoScrolled +from gajim.gtk.groupchat_invite import GroupChatInvite from gajim.gtk.groupchat_roster import GroupchatRoster from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_icon_name @@ -174,6 +175,11 @@ class GroupchatControl(ChatControlBase): self._muc_info_box = GroupChatInfoScrolled(self.account, {'width': 600}) self.xml.info_grid.attach(self._muc_info_box, 0, 0, 1, 1) + # Groupchat invite + self._invite_box = GroupChatInvite(self.room_jid) + self.xml.invite_grid.attach(self._invite_box, 0, 0, 1, 1) + self._invite_box.connect('listbox-changed', self._on_invite_ready) + self.control_menu = gui_menu_builder.get_groupchat_menu(self.control_id, self.account, self.room_jid) @@ -264,6 +270,7 @@ class GroupchatControl(ChatControlBase): ('request-voice-', None, self._on_request_voice), ('upload-avatar-', None, self._on_upload_avatar), ('information-', None, self._on_information), + ('invite-', None, self._on_invite), ('contact-information-', 's', self._on_contact_information), ('execute-command-', 's', self._on_execute_command), ('block-', 's', self._on_block), @@ -503,6 +510,20 @@ class GroupchatControl(ChatControlBase): self._subject_data.user_timestamp) self._show_page('muc-info') + def _on_invite(self, _action, _param): + self._invite_box.update() + self._show_page('invite') + + def _on_invite_ready(self, _, invitable): + self.xml.invite_button.set_sensitive(invitable) + + def _on_invite_clicked(self, _button): + invitees = self._invite_box.get_invitees() + con = app.connections[self.account] + for jid in invitees: + con.get_module('MUC').invite(self.room_jid, jid) + self._show_page('groupchat') + def _on_destroy_room(self, _action, _param): self.xml.destroy_reason_entry.grab_focus() self.xml.destroy_button.grab_default() @@ -1913,6 +1934,8 @@ class GroupchatControl(ChatControlBase): self.xml.subject_textview.grab_focus() elif page_name == 'captcha': self._captcha_request.focus_first_entry() + elif page_name == 'invite': + self._invite_box.focus_search_entry() elif page_name == 'destroy': self.xml.destroy_reason_entry.grab_focus_without_selecting() ===================================== gajim/gtk/groupchat_invite.py ===================================== @@ -0,0 +1,357 @@ +# 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/>. + +import locale + +from gi.repository import Gdk +from gi.repository import GLib +from gi.repository import GObject +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common import app +from gajim.common.i18n import _ +from gajim.common.const import AvatarSize +from gajim.common.helpers import validate_jid + +from gajim.gtk.util import get_builder + + +class GroupChatInvite(Gtk.Box): + __gsignals__ = { + 'listbox-changed': (GObject.SignalFlags.RUN_LAST, None, (bool,)) + } + + def __init__(self, room_jid): + Gtk.Box.__init__(self) + self.set_size_request(-1, 300) + self._ui = get_builder('groupchat_invite.ui') + self.add(self._ui.invite_grid) + + self._ui.contacts_listbox.set_filter_func(self._filter_func, None) + self._ui.contacts_listbox.set_sort_func(self._sort_func, None) + self._ui.contacts_listbox.set_placeholder(self._ui.contacts_placeholder) + self._ui.contacts_listbox.connect('row-activated', + self._on_contacts_row_activated) + + self._ui.invitees_listbox.set_sort_func(self._sort_func, None) + self._ui.invitees_listbox.set_placeholder( + self._ui.invitees_placeholder) + self._ui.invitees_listbox.connect('row-activated', + self._on_invitees_row_activated) + + self._new_contact_row_visible = False + self._room_jid = room_jid + + self.update() + + self._ui.search_entry.connect('search-changed', + self._on_search_changed) + self._ui.search_entry.connect('next-match', + self._select_new_match, 'next') + self._ui.search_entry.connect('previous-match', + self._select_new_match, 'prev') + self._ui.search_entry.connect( + 'stop-search', lambda *args: self._ui.search_entry.set_text('')) + self._ui.search_entry.connect('activate', + self._on_search_activate) + self.connect('key-press-event', self._on_key_press) + self._ui.connect_signals(self) + + self.show_all() + + def _add_accounts(self): + for account in self._accounts: + self._ui.account_store.append([None, *account]) + + def _add_contacts(self): + show_account = len(self._accounts) > 1 + our_jids = app.get_our_jids() + for account, _label in self._accounts: + self.new_contact_rows[account] = None + participant_jids = [] + for contact in app.contacts.get_gc_contact_list( + account, self._room_jid): + if contact.jid is not None: + participant_jids.append(app.get_jid_without_resource( + contact.jid)) + for jid in app.contacts.get_jid_list(account): + contact = app.contacts.get_contact_with_highest_priority( + account, jid) + # Exclude group chats + if contact.is_groupchat: + continue + # Exclude our own jid + if jid in our_jids: + continue + # Exclude group chat participants + if jid in participant_jids: + continue + row = ContactRow(account, contact, jid, + contact.get_shown_name(), show_account) + self._ui.contacts_listbox.add(row) + + def _on_contacts_row_activated(self, listbox, row): + if row.new: + jid = row.jid + try: + validate_jid(jid) + except ValueError as error: + icon = 'dialog-warning-symbolic' + self._ui.search_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, icon) + self._ui.search_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, str(error)) + return + self._ui.search_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, None) + show_account = len(self._accounts) > 1 + row = ContactRow( + row.account, None, '', None, show_account) + row.update_jid(jid) + self._remove_new_jid_row() + else: + listbox.remove(row) + self._ui.invitees_listbox.add(row) + self._ui.invitees_listbox.unselect_row(row) + self._ui.search_entry.set_text('') + + GLib.timeout_add(50, self._select_first_row) + self._ui.search_entry.grab_focus() + + invitable = self._ui.invitees_listbox.get_row_at_index(0) is not None + self.emit('listbox-changed', invitable) + + def _on_invitees_row_activated(self, listbox, row): + listbox.remove(row) + if not row.new: + self._ui.contacts_listbox.add(row) + self._ui.contacts_listbox.unselect_row(row) + self._ui.search_entry.grab_focus() + invitable = listbox.get_row_at_index(0) is not None + self.emit('listbox-changed', invitable) + + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Down: + self._ui.search_entry.emit('next-match') + return Gdk.EVENT_STOP + + if event.keyval == Gdk.KEY_Up: + self._ui.search_entry.emit('previous-match') + return Gdk.EVENT_STOP + + if event.keyval == Gdk.KEY_Return: + row = self._ui.contacts_listbox.get_selected_row() + if row is not None: + row.emit('activate') + return Gdk.EVENT_STOP + + self._ui.search_entry.grab_focus_without_selecting() + + return Gdk.EVENT_PROPAGATE + + def _on_search_activate(self, _entry): + row = self._ui.contacts_listbox.get_selected_row() + if row is not None and row.get_child_visible(): + row.emit('activate') + + def _on_search_changed(self, entry): + search_text = entry.get_text() + if '@' in search_text: + self._add_new_jid_row() + self._update_new_jid_rows(search_text) + else: + self._remove_new_jid_row() + self._ui.contacts_listbox.invalidate_filter() + + def _add_new_jid_row(self): + if self._new_contact_row_visible: + return + for account in self.new_contact_rows: + show_account = len(self._accounts) > 1 + row = ContactRow(account, None, '', None, show_account) + self.new_contact_rows[account] = row + self._ui.contacts_listbox.add(row) + row.get_parent().show_all() + self._new_contact_row_visible = True + + def _remove_new_jid_row(self): + if not self._new_contact_row_visible: + return + for account in self.new_contact_rows: + self._ui.contacts_listbox.remove( + self.new_contact_rows[account]) + self._new_contact_row_visible = False + + def _update_new_jid_rows(self, search_text): + for account in self.new_contact_rows: + self.new_contact_rows[account].update_jid(search_text) + + def _select_new_match(self, _entry, direction): + selected_row = self._ui.contacts_listbox.get_selected_row() + if selected_row is None: + return + + index = selected_row.get_index() + + if direction == 'next': + index += 1 + else: + index -= 1 + + while True: + new_selected_row = self._ui.contacts_listbox.get_row_at_index(index) + if new_selected_row is None: + return + if new_selected_row.get_child_visible(): + self._ui.contacts_listbox.select_row(new_selected_row) + new_selected_row.grab_focus() + return + if direction == 'next': + index += 1 + else: + index -= 1 + + def _select_first_row(self): + first_row = self._ui.contacts_listbox.get_row_at_y(0) + self._ui.contacts_listbox.select_row(first_row) + + def _scroll_to_first_row(self): + self._ui.scrolledwindow.get_vadjustment().set_value(0) + + def _filter_func(self, row, _user_data): + search_text = self._ui.search_entry.get_text().lower() + search_text_list = search_text.split() + row_text = row.get_search_text().lower() + for text in search_text_list: + if text not in row_text: + GLib.timeout_add(50, self._select_first_row) + return None + GLib.timeout_add(50, self._select_first_row) + return True + + @staticmethod + def _sort_func(row1, row2, _user_data): + name1 = row1.get_search_text() + name2 = row2.get_search_text() + account1 = row1.account + account2 = row2.account + + result = locale.strcoll(account1.lower(), account2.lower()) + if result != 0: + return result + + return locale.strcoll(name1.lower(), name2.lower()) + + def update(self): + self._ui.contacts_listbox.foreach(self._ui.contacts_listbox.remove) + self._ui.invitees_listbox.foreach(self._ui.invitees_listbox.remove) + self._accounts = app.get_enabled_accounts_with_labels() + self.new_contact_rows = {} + self._add_accounts() + self._add_contacts() + first_row = self._ui.contacts_listbox.get_row_at_index(0) + self._ui.contacts_listbox.select_row(first_row) + self._ui.search_entry.grab_focus() + self.emit('listbox-changed', False) + + def focus_search_entry(self): + self._ui.search_entry.grab_focus() + + def get_invitees(self): + invitees = [] + for row in self._ui.invitees_listbox.get_children(): + invitees.append(row.jid) + return invitees + + +class ContactRow(Gtk.ListBoxRow): + def __init__(self, account, contact, jid, name, show_account): + Gtk.ListBoxRow.__init__(self) + self.get_style_context().add_class('start-chat-row') + self.account = account + self.account_label = app.get_account_label(account) + self.show_account = show_account + self.jid = jid + self.contact = contact + self.name = name + self.new = jid == '' + + show = contact.show if contact else 'offline' + + grid = Gtk.Grid() + grid.set_column_spacing(12) + grid.set_size_request(260, -1) + + image = self._get_avatar_image(account, jid, show) + image.set_size_request(AvatarSize.ROSTER, AvatarSize.ROSTER) + grid.add(image) + + middle_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0) + middle_box.set_hexpand(True) + + if self.name is None: + self.name = _('Invite New Contact') + + self.name_label = Gtk.Label(label=self.name) + self.name_label.set_ellipsize(Pango.EllipsizeMode.END) + self.name_label.set_xalign(0) + self.name_label.set_width_chars(25) + self.name_label.set_halign(Gtk.Align.START) + self.name_label.get_style_context().add_class('bold16') + middle_box.add(self.name_label) + + self.jid_label = Gtk.Label(label=jid) + self.jid_label.set_ellipsize(Pango.EllipsizeMode.END) + self.jid_label.set_xalign(0) + self.jid_label.set_width_chars(25) + self.jid_label.set_halign(Gtk.Align.START) + self.jid_label.get_style_context().add_class('dim-label') + middle_box.add(self.jid_label) + + grid.add(middle_box) + + if show_account: + account_label = Gtk.Label(label=self.account_label) + account_label.set_halign(Gtk.Align.START) + account_label.set_valign(Gtk.Align.START) + + right_box = Gtk.Box() + right_box.set_vexpand(True) + right_box.add(account_label) + grid.add(right_box) + + self.add(grid) + self.show_all() + + def _get_avatar_image(self, account, jid, show): + if self.new: + icon_name = 'avatar-default' + return Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.DND) + + scale = self.get_scale_factor() + avatar = app.contacts.get_avatar( + account, jid, AvatarSize.ROSTER, scale, show) + return Gtk.Image.new_from_surface(avatar) + + def update_jid(self, jid): + self.jid = jid + self.jid_label.set_text(jid) + + def get_search_text(self): + if self.contact is None: + return self.jid + if self.show_account: + return '%s %s %s' % (self.name, self.jid, self.account_label) + return '%s %s' % (self.name, self.jid) ===================================== gajim/gui_menu_builder.py ===================================== @@ -572,6 +572,7 @@ def get_singlechat_menu(control_id, account, jid): def get_groupchat_menu(control_id, account, jid): groupchat_menu = [ ('win.information-', _('Information')), + ('win.invite-', _('Invite Contact')), (_('Manage Group Chat'), [ ('win.rename-groupchat-', _('Rename Group Chat')), ('win.change-subject-', _('Change Subject')), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d5e7481246203290359f18cb3a8bd1c1b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d5e7481246203290359f18cb3a8bd1c1b6… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2020