Commits July 2022

commits@gajim.org

1 participants
118 discussions

[Git][gajim/gajim][master] 5 commits: refactor: Remove redundant unicode string prefix
by Philipp Hörist (＠lovetox) 24 Jul '22

24 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0ad41c9c by lovetox at 2022-07-24T10:41:04+02:00 refactor: Remove redundant unicode string prefix This is only needed for python2 compat - - - - - 2242a9d8 by lovetox at 2022-07-24T10:48:33+02:00 refactor: Make credit constants lists - - - - - 81f3d555 by lovetox at 2022-07-24T10:59:33+02:00 refactor: Use single quotes - - - - - 6b5db823 by lovetox at 2022-07-24T10:59:51+02:00 ci: Update flake8 config - - - - - f2f022aa by lovetox at 2022-07-24T11:01:40+02:00 chore: Add new commit prefix - - - - - 7 changed files: - .githooks/update - CONTRIBUTING.md - gajim/common/const.py - gajim/common/storage/archive.py - gajim/dev/ipython_view.py - setup.cfg - win/misc/create-launcher.py Changes: ===================================== .githooks/update ===================================== @@ -11,6 +11,7 @@ import subprocess ALLOWED_TAGS = [ 'ci', + 'cs', 'feat', 'fix', 'perf', ===================================== CONTRIBUTING.md ===================================== @@ -35,6 +35,7 @@ # Commit Messages Every commit message must be prefixed with one of the following tags: - ci (ci related changes) +- cs (code style changes) - feat (a new feature was added) - fix (something was fixed) - perf (performance related changes) ===================================== gajim/common/const.py ===================================== @@ -465,85 +465,88 @@ class CallType(Enum): CONSONANTS = 'bcdfghjklmnpqrstvwxyz' -THANKS = u"""\ -Alexander Futász -Alexander V. Butenko -Alexey Nezhdanov -Alfredo Junix -Anaël Verrier -Anders Ström -Andrew Sayman -Anton Shmigirilov -Christian Bjälevik -Christophe Got -Christoph Neuroth -David Campey -Dennis Craven -Fabian Neumann -Filippos Papadopoulos -Francisco Alburquerque Parra (Membris Khan) -Frederic Lory -Fridtjof Bussefor -Geobert Quach -Guillaume Morin -Gustavo J. A. M. Carneiro -Ivo Anjo -Josef Vybíral -Juraj Michalek -Kjell Braden -Luis Peralta -Michael Scherer -Michele Campeotto -Mike Albon -Miguel Fonseca -Norman Rasmussen -Oscar Hellström -Peter Saint-Andre -Petr Menšík -Sergey Kuleshov -Stavros Giannouris -Stian B. Barmen -Thilo Molitor -Thomas Klein-Hitpaß -Urtzi Alfaro -Witold Kieraś -Yakov Bezrukov -Yavor Doganov -""".strip().split("\n") - -ARTISTS = u"""\ -Anders Ström -Christophe Got -Dennis Craven -Dmitry Korzhevin -Guillaume Morin -Gvorcek Spajreh -Josef Vybíral -Membris Khan -Rederick Asher -Jakub Szypulka -""".strip().split("\n") - -DEVS_CURRENT = u"""\ -Yann Leboulanger (asterix AT lagaule.org) -Philipp Hörist (philipp AT hoerist.com) -Daniel Brötzmann (wurstsalat AT posteo.de) -André Apitzsch -""".strip().split("\n") - -DEVS_PAST = u"""\ -Stefan Bethge (stefan AT lanpartei.de) -Alexander Cherniuk (ts33kr AT gmail.com) -Stephan Erb (steve-e AT h3c.de) -Vincent Hanquez (tab AT snarc.org) -Dimitur Kirov (dkirov AT gmail.com) -Nikos Kouremenos (kourem AT gmail.com) -Julien Pivotto (roidelapluie AT gmail.com) -Jonathan Schleifer (js-gajim AT webkeks.org) -Travis Shirk (travis AT pobox.com) -Brendan Taylor (whateley AT gmail.com) -Jean-Marie Traissard (jim AT lapin.org) -""".strip().split("\n") +THANKS = [ + 'Alexander Futász', + 'Alexander V. Butenko', + 'Alexey Nezhdanov', + 'Alfredo Junix', + 'Anaël Verrier', + 'Anders Ström', + 'Andrew Sayman', + 'Anton Shmigirilov', + 'Christian Bjälevik', + 'Christophe Got', + 'Christoph Neuroth', + 'David Campey', + 'Dennis Craven', + 'Fabian Neumann', + 'Filippos Papadopoulos', + 'Francisco Alburquerque Parra (Membris Khan)', + 'Frederic Lory', + 'Fridtjof Bussefor', + 'Geobert Quach', + 'Guillaume Morin', + 'Gustavo J. A. M. Carneiro', + 'Ivo Anjo', + 'Josef Vybíral', + 'Juraj Michalek', + 'Kjell Braden', + 'Luis Peralta', + 'Michael Scherer', + 'Michele Campeotto', + 'Mike Albon', + 'Miguel Fonseca', + 'Norman Rasmussen', + 'Oscar Hellström', + 'Peter Saint-Andre', + 'Petr Menšík', + 'Sergey Kuleshov', + 'Stavros Giannouris', + 'Stian B. Barmen', + 'Thilo Molitor', + 'Thomas Klein-Hitpaß', + 'Urtzi Alfaro', + 'Witold Kieraś', + 'Yakov Bezrukov', + 'Yavor Doganov', +] + + +ARTISTS = [ + 'Anders Ström', + 'Christophe Got', + 'Dennis Craven', + 'Dmitry Korzhevin', + 'Guillaume Morin', + 'Gvorcek Spajreh', + 'Josef Vybíral', + 'Membris Khan', + 'Rederick Asher', + 'Jakub Szypulka', +] + + +DEVS_CURRENT = [ + 'Yann Leboulanger (asterix AT lagaule.org)', + 'Philipp Hörist (philipp AT hoerist.com)', + 'Daniel Brötzmann (wurstsalat AT posteo.de)', + 'André Apitzsch', +] + + +DEVS_PAST = [ + 'Stefan Bethge (stefan AT lanpartei.de)', + 'Alexander Cherniuk (ts33kr AT gmail.com)', + 'Stephan Erb (steve-e AT h3c.de)', + 'Vincent Hanquez (tab AT snarc.org)', + 'Dimitur Kirov (dkirov AT gmail.com)', + 'Nikos Kouremenos (kourem AT gmail.com)', + 'Julien Pivotto (roidelapluie AT gmail.com)', + 'Jonathan Schleifer (js-gajim AT webkeks.org)', + 'Travis Shirk (travis AT pobox.com)', + 'Brendan Taylor (whateley AT gmail.com)', + 'Jean-Marie Traissard (jim AT lapin.org)', +] RFC5646_LANGUAGE_TAGS = { ===================================== gajim/common/storage/archive.py ===================================== @@ -177,8 +177,8 @@ def init(self, **kwargs: Any) -> None: self._con.row_factory = self._namedtuple_factory - self._con.create_function("like", 1, self._like) - self._con.create_function("get_timeout", 0, self._get_timeout) + self._con.create_function('like', 1, self._like) + self._con.create_function('get_timeout', 0, self._get_timeout) self._get_jid_ids_from_db() @@ -188,7 +188,7 @@ def _namedtuple_factory(self, assert cursor.description is not None fields = [col[0] for col in cursor.description] - Row = namedtuple("Row", fields) # type: ignore + Row = namedtuple('Row', fields) # type: ignore named_row = Row(*row) if 'additional_data' in fields: _dict = json.loads(named_row.additional_data or '{}') @@ -259,9 +259,9 @@ def _migrate(self) -> None: @staticmethod def _get_timeout() -> int: - """ + ''' returns the timeout in epoch - """ + ''' timeout = app.settings.get('restore_timeout') now = int(time.time()) @@ -275,9 +275,9 @@ def _like(search_str: str) -> str: @timeit def _get_jid_ids_from_db(self) -> None: - """ + ''' Load all jid/jid_id tuples into a dict for faster access - """ + ''' rows = self._con.execute( 'SELECT jid_id, jid, type FROM jids').fetchall() for row in rows: @@ -310,7 +310,7 @@ def get_jid_id(self, kind: Optional[KindConstant] = None, type_: Optional[JIDConstant] = None ) -> int: - """ + ''' Get the jid id from a jid. In case the jid id is not found create a new one. @@ -321,7 +321,7 @@ def get_jid_id(self, :param type_: The JIDConstant return the jid id - """ + ''' if kind in (KindConstant.GC_MSG, KindConstant.GCSTATUS): type_ = JIDConstant.ROOM_TYPE @@ -354,9 +354,9 @@ def get_jid_id(self, @staticmethod def convert_show_values_to_db_api_values(show: Optional[str] ) -> Optional[ShowConstant]: - """ + ''' Convert from string style to constant ints for db - """ + ''' if show == 'online': return ShowConstant.ONLINE @@ -384,7 +384,7 @@ def get_conversation_before_after(self, timestamp: float, n_lines: int ) -> list[ConversationRow]: - """ + ''' Load n_lines lines of conversation with jid before or after timestamp :param account: The account @@ -396,7 +396,7 @@ def get_conversation_before_after(self, :param timestamp: timestamp returns a list of namedtuples - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.ERROR, @@ -431,7 +431,7 @@ def get_last_conversation_line(self, account: str, jid: JID ) -> LastConversationRow: - """ + ''' Load the last line of a conversation with jid for account. Loads messages, but no status messages or error messages. @@ -440,7 +440,7 @@ def get_last_conversation_line(self, :param jid: The jid for which we request the conversation returns a list of namedtuples - """ + ''' jids = [jid] account_id = self.get_account_id(account) @@ -468,7 +468,7 @@ def get_conversation_around(self, timestamp: float ) -> tuple[list[ConversationRow], list[ConversationRow]]: - """ + ''' Load all lines of conversation with jid around a specific timestamp :param account: The account @@ -478,7 +478,7 @@ def get_conversation_around(self, :param timestamp: Timestamp around which to fetch messages returns a list of namedtuples - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.ERROR]) @@ -526,7 +526,7 @@ def get_conversation_between(self, jid: str, before: float, after: float) -> list[ConversationRow]: - """ + ''' Load all lines of conversation with jid between two timestamps :param account: The account @@ -538,7 +538,7 @@ def get_conversation_between(self, :param after: earliest timestamp returns a list of namedtuples - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.ERROR]) @@ -570,7 +570,7 @@ def search_log(self, before: Optional[datetime.datetime] = None, after: Optional[datetime.datetime] = None ) -> Iterator[SearchLogRow]: - """ + ''' Search the conversation log for messages containing the `query` string. The search can either span the complete log for the given @@ -590,7 +590,7 @@ def search_log(self, :param after: A datetime.datetime instance or None returns a list of namedtuples - """ + ''' jids = [jid] kinds = map(str, [KindConstant.STATUS, @@ -654,7 +654,7 @@ def search_all_logs(self, before: Optional[datetime.datetime] = None, after: Optional[datetime.datetime] = None ) -> Iterator[SearchLogRow]: - """ + ''' Search all conversation logs for messages containing the `query` string. @@ -667,7 +667,7 @@ def search_all_logs(self, :param after: A datetime.datetime instance or None returns a list of namedtuples - """ + ''' account_ids = self.get_active_account_ids() kinds = map(str, [KindConstant.STATUS, KindConstant.GCSTATUS]) @@ -726,9 +726,9 @@ def get_days_with_history(self, year: int, month: int ) -> list[HistoryDayRow]: - """ + ''' Get days in month where messages for 'jid' exist - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.STATUS, @@ -740,7 +740,7 @@ def get_days_with_history(self, delta = datetime.timedelta( days=days, hours=23, minutes=59, seconds=59, microseconds=999999) - sql = """ + sql = ''' SELECT DISTINCT CAST(strftime('%d', time, 'unixepoch', 'localtime') AS INTEGER) AS day FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) @@ -748,7 +748,7 @@ def get_days_with_history(self, AND time BETWEEN ? AND ? AND kind NOT IN ({kinds}) ORDER BY time - """.format(jids=', '.join('?' * len(jids)), + '''.format(jids=', '.join('?' * len(jids)), account_id=account_id, kinds=', '.join(kinds)) @@ -762,9 +762,9 @@ def get_last_history_timestamp(self, account: str, jid: str ) -> Optional[float]: - """ + ''' Get the timestamp of the last message we received for the jid - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.STATUS, @@ -788,9 +788,9 @@ def get_first_history_timestamp(self, account: str, jid: str ) -> Optional[float]: - """ + ''' Get the timestamp of the first message we received for the jid - """ + ''' jids = [jid] account_id = self.get_account_id(account) kinds = map(str, [KindConstant.STATUS, @@ -815,10 +815,10 @@ def date_has_history(self, jid: str, date: datetime.datetime ) -> Optional[float]: - """ + ''' Get a single timestamp of a message for 'jid' in time range of one day - """ + ''' jids = [jid] account_id = self.get_account_id(account) delta = datetime.timedelta( @@ -844,9 +844,9 @@ def get_first_message_meta_for_date(self, jid: str, date: datetime.datetime ) -> Optional[MessageMetaRow]: - """ + ''' Load meta data for the first message of a specific date - """ + ''' jids = [jid] account_id = self.get_account_id(account) @@ -876,7 +876,7 @@ def deduplicate_muc_message(self, timestamp: float, message_id: str ) -> bool: - """ + ''' Check if a message is already in the `logs` table :param account: The account @@ -888,7 +888,7 @@ def deduplicate_muc_message(self, :param timestamp: The timestamp in UTC epoch :param message_id: The message-id - """ + ''' # Add 60 seconds around the timestamp start_time = timestamp - 60 @@ -929,7 +929,7 @@ def find_stanza_id(self, origin_id: Optional[str] = None, groupchat: bool = False ) -> bool: - """ + ''' Checks if a stanza-id is already in the `logs` table :param account: The account @@ -944,7 +944,7 @@ def find_stanza_id(self, :param groupchat: stanza-id is from a groupchat return True if the stanza-id was found - """ + ''' ids: list[str] = [] if stanza_id is not None: ids.append(stanza_id) @@ -1122,7 +1122,7 @@ def insert_jid(self, kind: Optional[KindConstant] = None, type_: JIDConstant = JIDConstant.NORMAL_TYPE ) -> int: - """ + ''' Insert a new jid into the `jids` table. This is an alias of get_jid_id() for better readablility. @@ -1131,7 +1131,7 @@ def insert_jid(self, :param kind: A KindConstant :param type_: A JIDConstant - """ + ''' return self.get_jid_id(jid, kind, type_) @timeit @@ -1142,7 +1142,7 @@ def insert_into_logs(self, kind: KindConstant, **kwargs: Any ) -> int: - """ + ''' Insert a new message into the `logs` table :param jid: The jid as string @@ -1156,7 +1156,7 @@ def insert_into_logs(self, :param kwargs: Every additional named argument must correspond to a field in the `logs` table - """ + ''' jid_id = self.get_jid_id(jid, kind=kind) account_id = self.get_account_id(account) @@ -1193,7 +1193,7 @@ def set_message_error(self, message_id: str, error: str ) -> None: - """ + ''' Update the corresponding message with the error :param account_jid: The jid of the account @@ -1204,7 +1204,7 @@ def set_message_error(self, :param error: The error stanza as string - """ + ''' account_id = self.get_jid_id(account_jid) try: @@ -1227,7 +1227,7 @@ def set_marker(self, message_id: str, state: str ) -> None: - """ + ''' Update the marker state of the corresponding message :param account_jid: The jid of the account @@ -1238,7 +1238,7 @@ def set_marker(self, :param state: The state, 'received' or 'displayed' - """ + ''' if state not in ('received', 'displayed'): raise ValueError('Invalid marker state') @@ -1260,19 +1260,19 @@ def set_marker(self, @timeit def get_archive_infos(self, jid: str) -> Optional[LastArchiveMessageRow]: - """ + ''' Get the archive infos :param jid: The jid that belongs to the avatar - """ + ''' jid_id = self.get_jid_id(jid, type_=JIDConstant.ROOM_TYPE) sql = '''SELECT * FROM last_archive_message WHERE jid_id = ?''' return self._con.execute(sql, (jid_id,)).fetchone() @timeit def set_archive_infos(self, jid: str, **kwargs: Any) -> None: - """ + ''' Set archive infos :param jid: The jid that belongs to the avatar @@ -1288,7 +1288,7 @@ def set_archive_infos(self, jid: str, **kwargs: Any) -> None: :param sync_threshold: The max days that we request from a MUC archive - """ + ''' jid_id = self.get_jid_id(jid) exists = self.get_archive_infos(jid) if not exists: @@ -1316,12 +1316,12 @@ def set_archive_infos(self, jid: str, **kwargs: Any) -> None: @timeit def reset_archive_infos(self, jid: str) -> None: - """ + ''' Set archive infos :param jid: The jid of the archive - """ + ''' jid_id = self.get_jid_id(jid) sql = '''UPDATE last_archive_message SET last_mam_id = NULL, oldest_mam_timestamp = NULL, @@ -1366,10 +1366,10 @@ def get_messages_for_export(self, yield result def remove_history(self, account: str, jid: JID) -> None: - """ + ''' Remove history for a specific chat. If it's a group chat, remove last MAM ID as well. - """ + ''' account_id = self.get_account_id(account) try: jid_id = self.get_jid_id(jid) @@ -1383,9 +1383,9 @@ def remove_history(self, account: str, jid: JID) -> None: log.info('Removed history for: %s', jid) def remove_all_history(self) -> None: - """ + ''' Remove all messages for all accounts - """ + ''' statements = [ 'DELETE FROM logs', 'DELETE FROM jids', @@ -1395,9 +1395,9 @@ def remove_all_history(self) -> None: log.info('Removed all chat history') def cleanup_chat_history(self) -> None: - """ + ''' Remove messages from account where messages are older than max_age - """ + ''' for account in app.settings.get_accounts(): max_age = app.settings.get_account_setting( account, 'chat_history_max_age') ===================================== gajim/dev/ipython_view.py ===================================== @@ -43,7 +43,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -""" +''' Provides IPython console widget @author: Eitan Isaacson @@ -54,7 +54,7 @@ All rights reserved. This program and the accompanying materials are made available under the terms of the BSD which accompanies this distribution, and is available at U{http://www.opensource.org/licenses/bsd-license.php} -""" +''' import re import sys @@ -87,7 +87,7 @@ def write_output_prompt(self): class IterableIPShell: - """ + ''' Create an IPython instance. Does not start a blocking event loop, instead allow single iterations. This allows embedding in GTK without blockage @@ -102,10 +102,10 @@ class IterableIPShell: @type history_level: integer @ivar complete_sep: Separation delimiters for completion function. @type complete_sep: _sre.SRE_Pattern - """ + ''' def __init__(self, argv=None, user_ns=None, user_global_ns=None, cin=None, cout=None, cerr=None, input_func=None): - """ + ''' @param argv: Command line options for IPython @type argv: list @param user_ns: User namespace. @@ -120,7 +120,7 @@ def __init__(self, argv=None, user_ns=None, user_global_ns=None, cin=None, @type cerr: IO stream @param input_func: Replacement for builtin raw_input() @type input_func: function - """ + ''' if argv is None: argv = [] @@ -138,7 +138,7 @@ def __init__(self, argv=None, user_ns=None, user_global_ns=None, cin=None, from traitlets.config.loader import Config cfg = Config() - cfg.InteractiveShell.colors = "Linux" + cfg.InteractiveShell.colors = 'Linux' # InteractiveShell's __init__ gets a reference of stdout and stderr # so we save the standard here to revert it after init @@ -178,9 +178,9 @@ def __update_namespace(self): self.IP.user_ns.update({k: v}) def execute(self): - """ + ''' Execute the current line provided by the shell object - """ + ''' self.history_level = 0 orig_stdout = sys.stdout sys.stdout = IPython.utils.io.stdout @@ -237,37 +237,37 @@ def generatePrompt(self, is_continuation): ''' # TODO: Update to IPython 5.x and later - prompt = "In [%d]: " % self.IP.execution_count + prompt = 'In [%d]: ' % self.IP.execution_count return prompt def historyBack(self): - """ + ''' Provide one history command back @return: The command string. @rtype: string - """ + ''' self.history_level -= 1 return self._getHistory() def historyForward(self): - """ + ''' Provide one history command forward @return: The command string. @rtype: string - """ + ''' self.history_level += 1 return self._getHistory() def _getHistory(self): - """ + ''' Get the command string of the current history level @return: Historic command string. @rtype: string - """ + ''' try: rv = self.IP.user_ns['In'][self.history_level].strip('\n') except IndexError: @@ -276,16 +276,16 @@ def _getHistory(self): return rv def updateNamespace(self, ns_dict): - """ + ''' Add the current dictionary to the shell namespace @param ns_dict: A dictionary of symbol-values. @type ns_dict: dictionary - """ + ''' self.IP.user_ns.update(ns_dict) def complete(self, line): - """ + ''' Returns an auto completed line and/or possibilities for completion @param line: Given line so far. @@ -294,7 +294,7 @@ def complete(self, line): @return: Line completed as for as possible, and possible further completions. @rtype: tuple - """ + ''' split_line = self.complete_sep.split(line) if split_line[-1]: possibilities = self.IP.complete(split_line[-1]) @@ -331,7 +331,7 @@ def _commonPrefix(str1, str2): class ConsoleView(Gtk.TextView): - """ + ''' Specialized text view for console-like workflow @cvar ANSI_COLORS: Mapping of terminal colors to X11 names. @@ -345,7 +345,7 @@ class ConsoleView(Gtk.TextView): @type mark: Gtk.TextMark @ivar line_start: Start of command line mark. @type line_start: Gtk.TextMark - """ + ''' ANSI_COLORS = {'0;30': 'Black', '0;31': 'Red', '0;32': 'Green', '0;33': 'Brown', @@ -357,9 +357,9 @@ class ConsoleView(Gtk.TextView): '1;36': 'LightCyan', '1;37': 'White'} def __init__(self): - """ + ''' Initialize console view - """ + ''' GObject.GObject.__init__(self) self.override_font(Pango.FontDescription('Mono')) self.set_cursor_visible(True) @@ -396,14 +396,14 @@ def write(self, text, editable=False): GLib.idle_add(self._write5, text, editable) def _write5(self, text, editable=False): - """ + ''' Write given text to buffer @param text: Text to append. @type text: list of (token: string) @param editable: If true, added text is editable. @type editable: boolean - """ + ''' start_mark = self.text_buffer.create_mark( None, self.text_buffer.get_end_iter(), True) @@ -420,14 +420,14 @@ def _write5(self, text, editable=False): self.scroll_mark_onscreen(self.mark) def _write(self, text, editable=False): - """ + ''' Write given text to buffer @param text: Text to append. @type text: string @param editable: If true, added text is editable. @type editable: boolean - """ + ''' if isinstance(text, list): self._write5(text, editable) return @@ -457,12 +457,12 @@ def showPrompt(self, prompt): GLib.idle_add(self._showPrompt, prompt) def _showPrompt(self, prompt): - """ + ''' Print prompt at start of line @param prompt: Prompt to print. @type prompt: string - """ + ''' self._write(prompt) self.text_buffer.move_mark(self.line_start, self.text_buffer.get_end_iter()) @@ -471,12 +471,12 @@ def changeLine(self, text): GLib.idle_add(self._changeLine, text) def _changeLine(self, text): - """ + ''' Replace currently entered command line with given text @param text: Text to use as replacement. @type text: string - """ + ''' iter_ = self.text_buffer.get_iter_at_mark(self.line_start) iter_.forward_to_line_end() self.text_buffer.delete( @@ -484,12 +484,12 @@ def _changeLine(self, text): self._write(text, True) def getCurrentLine(self): - """ + ''' Get text in current command line @return: Text of current command line. @rtype: string - """ + ''' rv = self.text_buffer.get_slice( self.text_buffer.get_iter_at_mark(self.line_start), self.text_buffer.get_end_iter(), False) @@ -499,12 +499,12 @@ def showReturned(self, text): GLib.idle_add(self._showReturned, text) def _showReturned(self, text): - """ + ''' Show returned text from last command and print new prompt @param text: Text to show. @type text: string - """ + ''' iter_ = self.text_buffer.get_iter_at_mark(self.line_start) iter_.forward_to_line_end() self.text_buffer.apply_tag_by_name( @@ -524,7 +524,7 @@ def _showReturned(self, text): self.text_buffer.insert_at_cursor(indentation) def onKeyPress(self, _widget, event): - """ + ''' Key press callback used for correcting behavior for console-like interfaces. For example 'home' should go to prompt, not to beginning of line @@ -536,7 +536,7 @@ def onKeyPress(self, _widget, event): @return: Return True if event should not trickle. @rtype: boolean - """ + ''' insert_mark = self.text_buffer.get_insert() insert_iter = self.text_buffer.get_iter_at_mark(insert_mark) selection_mark = self.text_buffer.get_selection_bound() @@ -570,9 +570,9 @@ def onKeyPress(self, _widget, event): return self.onKeyPressExtend(event) def onKeyPressExtend(self, event): - """ + ''' For some reason we can't extend onKeyPress directly (bug #500900) - """ + ''' class IPythonView(ConsoleView, IterableIPShell): @@ -581,9 +581,9 @@ class IPythonView(ConsoleView, IterableIPShell): a GTK IPython console. ''' def __init__(self): - """ + ''' Initialize. Redirect I/O to console - """ + ''' ConsoleView.__init__(self) self.cout = StringIO() IterableIPShell.__init__(self, cout=self.cout, cerr=self.cout, @@ -604,7 +604,7 @@ def prompt_for_code(self): return self.raw_input(self) def raw_input(self, _prompt=''): - """ + ''' Custom raw_input() replacement. Gets current line from console buffer @param prompt: Prompt to print. Here for compatibility as replacement. @@ -612,14 +612,14 @@ def raw_input(self, _prompt=''): @return: The current command line text. @rtype: string - """ + ''' if self.interrupt: self.interrupt = False raise KeyboardInterrupt return self.getCurrentLine() def onKeyPressExtend(self, event): - """ + ''' Key press callback with plenty of shell goodness, like history, autocompletions, etc @@ -630,7 +630,7 @@ def onKeyPressExtend(self, event): @return: True if event should not trickle. @rtype: boolean - """ + ''' if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and event.keyval == 99): self.interrupt = True @@ -659,9 +659,9 @@ def onKeyPressExtend(self, event): return True def _processLine(self): - """ + ''' Process current command line - """ + ''' self.history_pos = 0 self.execute() rv = self.cout.getvalue() ===================================== setup.cfg ===================================== @@ -18,6 +18,10 @@ max-line-length = 80 statistics = True count = True +inline-quotes = single +multiline-quotes = ''' +docstring-quotes = ''' + [metadata] name = gajim version = attr: gajim.__version__ ===================================== win/misc/create-launcher.py ===================================== @@ -7,10 +7,10 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -"""Creates simple Python .exe launchers for gui and cli apps +# Creates simple Python .exe launchers for gui and cli apps +# +# ./create-launcher.py "1.4.0" <target-dir> -./create-launcher.py "1.4.0" <target-dir> -""" import os import sys @@ -22,26 +22,26 @@ def build_resource(rc_path: str, out_path: str) -> None: - """Raises subprocess.CalledProcessError""" + '''Raises subprocess.CalledProcessError''' def is_64bit(): - return struct.calcsize("P") == 8 + return struct.calcsize('P') == 8 subprocess.check_call( - ["windres", "-O", "coff", "-F", - "pe-x86-64" if is_64bit() else "pe-i386", rc_path, - "-o", out_path]) + ['windres', '-O', 'coff', '-F', + 'pe-x86-64' if is_64bit() else 'pe-i386', rc_path, + '-o', out_path]) def get_build_args() -> list[str]: python_name = os.path.splitext(os.path.basename(sys.executable))[0] python_config = os.path.join( - os.path.dirname(sys.executable), python_name + "-config") + os.path.dirname(sys.executable), python_name + '-config') cflags = subprocess.check_output( - ["sh", python_config, "--cflags"]).strip() + ['sh', python_config, '--cflags']).strip() libs = subprocess.check_output( - ["sh", python_config, "--libs"]).strip() + ['sh', python_config, '--libs']).strip() cflags = os.fsdecode(cflags) libs = os.fsdecode(libs) @@ -53,16 +53,16 @@ def build_exe(source_path: str, is_gui: bool, out_path: str) -> None: - args = ["gcc", "-s"] + args = ['gcc', '-s'] if is_gui: - args.append("-mwindows") - args.extend(["-o", out_path, source_path, resource_path]) + args.append('-mwindows') + args.extend(['-o', out_path, source_path, resource_path]) args.extend(get_build_args()) subprocess.check_call(args) def get_launcher_code(debug: bool) -> str: - template = """\ + template = '''\ #include "Python.h" #define WIN32_LEAN_AND_MEAN #include <windows.h> @@ -102,7 +102,7 @@ def get_launcher_code(debug: bool) -> str: Py_Finalize(); return result; } - """ % int(debug) + ''' % int(debug) return template @@ -115,7 +115,7 @@ def get_resouce_code(filename: str, product_version: str, company_name: str) -> str: - template = """\ + template = '''\ 1 ICON "%(icon_path)s" 1 VERSIONINFO FILEVERSION %(file_version_list)s @@ -141,22 +141,22 @@ def get_resouce_code(filename: str, VALUE "Translation", 0x409, 1252 END END -""" +''' def to_ver_list(v: str) -> str: - v = v.split("-")[0] - return ",".join(map(str, (list(map(int, v.split("."))) + [0] * 4)[:4])) + v = v.split('-')[0] + return ','.join(map(str, (list(map(int, v.split('.'))) + [0] * 4)[:4])) file_version_list = to_ver_list(file_version) product_version_list = to_ver_list(product_version) return template % { - "icon_path": icon_path, "file_version_list": file_version_list, - "product_version_list": product_version_list, - "file_version": file_version, "product_version": product_version, - "company_name": company_name, "filename": filename, - "internal_name": os.path.splitext(filename)[0], - "product_name": product_name, "file_desc": file_desc, + 'icon_path': icon_path, 'file_version_list': file_version_list, + 'product_version_list': product_version_list, + 'file_version': file_version, 'product_version': product_version, + 'company_name': company_name, 'filename': filename, + 'internal_name': os.path.splitext(filename)[0], + 'product_name': product_name, 'file_desc': file_desc, } @@ -178,16 +178,16 @@ def build_launcher(out_path: str, temp = tempfile.mkdtemp() try: os.chdir(temp) - with open("launcher.c", "w") as h: + with open('launcher.c', 'w') as h: h.write(get_launcher_code(debug)) - shutil.copyfile(src_ico, "launcher.ico") - with open("launcher.rc", "w") as h: + shutil.copyfile(src_ico, 'launcher.ico') + with open('launcher.rc', 'w') as h: h.write(get_resouce_code( os.path.basename(target), file_version, file_desc, - "launcher.ico", product_name, product_version, company_name)) + 'launcher.ico', product_name, product_version, company_name)) - build_resource("launcher.rc", "launcher.res") - build_exe("launcher.c", "launcher.res", is_gui, target) + build_resource('launcher.rc', 'launcher.res') + build_exe('launcher.c', 'launcher.res', is_gui, target) finally: os.chdir(dir_) shutil.rmtree(temp) @@ -199,17 +199,17 @@ def main() -> None: version = argv[1] target = argv[2] - company_name = "Gajim" + company_name = 'Gajim' misc = os.path.dirname(os.path.realpath(__file__)) build_launcher( - os.path.join(target, "Gajim.exe"), - os.path.join(misc, "gajim.ico"), "Gajim", "Gajim", + os.path.join(target, 'Gajim.exe'), + os.path.join(misc, 'gajim.ico'), 'Gajim', 'Gajim', version, company_name, True) build_launcher( - os.path.join(target, "Gajim-Debug.exe"), - os.path.join(misc, "gajim.ico"), "Gajim", "Gajim", + os.path.join(target, 'Gajim-Debug.exe'), + os.path.join(misc, 'gajim.ico'), 'Gajim', 'Gajim', version, company_name, False, debug=True) # build_launcher( @@ -218,5 +218,5 @@ def main() -> None: # version, company_name, 'history_manager.py', True) -if __name__ == "__main__": +if __name__ == '__main__': main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cc5d3ffa6acb514ec4ecc86c741efd7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cc5d3ffa6acb514ec4ecc86c741efd7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Main Window: Move to stored position on startup
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: cc5d3ffa by wurstsalat at 2022-07-23T22:56:32+02:00 fix: Main Window: Move to stored position on startup - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -54,6 +54,7 @@ from .builder import get_builder from .util import get_app_window from .util import get_key_theme +from .util import move_window from .util import resize_window from .util import restore_main_window_position from .util import save_main_window_position @@ -191,6 +192,10 @@ def _prepare_window(self) -> None: self.set_skip_taskbar_hint(not app.settings.get('show_in_taskbar')) + x_pos = app.settings.get('mainwin_x_position') + y_pos = app.settings.get('mainwin_y_position') + move_window(self, x_pos, y_pos) + self.show_all() show_main_window = app.settings.get('show_main_window_on_startup') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc5d3ffa6acb514ec4ecc86c741efd7a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc5d3ffa6acb514ec4ecc86c741efd7a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: ConversationView: Fix linting error
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d00dfe2e by wurstsalat at 2022-07-23T22:44:01+02:00 fix: ConversationView: Fix linting error - - - - - 3bc58246 by wurstsalat at 2022-07-23T22:44:01+02:00 imprv: Startup: Show hint in console if Gajim is already running Fixes #11039 - - - - - 2 changed files: - gajim/gtk/application.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -383,6 +383,8 @@ def _handle_local_options(self, self.register() if self.get_is_remote(): + print('Gajim is already running. ' + 'The primary instance will handle remote commands') return -1 self._core_command_line(options) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -392,7 +392,7 @@ def _reduce_messages_before(self) -> bool: row1 = self.get_row_at_index(2) row2 = self.get_row_at_index(3) - if row1.type == row2.type == 'date': + if row1.type == 'date' and row2.type == 'date': # First two rows are date rows, # it’s safe to remove the fist row row1.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4f486209083c62ca2914fee5c9f758e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4f486209083c62ca2914fee5c9f758e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Main Window: Unify height of topmost widgets
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: d174f13e by wurstsalat at 2022-07-23T22:20:29+02:00 Main Window: Unify height of topmost widgets - - - - - 3 changed files: - gajim/data/gui/chat_paned.ui - gajim/data/gui/main.ui - gajim/data/style/gajim.css Changes: ===================================== gajim/data/gui/chat_paned.ui ===================================== @@ -22,6 +22,7 @@ <property name="row-spacing">3</property> <child> <object class="GtkBox"> + <property name="height-request">39</property> <property name="visible">True</property> <property name="can-focus">False</property> <property name="spacing">12</property> @@ -31,6 +32,7 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="tooltip-text" translatable="yes">Edit workspace…</property> + <property name="valign">center</property> <signal name="clicked" handler="_on_edit_workspace_clicked" swapped="no"/> <child> <object class="GtkImage"> @@ -69,6 +71,7 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="tooltip-text" translatable="yes">Filter Chats…</property> + <property name="valign">center</property> <child> <object class="GtkImage"> <property name="visible">True</property> ===================================== gajim/data/gui/main.ui ===================================== @@ -72,7 +72,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="spacing">5</property> <child> <placeholder/> </child> ===================================== gajim/data/style/gajim.css ===================================== @@ -186,10 +186,10 @@ .app-sidebar-image { padding: 4px; } .app-page-box { - margin-top: 6px; + margin-top: 3px; } .app-page-box > separator { - background-color: darker(@theme_bg_color); + background-color: @unfocused_borders; margin-left: 12px; margin-right: 12px; } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d174f13ee6138de1b9f9eaaa8475ad47… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d174f13ee6138de1b9f9eaaa8475ad47… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] fix: Preserve primary clipboard throughout switching chats
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: ae457655 by wurstsalat at 2022-07-23T21:59:56+02:00 fix: Preserve primary clipboard throughout switching chats - - - - - 1 changed file: - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -20,6 +20,7 @@ import sys import logging +from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gio from gi.repository import Gtk @@ -97,6 +98,10 @@ def get_control_stack(self) -> ControlStack: return self._control_stack def show_chat(self, account: str, jid: JID) -> None: + # Store (preserve) primary clipboard and restore it after switching + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_PRIMARY) + old_primary_clipboard = clipboard.wait_for_text() + if self._current_contact is not None: self._current_contact.disconnect_all_from_obj(self) @@ -151,6 +156,10 @@ def show_chat(self, account: str, jid: JID) -> None: self.set_transition_type(Gtk.StackTransitionType.NONE) self.set_visible_child_name('controls') + + if old_primary_clipboard is not None: + GLib.idle_add(clipboard.set_text, old_primary_clipboard, -1) + GLib.idle_add(self._message_action_box.msg_textview.grab_focus) def _on_room_password_required(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae45765584c4a0ff321ea37aef49a92c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ae45765584c4a0ff321ea37aef49a92c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Preview: Add setting to disable file preview
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4f486209 by wurstsalat at 2022-07-23T21:32:48+02:00 imprv: Preview: Add setting to disable file preview Fixes #10991 - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -53,7 +53,9 @@ class _ACCOUNT_DEFAULT: 'dev_force_bookmark_2', 'dev_use_message_label', 'developer_modus', + 'enable_emoji_shortcodes', 'enable_negative_priority', + 'enable_file_preview', 'escape_key_closes', 'gc_notify_on_all_messages_private_default', 'gc_notify_on_all_messages_public_default', @@ -107,7 +109,6 @@ class _ACCOUNT_DEFAULT: 'use_stun_server', 'use_urgency_hint', 'video_see_self', - 'enable_emoji_shortcodes', ] IntSettings = Literal[ @@ -203,7 +204,9 @@ class _ACCOUNT_DEFAULT: 'developer_modus': False, 'dictionary_url': 'WIKTIONARY', 'emoticons_theme': 'noto-emoticons', + 'enable_emoji_shortcodes': True, 'enable_negative_priority': False, + 'enable_file_preview': True, 'escape_key_closes': False, 'file_transfers_port': 28011, 'ft_add_hosts_to_send': '', @@ -295,7 +298,6 @@ class _ACCOUNT_DEFAULT: 'video_see_self': True, 'video_size': '', 'workspace_order': [], - 'enable_emoji_shortcodes': True, } BoolAccountSettings = Literal[ ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -123,9 +123,11 @@ def __init__(self, from_us = kind == 'outgoing' is_previewable = False - if additional_data is not None: + preview_enabled = app.settings.get('enable_file_preview') + if additional_data is not None and preview_enabled: is_previewable = app.preview_manager.is_previewable( text, additional_data) + if is_previewable: context = None if self._is_groupchat: ===================================== gajim/gtk/preferences.py ===================================== @@ -445,11 +445,17 @@ def __init__(self, *args: Any) -> None: } settings = [ + Setting(SettingKind.SWITCH, + _('File Preview'), + SettingType.CONFIG, + 'enable_file_preview', + desc=_('Show previews for files')), Setting(SettingKind.SPIN, _('Preview Size'), SettingType.CONFIG, 'preview_size', desc=_('Size of preview image'), + bind='enable_file_preview', props={'range_': (100, 1000)}), Setting(SettingKind.POPOVER, @@ -457,6 +463,7 @@ def __init__(self, *args: Any) -> None: SettingType.CONFIG, 'preview_max_file_size', desc=_('Maximum file size for preview generation'), + bind='enable_file_preview', props={'entries': sizes}), Setting(SettingKind.SWITCH, @@ -464,27 +471,31 @@ def __init__(self, *args: Any) -> None: SettingType.CONFIG, 'preview_anonymous_muc', desc=_('Generate preview automatically in public ' - 'group chats (may disclose your data)')), + 'group chats (may disclose your data)'), + bind='enable_file_preview'), Setting(SettingKind.SWITCH, _('Preview all Image URLs'), SettingType.CONFIG, 'preview_allow_all_images', desc=_('Generate preview for any URLs containing images ' - '(may be unsafe)')), + '(may be unsafe)'), + bind='enable_file_preview'), Setting(SettingKind.POPOVER, _('Left Click Action'), SettingType.CONFIG, 'preview_leftclick_action', desc=_('Action when left-clicking a preview'), + bind='enable_file_preview', props={'entries': actions}), Setting(SettingKind.SWITCH, _('HTTPS Verification'), SettingType.CONFIG, 'preview_verify_https', - desc=_('Whether to check for a valid certificate')), + desc=_('Whether to check for a valid certificate'), + bind='enable_file_preview'), ] PreferenceBox.__init__(self, settings) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f486209083c62ca2914fee5c9f758e4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f486209083c62ca2914fee5c9f758e4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 2 commits: Hotkeys: Cleanup
by Daniel Brötzmann (＠wurstsalat) 23 Jul '22

