version 0.1.7

[fms.git] / src / nntp / nntpconnection.cpp

diff --git a/src/nntp/nntpconnection.cpp b/src/nntp/nntpconnection.cpp
index 0ccef18..d7eaa70 100644 (file)
--- a/src/nntp/nntpconnection.cpp
+++ b/src/nntp/nntpconnection.cpp
@@ -319,7 +319,7 @@ const bool NNTPConnection::HandleListCommand(const NNTPCommand &command)
 \r
                        if(show==true)\r
                        {\r
-                               tempstr << (*i).GetBoardName() << "\t" << (*i).GetHighMessageID() << "\t" << (*i).GetLowMessageID() << "\t" << (m_status.m_allowpost ? "y" : "n");\r
+                               tempstr << (*i).GetBoardName() << " " << (*i).GetHighMessageID() << " " << (*i).GetLowMessageID() << " " << (m_status.m_allowpost ? "y" : "n");\r
                                SendBufferedLine(tempstr.str());\r
                        }\r
                }\r
@@ -636,6 +636,11 @@ const bool NNTPConnection::HandleOverCommand(const NNTPCommand &command)
                        messageuuid=command.m_arguments[0];\r
                        messageuuid=StringFunctions::Replace(messageuuid,"<","");\r
                        messageuuid=StringFunctions::Replace(messageuuid,">","");\r
+                       // get rid of @ and everything after\r
+                       if(messageuuid.find("@")!=std::string::npos)\r
+                       {\r
+                               messageuuid.erase(messageuuid.find("@"));\r
+                       }\r
                }\r
                // single article or range\r
                else\r
@@ -944,7 +949,7 @@ void NNTPConnection::SendArticleOverInfo(Message &message)
                        {\r
                                line+=" ";\r
                        }\r
-                       line+="<"+(*i).second+">";\r
+                       line+="<"+(*i).second+"@freenetproject.org>";\r
                }\r
                line+="\t";\r
        }\r