drop when empty

server/src/notifier.py

@@ -36,34 +36,43 @@ def sendsmpmessage(target, message):
     responsejson = ws.recv()  # Receive response
     response = json.loads(responsejson)
     # ws.close()
+    if response is not None:
+        return True
+    else:
+        return False
 
-    for chatitem in response['resp']['chatItems']:
-        statusdict = chatitem['chatItem']['meta']['itemStatus']
-        try:
-            status = statusdict['sndProgress']
-        except KeyError:
-            print("FAILED")
-            status = 'FAILED'
-        else:
-            smessage = chatitem['chatItem']['meta']['itemText']
-            print("Message '%s' sent over websocket to %s, status was %s" % (smessage, target, status))
+    # for chatitem in response['resp']['chatItems']:
+    #     statusdict = chatitem['chatItem']['meta']['itemStatus']
+    #     try:
+    #         status = statusdict['sndProgress']
+    #     except KeyError:
+    #         pprint(response['resp']['chatItems'])
+    #         print('---')
+    #         pprint(chatitem)
+    #         print("FAILED")
+    #         status = 'FAILED'
+    #     else:
+    #         smessage = chatitem['chatItem']['meta']['itemText']
+    #         print("Message '%s' sent over websocket to %s, status was %s" % (smessage, target, status))
 
-        if status == 'complete':
-            return True
-        else:
-            return False
+    #     if status == 'complete' or status == 'partial':
+    #         return True
+    #     else:
+    #         return False
 
 
 if __name__ == '__main__':
+    print("Tellme Notifier started...")
     while True:
-        zmq = socket.recv_string()
+        zmqmessage = socket.recv_string()
         print(f"Received request: {zmqmessage}")
         result = True
 
         decoded = json.loads(zmqmessage)
         pprint(decoded)
 
-        result = sendmessage(decoded.get('target'), decoded.get('message'))
+        result = sendsmpmessage(decoded.get('target'), decoded.get('message'))
+        print(result)
 
         if result is True:
             socket.send_string("sent")

server/src/tellmesrv.py

@@ -3,7 +3,7 @@ from flask import Flask, request, jsonify
 import websocket
 import json
 import yaml
-import random
+import zmq
 from pprint import pprint
 
 __version__ = "2.0.0b2"
@@ -11,6 +11,7 @@ versionstring='Taurix TellMe server v' + __version__
 
 app = Flask(__name__)
 
+context = zmq.Context()
 socket = context.socket(zmq.REQ)
 socket.connect("tcp://localhost:5555")
 
@@ -51,8 +52,10 @@ def webhook_receiver(id):
 
     if target is not None:
         print(target)
-        with lock:
+        if data.get('message') is not None:
             sendmessage(target, data.get('message'))
+        else:
+            print("No message, droppint")
     else:
         print("No target found, dropping message")
 

server/tellme_notifier.service

@@ -5,7 +5,7 @@ After=network.target
 [Service]
 User=tellme
 WorkingDirectory=/opt/tellme
-ExecStart=notifier.py
+ExecStart=python3 notifier.py
 Restart=always
 
 [Install]