X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fmessagerequester.cpp;h=c9908a5ecaefa20e22d35e8c40346d3891ff6d1a;hp=7acb44d9af7119fa76f2206d725d66be5e31eff4;hb=37a8d59548287dcad78ef00e7b18058721eb9935;hpb=6b896a9e1dc143bba86795be1e9336549db9b85f

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index 7acb44d..c9908a5 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -10,7 +10,7 @@ MessageRequester::MessageRequester()
 	Initialize();
 }
 
-MessageRequester::MessageRequester(FCPv2 *fcp):IIndexRequester(fcp)
+MessageRequester::MessageRequester(FCPv2 *fcp):IIndexRequester<std::string>(fcp)
 {
 	Initialize();
 }
@@ -209,7 +209,7 @@ void MessageRequester::Initialize()
 {
 	m_fcpuniquename="MessageRequester";
 	std::string tempval;
-	Option::instance()->Get("MaxMessageRequests",tempval);
+	Option::Instance()->Get("MaxMessageRequests",tempval);
 	StringFunctions::Convert(tempval,m_maxrequests);
 	if(m_maxrequests<1)
 	{
@@ -220,7 +220,7 @@ void MessageRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxMessageRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
-	Option::instance()->Get("MessageDownloadMaxDaysBackward",tempval);
+	Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval);
 	StringFunctions::Convert(tempval,m_maxdaysbackward);
 	if(m_maxdaysbackward<0)
 	{
@@ -239,13 +239,22 @@ void MessageRequester::PopulateIDList()
 	std::string val1;
 	std::string val2;
 	std::string val3;
+	std::string sql;
 
 	date.SetToGMTime();
 	date.Add(0,0,0,-m_maxdaysbackward);
 
-	SQLite3DB::Statement st=m_db->Prepare("SELECT tblIdentity.IdentityID,Day,RequestIndex FROM tblMessageRequests INNER JOIN tblIdentity ON tblMessageRequests.IdentityID=tblIdentity.IdentityID WHERE tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') AND FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"';");
+	sql="SELECT tblIdentity.IdentityID,Day,RequestIndex ";
+	sql+="FROM tblMessageRequests INNER JOIN tblIdentity ON tblMessageRequests.IdentityID=tblIdentity.IdentityID ";
+	sql+="WHERE tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') AND FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"' ";
+	sql+="AND (tblIdentity.PeerMessageTrust IS NULL OR tblIdentity.PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ";
+	sql+=";";
+
+	SQLite3DB::Statement st=m_db->Prepare(sql);
 	st.Step();
 
+	m_ids.clear();
+
 	while(st.RowReturned())
 	{
 		st.ResultText(0,val1);
@@ -296,4 +305,4 @@ void MessageRequester::StartRequest(const std::string &requestid)
 	
 	m_ids[requestid]=true;
 
-}
\ No newline at end of file
+}