version 0.3.29

[fms.git] / src / message.cpp

diff --git a/src/message.cpp b/src/message.cpp
index e078c95..4c897e3 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -18,12 +18,12 @@
        #include <xmem.h>\r
 #endif\r
 \r
-Message::Message()\r
+Message::Message(SQLite3DB::DB *db):IDatabase(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-Message::Message(const long messageid)\r
+Message::Message(SQLite3DB::DB *db, const long messageid):IDatabase(db)\r
 {\r
        Load(messageid);\r
 }\r
@@ -49,6 +49,63 @@ const bool Message::CheckForAdministrationBoard(const std::vector<std::string> &
        return false;\r
 }\r
 \r
+const bool Message::Create(const long localidentityid, const long boardid, const std::string &subject, const std::string &body, const std::string &references)\r
+{\r
+       Initialize();\r
+\r
+       Poco::UUIDGenerator uuidgen;\r
+       Poco::UUID uuid;\r
+\r
+       // get header info\r
+       // date is always set to now regardless of what message has\r
+       m_datetime=Poco::Timestamp();\r
+\r
+       // messageuuid is always a unique id we generate regardless of message message-id\r
+       try\r
+       {\r
+               uuid=uuidgen.createRandom();\r
+               m_messageuuid=uuid.toString();\r
+               StringFunctions::UpperCase(m_messageuuid,m_messageuuid);\r
+       }\r
+       catch(...)\r
+       {\r
+               m_log->fatal("Message::ParseNNTPMessage could not create UUID");\r
+       }\r
+       \r
+       // get from\r
+       SQLite3DB::Statement st=m_db->Prepare("SELECT Name FROM tblLocalIdentity WHERE LocalIdentityID=?;");\r
+       st.Bind(0,localidentityid);\r
+       st.Step();\r
+       if(st.RowReturned())\r
+       {\r
+               st.ResultText(0,m_fromname);\r
+       }\r
+\r
+       // get boards posted to\r
+       std::string boardname="";\r
+       SQLite3DB::Statement boardst=m_db->Prepare("SELECT BoardName FROM tblBoard WHERE BoardID=?;");\r
+       boardst.Bind(0,boardid);\r
+       boardst.Step();\r
+       if(boardst.RowReturned())\r
+       {\r
+               boardst.ResultText(0,boardname);\r
+       }\r
+\r
+       m_boards.push_back(boardname);\r
+       m_replyboardname=boardname;\r
+\r
+       m_subject=subject;\r
+\r
+       m_body=body;\r
+\r
+       if(references!="")\r
+       {\r
+               m_inreplyto[0]=references;\r
+       }\r
+\r
+       return true;\r
+}\r
+\r
 const int Message::FindLocalIdentityID(const std::string &name)\r
 {\r
        SQLite3DB::Statement st=m_db->Prepare("SELECT LocalIdentityID FROM tblLocalIdentity WHERE Name=?;");\r
@@ -343,9 +400,11 @@ void Message::Initialize()
        m_inreplyto.clear();\r
        m_fileattachments.clear();\r
        m_changemessagetrustonreply=0;\r
-       Option::Instance()->Get("ChangeMessageTrustOnReply",tempval);\r
+       Option option(m_db);\r
+\r
+       option.Get("ChangeMessageTrustOnReply",tempval);\r
        StringFunctions::Convert(tempval,m_changemessagetrustonreply);\r
-       Option::Instance()->Get("AddNewPostFromIdentities",tempval);\r
+       option.Get("AddNewPostFromIdentities",tempval);\r
        if(tempval=="true")\r
        {\r
                m_addnewpostfromidentities=true;\r
@@ -355,10 +414,10 @@ void Message::Initialize()
                m_addnewpostfromidentities=false;\r
        }\r
        tempval="50";\r
-       Option::Instance()->Get("MinLocalMessageTrust",tempval);\r
+       option.Get("MinLocalMessageTrust",tempval);\r
        StringFunctions::Convert(tempval,m_minlocalmessagetrust);\r
        tempval="51";\r
-       Option::Instance()->Get("MinLocalTrustListTrust",tempval);\r
+       option.Get("MinLocalTrustListTrust",tempval);\r
        StringFunctions::Convert(tempval,m_minlocaltrustlisttrust);\r
 }\r
 \r
@@ -639,6 +698,12 @@ const bool Message::ParseNNTPMessage(const std::string &nntpmessage)
                // remove any path folding\r
                m_replyboardname=StringFunctions::Replace(m_replyboardname,"\r\n","");\r
                m_replyboardname=StringFunctions::Replace(m_replyboardname,"\t","");\r
+               std::vector<std::string> parts;\r
+               StringFunctions::Split(m_replyboardname,",",parts);\r
+               if(parts.size()>1)\r
+               {\r
+                       m_replyboardname=parts[0];\r
+               }\r
        }\r
        else\r
        {\r