X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistrequester.cpp;h=bbf86508635a156c33905d90364ca1739d47704b;hb=4430e7762844c66428b6f822288beb71b7f82b95;hp=c5ef11c586d9c27d21e89fcc6dc33866d199cacc;hpb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;p=fms.git

diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index c5ef11c..bbf8650 100644
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -54,6 +54,7 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 	{
 
 		SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblMessageRequests WHERE IdentityID=? AND Day=? AND RequestIndex=?;");
+		SQLite3DB::Statement spk=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey=?;");
 		SQLite3DB::Statement mst=m_db->Prepare("INSERT INTO tblMessageRequests(IdentityID,Day,RequestIndex,FromMessageList) VALUES(?,?,?,'true');");
 		for(long i=0; i<xml.MessageCount(); i++)
 		{
@@ -71,8 +72,24 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 			}
 			st.Reset();
 		}
-		mst.Finalize();
-		st.Finalize();
+
+		// insert external message indexes
+		for(long i=0; i<xml.ExternalMessageCount(); i++)
+		{
+			spk.Bind(0,xml.GetExternalIdentity(i));
+			spk.Step();
+			if(spk.RowReturned())
+			{
+				int thisidentityid=0;
+				spk.ResultInt(0,thisidentityid);
+				mst.Bind(0,thisidentityid);
+				mst.Bind(1,xml.GetExternalDate(i));
+				mst.Bind(2,xml.GetExternalIndex(i));
+				mst.Step();
+				mst.Reset();
+			}
+			spk.Reset();
+		}
 
 		st=m_db->Prepare("INSERT INTO tblMessageListRequests(IdentityID,Day,RequestIndex,Found) VALUES(?,?,?,'true');");
 		st.Bind(0,identityid);
@@ -160,7 +177,7 @@ void MessageListRequester::PopulateIDList()
 	date.SetToGMTime();
 
 	// select identities we want to query (we've seen them today) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)
-	SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
+	SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+date.Format("%Y-%m-%d")+"' AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");
 	st.Step();
 
 	m_ids.clear();