X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistrequester.cpp;h=62d5bb2f1c03a238881cac8b9559becb178ef650;hp=ee2dfaf38f279987c12a4a937b3a22831f6c1020;hb=026dc6b2bc548c945359c4e166eff514f2c47c6a;hpb=dec33c63afafabf83c3039e916725cac6faef9b3

diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index ee2dfaf..62d5bb2 100644
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -19,6 +19,30 @@ MessageListRequester::MessageListRequester(FCPv2 *fcp):IIndexRequester<long>(fcp
 	Initialize();
 }
 
+void MessageListRequester::GetBoardList(std::map<std::string,bool> &boards)
+{
+	SQLite3DB::Statement st=m_db->Prepare("SELECT BoardName, SaveReceivedMessages FROM tblBoard;");
+	st.Step();
+	while(st.RowReturned())
+	{
+		std::string boardname="";
+		std::string tempval="";
+		st.ResultText(0,boardname);
+		st.ResultText(1,tempval);
+
+		if(tempval=="true")
+		{
+			boards[boardname]=true;
+		}
+		else
+		{
+			boards[boardname]=false;
+		}
+
+		st.Step();
+	}
+}
+
 const bool MessageListRequester::HandleAllData(FCPMessage &message)
 {	
 	SQLite3DB::Statement st;
@@ -29,6 +53,11 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 	MessageListXML xml;
 	long identityid;
 	long index;
+	std::map<std::string,bool> boards;	// list of boards and if we will save messages for that board or not
+	bool addmessage=false;
+	std::string boardsstr="";
+
+	GetBoardList(boards);
 
 	StringFunctions::Split(message["Identifier"],"|",idparts);
 	StringFunctions::Convert(message["DataLength"],datalength);
@@ -60,19 +89,52 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 		SQLite3DB::Statement mst=m_db->Prepare("INSERT INTO tblMessageRequests(IdentityID,Day,RequestIndex,FromMessageList) VALUES(?,?,?,'true');");
 		for(long i=0; i<xml.MessageCount(); i++)
 		{
-			st.Bind(0,identityid);
-			st.Bind(1,xml.GetDate(i));
-			st.Bind(2,xml.GetIndex(i));
-			st.Step();
-			if(st.RowReturned()==false)
+
+			// go through each board the message was posted to and see if we are saving messages to that board
+			// if the board isn't found, see if we are saving messages to new boards
+			boardsstr="";
+			addmessage=false;
+			std::vector<std::string> messageboards=xml.GetBoards(i);
+			for(std::vector<std::string>::iterator j=messageboards.begin(); j!=messageboards.end(); j++)
 			{
-				mst.Bind(0,identityid);
-				mst.Bind(1,xml.GetDate(i));
-				mst.Bind(2,xml.GetIndex(i));
-				mst.Step();
-				mst.Reset();
+				if(boards.find((*j))!=boards.end())
+				{
+					if(boards[(*j)]==true)
+					{
+						addmessage=true;
+					}
+				}
+				else if(m_savetonewboards==true)
+				{
+					addmessage=true;
+				}
+				if(j!=messageboards.begin())
+				{
+					boardsstr+=", ";
+				}
+				boardsstr+=(*j);
+			}
+
+			if(addmessage==true)
+			{
+				st.Bind(0,identityid);
+				st.Bind(1,xml.GetDate(i));
+				st.Bind(2,xml.GetIndex(i));
+				st.Step();
+				if(st.RowReturned()==false)
+				{
+					mst.Bind(0,identityid);
+					mst.Bind(1,xml.GetDate(i));
+					mst.Bind(2,xml.GetIndex(i));
+					mst.Step();
+					mst.Reset();
+				}
+				st.Reset();
+			}
+			else
+			{
+				m_log->trace("MessageListRequester::HandleAllData will not download message posted to "+boardsstr);
 			}
-			st.Reset();
 		}
 
 		// insert external message indexes
@@ -80,19 +142,51 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 		{
 			if(xml.GetExternalType(i)=="Keyed")
 			{
-				spk.Bind(0,xml.GetExternalIdentity(i));
-				spk.Step();
-				if(spk.RowReturned())
+				// go through each board the message was posted to and see if we are saving messages to that board
+				// if the board isn't found, see if we are saving messages to new boards
+				boardsstr="";
+				addmessage=false;
+				std::vector<std::string> messageboards=xml.GetExternalBoards(i);
+				for(std::vector<std::string>::iterator j=messageboards.begin(); j!=messageboards.end(); j++)
 				{
-					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();
+					if(boards.find((*j))!=boards.end())
+					{
+						if(boards[(*j)]==true)
+						{
+							addmessage=true;
+						}
+					}
+					else if(m_savetonewboards==true)
+					{
+						addmessage=true;
+					}
+					if(j!=messageboards.begin())
+					{
+						boardsstr+=", ";
+					}
+					boardsstr+=(*j);
+				}
+
+				if(addmessage==true)
+				{
+					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();
+				}
+				else
+				{
+					m_log->trace("MessageListRequester::HandleAllData will not download external message posted to "+boardsstr+" from " + xml.GetExternalIdentity(i));
 				}
-				spk.Reset();
 			}
 		}
 
@@ -178,6 +272,7 @@ void MessageListRequester::Initialize()
 		m_log->warning("Option MaxMessageListRequests is currently set at "+tempval+".  This value might be incorrectly configured.");
 	}
 
+	tempval="";
 	Option::Instance()->Get("LocalTrustOverridesPeerTrust",tempval);
 	if(tempval=="true")
 	{
@@ -188,6 +283,17 @@ void MessageListRequester::Initialize()
 		m_localtrustoverrides=false;
 	}
 
+	tempval="";
+	Option::Instance()->Get("SaveMessagesFromNewBoards",tempval);
+	if(tempval=="true")
+	{
+		m_savetonewboards=true;
+	}
+	else
+	{
+		m_savetonewboards=false;
+	}
+
 }
 
 void MessageListRequester::PopulateIDList()