23 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: cdc45c5f by wurstsalat at 2022-07-23T20:05:41+02:00 Hotkeys: Cleanup - - - - - 84e06821 by wurstsalat at 2022-07-23T20:21:47+02:00 MessageInputTextView: Clear undo list when clearing input - - - - - 3 changed files: - gajim/gtk/controls/base.py - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -273,15 +273,15 @@ def _on_conversation_view_key_press(self, # if textview.get_buffer().props.has_selection: # return Gdk.EVENT_PROPAGATE - if not self.msg_textview.get_sensitive(): - # If the input textview is not sensitive it can’t get the focus. - # In that case propagate_key_event() would send the event again - # to the conversation textview. This would mean a recursion. - return Gdk.EVENT_PROPAGATE - - # Focus the Message Input and resend the event - self.msg_textview.grab_focus() - self.msg_textview.get_toplevel().propagate_key_event(event) + # if not self.msg_textview.get_sensitive(): + # # If the input textview is not sensitive it can’t get the focus. + # # In that case propagate_key_event() would send the event again + # # to the conversation textview. This would mean a recursion. + # return Gdk.EVENT_PROPAGATE + + # # Focus the Message Input and resend the event + # self.msg_textview.grab_focus() + # self.msg_textview.get_toplevel().propagate_key_event(event) return Gdk.EVENT_STOP @property ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -537,7 +537,6 @@ def _on_msg_textview_key_press_event(self, self.space_pressed = False event_state = event.get_state() - # Ctrl [+ Shift] + Tab are not forwarded to notebook. We handle it here if event_state & Gdk.ModifierType.SHIFT_MASK: if event_state & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_ISO_Left_Tab: @@ -546,8 +545,10 @@ def _on_msg_textview_key_press_event(self, return True if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): - self.conversation_view.event(event) - return True + control = app.window.get_active_control() + if control is not None: + control.conversation_view.event(event) + return True if event_state & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: ===================================== gajim/gtk/message_input.py ===================================== @@ -323,6 +323,7 @@ def clear(self, *args: Any) -> None: buf = self.get_buffer() start, end = buf.get_bounds() buf.delete(start, end) + self._undo_list.clear() def save_undo(self, text: str) -> None: self._undo_list.append(text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b975ba28537d9ccb1f25d2c44b7ab53… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b975ba28537d9ccb1f25d2c44b7ab53… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Settings: Add type annotations for bind_signal
by Daniel Brötzmann (＠wurstsalat) 21 Jul '22

21 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: b975ba28 by wurstsalat at 2022-07-21T21:04:12+02:00 Settings: Add type annotations for bind_signal - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -146,19 +146,20 @@ def disconnect_signals(self, object_: object) -> Any: handlers.remove(handler) def bind_signal(self, - setting, - widget, - func_name, - account=None, - jid=None, - inverted=False, - default_text=None): + setting: str, + widget: Any, + func_name: str, + account: Optional[str] = None, + jid: Optional[JID] = None, + inverted: bool = False, + default_text: Optional[str] = None + ) -> None: callbacks = self._callbacks[(setting, account, jid)] func = getattr(widget, func_name) callbacks.append((func, inverted, default_text)) - def _on_destroy(*args): + def _on_destroy(*args: Any) -> None: callbacks.remove((func, inverted, default_text)) widget.connect('destroy', _on_destroy) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b975ba28537d9ccb1f25d2c44b7ab53b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b975ba28537d9ccb1f25d2c44b7ab53b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Remove scroll history and save_message remnants
by Daniel Brötzmann (＠wurstsalat) 21 Jul '22

