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

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/rbot/journal.rb b/lib/rbot/journal.rb
index c5bfcfea..8d897929 100644
--- 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