\r
#include <Poco/DateTime.h>\r
#include <Poco/DateTimeFormatter.h>\r
+#include <Poco/DateTimeParser.h>\r
#include <Poco/Timestamp.h>\r
\r
#ifdef XMEM\r
Initialize();\r
}\r
\r
+const bool MessageListRequester::CheckDateNotFuture(const std::string &datestr) const\r
+{\r
+ std::vector<std::string> dateparts;\r
+ int year=0;\r
+ int month=0;\r
+ int day=0;\r
+ Poco::DateTime today;\r
+\r
+ StringFunctions::Split(datestr,"-",dateparts);\r
+ if(dateparts.size()==3)\r
+ {\r
+ StringFunctions::Convert(dateparts[0],year);\r
+ StringFunctions::Convert(dateparts[1],month);\r
+ StringFunctions::Convert(dateparts[2],day);\r
+ if(today.year()>year || (today.year()==year && today.month()>month) || (today.year()==year && today.month()==month && today.day()>=day))\r
+ {\r
+ return true;\r
+ }\r
+ else\r
+ {\r
+ return false;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ return false;\r
+ }\r
+\r
+}\r
+\r
+const bool MessageListRequester::CheckDateWithinMaxDays(const std::string &datestr) const\r
+{\r
+ Poco::DateTime checkdate;\r
+ Poco::DateTime date;\r
+ int tzdiff=0;\r
+ if(Poco::DateTimeParser::tryParse(datestr,date,tzdiff))\r
+ {\r
+ checkdate-=Poco::Timespan(m_messagedownloadmaxdaysbackward,0,0,0,0);\r
+ if(checkdate<=date)\r
+ {\r
+ return true;\r
+ }\r
+ else\r
+ {\r
+ return false;\r
+ }\r
+ }\r
+ else\r
+ {\r
+ return false;\r
+ }\r
+}\r
+\r
void MessageListRequester::GetBoardList(std::map<std::string,bool> &boards)\r
{\r
SQLite3DB::Statement st=m_db->Prepare("SELECT BoardName, SaveReceivedMessages FROM tblBoard;");\r
std::map<std::string,bool> boards; // list of boards and if we will save messages for that board or not\r
bool addmessage=false;\r
std::string boardsstr="";\r
+ std::string datestr="";\r
+ std::vector<std::string> dateparts;\r
\r
GetBoardList(boards);\r
\r
\r
// receive the file\r
data.resize(datalength);\r
- m_fcp->ReceiveRaw(&data[0],datalength);\r
+ if(data.size()>0)\r
+ {\r
+ m_fcp->ReceiveRaw(&data[0],datalength);\r
+ }\r
\r
// parse file into xml and update the database\r
- if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
+ if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
{\r
\r
SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblMessageRequests WHERE IdentityID=? AND Day=? AND RequestIndex=?;");\r
boardsstr+=(*j);\r
}\r
\r
+ if(CheckDateNotFuture(xml.GetDate(i))==false)\r
+ {\r
+ addmessage=false;\r
+ m_log->error(m_fcpuniquename+"::HandleAllData date for message is in future! "+xml.GetDate(i));\r
+ }\r
+\r
+ if(addmessage==true && CheckDateWithinMaxDays(xml.GetDate(i))==false)\r
+ {\r
+ addmessage=false;\r
+ }\r
+\r
if(addmessage==true)\r
{\r
st.Bind(0,identityid);\r
}\r
else\r
{\r
- m_log->trace("MessageListRequester::HandleAllData will not download message posted to "+boardsstr);\r
+ //m_log->trace("MessageListRequester::HandleAllData will not download message posted to "+boardsstr+" on "+xml.GetDate(i));\r
}\r
}\r
\r
boardsstr+=(*j);\r
}\r
\r
+ if(CheckDateNotFuture(xml.GetExternalDate(i))==false)\r
+ {\r
+ addmessage=false;\r
+ m_log->error(m_fcpuniquename+"::HandleAllData date for external message is in future! "+xml.GetExternalDate(i));\r
+ }\r
+\r
+ if(addmessage==true && CheckDateWithinMaxDays(xml.GetExternalDate(i))==false)\r
+ {\r
+ addmessage=false;\r
+ }\r
+\r
if(addmessage==true)\r
{\r
spk.Bind(0,xml.GetExternalIdentity(i));\r
}\r
else\r
{\r
- m_log->trace("MessageListRequester::HandleAllData will not download external message posted to "+boardsstr+" from " + xml.GetExternalIdentity(i));\r
+ //m_log->trace("MessageListRequester::HandleAllData will not download external message posted to "+boardsstr+" from " + xml.GetExternalIdentity(i) + " on " + xml.GetExternalDate(i));\r
}\r
}\r
}\r
st.Step();\r
st.Finalize();\r
\r
- m_log->debug("MessageListRequester::HandleAllData parsed MessageList XML file : "+message["Identifier"]);\r
+ m_log->debug(m_fcpuniquename+"::HandleAllData parsed MessageList XML file : "+message["Identifier"]);\r
}\r
else\r
{\r
st.Step();\r
st.Finalize();\r
\r
- m_log->error("MessageListRequester::HandleAllData error parsing MessageList XML file : "+message["Identifier"]);\r
+ m_log->error(m_fcpuniquename+"::HandleAllData error parsing MessageList XML file : "+message["Identifier"]);\r
}\r
\r
// remove this identityid from request list\r
st.Step();\r
st.Finalize();\r
\r
- m_log->error("MessageListRequester::HandleGetFailed fatal error code="+message["Code"]+" requesting "+message["Identifier"]);\r
+ m_log->error(m_fcpuniquename+"::HandleGetFailed fatal error code="+message["Code"]+" requesting "+message["Identifier"]);\r
}\r
\r
// remove this identityid from request list\r
\r
void MessageListRequester::Initialize()\r
{\r
- m_fcpuniquename="MessageListRequester";\r
- std::string tempval;\r
- Option::Instance()->Get("MaxMessageListRequests",tempval);\r
- StringFunctions::Convert(tempval,m_maxrequests);\r
+ m_fcpuniquename="ActiveMessageListRequester";\r
+ std::string tempval="";\r
+\r
+ m_maxrequests=0;\r
+ Option::Instance()->GetInt("MaxMessageListRequests",m_maxrequests);\r
+\r
+ // active identities get 1/2 of the max requests option + any remaining if not evenly divisible - inactive identities get 1/2\r
+ m_maxrequests=(m_maxrequests/2)+(m_maxrequests%2);\r
+\r
if(m_maxrequests<1)\r
{\r
m_maxrequests=1;\r
m_savetonewboards=false;\r
}\r
\r
+ m_messagedownloadmaxdaysbackward=5;\r
+ tempval="5";\r
+ Option::Instance()->Get("MessageDownloadMaxDaysBackward",tempval);\r
+ StringFunctions::Convert(tempval,m_messagedownloadmaxdaysbackward);\r
+\r
}\r
\r
void MessageListRequester::PopulateIDList()\r
{\r
Poco::DateTime date;\r
+ Poco::DateTime yesterday=date-Poco::Timespan(1,0,0,0,0);\r
int id;\r
\r
SQLite3DB::Statement st;\r
// select identities we want to query (we've seen them today) - sort by their trust level (descending) with secondary sort on how long ago we saw them (ascending)\r
if(m_localtrustoverrides==false)\r
{\r
- st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+ st=m_db->Prepare("SELECT tblIdentity.IdentityID FROM tblIdentity INNER JOIN vwIdentityStats ON tblIdentity.IdentityID=vwIdentityStats.IdentityID WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (vwIdentityStats.LastMessageDate>='"+Poco::DateTimeFormatter::format(yesterday,"%Y-%m-%d")+"') AND (LocalMessageTrust IS NULL OR LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust')) AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
}\r
else\r
{\r
- st=m_db->Prepare("SELECT IdentityID FROM tblIdentity WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (LocalMessageTrust IS NULL AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
+ st=m_db->Prepare("SELECT tblIdentity.IdentityID FROM tblIdentity INNER JOIN vwIdentityStats ON tblIdentity.IdentityID=vwIdentityStats.IdentityID WHERE PublicKey IS NOT NULL AND PublicKey <> '' AND LastSeen>='"+Poco::DateTimeFormatter::format(date,"%Y-%m-%d")+"' AND (vwIdentityStats.LastMessageDate>='"+Poco::DateTimeFormatter::format(yesterday,"%Y-%m-%d")+"') AND (LocalMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinLocalMessageTrust') OR (LocalMessageTrust IS NULL AND (PeerMessageTrust IS NULL OR PeerMessageTrust>=(SELECT OptionValue FROM tblOption WHERE Option='MinPeerMessageTrust')))) ORDER BY LocalMessageTrust+LocalTrustListTrust DESC, LastSeen;");\r
}\r
st.Step();\r
\r
projects / fms.git / blobdiff