Merge branch 'develop'

MANIFEST.in

@@ -1,3 +1,3 @@
 include README.md version.txt
-include gotifytray/gui/images/*.png
+include gotify_tray/gui/images/*.png
-include gotifytray/gui/images/*.svg
+include gotify_tray/gui/images/*.svg

gotify_tray/__init__.py

@@ -1 +0,0 @@
-from .gui import start_gui

gotify_tray/__main__.py

@@ -1,3 +1,13 @@
-from gotify_tray.gui import start_gui
+def main():
+    import sys
 
+    if "--version" in sys.argv:
+        from gotify_tray.__version__ import __version__
+        print(__version__)
+    else:
+        from gotify_tray.gui import start_gui
         start_gui()
+
+
+if __name__ == "__main__":
+    main()

gotify_tray/gotify/models.py

@@ -1,4 +1,5 @@
 import datetime
+from dateutil.parser import isoparse
 import logging
 from typing import List, Optional
 
@@ -47,15 +48,8 @@ class GotifyMessageModel(AttributeDict):
     title: Optional[str] = None
 
     def __init__(self, d: dict, *args, **kwargs):
-        s = (
-            d["date"].split(".")[0]  # date
-            + "."
-            + d["date"].split(".")[1][:6]  # ms
-            + "+"
-            + d["date"].split("+")[-1]  # timezone
-        )
         d.update(
-            {"date": datetime.datetime.fromisoformat(s).astimezone(local_timezone)}
+            {"date": isoparse(d["date"]).astimezone(local_timezone)}
         )
         super(GotifyMessageModel, self).__init__(d, *args, **kwargs)
 

requirements.txt

@@ -1,3 +1,4 @@
 requests==2.27.1
-websocket-client==1.2.3
+websocket-client==1.3.2
-pyqt6==6.2.3
+pyqt6==6.3.0
+python-dateutil==2.8.2

setup.py

@@ -69,7 +69,7 @@ setup(
     ],
 
     entry_points={
-        'console_scripts': ['gotify-tray=gotify_tray:start_gui'],
+        'console_scripts': ['gotify-tray=gotify_tray.__main__:main'],
     },
     install_requires=REQUIRED,
     extras_require=EXTRAS,