version 0.2.17

[fms.git] / src / message.cpp

diff --git a/src/message.cpp b/src/message.cpp
index 53d8b34..f8b64e5 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -738,8 +738,6 @@ const bool Message::StartFreenetInsert()
                xml.SetSubject(m_subject);\r
                xml.SetBody(m_body);\r
                xml.SetReplyBoard(m_replyboardname);\r
-               xml.SetDate(m_datetime.Format("%Y-%m-%d"));\r
-               xml.SetTime(m_datetime.Format("%H:%M:%S"));\r
                \r
                for(std::vector<std::string>::iterator i=m_boards.begin(); i!=m_boards.end(); i++)\r
                {\r
@@ -757,10 +755,43 @@ const bool Message::StartFreenetInsert()
                        return false;\r
                }\r
 \r
-               SQLite3DB::Statement st=m_db->Prepare("INSERT INTO tblMessageInserts(LocalIdentityID,MessageUUID,MessageXML) VALUES(?,?,?);");\r
+               // add the message delay if there is one\r
+               SQLite3DB::Statement st=m_db->Prepare("SELECT MinMessageDelay,MaxMessageDelay FROM tblLocalIdentity WHERE LocalIdentityID=?;");\r
+               st.Bind(0,localidentityid);\r
+               st.Step();\r
+               if(st.RowReturned())\r
+               {\r
+                       int min=0;\r
+                       int max=0;\r
+                       st.ResultInt(0,min);\r
+                       st.ResultInt(1,max);\r
+\r
+                       min<0 ? min=0 : false;\r
+                       max<0 ? max=0 : false;\r
+                       min>max ? min=max : false;\r
+\r
+                       if(min==max)\r
+                       {\r
+                               m_datetime.Add(0,min);\r
+                       }\r
+                       else if(max>min)\r
+                       {\r
+                               int delay=(rand()%(max-min))+min;\r
+                               m_datetime.Add(0,delay);\r
+                       }\r
+\r
+               }\r
+               st.Finalize();\r
+\r
+               // set date in xml file AFTER we set the delay\r
+               xml.SetDate(m_datetime.Format("%Y-%m-%d"));\r
+               xml.SetTime(m_datetime.Format("%H:%M:%S"));\r
+\r
+               st=m_db->Prepare("INSERT INTO tblMessageInserts(LocalIdentityID,MessageUUID,MessageXML,SendDate) VALUES(?,?,?,?);");\r
                st.Bind(0,localidentityid);\r
                st.Bind(1,m_messageuuid);\r
                st.Bind(2,xml.GetXML());\r
+               st.Bind(3,m_datetime.Format("%Y-%m-%d %H:%M:%S"));\r
                st.Step();\r
 \r
                // insert file attachments into database\r