refactor: wordlist shouldn't use bot singleton #35

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / games / hangman.rb

diff --git a/data/rbot/plugins/games/hangman.rb b/data/rbot/plugins/games/hangman.rb
index 535d1990ed4e1634a8b8855b55d3ed507183f22e..890f821acfe1b123a71df7423bf42a2b66dca522 100644 (file)
--- a/data/rbot/plugins/games/hangman.rb
+++ b/data/rbot/plugins/games/hangman.rb
@@ -11,26 +11,22 @@
 #
 # TODO:: some sort of turn-basedness, maybe
 
-module RandomWord
-  SITE = "http://coyotecult.com/tools/randomwordgenerator.php"
-
-  def self.get(count=1)
-    res = Net::HTTP.post_form(URI.parse(SITE), {'numwords' => count})
-    words = res.body.scan(%r{<a.*?\?w=(.*?)\n}).flatten
-
-    count == 1 ? words.first : words
-  end
-end
+# https://www.wordgenerator.net/application/p.php?type=2&id=dictionary_words&spaceflag=false
 
-module Google
-  URL   = "http://www.google.com/wml/search?hl=en&q=define:"
-  REGEX = %r{Web definitions for .*?<br/>(.*?)<br/>}
+module RandomWord
+  SITE = 'https://www.wordgenerator.net/random-word-generator.php'
+  BASE_URL = 'https://www.wordgenerator.net/application/p.php'
 
-  def self.define(phrase)
-    raw = Net::HTTP.get(URI.parse(URL+CGI.escape(phrase)))
-    res = raw.scan(REGEX).flatten.map { |e| e.strip }
+  # we could allow to specify by word types:  (defaults to all)
+  TYPES = {
+    all: 'dictionary_words',
+    noun: 'nouns',
+    adj: 'adjectives',
+    verb: 'action_verbs'
+  }
 
-    res.empty? ? false : res.last
+  def self.get(bot, type)
+    bot.httputil.get("#{BASE_URL}?type=1&id=#{TYPES[type]}&spaceflag=false", cache: false).split(',')
   end
 end
 
@@ -247,10 +243,8 @@ class HangmanPlugin < Plugin
               _("hangman play with wordlist <wordlist> => hangman with random word from <wordlist>")].join % { :site => RandomWord::SITE }
     when "stop"
       return _("hangman stop => quits the current game")
-    when "define"
-      return _("define => seeks a definition for the previous answer using google")
     else
-      return _("hangman game plugin - topics: play, stop, define")
+      return _("hangman game plugin - topics: play, stop")
     end
   end
 
@@ -259,14 +253,14 @@ class HangmanPlugin < Plugin
       params[:word].join(" ")
     elsif params[:wordlist]
       begin
-        wordlist = Wordlist.get(params[:wordlist].join("/"), :spaces => true)
+        wordlist = Wordlist.get(@bot, params[:wordlist].join("/"), :spaces => true)
       rescue
         raise _("no such wordlist")
       end
 
       wordlist[rand(wordlist.size)]
     else # getting a random word
-      words = RandomWord::get(100)
+      words = RandomWord::get(@bot, :all)
 
       if adj = params[:adj]
         words = words.sort_by { |e| e.size }
@@ -303,11 +297,11 @@ class HangmanPlugin < Plugin
       target = if m.public?
         m.channel
       else
-        params[:channel]
+        @bot.server.channel(params[:channel])
       end
 
       # is the bot on the channel?
-      unless @bot.server.channels.names.include?(target.to_s)
+      unless @bot.myself.channels.include?(target)
         m.reply _("i'm not on that channel")
         return
       end
@@ -393,8 +387,8 @@ class HangmanPlugin < Plugin
         }, :nick => true
 
         if rand(5).zero?
-          m.reply _("wondering what that means? try ´%{prefix}define´") % {
-            :prefix => @bot.config['core.address_prefix']
+          m.reply _("wondering what that means? try ´%{prefix}oxford <word>´") % {
+            :prefix => @bot.config['core.address_prefix'].first
           }
         end
 
@@ -476,13 +470,6 @@ class HangmanPlugin < Plugin
       score(m, params)
     end
   end
-
-  def define(m, params)
-    if game = @games.previous(m.replyto)
-      return unless res = Google.define(game.word)
-      m.reply "#{Bold}#{game.word}#{Bold} -- #{res}"
-    end
-  end
 end
 
 plugin = HangmanPlugin.new
@@ -496,4 +483,3 @@ plugin.map "hangman stop", :action => 'stop'
 
 plugin.map "hangman score [:nick]", :action => 'score'
 plugin.map "hangman stats", :action => 'stats'
-plugin.map "hangman define", :action => 'define'