21 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: a505fa99 by wurstsalat at 2022-07-21T20:42:20+02:00 Remove scroll history and save_message remnants - - - - - 2 changed files: - gajim/command_system/implementation/middleware.py - gajim/data/gui/shortcuts_window.ui Changes: ===================================== gajim/command_system/implementation/middleware.py ===================================== @@ -56,7 +56,6 @@ def process_as_command(self, text): parents = super(ChatCommandProcessor, self) flag = parents.process_as_command(text) if flag and self.command_succeeded: - self.add_history(text) self.clear_input() return flag @@ -147,13 +146,6 @@ def clear_input(self): """ self.set_input(str()) - def add_history(self, text): - """ - Add given text to the input history, so user can scroll through - it using ctrl + up/down arrow keys. - """ - self.save_message(text, 'sent') - @property def connection(self): """ ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -100,34 +100,6 @@ <property name="title" translatable="yes">Complete a command or a nickname</property> </object> </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><primary>Up</property> - <property name="title" translatable="yes">Previously sent message</property> - </object> - </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><primary>Down</property> - <property name="title" translatable="yes">Next sent messages</property> - </object> - </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><primary><shift>Up</property> - <property name="title" translatable="yes">Quote previous message</property> - </object> - </child> - <child> - <object class="GtkShortcutsShortcut"> - <property name="visible">1</property> - <property name="accelerator"><primary><shift>Down</property> - <property name="title" translatable="yes">Quote next message</property> - </object> - </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a505fa99a0118509dad297d2fa03b891… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a505fa99a0118509dad297d2fa03b891… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 2 commits: ConversationView: Fix linting error
by Daniel Brötzmann (＠wurstsalat) 21 Jul '22

