Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] refactor: Separate nickname generator to GroupChatNickCompletion
by Daniel Brötzmann (＠wurstsalat) 22 Jun '22

22 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6cd4bf4a by wurstsalat at 2022-06-22T20:08:41+02:00 refactor: Separate nickname generator to GroupChatNickCompletion - - - - - 5 changed files: - gajim/gtk/controls/base.py - gajim/gtk/controls/groupchat.py - + gajim/gtk/groupchat_nick_completion.py - gajim/gtk/util.py - pyrightconfig.json Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -266,9 +266,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: # TODO: self.user_nick: Optional[str] = None - self.command_hits: list[str] = [] - self.last_key_tabs: bool = False - self.sendmessage: bool = True self._client.get_module('Chatstate').set_active(self.contact) @@ -846,10 +843,6 @@ def _on_message_textview_key_press_event(self, self.space_pressed = False # Ctrl [+ Shift] + Tab are not forwarded to notebook. We handle it here - if self.is_groupchat: - if event.keyval not in (Gdk.KEY_ISO_Left_Tab, Gdk.KEY_Tab): - self.last_key_tabs = False - if event.get_state() & Gdk.ModifierType.SHIFT_MASK: if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and event.keyval == Gdk.KEY_ISO_Left_Tab): ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -72,8 +72,7 @@ from gajim.gui.groupchat_inviter import GroupChatInviter from gajim.gui.groupchat_roster import GroupchatRoster from gajim.gui.groupchat_state import GroupchatState -from gajim.gui.message_input import MessageInputTextView -from gajim.gui.util import NickCompletionGenerator +from gajim.gui.groupchat_nick_completion import GroupChatNickCompletion from gajim.gui.util import open_window from ..menus import get_encryption_menu @@ -153,11 +152,8 @@ def __init__(self, account: str, jid: JID) -> None: # if True, the room has mentioned us self.attention_flag: bool = False - # sorted list of nicks who mentioned us (last at the end) - self.attention_list: list[str] = [] - self.nick_hits: list[str] = [] - self.__nick_completion: Optional[NickCompletionGenerator] = None - self.last_key_tabs: bool = False + self._nick_completion = GroupChatNickCompletion( + self.account, self.contact, self.msg_textview) # Send file self.xml.sendfile_button.set_action_name( @@ -260,13 +256,6 @@ def _on_client_state_changed(self, ) -> None: pass - @property - def _nick_completion(self) -> NickCompletionGenerator: - if self.__nick_completion is None: - self.__nick_completion = NickCompletionGenerator( - self.contact.nickname) - return self.__nick_completion - @property def disco_info(self): return app.storage.cache.get_last_disco_info(self.contact.jid) @@ -797,7 +786,7 @@ def _on_user_joined(self, _contact: GroupchatContact, _signal_name: str, user_contact: GroupchatParticipant, - properties: MessageProperties + properties: PresenceProperties ) -> None: nick = user_contact.name if not properties.is_muc_self_presence: @@ -852,12 +841,10 @@ def _on_user_nickname_changed(self, nick = user_contact.name new_nick = properties.muc_user.nick if properties.is_muc_self_presence: - self._nick_completion.change_nick(new_nick) message = _('You are now known as %s') % new_nick else: message = _('{nick} is now known ' 'as {new_nick}').format(nick=nick, new_nick=new_nick) - self._nick_completion.contact_renamed(nick, new_nick) self.add_info_message(message) @@ -1224,128 +1211,6 @@ def _on_drag_data_received(self, # File drag and drop (handled in chat_control_base) self.drag_data_file_transfer(selection) - def _jid_not_blocked(self, bare_jid: str) -> bool: - fjid = self.room_jid + '/' + bare_jid - return not helpers.jid_is_blocked(self.account, fjid) - - def _on_message_textview_key_press_event(self, - textview: MessageInputTextView, - event: Gdk.EventKey - ) -> bool: - # pylint: disable=too-many-nested-blocks - res = BaseControl._on_message_textview_key_press_event( - self, textview, event) - if res: - return True - - if event.keyval == Gdk.KEY_Tab: # TAB - message_buffer = textview.get_buffer() - start_iter, end_iter = message_buffer.get_bounds() - cursor_position = message_buffer.get_insert() - end_iter = message_buffer.get_iter_at_mark(cursor_position) - text = message_buffer.get_text(start_iter, end_iter, False) - - splitted_text = text.split() - - # nick completion - # check if tab is pressed with empty message - if splitted_text: # if there are any words - begin = splitted_text[-1] # last word we typed - else: - begin = '' - - gc_refer_to_nick_char = app.settings.get('gc_refer_to_nick_char') - with_refer_to_nick_char = False - after_nick_len = 1 # the space that is printed after we type [Tab] - - # first part of this if : works fine even if refer_to_nick_char - if (gc_refer_to_nick_char and - text.endswith(gc_refer_to_nick_char + ' ')): - with_refer_to_nick_char = True - after_nick_len = len(gc_refer_to_nick_char + ' ') - if self.nick_hits and self.last_key_tabs and \ - text[:-after_nick_len].endswith(self.nick_hits[0]): - # we should cycle - # Previous nick in list may had a space inside, so we check text - # and not splitted_text and store it into 'begin' var - self.nick_hits.append(self.nick_hits[0]) - begin = self.nick_hits.pop(0) - else: - list_nick = self.contact.get_user_nicknames() - list_nick = list(filter(self._jid_not_blocked, list_nick)) - - log.debug("Nicks to be considered for autosuggestions: %s", - list_nick) - self.nick_hits = self._nick_completion.generate_suggestions( - nicks=list_nick, beginning=begin) - log.debug("Nicks filtered for autosuggestions: %s", - self.nick_hits) - - if self.nick_hits: - if len(splitted_text) < 2 or with_refer_to_nick_char: - # This is the 1st word of the line or no word or we are - # cycling at the beginning, possibly with a space in - # one nick - add = gc_refer_to_nick_char + ' ' - else: - add = ' ' - start_iter = end_iter.copy() - if (self.last_key_tabs and - with_refer_to_nick_char or (text and text[-1] == ' ')): - # have to accommodate for the added space from last - # completion - # gc_refer_to_nick_char may be more than one char! - start_iter.backward_chars(len(begin) + len(add)) - elif (self.last_key_tabs and - not app.settings.get('shell_like_completion')): - # have to accommodate for the added space from last - # completion - start_iter.backward_chars( - len(begin) + len(gc_refer_to_nick_char)) - else: - start_iter.backward_chars(len(begin)) - - self._client.get_module('Chatstate').block_chatstates( - self.contact, True) - - message_buffer.delete(start_iter, end_iter) - # get a shell-like completion - # if there's more than one nick for this completion, complete - # only the part that all these nicks have in common - if (app.settings.get('shell_like_completion') and - len(self.nick_hits) > 1): - end = False - completion = '' - add = "" # if nick is not complete, don't add anything - while not end and len(completion) < len(self.nick_hits[0]): - completion = self.nick_hits[0][:len(completion) + 1] - for nick in self.nick_hits: - if completion.lower() not in nick.lower(): - end = True - completion = completion[:-1] - break - # if the current nick matches a COMPLETE existing nick, - # and if the user tab TWICE, complete that nick (with the - # "add") - if self.last_key_tabs: - for nick in self.nick_hits: - if nick == completion: - # The user seems to want this nick, so - # complete it as if it were the only nick - # available - add = gc_refer_to_nick_char + ' ' - else: - completion = self.nick_hits[0] - message_buffer.insert_at_cursor(completion + add) - - self._client.get_module('Chatstate').block_chatstates( - self.contact, False) - - self.last_key_tabs = True - return True - self.last_key_tabs = False - return False - def delegate_action(self, action: str) -> int: res = super().delegate_action(action) if res == Gdk.EVENT_STOP: ===================================== gajim/gtk/groupchat_nick_completion.py ===================================== @@ -0,0 +1,264 @@ +# 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/>. + +from __future__ import annotations + +from typing import TYPE_CHECKING + +import logging + +from nbxmpp.structs import PresenceProperties + +from gi.repository import Gdk + +from gajim.common import app +from gajim.common import types +from gajim.common.helpers import jid_is_blocked + +if TYPE_CHECKING: + from .message_input import MessageInputTextView + +log = logging.getLogger('gajim.gui.groupchat_nick_completion') + + +class GroupChatNickCompletion: + def __init__(self, + account: str, + contact: types.GroupchatContactT, + message_input: MessageInputTextView + ) -> None: + self._account = account + self._client = app.get_client(account) + + self._contact = contact + self._contact.connect( + 'user-nickname-changed', self._on_user_nickname_changed) + + self._message_input = message_input + self._message_input.connect('key-press-event', self._on_key_press) + + self._sender_list: list[str] = [] + self._attention_list: list[str] = [] + self._nick_hits: list[str] = [] + self._last_key_tab = False + + def _on_user_nickname_changed(self, + _contact: types.GroupchatContact, + _signal_name: str, + user_contact: types.GroupchatParticipant, + properties: PresenceProperties + ) -> None: + if properties.is_muc_self_presence: + return + + old_name = user_contact.name + assert properties.muc_user + new_name = properties.muc_user.nick + assert new_name is not None + log.debug('Contact %s renamed to %s', old_name, new_name) + for lst in (self._attention_list, self._sender_list): + for idx, contact in enumerate(lst): + if contact == old_name: + lst[idx] = new_name + + def record_message(self, contact_name: str, highlight: bool) -> None: + if contact_name == self._contact.nickname: + return + + log.debug('Recorded a message from %s, highlight; %s', + contact_name, + highlight) + + if highlight: + try: + self._attention_list.remove(contact_name) + except ValueError: + pass + if len(self._attention_list) > 6: + self._attention_list.pop(0) # remove older + self._attention_list.append(contact_name) + + # TODO implement it in a more efficient way + # Currently it's O(n*m + n*s), where n is the number of participants and + # m is the number of messages processed, s - the number of times the + # suggestions are requested + # + # A better way to do it would be to keep a dict: contact -> timestamp + # with expected O(1) insert, and sort it by timestamps in O(n log n) + # for each suggestion (currently generating the suggestions is O(n)) + # this would give the expected complexity of O(m + s * n log n) + try: + self._sender_list.remove(contact_name) + except ValueError: + pass + self._sender_list.append(contact_name) + + def _generate_suggestions(self, + nicks: list[str], + beginning: str + ) -> list[str]: + """ + Generate the order of suggested MUC autocompletions + + `nicks` is the list of contacts currently participating in a MUC + `beginning` is the text already typed by the user + """ + def _nick_matching(nick: str) -> bool: + return (nick != self._contact.nickname and + nick.lower().startswith(beginning.lower())) + + if beginning == '': + # empty message, so just suggest recent mentions + potential_matches = self._attention_list + else: + # nick partially typed, try completing it + potential_matches = self._sender_list + + potential_matches_set = set(potential_matches) + log.debug('Priority matches: %s', potential_matches_set) + + matches = [n for n in potential_matches if _nick_matching(n)] + # the most recent nick is the last one on the list + matches.reverse() + + # handle people who have not posted/mentioned us + other_nicks = [ + n for n in nicks + if _nick_matching(n) and n not in potential_matches_set + ] + other_nicks.sort(key=str.lower) + log.debug('Other matches: %s', other_nicks) + + return matches + other_nicks + + def _on_key_press(self, + textview: MessageInputTextView, + event: Gdk.EventKey + ) -> bool: + if event.keyval not in (Gdk.KEY_ISO_Left_Tab, Gdk.KEY_Tab): + self._last_key_tab = False + return False + + message_buffer = textview.get_buffer() + start_iter, end_iter = message_buffer.get_bounds() + cursor_position = message_buffer.get_insert() + end_iter = message_buffer.get_iter_at_mark(cursor_position) + text = message_buffer.get_text(start_iter, end_iter, False) + + text_split = text.split() + + # nick completion + # check if tab is pressed with empty message + if text_split: # if there are any words + begin = text_split[-1] # last word we typed + else: + begin = '' + + gc_refer_to_nick_char = app.settings.get('gc_refer_to_nick_char') + with_refer_to_nick_char = False + after_nick_len = 1 # the space that is printed after we type [Tab] + + # first part of this if : works fine even if refer_to_nick_char + if (gc_refer_to_nick_char and + text.endswith(gc_refer_to_nick_char + ' ')): + with_refer_to_nick_char = True + after_nick_len = len(gc_refer_to_nick_char + ' ') + if (self._nick_hits and self._last_key_tab and + text[:-after_nick_len].endswith(self._nick_hits[0])): + # we should cycle + # Previous nick in list may had a space inside, so we check text + # and not text_split and store it into 'begin' var + self._nick_hits.append(self._nick_hits[0]) + begin = self._nick_hits.pop(0) + else: + list_nick = self._contact.get_user_nicknames() + list_nick = list(filter(self._jid_not_blocked, list_nick)) + + log.debug('Nicks to be considered for autosuggestions: %s', + list_nick) + self._nick_hits = self._generate_suggestions( + nicks=list_nick, beginning=begin) + log.debug('Nicks filtered for autosuggestions: %s', + self._nick_hits) + if not self._nick_hits: + self._last_key_tab = True + return False + + if self._nick_hits: + if len(text_split) < 2 or with_refer_to_nick_char: + # This is the 1st word of the line or no word or we are + # cycling at the beginning, possibly with a space in + # one nick + add = gc_refer_to_nick_char + ' ' + else: + add = ' ' + start_iter = end_iter.copy() + if (self._last_key_tab and + with_refer_to_nick_char or (text and text[-1] == ' ')): + # have to accommodate for the added space from last + # completion + # gc_refer_to_nick_char may be more than one char! + start_iter.backward_chars(len(begin) + len(add)) + elif (self._last_key_tab and + not app.settings.get('shell_like_completion')): + # have to accommodate for the added space from last + # completion + start_iter.backward_chars( + len(begin) + len(gc_refer_to_nick_char)) + else: + start_iter.backward_chars(len(begin)) + + self._client.get_module('Chatstate').block_chatstates( + self._contact, True) + + message_buffer.delete(start_iter, end_iter) + # get a shell-like completion + # if there's more than one nick for this completion, complete + # only the part that all these nicks have in common + if (app.settings.get('shell_like_completion') and + len(self._nick_hits) > 1): + end = False + completion = '' + add = "" # if nick is not complete, don't add anything + while not end and len(completion) < len(self._nick_hits[0]): + completion = self._nick_hits[0][:len(completion) + 1] + for nick in self._nick_hits: + if completion.lower() not in nick.lower(): + end = True + completion = completion[:-1] + break + # if the current nick matches a COMPLETE existing nick, + # and if the user tab TWICE, complete that nick (with the + # "add") + if self._last_key_tab: + for nick in self._nick_hits: + if nick == completion: + # The user seems to want this nick, so + # complete it as if it were the only nick + # available + add = gc_refer_to_nick_char + ' ' + else: + completion = self._nick_hits[0] + message_buffer.insert_at_cursor(completion + add) + + self._client.get_module('Chatstate').block_chatstates( + self._contact, False) + + self._last_key_tab = True + return True + + def _jid_not_blocked(self, resource: str) -> bool: + resource_contact = self._contact.get_resource(resource) + return not jid_is_blocked( + self._account, str(resource_contact.jid)) ===================================== gajim/gtk/util.py ===================================== @@ -65,89 +65,6 @@ MenuItemListT = list[tuple[str, str, MenuValueT]] -class NickCompletionGenerator: - def __init__(self, self_nick: str) -> None: - self.nick = self_nick - self.sender_list: list[str] = [] - self.attention_list: list[str] = [] - - def change_nick(self, new_nick: str) -> None: - self.nick = new_nick - - def record_message(self, contact: str, highlight: bool) -> None: - if contact == self.nick: - return - - log.debug('Recorded a message from %s, highlight; %s', contact, - highlight) - if highlight: - try: - self.attention_list.remove(contact) - except ValueError: - pass - if len(self.attention_list) > 6: - self.attention_list.pop(0) # remove older - self.attention_list.append(contact) - - # TODO implement it in a more efficient way - # Currently it's O(n*m + n*s), where n is the number of participants and - # m is the number of messages processed, s - the number of times the - # suggestions are requested - # - # A better way to do it would be to keep a dict: contact -> timestamp - # with expected O(1) insert, and sort it by timestamps in O(n log n) - # for each suggestion (currently generating the suggestions is O(n)) - # this would give the expected complexity of O(m + s * n log n) - try: - self.sender_list.remove(contact) - except ValueError: - pass - self.sender_list.append(contact) - - def contact_renamed(self, contact_old: str, contact_new: str) -> None: - log.debug('Contact %s renamed to %s', contact_old, contact_new) - for lst in (self.attention_list, self.sender_list): - for idx, contact in enumerate(lst): - if contact == contact_old: - lst[idx] = contact_new - - def generate_suggestions(self, nicks: list[str], - beginning: str) -> list[str]: - """ - Generate the order of suggested MUC autocompletions - - `nicks` is the list of contacts currently participating in a MUC - `beginning` is the text already typed by the user - """ - def nick_matching(nick: str) -> bool: - return nick != self.nick \ - and nick.lower().startswith(beginning.lower()) - - if beginning == '': - # empty message, so just suggest recent mentions - potential_matches = self.attention_list - else: - # nick partially typed, try completing it - potential_matches = self.sender_list - - potential_matches_set = set(potential_matches) - log.debug('Priority matches: %s', potential_matches_set) - - matches = [n for n in potential_matches if nick_matching(n)] - # the most recent nick is the last one on the list - matches.reverse() - - # handle people who have not posted/mentioned us - other_nicks = [ - n for n in nicks - if nick_matching(n) and n not in potential_matches_set - ] - other_nicks.sort(key=str.lower) - log.debug('Other matches: %s', other_nicks) - - return matches + other_nicks - - def set_urgency_hint(window: Gtk.Window, setting: bool) -> None: if app.settings.get('use_urgency_hint'): window.set_urgency_hint(setting) ===================================== pyrightconfig.json ===================================== @@ -79,6 +79,7 @@ "gajim/gtk/groupchat_invitation.py", "gajim/gtk/groupchat_inviter.py", "gajim/gtk/groupchat_nick.py", + "gajim/gtk/groupchat_nick_completion.py", "gajim/gtk/groupchat_outcasts.py", "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6cd4bf4ac6deb4ddac9c6f463967027d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6cd4bf4ac6deb4ddac9c6f463967027d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Update python version to 3.10
by Philipp Hörist (＠lovetox) 22 Jun '22

