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

diff --git a/src/freenet/messagelistinserter.cpp b/src/freenet/messagelistinserter.cpp
index e0d8957..f598b51 100644
--- a/src/freenet/messagelistinserter.cpp
+++ b/src/freenet/messagelistinserter.cpp
@@ -35,7 +35,7 @@ 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"));
@@ -168,7 +168,7 @@ const bool 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 100;");
+	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())
@@ -214,12 +214,12 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
 	}
 	StringFunctions::Convert(index,indexstr);
 
-	// actually insert message
 	xmlstr=mlxml.GetXML();
 
 	// 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");
@@ -230,9 +230,29 @@ const bool MessageListInserter::StartInsert(const long &localidentityid)
 		m_fcp->SendMessage(message);
 		m_fcp->SendRaw(xmlstr.c_str(),xmlstr.size());
 
-		m_inserting.push_back(localidentityid);
+		/*
+		// 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