From c004adfb8c8bb3b55c07a5be69bde083e85f16b0 Mon Sep 17 00:00:00 2001
From: Aleksei Stepanov <alekseis@nvidia.com>
Date: Tue, 23 Jan 2024 08:45:58 +0100
Subject: [PATCH 1/2] Fix docker image build

* Use non-rc python
* Use `pip` for package install
  `python setup.py --install` is deprecated by setuptools
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0944827..e9920e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11-rc-alpine3.14 as build
+FROM python:3.12-alpine as build
 
 RUN apk add --no-cache build-base linux-headers libffi-dev cargo
 
@@ -8,10 +8,10 @@ ENV PATH="/opt/venv/bin:$PATH"
 RUN pip3 install setuptools-rust pyopenssl cryptography
 
 COPY . /app/
-RUN cd /app/ && python3 setup.py install
+RUN cd /app/ && pip3 install .
 
 # Use multi-stage build, as we don't need rust compilation on the final image
-FROM python:3.11-rc-alpine3.14
+FROM python:3.12-alpine
 
 LABEL org.opencontainers.image.documentation="https://github.com/markqvist/NomadNet#nomad-network-daemon-with-docker"
 

From 04376a9f96d0eca8a50ed8c560f1f94da04bf58c Mon Sep 17 00:00:00 2001
From: Jeremy O'Brien <neutral@fastmail.com>
Date: Thu, 25 Jan 2024 10:14:12 -0500
Subject: [PATCH 2/2] add message notification bell for textui

---
 nomadnet/NomadNetworkApp.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nomadnet/NomadNetworkApp.py b/nomadnet/NomadNetworkApp.py
index bfe71f1..89a142d 100644
--- a/nomadnet/NomadNetworkApp.py
+++ b/nomadnet/NomadNetworkApp.py
@@ -125,6 +125,7 @@ class NomadNetworkApp:
         self.peer_announce_at_start  = True
         self.try_propagation_on_fail = True
         self.disable_propagation     = False
+        self.notify_on_new_message   = True
 
         self.periodic_lxmf_sync = True
         self.lxmf_sync_interval = 360*60
@@ -546,6 +547,9 @@ class NomadNetworkApp:
 
         nomadnet.Conversation.ingest(message, self)
 
+        if self.notify_on_new_message:
+            self.notify_message_recieved()
+
         if self.should_print(message):
             self.print_message(message)
 
@@ -649,6 +653,11 @@ class NomadNetworkApp:
             if os.path.isfile(self.conversationpath + "/" + source_hash + "/unread"):
                 os.unlink(self.conversationpath + "/" + source_hash + "/unread")
 
+    def notify_message_recieved(self):
+        if self.uimode == nomadnet.ui.UI_TEXT:
+            sys.stdout.write("\a")
+            sys.stdout.flush()
+
     def clear_tmp_dir(self):
         if os.path.isdir(self.tmpfilespath):
             for file in os.listdir(self.tmpfilespath):
@@ -726,6 +735,10 @@ class NomadNetworkApp:
                     value = self.config["client"].as_bool(option)
                     self.compact_stream = value
 
+                if option == "notify_on_new_message":
+                    value = self.config["client"].as_bool(option)
+                    self.notify_on_new_message = value
+
                 if option == "user_interface":
                     value = value.lower()
                     if value == "none":
@@ -953,6 +966,7 @@ destination = file
 enable_client = yes
 user_interface = text
 downloads_path = ~/Downloads
+notify_on_new_message = yes
 
 # By default, the peer is announced at startup
 # to let other peers reach it immediately.