22 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 53ebe405 by lovetox at 2022-06-22T18:39:59+02:00 ci: Windows: Update python version to 3.10 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -12,7 +12,7 @@ cd "${DIR}" # CONFIG START MAJOR_PY_VERSION="3" -MINOR_PY_VERSION="9" +MINOR_PY_VERSION="10" PYTHON_VERSION="${MAJOR_PY_VERSION}.${MINOR_PY_VERSION}" BUILD_VERSION="0" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/53ebe405880d6d75d4568d1896236ec6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/53ebe405880d6d75d4568d1896236ec6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Set commit author correctly
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 358fb15d by lovetox at 2022-06-21T22:19:04+02:00 ci: Set commit author correctly - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -134,8 +134,8 @@ deploy-flatpak: - chmod 700 ~/.ssh - ssh-keyscan github.com >> ~/.ssh/known_hosts script: - - git config user.email "$CI_GIT_USER_EMAIL" - - git config user.name "$CI_GIT_USER_USERNAME" + - git config --global user.email "$CI_GIT_USER_EMAIL" + - git config --global user.name "$CI_GIT_USER_USERNAME" - git clone https://github.com/flathub/org.gajim.Gajim.git - cd org.gajim.Gajim - mv ../flatpak/org.gajim.Gajim.yaml org.gajim.Gajim.yaml View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/358fb15dfefebd43482484a5547318bc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/358fb15dfefebd43482484a5547318bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag 1.4.5
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed new tag 1.4.5 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/1.4.5 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] release: 1.4.5
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 68024cf1 by lovetox at 2022-06-21T22:04:20+02:00 release: 1.4.5 - - - - - 4 changed files: - ChangeLog - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,29 @@ +Gajim 1.4.5 (21 Jun 2022) + + New + + * Add new Shortcut for toggling the chat list + + Improvements + + * Preferences: Add setting for emoji shortcodes + * Disable plugin updates by Gajim on flatpak + + Bug Fixes + + * Use nickname provided in subscription requests everywhere + * GroupchatOutcasts: Make removing users work + * Chat: Display corrections for /me messages correctly (#10933) + * Styling: Process URIs when using /me command (#10988) + * Preview: Align link button correctly (#10997) + * MUC: Don’t fail on presence from unknown occupants (#10981) + * SystemStyleListener: Fix handling of color scheme states (#10996) + * Styling: Improve address regex + * Styling: Improve uri regex + * Styling: Parse text correctly which contains uris and addresses (#10974) + * Main: Process window shortcuts when no chat is open + * Restore minimal AdHoc module + Gajim 1.4.4 (18 Jun 2022) New ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -74,6 +74,7 @@ <control>pointing</control> </recommends> <releases> + <release version="1.4.5" date="2022-06-21" /> <release version="1.4.4" date="2022-06-18" /> <release version="1.4.3" date="2022-06-01" /> <release version="1.4.2" date="2022-05-25" /> ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -315,7 +315,7 @@ modules: sources: - type: git url: https://dev.gajim.org/gajim/gajim.git - tag: 1.4.4 + tag: 1.4.5 - type: file path: app-overrides.json post-install: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import sys from pathlib import Path -__version__ = '1.4.4' +__version__ = '1.4.5' IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/68024cf1fbbda9e79d0dc64666e1c7bf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/68024cf1fbbda9e79d0dc64666e1c7bf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update translations
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 67e3aadd by Weblate at 2022-06-21T22:00:20+02:00 chore: Update translations - - - - - 30 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gajim.pot - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/lt.po - po/nb_NO.po - po/nl.po - po/pl.po - po/pt.po - po/pt_BR.po - po/ro.po - po/ru.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67e3aaddb833ef68b8efa271faab500a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67e3aaddb833ef68b8efa271faab500a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update release template
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1016819b by lovetox at 2022-06-21T21:59:00+02:00 chore: Update release template - - - - - 1 changed file: - .gitlab/issue_templates/Release.md Changes: ===================================== .gitlab/issue_templates/Release.md ===================================== @@ -1,12 +1,7 @@ *Release date: xx xxx xxxx* -## Things to do before release: - -* [ ] xxx - ## Build * [ ] Merge translations from Weblate -* [ ] Update `ChangeLog` * [ ] Run `./scripts/bump_version.py x.x.x` * [ ] Push release tag `x.x.x` View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1016819b2d9c2a02fc3d44e78c055961… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1016819b2d9c2a02fc3d44e78c055961… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Update git-chglog template
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e0b32d9e by lovetox at 2022-06-21T21:56:38+02:00 chore: Update git-chglog template - - - - - ebe34654 by lovetox at 2022-06-21T21:56:38+02:00 chore: Scripts: Generate changelog when using bump_version.py - - - - - 2 changed files: - .chglog/CHANGELOG.tpl.md - scripts/bump_version.py Changes: ===================================== .chglog/CHANGELOG.tpl.md ===================================== @@ -1,26 +1,11 @@ -{{ if .Versions -}} -<a name="unreleased"></a> -## [Unreleased] - -{{ if .Unreleased.CommitGroups -}} -{{ range .Unreleased.CommitGroups -}} -{{ .Title }} - -{{ range .Commits -}} - * {{if .Refs}}{{range .Refs}}#{{.Ref}} {{end}}{{end}}{{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} -{{ end }} -{{ end -}} -{{ end -}} -{{ end -}} - - {{ range .Versions }} -<a name="{{ .Tag.Name }}"></a> -## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }} +Gajim {{ .Tag.Name }} ({{ datetime "02 Jan 2006" .Tag.Date }}) + {{ range .CommitGroups -}} -{{ .Title }} +{{ if .Title }} {{ .Title }}{{end}} + {{ range .Commits -}} - * {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }} +{{ if .Subject }} * {{ .Subject }}{{end}}{{if .Refs}} ({{range .Refs}}#{{.Ref}}{{end}}){{end}} {{ end }} {{ end -}} @@ -32,13 +17,7 @@ ## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - { {{ end }} {{ end -}} {{ end -}} -{{ end -}} -{{- if .Versions }} -[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD -{{ range .Versions -}} -{{ if .Tag.Previous -}} -[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }} -{{ end -}} +{{break}} + {{ end -}} -{{ end -}} \ No newline at end of file ===================================== scripts/bump_version.py ===================================== @@ -4,6 +4,7 @@ import argparse from datetime import datetime from pathlib import Path +import subprocess REPO_DIR = Path(__file__).resolve().parent.parent @@ -11,6 +12,7 @@ INIT = REPO_DIR / 'gajim' / '__init__.py' FLATPAK = REPO_DIR / 'flatpak' / 'org.gajim.Gajim.yaml' APPDATA = REPO_DIR / 'data' / 'org.gajim.Gajim.appdata.xml.in' +CHANGELOG = REPO_DIR / 'ChangeLog' VERSION_RX = r"\d+\.\d+\.\d+" @@ -61,6 +63,29 @@ def bump_appdata(new_version: str) -> None: f.write('\n') +def make_changelog(new_version: str) -> None: + + cmd = [ + 'git-chglog', + '--next-tag', + new_version + ] + + result = subprocess.run(cmd, + cwd=REPO_DIR, + text=True, + check=True, + capture_output=True) + + changes = result.stdout + changes = changes.removeprefix('\n') + + current_changelog = CHANGELOG.read_text() + + with CHANGELOG.open('w') as f: + f.write(changes + current_changelog) + + if __name__ == '__main__': parser = argparse.ArgumentParser(description='Bump Version') parser.add_argument('version', help='The new version, e.g. 1.5.0') @@ -70,3 +95,4 @@ def bump_appdata(new_version: str) -> None: bump_init(current_version, args.version) bump_flatpak(current_version, args.version) bump_appdata(args.version) + make_changelog(args.version) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ec46547c3b0efb7a94b2b16e59571e2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ec46547c3b0efb7a94b2b16e59571e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Use nickname provided in subscription requests everywhere
by Philipp Hörist (＠lovetox) 21 Jun '22

21 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ec46547c by bodqhrohro at 2022-06-21T18:53:28+00:00 fix: Use nickname provided in subscription requests everywhere The nickname is now also shown in the notification and passed to the AddContact dialog, which afterwards adds the nickname to the roster. - - - - - 1 changed file: - gajim/gtk/notification_manager.py Changes: ===================================== gajim/gtk/notification_manager.py ===================================== @@ -66,15 +66,15 @@ def _on_destroy(self, *args: Any) -> None: def _add_actions(self) -> None: actions = [ - ('subscription-accept', self._on_subscription_accept), - ('subscription-deny', self._on_subscription_deny), - ('subscription-block', self._on_subscription_block), - ('subscription-report', self._on_subscription_report), + ('subscription-accept', self._on_subscription_accept, 'as'), + ('subscription-deny', self._on_subscription_deny, 's'), + ('subscription-block', self._on_subscription_block, 's'), + ('subscription-report', self._on_subscription_report, 's'), ] for action in actions: - action_name, func = action + action_name, func, typ = action act = Gio.SimpleAction.new( - f'{action_name}-{self._account}', GLib.VariantType.new('s')) + f'{action_name}-{self._account}', GLib.VariantType.new(typ)) act.connect('activate', func) app.window.add_action(act) @@ -123,14 +123,14 @@ def _on_subscription_accept(self, _action: Gio.SimpleAction, param: GLib.Variant ) -> None: - jid = param.get_string() + jid, nickname = param.get_strv() row = self._get_notification_row(jid) self._client.get_module('Presence').subscribed(jid) jid = JID.from_string(jid) contact = self._client.get_module('Contacts').get_contact(jid) if not contact.is_in_roster: open_window('AddContact', account=self._account, - jid=jid, nick=contact.name) + jid=jid, nick=nickname or contact.name) if row is not None: row.destroy() @@ -189,9 +189,12 @@ def add_subscription_request(self, new_row.connect('destroy', self._on_row_destroy) self.add(new_row) - contact = self._client.get_module('Contacts').get_contact( - event.jid) - text = _('%s asks you to share your status') % contact.name + nick = event.user_nick + if not nick: + contact = self._client.get_module('Contacts').get_contact( + event.jid) + nick = contact.name + text = _('%s asks you to share your status') % nick app.ged.raise_event( Notification(account=self._account, @@ -330,7 +333,10 @@ def __init__(self, accept_button.set_valign(Gtk.Align.CENTER) accept_button.set_action_name( f'win.subscription-accept-{self._account}') - accept_button.set_action_target_value(GLib.Variant('s', self.jid)) + accept_button.set_action_target_value(GLib.Variant.new_strv([ + self.jid, + user_nick or '' + ])) self.grid.attach(accept_button, 3, 1, 1, 2) more_image = Gtk.Image.new_from_icon_name( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ec46547c3b0efb7a94b2b16e59571e2c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ec46547c3b0efb7a94b2b16e59571e2c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: BaseControl: Remove obsolete code
by Daniel Brötzmann (＠wurstsalat) 21 Jun '22

21 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 41096418 by wurstsalat at 2022-06-21T19:05:03+02:00 chore: BaseControl: Remove obsolete code - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -867,41 +867,6 @@ def _on_message_textview_key_press_event(self, message_buffer = self.msg_textview.get_buffer() event_state = event.get_state() - if event.keyval == Gdk.KEY_Tab: - start, end = message_buffer.get_bounds() - position = message_buffer.get_insert() - end = message_buffer.get_iter_at_mark(position) - text = message_buffer.get_text(start, end, False) - split = text.split() - if (text.startswith(self.COMMAND_PREFIX) and - not text.startswith(self.COMMAND_PREFIX * 2) and - len(split) == 1): - text = split[0] - bare = text.lstrip(self.COMMAND_PREFIX) - if len(text) == 1: - self.command_hits = [] - for command in self.list_commands(): - for name in command.names: - self.command_hits.append(name) - else: - if (self.last_key_tabs and self.command_hits and - self.command_hits[0].startswith(bare)): - self.command_hits.append(self.command_hits.pop(0)) - else: - self.command_hits = [] - for command in self.list_commands(): - for name in command.names: - if name.startswith(bare): - self.command_hits.append(name) - - if self.command_hits: - message_buffer.delete(start, end) - message_buffer.insert_at_cursor( - self.COMMAND_PREFIX + self.command_hits[0] + ' ') - self.last_key_tabs = True - return True - if not self.is_groupchat: - self.last_key_tabs = False if event.keyval == Gdk.KEY_Up: if event_state & Gdk.ModifierType.CONTROL_MASK: if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+UP View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41096418bbdc047513ea1d72c9561251… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/41096418bbdc047513ea1d72c9561251… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits