komrade update!

komrade/backend/komrades.py

@@ -488,6 +488,7 @@ class KomradeX(Caller):
                 'to':someone.pubkey.data_b64,
                 'to_name':someone.name,
                 'msg':direct_msg_data,
+                'timestamp':time.time()
             }
             
         }
@@ -743,6 +744,7 @@ class KomradeX(Caller):
         post_signed_b = msg_from_op.get('post')
         post_from_uri = msg_from_op.get('post_from')
         post_from_name = msg_from_op.get('post_from_name')
+        post_timestamp = msg_from_op.get('post_timestamp')
 
         # verify!
         try:
@@ -761,7 +763,8 @@ class KomradeX(Caller):
             {
                 'from':post_from_uri,'from_name':post_from_name,
                 'to':Komrade(WORLD_NAME).uri, 'to_name':WORLD_NAME,
-                'msg':post_data
+                'msg':post_data,
+                'timestamp':post_timestamp
             }
         )
         self.log('post obj?',post_obj)

komrade/backend/messages.py

@@ -23,6 +23,7 @@ class Message(Logger):
         self.from_name=msg_d.get('from_name') if not from_whom else from_whom.name
         self.from_pubkey=msg_d.get('from') if not from_whom else from_whom.uri
         self.msg=msg_d.get('msg') if not msg else msg
+        self.timestamp=msg_d.get('timestamp',time.time())
         self._route=msg_d.get(ROUTE_KEYNAME)
         self._is_encrypted=None
 
@@ -32,7 +33,8 @@ class Message(Logger):
             'to':self.to_pubkey,
             'to_name':self.to_name,
             'from':self.from_pubkey,
-            'from_name':self.from_name
+            'from_name':self.from_name,
+            'timestamp':self.timestamp,
         }
 
     def __repr__(self):
@@ -90,7 +92,8 @@ to:   @{self.to_name if self.to_name else ''}
                 'to':self.msg_d.get('from'),
                 'from_name':self.msg_d.get('to_name'),
                 'to_name':self.msg_d.get('from_name'),
-                'msg':new_msg if new_msg else self.msg_d.get('msg')
+                'msg':new_msg if new_msg else self.msg_d.get('msg'),
+                'timestamp':time.time(),
             }
         )
 

komrade/backend/the_operator.py

@@ -316,40 +316,6 @@ class TheOperator(Operator):
         # self.log('Operator returning result:',dict_format(res,tab=2))
 
 
-
-
-    def mass_deliver_msg(self,post_msg_d,contacts):
-        def do_mass_deliver_msg(contact,post_msg_d=post_msg_d):
-            self.log(f'<- delivering to {contact} the post: {post_msg_d}')
-            msg_from_op = Message(
-                {  # op -> komrade
-
-                    'to':post_msg_d.get('to'),
-                    'to_name':post_msg_d.get('from'),
-                    'from':self.uri,
-                    'from_name':self.name,
-                    'msg':post_msg_d.get             
-                }
-            )
-            self.log(f'prepared msg for {contact}: {msg_from_op.msg}')
-
-            # encrypt
-            msg_from_op.encrypt()
-            self.log('encrypted to:',msg_from_op.msg)
-
-            # actually deliver
-            res=self.actually_deliver_msg(msg_from_op)
-            self.log('delivery res =',res)
-
-        for contact in contacts:
-            do_mass_deliver_msg(contact)
-
-        return {
-            'success':True,
-            'status':f'Delivered post to {len(contacts)}.',
-        }
-
-
     def validate_msg(self,msg_d):
         from komrade.backend.messages import is_valid_msg_d
         if not is_valid_msg_d(msg_d): return False
@@ -561,6 +527,7 @@ class TheOperator(Operator):
             self.log('post_pkg_d',post_pkg_d)
             from_uri = post_pkg_d.get('post_from')
             from_name = post_pkg_d.get('post_from_name')
+            post_timestamp = post_pkg_d.get('post_timestamp')
             post_b_signed_encr4world = post_pkg_d.get('post')
             # if not from_uri or not from_name or b64enc(self.find_pubkey(from_name))!=from_uri or not post_b_signed_encr4world:
             #     return {
@@ -579,7 +546,8 @@ class TheOperator(Operator):
             post_pkg_d2 = {
                 'post':post_b_signed,
                 'post_from':from_uri,
-                'post_from_name':from_name
+                'post_from_name':from_name,
+                'post_timestamp':post_timestamp
             }
             post_pkg_b2 = pickle.dumps(post_pkg_d2)
             post_pkg_b2_encr_op2kom = SMessage(