From 5fbdcca996b754580c1a8f817ad9ea55a2fc2f41 Mon Sep 17 00:00:00 2001
From: "dries.k" <k.dries@protonmail.com>
Date: Sat, 30 Apr 2022 23:12:45 +0200
Subject: [PATCH 1/4] print version from the commandline

---
 MANIFEST.in             |  4 ++--
 gotify_tray/__init__.py |  1 -
 gotify_tray/__main__.py | 14 ++++++++++++--
 setup.py                |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index f0eddcc..4a6ebed 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include README.md version.txt
-include gotifytray/gui/images/*.png
-include gotifytray/gui/images/*.svg
+include gotify_tray/gui/images/*.png
+include gotify_tray/gui/images/*.svg
diff --git a/gotify_tray/__init__.py b/gotify_tray/__init__.py
index 183e3c0..e69de29 100644
--- a/gotify_tray/__init__.py
+++ b/gotify_tray/__init__.py
@@ -1 +0,0 @@
-from .gui import start_gui
diff --git a/gotify_tray/__main__.py b/gotify_tray/__main__.py
index e9ca9da..a5023f5 100644
--- a/gotify_tray/__main__.py
+++ b/gotify_tray/__main__.py
@@ -1,3 +1,13 @@
-from gotify_tray.gui import start_gui
+def main():
+    import sys
 
-start_gui()
+    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()
diff --git a/setup.py b/setup.py
index 36cf034..a5f490f 100644
--- a/setup.py
+++ b/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,

From 7d2c98ccdc51fd47209941450e533400ccd12622 Mon Sep 17 00:00:00 2001
From: CeruleanSky <CeruleanSky@users.noreply.github.com>
Date: Sat, 4 Jun 2022 08:43:17 -0400
Subject: [PATCH 2/4] Fix message timestamp parsing

---
 requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index dba3972..67845d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 requests==2.27.1
 websocket-client==1.2.3
-pyqt6==6.2.3
\ No newline at end of file
+pyqt6==6.2.3
+python-dateutil==2.8.2

From 0d761259cd6486ac00c789cd64157b25995282a5 Mon Sep 17 00:00:00 2001
From: CeruleanSky <CeruleanSky@users.noreply.github.com>
Date: Sat, 4 Jun 2022 08:50:01 -0400
Subject: [PATCH 3/4] Use dateutil.paraser isoparse

Use dateutil.paraser isoparse to handle all the types of rfc3339 time that gotify might and will serve
---
 gotify_tray/gotify/models.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/gotify_tray/gotify/models.py b/gotify_tray/gotify/models.py
index 4a98c3b..36064f3 100644
--- a/gotify_tray/gotify/models.py
+++ b/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)
 

From 0004431b445ac9f2881387e3d0af4e73c267fb2f Mon Sep 17 00:00:00 2001
From: "dries.k" <k.dries@protonmail.com>
Date: Sat, 4 Jun 2022 18:28:12 +0200
Subject: [PATCH 4/4] update requirements

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 67845d3..f054c43 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 requests==2.27.1
-websocket-client==1.2.3
-pyqt6==6.2.3
+websocket-client==1.3.2
+pyqt6==6.3.0
 python-dateutil==2.8.2