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

diff --git a/src/freenet/messagerequester.cpp b/src/freenet/messagerequester.cpp
index 5b6d271..5c95cdb 100644
--- a/src/freenet/messagerequester.cpp
+++ b/src/freenet/messagerequester.cpp
@@ -206,6 +206,25 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 
 		if(validmessage && savetoboardcount>0)
 		{
+			std::string nntpbody="";
+			nntpbody=xml.GetBody();
+
+			//add file keys/sizes to body
+			std::vector<MessageXML::fileattachment> fileattachments=xml.GetFileAttachments();
+			if(fileattachments.size()>0)
+			{
+				nntpbody+="\r\nAttachments";
+			}
+			for(std::vector<MessageXML::fileattachment>::iterator i=fileattachments.begin(); i!=fileattachments.end(); i++)
+			{
+				std::string sizestr="0";
+				StringFunctions::Convert((*i).m_size,sizestr);
+
+				nntpbody+="\r\n"+(*i).m_key;
+				nntpbody+="\r\n"+sizestr+" bytes";
+				nntpbody+="\r\n";
+			}
+
 			st=m_db->Prepare("INSERT INTO tblMessage(IdentityID,FromName,MessageDate,MessageTime,Subject,MessageUUID,ReplyBoardID,Body,MessageIndex) VALUES(?,?,?,?,?,?,?,?,?);");
 			st.Bind(0,identityid);
 			st.Bind(1,GetIdentityName(identityid));
@@ -214,7 +233,7 @@ const bool MessageRequester::HandleAllData(FCPMessage &message)
 			st.Bind(4,xml.GetSubject());
 			st.Bind(5,xml.GetMessageID());
 			st.Bind(6,GetBoardID(xml.GetReplyBoard(),GetIdentityName(identityid)));
-			st.Bind(7,xml.GetBody());
+			st.Bind(7,nntpbody);
 			st.Bind(8,index);
 			inserted=st.Step(true);
 			int messageid=st.GetLastInsertRowID();
@@ -348,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")
 	{
@@ -357,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()
@@ -373,9 +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);
@@ -455,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);