Cache profile and load avatar into conversations

Author: cpacia

db/datastore.py

@@ -562,8 +562,17 @@ def get_conversations(self):
 WHERE guid=? and messageType=?''', (g[0], "CHAT"))
             val = cursor.fetchone()
             if val[0] is not None:
+                avatar_hash = None
+                try:
+                    with open(DATA_FOLDER + 'cache/' + g[0], "r") as filename:
+                        profile = filename.read()
+                    p = objects.Profile()
+                    p.ParseFromString(profile)
+                    avatar_hash = p.avatar_hash.encode("hex")
+                except Exception:
+                    pass
                 ret.append({"guid": g[0],
-                            "avatar_hash": val[0].encode("hex"),
+                            "avatar_hash": avatar_hash,
                             "last_message": val[1],
                             "timestamp": val[2],
                             "public_key": val[3].encode("hex"),
@@ -842,7 +851,7 @@ def get_all(self):
     def get_unfunded(self):
         conn = Database.connect_database(self.PATH)
         cursor = conn.cursor()
-        cursor.execute('''SELECT id FROM purchases WHERE status=0''')
+        cursor.execute('''SELECT id, timestamp FROM purchases WHERE status=0''')
         ret = cursor.fetchall()
         conn.close()
         return ret

market/network.py

@@ -196,6 +196,7 @@ def get_result(result):
                     self.get_image(node_to_ask, p.avatar_hash)
                 if not os.path.isfile(DATA_FOLDER + 'cache/' + p.header_hash.encode("hex")):
                     self.get_image(node_to_ask, p.header_hash)
+                self.cache(result[1][0], node_to_ask.id.encode("hex"))
                 return p
             except Exception:
                 return None

net/rpcudp.py

@@ -158,7 +158,6 @@ def __getattr__(self, name):
 
         def func(node, *args):
             msgID = sha1(str(random.getrandbits(255))).digest()
-
             m = Message()
             m.messageID = msgID
             m.sender.MergeFrom(self.sourceNode.getProto())