From b6fb71d5a5337d82b7ba7362b8bdd3e299813443 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Wed, 15 Oct 2003 05:30:02 +0000 Subject: [PATCH] Added one minor thing so *all* unexpired news items aren't shown. --- plugins/News.py | 2 +- test/test_News.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/News.py b/plugins/News.py index 88c689675..d2ad5ec0b 100644 --- a/plugins/News.py +++ b/plugins/News.py @@ -262,7 +262,7 @@ class News(plugins.ChannelDBHandler, callbacks.Privmsg): irc.reply(msg, '%s: %s' % (cursor, item)) else: cursor.execute("""SELECT id, subject FROM news - WHERE expires_at < %s + WHERE expires_at <> 0 AND expires_at < %s ORDER BY id DESC""", int(time.time())) if cursor.rowcount == 0: irc.error(msg, 'I have no news for that channel.') diff --git a/test/test_News.py b/test/test_News.py index d748f0298..df6ead9ac 100644 --- a/test/test_News.py +++ b/test/test_News.py @@ -75,6 +75,8 @@ if sqlite is not None: self.assertRegexp('news 1', 'baz') def testOldnews(self): + self.assertError('oldnews') + self.assertNotError('addnews 0 a: b') self.assertError('oldnews') self.assertNotError('addnews 5 foo: bar') self.assertError('oldnews')