update type hinting

gotify_tray/gui/MainApplication.py

@@ -4,7 +4,6 @@ import os
 import platform
 import sys
 import tempfile
-from typing import List, Union
 
 from gotify_tray import gotify
 from gotify_tray.__version__ import __title__
@@ -87,9 +86,9 @@ class MainApplication(QtWidgets.QApplication):
         self.first_connect = True
 
         self.gotify_client.listen(
-            new_message_callback=self.new_message_callback,
             opened_callback=self.listener_opened_callback,
             closed_callback=self.listener_closed_callback,
+            new_message_callback=self.new_message_callback,
             error_callback=self.listener_error_callback,
         )
 
@@ -119,7 +118,7 @@ class MainApplication(QtWidgets.QApplication):
         self.get_applications_task.start()
 
     def get_applications_success_callback(
-        self, applications: List[gotify.GotifyApplicationModel],
+        self, applications: list[gotify.GotifyApplicationModel],
     ):
         for i, application in enumerate(applications):
             icon = QtGui.QIcon(
@@ -184,7 +183,7 @@ class MainApplication(QtWidgets.QApplication):
             self.gotify_client.stop(reset_wait=True)
 
     def application_selection_changed_callback(
-        self, item: Union[ApplicationModelItem, ApplicationAllMessagesItem]
+        self, item: ApplicationModelItem | ApplicationAllMessagesItem
     ):
         self.messages_model.clear()
 
@@ -270,7 +269,7 @@ class MainApplication(QtWidgets.QApplication):
         self.delete_message_task.start()
 
     def delete_all_messages_callback(
-        self, item: Union[ApplicationModelItem, ApplicationAllMessagesItem]
+        self, item: ApplicationModelItem | ApplicationAllMessagesItem
     ):
         if isinstance(item, ApplicationModelItem):
             self.delete_application_messages_task = DeleteApplicationMessagesTask(
@@ -374,7 +373,7 @@ class MainApplication(QtWidgets.QApplication):
 
         self.messages_model.rowsInserted.connect(self.main_window.display_message_widgets)
 
-        self.watchdog.closed.connect(lambda: self.listener_closed_callback(None, None))
+        self.watchdog.closed.connect(lambda: self.listener_closed_callback(0, 0))
 
     def init_shortcuts(self):
         self.shortcut_quit = QtGui.QShortcut(

gotify_tray/gui/models/ApplicationModel.py

@@ -1,6 +1,5 @@
 import enum
 
-from typing import Optional, Union
 from PyQt6 import QtCore, QtGui
 from gotify_tray import gotify
 from gotify_tray.database import Settings
@@ -18,7 +17,7 @@ class ApplicationModelItem(QtGui.QStandardItem):
     def __init__(
         self,
         application: gotify.GotifyApplicationModel,
-        icon: Optional[QtGui.QIcon] = None,
+        icon: QtGui.QIcon | None = None,
         *args,
         **kwargs,
     ):
@@ -63,16 +62,16 @@ class ApplicationModel(QtGui.QStandardItemModel):
         self,
         row: int,
         column: int,
-        item: Union[ApplicationModelItem, ApplicationAllMessagesItem],
+        item: ApplicationModelItem | ApplicationAllMessagesItem,
     ) -> None:
         super(ApplicationModel, self).setItem(row, column, item)
 
     def itemFromIndex(
         self, index: QtCore.QModelIndex
-    ) -> Union[ApplicationModelItem, ApplicationAllMessagesItem]:
+    ) -> ApplicationModelItem | ApplicationAllMessagesItem:
         return super(ApplicationModel, self).itemFromIndex(index)
 
-    def itemFromId(self, appid: int) -> Optional[ApplicationModelItem]:
+    def itemFromId(self, appid: int) -> ApplicationModelItem | None:
         for row in range(self.rowCount()):
             item = self.item(row, 0)
             if not isinstance(item, ApplicationModelItem):

gotify_tray/gui/themes/__init__.py

@@ -45,7 +45,7 @@ def set_theme(app: QtWidgets.QApplication, theme: str = "automatic"):
     app.setStyleSheet(stylesheet)
 
 
-def get_theme_file(app: QtWidgets.QApplication, file: str, theme: str = None) -> str:
+def get_theme_file(app: QtWidgets.QApplication, file: str, theme: str | None = None) -> str:
     theme = settings.value("theme", type=str) if not theme else theme
 
     if not is_valid_theme(theme):

gotify_tray/gui/widgets/ImagePopup.py

@@ -8,7 +8,7 @@ settings = Settings("gotify-tray")
 
 
 class ImagePopup(QtWidgets.QLabel):
-    def __init__(self, filename: str, pos: QtCore.QPoint, link: str = None):
+    def __init__(self, filename: str, pos: QtCore.QPoint, link: str | None = None):
         """Create and show a pop-up image under the cursor
 
         Args:

gotify_tray/gui/widgets/MessageWidget.py

@@ -23,7 +23,7 @@ class MessageWidget(QtWidgets.QWidget, Ui_Form):
         app: QtWidgets.QApplication,
         parent: QtWidgets.QWidget,
         message_item: MessagesModelItem,
-        icon: QtGui.QIcon = None,
+        icon: QtGui.QIcon | None = None,
     ):
         super(MessageWidget, self).__init__(parent)
         self.app = app