X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fintroductionpuzzlerequester.cpp;h=830bdb35f12e9745f863ae3bf83f360561b8f041;hp=91c127e2206b2e753982d89b034c924cc527260e;hb=f60495a029c54358f82956482fe203fe2b7b5b23;hpb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688

diff --git a/src/freenet/introductionpuzzlerequester.cpp b/src/freenet/introductionpuzzlerequester.cpp
index 91c127e..830bdb3 100644
--- a/src/freenet/introductionpuzzlerequester.cpp
+++ b/src/freenet/introductionpuzzlerequester.cpp
@@ -188,11 +188,21 @@ void IntroductionPuzzleRequester::PopulateIDList()
 {
 	DateTime now;
 	int id;
+	std::string limitnum="30";
+
+	// if we don't have an identity that we haven't seen yet, then set limit to 5
+	SQLite3DB::Statement st=m_db->Prepare("SELECT tblLocalIdentity.LocalIdentityID FROM tblLocalIdentity LEFT JOIN tblIdentity ON tblLocalIdentity.PublicKey=tblIdentity.PublicKey WHERE tblIdentity.IdentityID IS NULL;");
+	st.Step();
+	if(!st.RowReturned())
+	{
+		limitnum="5";
+	}
+	st.Finalize();
 
 	now.SetToGMTime();
 
-	// select identities that aren't single use and have been seen today
-	SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND SingleUse='false' AND LastSeen>='"+now.Format("%Y-%m-%d")+"';");
+	// select identities that aren't single use and have been seen today ( order by trust DESC and limit to limitnum )
+	st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND SingleUse='false' AND LastSeen>='"+now.Format("%Y-%m-%d")+"' ORDER BY LocalMessageTrust DESC LIMIT 0,"+limitnum+";");
 	st.Step();
 
 	m_ids.clear();
@@ -233,7 +243,7 @@ void IntroductionPuzzleRequester::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;