GitLab

at 2022-10-29T14:36:01+02:00

refactor: Remove unused code

refactor: Move init code into application

refactor: Remove unused code

 

 import typing

 from typing import Any

-from typing import NamedTuple

 from typing import Optional

 from typing import cast

 

 import pprint

 from collections import defaultdict

 

-import nbxmpp

 from nbxmpp.idlequeue import IdleQueue

 from gi.repository import Gdk

 from gi.repository import GLib

 

 transport_type: dict[str, str] = {}

 

-# dict of rooms that must be automatically configured

-# and for which we have a list of invities

-# {account: {room_jid: {'invities': []}}}

-automatic_rooms: dict[str, dict[str, dict[str, list[str]]]] = {}

-

 # list of contacts that has just signed out

 to_be_removed: dict[str, list[str]] = {}

 

 _tasks: dict[int, list[Any]] = defaultdict(list)

 

 

-class RecentGroupchat(NamedTuple):

-    room: str

-    server: str

-    nickname: str

-

-

 def print_version() -> None:

     log('gajim').info('Gajim Version: %s', gajim.__version__)

 

     return connections[account].state.is_available

 

 

-def account_is_disconnected(account: str) -> bool:

-    return not account_is_connected(account)

-

-

 def get_transport_name_from_jid(

         jid: str,

         use_config_setting: bool = True) -> Optional[str]:

     return jid

 

 

-def get_account_from_jid(jid: str) -> Optional[str]:

-    for account in settings.get_accounts():

-        if jid == get_jid_from_account(account):

-            return account

-

-

 def get_hostname_from_account(account_name: str, use_srv: bool = False) -> str:

     '''

     Returns hostname (if custom hostname is used, that is returned)

     return settings.get_account_setting(account_name, 'hostname')

 

 

-def get_notification_image_prefix(jid: str) -> str:

-    '''

-    Returns the prefix for the notification images

-    '''

-    transport_name = get_transport_name_from_jid(jid)

-    if transport_name in ['icq', 'facebook']:

-        prefix = transport_name

-    else:

-        prefix = 'jabber'

-    return prefix

-

-

-def get_recent_groupchats(account: str) -> list[RecentGroupchat]:

-    recent_groupchats = settings.get_account_setting(

-        account, 'recent_groupchats').split()

-

-    recent_list: list[RecentGroupchat] = []

-    for groupchat in recent_groupchats:

-        jid = nbxmpp.JID.from_string(groupchat)

-        recent = RecentGroupchat(jid.localpart, jid.domain, jid.resource)

-        recent_list.append(recent)

-    return recent_list

-

-

-def add_recent_groupchat(account: str, room_jid: str, nickname: str) -> None:

-    recent = settings.get_account_setting(

-        account, 'recent_groupchats').split()

-    full_jid = room_jid + '/' + nickname

-    if full_jid in recent:

-        recent.remove(full_jid)

-    recent.insert(0, full_jid)

-    if len(recent) > 10:

-        recent = recent[0:9]

-    config_value = ' '.join(recent)

-    settings.set_account_setting(account, 'recent_groupchats', config_value)

-

-

 def get_priority(account: str, show: str) -> int:

     '''

     Return the priority an account must have

     return logging.getLogger(domain)

 

 

-def prefers_app_menu() -> bool:

-    if sys.platform == 'darwin':

-        return True

-    if sys.platform == 'win32':

-        return False

-    return app.prefers_app_menu()

-

-

 def load_css_config() -> None:

     global css_config   # pylint: disable=global-statement

     from gajim.gui.css_config import CSSConfig

 

         for account in app.settings.get_active_accounts():

             app.connections[account] = Client(account)

+            app.to_be_removed[account] = []

+            app.nicks[account] = app.settings.get_account_setting(account,

+                                                                  'name')

 

         app.plugin_manager = PluginManager()

         app.plugin_manager.init_plugins()

         app.plugin_manager.register_modules_for_account(

             app.connections[account])

 

-        app.automatic_rooms[account] = {}

         app.to_be_removed[account] = []

         app.nicks[account] = app.settings.get_account_setting(account, 'name')

         app.settings.set_account_setting(account, 'active', True)

         if account in app.interface.instances:

             del app.interface.instances[account]

         del app.nicks[account]

-        del app.automatic_rooms[account]

         del app.to_be_removed[account]

 

     def remove_account(self, account: str) -> None:

         self._con.get_module('Discovery').disco_muc(

             result.jid, callback=self._on_disco_result_after_config)

 

-        # If this is an automatic room creation

-        try:

-            invites = app.automatic_rooms[self._account][result.jid]['invities']

-        except KeyError:

-            return

-

-        user_list = {}

-        for jid in invites:

-            user_list[jid] = {'affiliation': 'member'}

-        self.set_affiliation(result.jid, user_list)

-

-        for jid in invites:

-            self.invite(result.jid, JID.from_string(jid))

-

     def _on_disco_result_after_config(self, task: Task) -> None:

         try:

             result = task.finish()

     'name',

     'password',

     'proxy',

-    'recent_groupchats',

     'resource',

     'roster_version',

     'send_chatstate_default',

         'proxy': '',

         'publish_location': False,

         'publish_tune': False,

-        'recent_groupchats': '',

         'request_user_data': True,

         'resource': 'gajim.$rand',

         'restore_last_status': False,

 

         self.instances: dict[str, Any] = {}

 

-        for acc in app.settings.get_active_accounts():

-            app.automatic_rooms[acc] = {}

-            app.to_be_removed[acc] = []

-            app.nicks[acc] = app.settings.get_account_setting(acc, 'name')

-

     # Jingle File Transfer

     @staticmethod

     def handle_event_file_error(title: str, message: str) -> None:

Philipp Hörist pushed to branch master at gajim / gajim

Commits:

5 changed files:

Changes: