retronews

commit b3fd323e9053755288884be017ecc4f40395a6d1
parent 667dc3520490c74a42babab193f608136e0bf65c
Author: luke8086 <55237178+luke8086@users.noreply.github.com>
Date:   Mon, 16 Sep 2024 09:11:44 +0000

Fix mypy/linter issues

Diffstat:
M
retronews.py
 | 
19
++++++++++++-------

1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/retronews.py b/retronews.py
@@ -716,40 +716,45 @@ def cmd_next_unread(app: AppState) -> None:
     if message is not None:
         app_select_message(app, message)
 
+
 def cmd_next_sibling(app: AppState) -> None:
-    if (msg := app.selected_message) is not None and (parent_msg := msg.parent) is not None:
+    if (msg := app.selected_message) and (parent_msg := msg.parent) and parent_msg.children:
         # find the next sibling
         try:
             idx = parent_msg.children.index(msg)
             if idx < len(parent_msg.children):
-                app_select_message(app, parent_msg.children[idx+1])
+                app_select_message(app, parent_msg.children[idx + 1])
         except IndexError:
             pass
 
+
 def cmd_prev_sibling(app: AppState) -> None:
-    if (msg := app.selected_message) is not None and (parent_msg := msg.parent) is not None:
+    if (msg := app.selected_message) and (parent_msg := msg.parent) and parent_msg.children:
         # find the previous sibling
         try:
             idx = parent_msg.children.index(msg)
             if idx > 0:
-                app_select_message(app, parent_msg.children[idx-1])
+                app_select_message(app, parent_msg.children[idx - 1])
         except IndexError:
             pass
 
+
 def cmd_mark_thread_as_read(app: AppState) -> None:
     # recursively mark us and all children as read
     # then jump to the next sibling
-    def iterate(message):
-        if message != None:
+    def iterate(message: Message):
+        if message.children:
             for child in message.children:
                 child.flags.read = True
-                db_save_message(app.db, msg)
+                db_save_message(app.db, child)
                 iterate(child)
+
     if (msg := app.selected_message) is not None:
         iterate(msg)
         # jump to the next sibling
         cmd_next_sibling(app)
 
+
 def cmd_parent(app: AppState) -> None:
     if (msg := app.selected_message) is not None and (parent_msg := msg.parent) is not None:
         app_select_message(app, parent_msg)