X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Ffreenet%2Fperiodicdbmaintenance.cpp;h=c615d603c990edf9a679c97c5154d13d47b63619;hp=01a76c7dd1087dfa67db052ac2eba870512c30cb;hb=52c0819bfc1d083c6e0738f75f0d7eeba521295a;hpb=df316253862dc50e8e5a790d9634ef90be37badb

diff --git a/src/freenet/periodicdbmaintenance.cpp b/src/freenet/periodicdbmaintenance.cpp
index 01a76c7..c615d60 100644
--- a/src/freenet/periodicdbmaintenance.cpp
+++ b/src/freenet/periodicdbmaintenance.cpp
@@ -1,4 +1,5 @@
 #include "../../include/freenet/periodicdbmaintenance.h"
+#include "../../include/stringfunctions.h"
 
 #ifdef XMEM
 	#include <xmem.h>
@@ -89,6 +90,49 @@ void PeriodicDBMaintenance::Do1DayMaintenance()
 	// delete trust lists from identities we aren't trusting anymore
 	m_db->Execute("DELETE FROM tblPeerTrust WHERE IdentityID NOT IN (SELECT IdentityID FROM tblIdentity WHERE (LocalTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalTrustListTrust')) AND (PeerTrustListTrust IS NULL OR PeerTrustListTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerTrustListTrust')));");
 
+	// remove identityid from messages where the identity has been deleted
+	m_db->Execute("UPDATE tblMessage SET IdentityID=NULL WHERE IdentityID NOT IN (SELECT IdentityID FROM tblIdentity);");
+
+	// try to re-attach messages from identities that were previously deleted, but have been since re-added
+	// first get the names from messages that have a NULL IdentityID
+	SQLite3DB::Statement st=m_db->Prepare("SELECT FromName FROM tblMessage WHERE IdentityID IS NULL GROUP BY FromName;");
+	st.Step();
+	while(st.RowReturned())
+	{
+		std::string name="";
+		std::string publickey="";
+		int identityid=0;
+		st.ResultText(0,name);
+
+		std::vector<std::string> parts;
+		StringFunctions::Split(name,"@",parts);
+
+		// find identities with this name
+		SQLite3DB::Statement st2=m_db->Prepare("SELECT IdentityID,PublicKey FROM tblIdentity WHERE Name=?;");
+		st2.Bind(0,name);
+		st2.Step();
+		while(st2.RowReturned())
+		{
+			publickey="";
+			identityid=0;
+			st2.ResultText(1,publickey);
+			// check if public key matches 2nd part
+			if(parts.size()>1 && publickey.find(parts[1])==4)
+			{
+				// we have the identity - so update the messages table with the identityid
+				st2.ResultInt(0,identityid);
+
+				SQLite3DB::Statement st3=m_db->Prepare("UPDATE tblMessage SET IdentityID=? WHERE Name=? AND IdentityID IS NULL;");
+				st3.Bind(0,identityid);
+				st3.Bind(1,name);
+				st3.Step();
+			}
+			st2.Step();
+		}
+
+		st.Step();
+	}
+
 }
 
 void PeriodicDBMaintenance::Process()