journal: allow hash/proc for query in count and remove

diff --git a/lib/rbot/journal.rb b/lib/rbot/journal.rb
index c5bfcfea1e4f699f93ff4ee4b84f844c5bed5718..8d8979296bb8518913262cdd60bb83d8ec8cfb4a 100644 (file)
--- a/lib/rbot/journal.rb
+++ b/lib/rbot/journal.rb
@@ -344,6 +344,7 @@ module Journal
 
     def publish(topic, payload)
       @queue << JournalMessage::create(topic, payload)
+      nil
     end
 
     # Subscribe to receive messages from a topic.
@@ -401,10 +402,16 @@ module Journal
     end
 
     def count(query=nil)
+      unless query.is_a? Query
+        query = Query.define(query)
+      end
       @storage.count(query)
     end
 
     def remove(query=nil)
+      unless query.is_a? Query
+        query = Query.define(query)
+      end
       @storage.remove(query)
     end