21 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: e45b19c0 by wurstsalat at 2022-07-20T21:51:03+02:00 ConversationView: Fix linting error - - - - - 1e44ef2f by wurstsalat at 2022-07-21T20:29:53+02:00 Fix message correction - - - - - 11 changed files: - gajim/common/storage/archive.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/conversation/view.py - gajim/gtk/main.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -992,6 +992,35 @@ def find_stanza_id(self, return True return False + @timeit + def get_last_correctable_message(self, + account: str, + jid: JID, + message_id: str + ) -> Optional[LastConversationRow]: + """ + Load the last correctable message of a conversation by message_id. + Conditions: max 5 min old + """ + jids = [jid] + account_id = self.get_account_id(account) + min_time = time.time() - 5 * 60 + print(min_time) + + sql = ''' + SELECT contact_name, time, kind, message, stanza_id, message_id, + additional_data + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} + AND message_id = ? + AND time > ? + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id) + + return self._con.execute( + sql, + tuple(jids) + (message_id, min_time)).fetchone() + @timeit def store_message_correction(self, account: str, ===================================== gajim/gtk/chat_stack.py ===================================== @@ -306,6 +306,8 @@ def _update_base_actions(self, contact: ChatContactT) -> None: httpupload.get_enabled()) app.window.get_action('show-contact-info').set_enabled(online) + app.window.get_action('correct-message').set_enabled(online) + app.window.get_action('input-bold').set_enabled(True) app.window.get_action('input-italic').set_enabled(True) app.window.get_action('input-strike').set_enabled(True) @@ -538,11 +540,11 @@ def _on_send_message(self) -> None: label = self._message_action_box.get_seclabel() - correct_id: Optional[str] = None - if control.correcting and control.last_sent_msg: - correct_id = control.last_sent_msg - else: - correct_id = None + correct_id = None + if self._message_action_box.is_correcting: + correct_id = self._message_action_box.last_message_id.get( + (contact.account, contact.jid)) + self._message_action_box.is_correcting = False chatstate = client.get_module('Chatstate').get_active_chatstate( contact) @@ -563,8 +565,9 @@ def _on_send_message(self) -> None: client.send_message(message_) self._message_action_box.msg_textview.clear() - self._message_action_box.msg_textview.get_style_context().remove_class( - 'gajim-msg-correcting') + + def get_last_message_id(self, account: str, jid: JID) -> Optional[str]: + return self._message_action_box.last_message_id.get((account, jid)) def _close_control(self) -> None: assert self._current_contact is not None @@ -582,6 +585,7 @@ def process_event(self, event: Any) -> None: if isinstance(event, MucDiscoUpdate): self._on_muc_disco_update(event) self._control_stack.process_event(event) + self._message_action_box.process_event(event) class ChatPlaceholderBox(Gtk.Box): ===================================== gajim/gtk/const.py ===================================== @@ -194,6 +194,7 @@ def __str__(self): ('input-strike', None, False), ('input-clear', None, False), ('show-emoji-chooser', None, False), + ('correct-message', None, False), ('quote', 's', False), ('mention', 's', False), ('send-file-httpupload', None, False), ===================================== gajim/gtk/controls/base.py ===================================== @@ -182,15 +182,10 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: # XEP-0333 Chat Markers self.last_msg_id: Optional[str] = None - # XEP-0308 Message Correction - self.last_sent_msg: Optional[str] = None - # XEP-0172 User Nickname # TODO: self.user_nick: Optional[str] = None - self.sendmessage: bool = True - self._client.get_module('Chatstate').set_active(self.contact) self.encryption: Optional[str] = self.get_encryption_state() @@ -501,11 +496,8 @@ def add_message(self, self.last_msg_id = message_id if kind == 'incoming': - # Record the history of received messages - # self.save_message(text, 'received') - - # Issue notification if notify: + # Issue notification self._notify(name, text, tim, additional_data) if not chat_active and notify: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -70,12 +70,6 @@ def __init__(self, account: str, jid: JID) -> None: 'chat_control', account, jid) - - self.sendmessage: bool = True - - # XEP-0308 Message Correction - self.last_sent_msg: Optional[str] = None - # PluginSystem: adding GUI extension point for this ChatControl # instance object app.plugin_manager.gui_extension_point('chat_control', self) @@ -132,13 +126,6 @@ def _on_message_sent(self, event: events.MessageSent) -> None: if not event.message: return - if event.correct_id is None: - oob_url = event.additional_data.get_value('gajim', 'oob_url') - if oob_url == event.message: - self.last_sent_msg = None - else: - self.last_sent_msg = event.message_id - message_id = event.message_id if event.label: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -82,15 +82,6 @@ def __init__(self, account: str, jid: JID) -> None: self.room_jid = str(self.contact.jid) - # Last sent message text - self.last_sent_txt: str = '' - - # Attribute, encryption plugins use to signal the message can be sent - self.sendmessage: bool = False - - # XEP-0308 Message Correction - self.last_sent_msg: Optional[str] = None - self._groupchat_state = GroupchatState(self.contact) self.xml.conv_view_overlay.add_overlay(self._groupchat_state) @@ -226,9 +217,6 @@ def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: displaymarking=event.displaymarking, additional_data=event.additional_data) else: - if event.properties.muc_nickname == self.contact.nickname: - self.last_sent_txt = event.msgtxt - self.add_message(event.msgtxt, contact=event.properties.muc_nickname, tim=event.properties.timestamp, @@ -634,16 +622,7 @@ def _on_room_destroyed(self, self.add_info_message(join_message) def _on_message_sent(self, event: events.MessageSent) -> None: - if not event.message: - return - # we'll save sent message text when we'll receive it in - # _nec_gc_message_received - if event.correct_id is None: - oob_url = event.additional_data.get_value('gajim', 'oob_url') - if oob_url == event.message: - self.last_sent_msg = None - else: - self.last_sent_msg = event.message_id + pass def _on_message_error(self, event: events.MessageError) -> None: self.conversation_view.show_error(event.message_id, event.error) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -319,6 +319,9 @@ def on_quote_message(self, _widget: Gtk.Widget) -> None: app.window.activate_action( 'quote', GLib.Variant('s', self._message_widget.get_text())) + def on_correct_message(self, _widget: Gtk.Widget) -> None: + app.window.activate_action('correct-message', None) + def on_retract_message(self, _widget: Gtk.Widget) -> None: def _on_retract(reason: str) -> None: self._client.get_module('MUC').retract_message( ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -14,8 +14,7 @@ from __future__ import annotations -from typing import Union -from typing import Any +from typing import TYPE_CHECKING from gi.repository import Gtk from gi.repository import Pango @@ -24,13 +23,13 @@ from gajim.common import app from gajim.common.i18n import _ from gajim.common.helpers import is_retraction_allowed -from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact -from gajim.common.modules.contacts import GroupchatParticipant +from gajim.common.types import ChatContactT -from ...util import wrap_with_event_box +if TYPE_CHECKING: + from .message import MessageRow -ContactT = Union[BareContact, GroupchatContact, GroupchatParticipant] +from ...util import wrap_with_event_box class SimpleLabel(Gtk.Label): @@ -45,8 +44,8 @@ def __init__(self) -> None: @wrap_with_event_box class MoreMenuButton(Gtk.Button): def __init__(self, - row: Any, - contact: ContactT, + row: MessageRow, + contact: ChatContactT, name: str ) -> None: @@ -70,23 +69,33 @@ def _on_click(self, _button: Gtk.Button) -> None: show_retract = False if isinstance(self._contact, GroupchatContact): if not self._contact.is_joined: - self._create_popover(False) + self._create_popover(show_retract=False) return - disco_info = app.storage.cache.get_last_disco_info( - self._contact.jid) - assert disco_info is not None - contact = self._contact.get_resource(self._name) self_contact = self._contact.get_self() assert self_contact is not None - is_allowed = is_retraction_allowed(self_contact, contact) + + disco_info = app.storage.cache.get_last_disco_info( + self._contact.jid) + assert disco_info is not None + if disco_info.has_message_moderation and is_allowed: show_retract = True - self._create_popover(show_retract) - def _create_popover(self, show_retract: bool) -> None: + show_correction = False + if self._row.message_id is not None: + show_correction = app.window.is_message_correctable( + self._contact.account, self._contact.jid, self._row.message_id) + + self._create_popover(show_retract=show_retract, + show_correction=show_correction) + + def _create_popover(self, + show_retract: bool = False, + show_correction: bool = False + ) -> None: menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) menu_box.get_style_context().add_class('padding-6') @@ -116,6 +125,16 @@ def _create_popover(self, show_retract: bool) -> None: 'edit-copy-symbolic', Gtk.IconSize.MENU)) menu_box.add(copy_button) + if show_correction: + correct_button = Gtk.ModelButton() + correct_button.set_halign(Gtk.Align.START) + correct_button.connect( + 'clicked', self._row.on_correct_message) + correct_button.set_label(_('Correct')) + correct_button.set_image(Gtk.Image.new_from_icon_name( + 'document-edit-symbolic', Gtk.IconSize.MENU)) + menu_box.add(correct_button) + if show_retract: retract_button = Gtk.ModelButton() retract_button.set_halign(Gtk.Align.START) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -380,7 +380,7 @@ def _reduce_messages_before(self) -> bool: row1 = self.get_row_at_index(2) row2 = self.get_row_at_index(3) - if row1.type == row2.type == 'date': + if row1.type == 'date' and row2.type == 'date': # First two rows are date rows, # it’s safe to remove the fist row row1.destroy() ===================================== gajim/gtk/main.py ===================================== @@ -38,7 +38,8 @@ from gajim.common.ged import EventHelper from gajim.common.i18n import _ from gajim.common.modules.bytestream import is_transfer_active -from gajim.gtk.const import MAIN_WIN_ACTIONS, MAIN_WIN_STATEFUL_ACTIONS +from gajim.gtk.const import MAIN_WIN_ACTIONS +from gajim.gtk.const import MAIN_WIN_STATEFUL_ACTIONS from gajim.plugins.pluginmanager import PluginManifest from gajim.plugins.repository import PluginRepository @@ -731,6 +732,20 @@ def is_chat_loaded(self, account: str, jid: JID) -> bool: def chat_exists(self, account: str, jid: JID) -> bool: return self._chat_page.chat_exists(account, jid) + def is_message_correctable(self, + account: str, + jid: JID, + message_id: str + ) -> bool: + chat_stack = self._chat_page.get_chat_stack() + last_message_id = chat_stack.get_last_message_id(account, jid) + if last_message_id is None or last_message_id != message_id: + return False + + message_row = app.storage.archive.get_last_correctable_message( + account, jid, last_message_id) + return message_row is not None + def get_total_unread_count(self) -> int: chat_list_stack = self._chat_page.get_chat_list_stack() return chat_list_stack.get_total_unread_count() ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -32,8 +32,10 @@ from nbxmpp.const import Chatstate from nbxmpp.modules.security_labels import SecurityLabel +from nbxmpp.protocol import JID from gajim.common import app +from gajim.common import events from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.client import Client @@ -65,7 +67,7 @@ class MessageActionsBox(Gtk.Grid): def __init__(self) -> None: - super().__init__() + Gtk.Grid.__init__(self) self._client: Optional[Client] = None self._contact: Optional[ChatContactT] = None @@ -75,8 +77,13 @@ def __init__(self) -> None: self.attach(self._ui.box, 0, 0, 1, 1) + # For undo self.space_pressed = False + # XEP-0308 Message Correction + self.is_correcting = False + self.last_message_id: dict[tuple[str, JID], Optional[str]] = {} + self._ui.send_message_button.set_visible( app.settings.get('show_send_message_button')) app.settings.bind_signal('show_send_message_button', @@ -90,7 +97,7 @@ def __init__(self) -> None: self.msg_textview.get_buffer().connect('changed', self._on_buffer_changed) self.msg_textview.connect('key-press-event', - self._on_textview_key_press_event) + self._on_msg_textview_key_press_event) self.msg_textview.connect('paste-clipboard', self._on_paste_clipboard) @@ -133,6 +140,7 @@ def _connect_actions(self) -> None: 'show-emoji-chooser', 'quote', 'mention', + 'correct-message', ] for action in actions: @@ -179,6 +187,9 @@ def _on_action(self, assert param self.msg_textview.mention_participant(param.get_string()) + elif action_name == 'correct-message': + self.toggle_message_correction() + def switch_contact(self, contact: ChatContactT) -> None: if self._client is not None: self._set_chatstate(False) @@ -503,10 +514,10 @@ def _on_buffer_changed(self, textbuffer: Gtk.TextBuffer) -> None: client.get_module('Chatstate').set_chatstate( self._contact, Chatstate.COMPOSING) - def _on_textview_key_press_event(self, - textview: MessageInputTextView, - event: Gdk.EventKey - ) -> bool: + def _on_msg_textview_key_press_event(self, + textview: MessageInputTextView, + event: Gdk.EventKey + ) -> bool: # pylint: disable=too-many-nested-blocks if event.keyval == Gdk.KEY_space: self.space_pressed = True @@ -525,24 +536,33 @@ def _on_textview_key_press_event(self, True)) self.space_pressed = False + event_state = event.get_state() # Ctrl [+ Shift] + Tab are not forwarded to notebook. We handle it here - if event.get_state() & Gdk.ModifierType.SHIFT_MASK: - if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and - event.keyval == Gdk.KEY_ISO_Left_Tab): - app.window.select_next_chat(Direction.PREV, unread_first=True) - return True + if event_state & Gdk.ModifierType.SHIFT_MASK: + if event_state & Gdk.ModifierType.CONTROL_MASK: + if event.keyval == Gdk.KEY_ISO_Left_Tab: + app.window.select_next_chat( + Direction.PREV, unread_first=True) + return True if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): self.conversation_view.event(event) return True - if event.get_state() & Gdk.ModifierType.CONTROL_MASK: + if event_state & Gdk.ModifierType.CONTROL_MASK: if event.keyval == Gdk.KEY_Tab: app.window.select_next_chat(Direction.NEXT, unread_first=True) return True - event_state = event.get_state() - if event.keyval in (Gdk.KEY_Return, Gdk.KEY_KP_Enter): # ENTER + if event.keyval == Gdk.KEY_z: + self.msg_textview.undo() + return True + + if event.keyval == Gdk.KEY_Up: + self.toggle_message_correction() + return True + + if event.keyval in (Gdk.KEY_Return, Gdk.KEY_KP_Enter): if event_state & Gdk.ModifierType.SHIFT_MASK: textview.insert_newline() return True @@ -566,11 +586,6 @@ def _on_textview_key_press_event(self, app.window.activate_action('send-message', None) return True - if event.keyval == Gdk.KEY_z: # CTRL+z - if event_state & Gdk.ModifierType.CONTROL_MASK: - self.msg_textview.undo() - return True - return False def _on_paste_clipboard(self, @@ -616,3 +631,52 @@ def _paste_event_confirmed(self, assert self._contact is not None app.interface.start_file_transfer(self._contact, path) + + def toggle_message_correction(self) -> None: + if self.is_correcting: + self.is_correcting = False + self.msg_textview.clear() + self.msg_textview.get_style_context().remove_class( + 'gajim-msg-correcting') + self.msg_textview.grab_focus() + return + + assert self._contact is not None + last_message_id = self.last_message_id.get( + (self._contact.account, self._contact.jid)) + if last_message_id is None: + return + + message_row = app.storage.archive.get_last_correctable_message( + self._contact.account, self._contact.jid, last_message_id) + if message_row is None: + return + + self.is_correcting = True + self.msg_textview.clear() + self.msg_textview.insert_text(message_row.message) + self.msg_textview.get_style_context().add_class('gajim-msg-correcting') + self.msg_textview.grab_focus() + + def _on_message_sent(self, event: events.MessageSent) -> None: + if not event.message: + return + + if event.correct_id is None: + # This wasn't a corrected message + assert self._contact is not None + oob_url = event.additional_data.get_value('gajim', 'oob_url') + account = self._contact.account + jid = self._contact.jid + if oob_url == event.message: + # Don't allow to correct HTTP Upload file transfer URLs + self.last_message_id[(account, jid)] = None + else: + self.last_message_id[(account, jid)] = event.message_id + + self.msg_textview.get_style_context().remove_class( + 'gajim-msg-correcting') + + def process_event(self, event: events.ApplicationEvent) -> None: + if isinstance(event, events.MessageSent): + self._on_message_sent(event) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/033080b26d7d426f2e607550ae9e762… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/033080b26d7d426f2e607550ae9e762… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2022