From: Matthias Hecker <36882671+mattzque@users.noreply.github.com>
Date: Fri, 27 Mar 2020 20:00:16 +0000 (+0100)
Subject: Merge pull request #30 from ruby-rbot/dependabot/bundler/nokogiri-1.10.9
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=6586d3e63c650ab377b92c54cc96116cb23d714f;hp=358e6c29b8dfc9182a7c86f9bc9021a7a567d3d2;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

Merge pull request #30 from ruby-rbot/dependabot/bundler/nokogiri-1.10.9

Bump nokogiri from 1.6.1 to 1.10.9
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 47f5836e..b57346a7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.5.2)
+    rack (1.6.13)
     shorturl (1.0.0)
     thread_safe (0.2.0)
       atomic (>= 1.1.7, < 2)
diff --git a/data/rbot/plugins/markov.rb b/data/rbot/plugins/markov.rb
index eb9294e2..abb10172 100644
--- a/data/rbot/plugins/markov.rb
+++ b/data/rbot/plugins/markov.rb
@@ -391,7 +391,7 @@ class MarkovPlugin < Plugin
 
   def status(m,params)
     if @bot.config['markov.enabled']
-      reply = _("markov is currently enabled, %{p}% chance of chipping in") % { :p => probability? }
+      reply = _("markov is currently enabled, %{p}%% chance of chipping in") % { :p => probability? }
       l = @learning_queue.length
       reply << (_(", %{l} messages in queue") % {:l => l}) if l > 0
       l = @upgrade_queue.length
@@ -494,7 +494,7 @@ class MarkovPlugin < Plugin
       @bot.config['markov.probability'] = params[:probability].to_i
       m.okay
     else
-      m.reply _("markov has a %{prob}% chance of chipping in") % { :prob => probability? }
+      m.reply _("markov has a %{prob}%% chance of chipping in") % { :prob => probability? }
     end
   end
 
@@ -749,9 +749,10 @@ plugin.map 'markov enable', :action => "enable"
 plugin.map 'markov disable', :action => "disable"
 plugin.map 'markov status', :action => "status"
 plugin.map 'markov stats', :action => "stats"
-plugin.map 'chat about :seed1 [:seed2]', :action => "chat"
+plugin.map 'chat about :seed1 [:seed2]', :action => "chat", :defaults => {:seed2 => nil}
 plugin.map 'chat', :action => "rand_chat"
 plugin.map 'markov probability [:probability]', :action => "probability",
+           :defaults => {:probability => nil},
            :requirements => {:probability => /^\d+%?$/}
 plugin.map 'markov learn from :file [:testing [:lines lines]] [using pattern *pattern]', :action => "learn_from", :thread => true,
            :requirements => {