X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fmessagerequester.cpp;h=5c95cdbbcdb9da3eb2e1123f14bf15e8a4dd4aa5;hp=836d402d839c9ee3241df5e2576701acf30f90b3;hb=853f67b0b7b8121d572cff34d40f7b28cac8f65e;hpb=63376b2a82c3f6cdf2df56b1f134bd7df0aaab3a

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index 836d402..5c95cdb 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -367,6 +367,7 @@ void MessageRequester::Initialize()
 	{
 		m_log->WriteLog(LogFile::LOGLEVEL_WARNING,"Option MaxBoardsPerMessage is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
+
 	Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);
 	if(tempval=="true")
 	{
@@ -376,6 +377,17 @@ void MessageRequester::Initialize()
 	{
 		m_savemessagesfromnewboards=false;
 	}
+
+	Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);
+	if(tempval=="true")
+	{
+		m_localtrustoverrides=true;
+	}
+	else
+	{
+		m_localtrustoverrides=false;
+	}
+
 }
 
 void MessageRequester::PopulateIDList()
@@ -392,10 +404,19 @@ void MessageRequester::PopulateIDList()
 
 	sql="SELECT tblIdentity.IdentityID,Day,RequestIndex ";
 	sql+="FROM tblMessageRequests INNER JOIN tblIdentity ON tblMessageRequests.IdentityID=tblIdentity.IdentityID ";
-	sql+="WHERE (tblIdentity.LocalMessageTrust IS NULL OR tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) ";
-	sql+="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+="WHERE FromMessageList='true' AND Found='false' AND Day>='"+date.Format("%Y-%m-%d")+"' ";
+	if(m_localtrustoverrides==false)
+	{
+		sql+="AND (tblIdentity.LocalMessageTrust IS NULL OR tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) ";
+		sql+="AND (tblIdentity.PeerMessageTrust IS NULL OR tblIdentity.PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ";
+	}
+	else
+	{
+		sql+="AND (tblIdentity.LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (tblIdentity.LocalMessageTrust IS NULL AND (tblIdentity.PeerMessageTrust IS NULL OR tblIdentity.PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ";
+	}
 	sql+="AND tblIdentity.Name <> '' ";
+	// sort by day descending - in case there is a bunch of messages on a day that keep timing out, we will eventually get to the next day and hopefully find messages there
+	sql+="ORDER BY tblMessageRequests.Day DESC ";
 	sql+=";";
 
 	SQLite3DB::Statement st=m_db->Prepare(sql);
@@ -475,7 +496,7 @@ void MessageRequester::StartRequest(const std::string &requestid)
 		message["Identifier"]=m_fcpuniquename+"|"+requestid+"|"+parts[0]+"|"+parts[1]+"|"+parts[2]+"|"+message["URI"];
 		message["ReturnType"]="direct";
 		message["MaxSize"]="1000000";		// 1 MB
-		message["MaxRetries"]="-1";			// use new ULPR since we are fairly sure message exists since the author says it does
+		message["MaxRetries"]="-1";			// use ULPR since we are fairly sure message exists since the author says it does
 
 		m_fcp->SendMessage(message);