X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffreenet%2Fmessagelistinserter.cpp;h=f598b513660d66593b69cb2bd4d00937429b759d;hb=7ddb1aeb0b3dc7384597e75f7b3557f2d8f6d14c;hp=b608145a7a597d232d4f487ab4b7c1d77b8c6247;hpb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;p=fms.git

diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp
index b608145..f598b51 100644
--- a/src/freenet/messagelistinserter.cpp
+++ b/src/freenet/messagelistinserter.cpp
@@ -24,6 +24,7 @@ void MessageListInserter::CheckForNeededInsert()
 		std::string sql;
 		DateTime now;
 		DateTime previous;
+		bool startedinsert=false;
 
 		now.SetToGMTime();
 		previous.SetToGMTime();
@@ -34,18 +35,19 @@ void MessageListInserter::CheckForNeededInsert()
 		sql="SELECT tblLocalIdentity.LocalIdentityID ";
 		sql+="FROM tblLocalIdentity INNER JOIN tblMessageInserts ON tblLocalIdentity.LocalIdentityID=tblMessageInserts.LocalIdentityID ";
 		sql+="WHERE tblMessageInserts.Day>=? AND ((tblLocalIdentity.LastInsertedMessageList<=? OR tblLocalIdentity.LastInsertedMessageList IS NULL OR tblLocalIdentity.LastInsertedMessageList='') OR tblLocalIdentity.LocalIdentityID IN (SELECT LocalIdentityID FROM tmpMessageListInsert)) ";
-		sql+=";";
+		sql+="GROUP BY tblLocalIdentity.LocalIdentityID;";
 
 		SQLite3DB::Statement st=m_db->Prepare(sql);
 		st.Bind(0,previous.Format("%Y-%m-%d"));
 		st.Bind(1,(now-(1.0/48.0)).Format("%Y-%m-%d %H:%M:%S"));
 		st.Step();
 
-		if(st.RowReturned())
+		while(st.RowReturned() && startedinsert==false)
 		{
 			int localidentityid;
 			st.ResultInt(0,localidentityid);
-			StartInsert(localidentityid);
+			startedinsert=StartInsert(localidentityid);
+			st.Step();
 		}
 	}
 
@@ -121,7 +123,7 @@ void MessageListInserter::Initialize()
 	StringFunctions::Convert(tempval,m_daysbackward);
 }
 
-void MessageListInserter::StartInsert(const long &localidentityid)
+const bool MessageListInserter::StartInsert(const long &localidentityid)
 {
 	FCPMessage message;
 	DateTime date;
@@ -165,6 +167,40 @@ void MessageListInserter::StartInsert(const long &localidentityid)
 	}
 	st.Finalize();
 
+
+	st=m_db->Prepare("SELECT MessageDate, MessageIndex, PublicKey, MessageID FROM tblMessage INNER JOIN tblIdentity ON tblMessage.IdentityID=tblIdentity.IdentityID WHERE MessageIndex IS NOT NULL ORDER BY MessageDate DESC, MessageTime DESC LIMIT 200;");
+	SQLite3DB::Statement st2=m_db->Prepare("SELECT BoardName FROM tblBoard INNER JOIN tblMessageBoard ON tblBoard.BoardID=tblMessageBoard.BoardID WHERE tblMessageBoard.MessageID=?;");
+	st.Step();
+	while(st.RowReturned())
+	{
+		std::string day;
+		int index;
+		std::string publickey;
+		std::vector<std::string> boardlist;
+		int messageid;
+		
+		st.ResultText(0,day);
+		st.ResultInt(1,index);
+		st.ResultText(2,publickey);
+		st.ResultInt(3,messageid);
+
+		st2.Bind(0,messageid);
+		st2.Step();
+		while(st2.RowReturned())
+		{
+			std::string boardname="";
+			st2.ResultText(0,boardname);
+			StringFunctions::LowerCase(boardname,boardname);
+			boardlist.push_back(boardname);
+			st2.Step();
+		}
+		st2.Reset();
+
+		mlxml.AddExternalMessage(publickey,day,index,boardlist);
+
+		st.Step();
+	}
+
 	// get last inserted messagelist index for this day
 	index=0;
 	st=m_db->Prepare("SELECT MAX(InsertIndex) FROM tblMessageListInserts WHERE LocalIdentityID=? AND Day=?;");
@@ -178,18 +214,50 @@ void MessageListInserter::StartInsert(const long &localidentityid)
 	}
 	StringFunctions::Convert(index,indexstr);
 
-	// actually insert message
 	xmlstr=mlxml.GetXML();
-	StringFunctions::Convert(xmlstr.size(),xmlsizestr);
 
-	message.SetName("ClientPut");
-	message["URI"]=privatekey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|MessageList|"+indexstr+".xml";
-	message["Identifier"]=m_fcpuniquename+"|"+localidentityidstr+"|"+indexstr+"|"+message["URI"];
-	message["UploadFrom"]="direct";
-	message["DataLength"]=xmlsizestr;
-	m_fcp->SendMessage(message);
-	m_fcp->SendRaw(xmlstr.c_str(),xmlstr.size());
-
-	m_inserting.push_back(localidentityid);
+	// only insert if the last message this identity inserted is different than this message
+	if(m_lastinsertedxml[localidentityid]!=xmlstr)
+	{
+		std::string targeturi="";
+		StringFunctions::Convert(xmlstr.size(),xmlsizestr);
+
+		message.SetName("ClientPut");
+		message["URI"]=privatekey+m_messagebase+"|"+now.Format("%Y-%m-%d")+"|MessageList|"+indexstr+".xml";
+		message["Identifier"]=m_fcpuniquename+"|"+localidentityidstr+"|"+indexstr+"|"+message["URI"];
+		message["UploadFrom"]="direct";
+		message["DataLength"]=xmlsizestr;
+		m_fcp->SendMessage(message);
+		m_fcp->SendRaw(xmlstr.c_str(),xmlstr.size());
+
+		/*
+		// insert a USK redirect to the file we just inserted
+		targeturi=message["URI"];
+		message.Reset();
+		message.SetName("ClientPut");
+		message["URI"]="USK"+privatekey.substr(3)+m_messagebase+"|"+now.Format("%Y.%m.%d")+"|MessageList/0/MessageList.xml";
+		message["Identifier"]=message["URI"];
+		message["UploadFrom"]="redirect";
+		message["TargetURI"]=targeturi;
+		m_fcp->SendMessage(message);
+		*/
+		message.Reset();
+		message.SetName("ClientPut");
+		message["URI"]="USK"+privatekey.substr(3)+m_messagebase+"|"+now.Format("%Y.%m.%d")+"|MessageList/0/MessageList.xml";
+		message["Identifier"]=message["URI"];
+		message["UploadFrom"]="direct";
+		message["DataLength"]=xmlsizestr;
+		m_fcp->SendMessage(message);
+		m_fcp->SendRaw(xmlstr.c_str(),xmlstr.size());
+
+		m_inserting.push_back(localidentityid);
+		m_lastinsertedxml[localidentityid]=xmlstr;
+
+		return true;
+	}
+	else
+	{
+		return false;
+	}
 
 }