X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Ftrustlistrequester.cpp;h=77b03b19c0bc7274d21361c36a74ed20ec6b397e;hb=ee580d19b7920904587e18d72a3465d52eab6204;hp=1d208691596f172482cb26346db29fbcb60905b4;hpb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;p=fms.git

diff --git a/src/freenet/trustlistrequester.cpp b/src/freenet/trustlistrequester.cpp
index 1d20869..77b03b1 100644
--- a/src/freenet/trustlistrequester.cpp
+++ b/src/freenet/trustlistrequester.cpp
@@ -96,8 +96,22 @@ const bool TrustListRequester::HandleAllData(FCPMessage &message)
 			//insert trust for this identity
 			trustst.Bind(0,identityid);
 			trustst.Bind(1,id);
-			trustst.Bind(2,xml.GetMessageTrust(i));
-			trustst.Bind(3,xml.GetTrustListTrust(i));
+			if(xml.GetMessageTrust(i)==-1)
+			{
+				trustst.Bind(2);
+			}
+			else
+			{
+				trustst.Bind(2,xml.GetMessageTrust(i));
+			}
+			if(xml.GetTrustListTrust(i)==-1)
+			{
+				trustst.Bind(3);
+			}
+			else
+			{
+				trustst.Bind(3,xml.GetTrustListTrust(i));
+			}
 			trustst.Step();
 			trustst.Reset();
 
@@ -230,8 +244,8 @@ void TrustListRequester::PopulateIDList()
 
 	// select identities we want to query (we've seen them today and they are publishing trust list) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)
 	sql="SELECT IdentityID FROM tblIdentity ";
-	sql+="WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND PublishTrustList='true' AND LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') )";
-	sql+="ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;";
+	sql+="WHERE Name IS NOT NULL AND Name <> '' AND PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND PublishTrustList='true' AND LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust') AND ( PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust') )";
+	sql+="ORDER BY LocalTrustListTrust DESC, LastSeen;";
 
 	SQLite3DB::Statement st=m_db->Prepare(sql);
 	st.Step();
@@ -274,7 +288,7 @@ void TrustListRequester::Process()
 	// this will recheck for ids every minute
 	DateTime now;
 	now.SetToGMTime();
-	if(m_tempdate<(now-(1.0/1440.0)))
+	if(m_ids.size()==0 && m_tempdate<(now-(1.0/1440.0)))
 	{
 		PopulateIDList();
 		m_tempdate=now;