diff fetchnews.php @ 13:cccd73f72bf6 draft

Added filtering support and several bugfixes
author Ivo Smits <Ivo@UCIS.nl>
date Thu, 10 Jul 2014 22:26:45 +0200
parents 7917bd536187
children 372f4e195986
line wrap: on
line diff
--- a/fetchnews.php	Wed Jun 12 22:22:07 2013 +0200
+++ b/fetchnews.php	Thu Jul 10 22:26:45 2014 +0200
@@ -61,7 +61,6 @@
 				$line = nntp_readline($socket);
 				$code = strtok($line, " \t");
 				if ($code != 240 && $code != 235) print("Article $article[messageid] was not accepted ($code)\n");
-				if ($article['id'] > $peer['lastposted']) $peer['lastposted'] = $article['id'];
 			} else {
 				print("IHAVE rejected by remote server, falling back to POST\n");
 				$peer['post'] = 1;
@@ -104,6 +103,8 @@
 					if (!$groupmessage) {
 						$db->insert('INSERT INTO `groupmessages` (`group`, `message`) VALUES (?, ?)', array($group['id'], $message['id']));
 					}
+				} else if (!nntp_article_wanted($messageid)) {
+					print("Ignoring filtered article $messageid\n");
 				} else {
 					nntp_writeline($socket, 'ARTICLE '.$i);
 					$line = nntp_readline($socket);