X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnntp%2Fnntpconnection.cpp;h=fa35f4f831e8f0d5cb8f84a9b6cf41a0cbacbab6;hb=ee580d19b7920904587e18d72a3465d52eab6204;hp=3fffad7d312c4e12194da23d85e0a94949227c25;hpb=b9c3763a932cebaa015a27fe111017f6f34dfbaa;p=fms.git

diff --git a/src/nntp/nntpconnection.cpp b/src/nntp/nntpconnection.cpp
index 3fffad7..fa35f4f 100644
--- a/src/nntp/nntpconnection.cpp
+++ b/src/nntp/nntpconnection.cpp
@@ -635,11 +635,13 @@ const bool NNTPConnection::HandleOverCommand(const NNTPCommand &command)
 			messageuuid=command.m_arguments[0];
 			messageuuid=StringFunctions::Replace(messageuuid,"<","");
 			messageuuid=StringFunctions::Replace(messageuuid,">","");
+			/*
 			// get rid of @ and everything after
 			if(messageuuid.find("@")!=std::string::npos)
 			{
 				messageuuid.erase(messageuuid.find("@"));
 			}
+			*/
 		}
 		// single article or range
 		else
@@ -784,9 +786,15 @@ void NNTPConnection::HandlePostedMessage(const std::string &message)
 		}
 		else
 		{
-			mess.StartFreenetInsert();
+			if(mess.StartFreenetInsert())
+			{
+				SendBufferedLine("240 Article received OK");
+			}
+			else
+			{
+				SendBufferedLine("441 Posting failed.  Make sure the identity you are sending with exists!");
+			}
 		}
-		SendBufferedLine("240 Article received OK");
 	}
 	else
 	{
@@ -955,7 +963,7 @@ void NNTPConnection::SendArticleOverInfo(Message &message)
 			{
 				line+=" ";
 			}
-			line+="<"+(*i).second+"@freenetproject.org>";
+			line+="<"+(*i).second+">"; //+"@freenetproject.org>";
 		}
 		line+="\t";
 	}
@@ -1015,6 +1023,21 @@ void NNTPConnection::SendArticleParts(const NNTPConnection::NNTPCommand &command
 		else
 		{
 			articleid=command.m_arguments[0];
+			//strip off < and > and everthing after @
+			if(articleid.size()>0 && articleid[0]=='<')
+			{
+				articleid.erase(0,1);
+			}
+			if(articleid.size()>0 && articleid[articleid.size()-1]=='>')
+			{
+				articleid.erase(articleid.size()-1);
+			}
+			/*
+			if(articleid.size()>0 && articleid.find('@')!=std::string::npos)
+			{
+				articleid.erase(articleid.find('@'));
+			}
+			*/
 			message.Load(articleid);
 			type=2;
 		}