!image eats !gif

!gif maybe used to use Reddit, but now it's basically the same as !image
with a parameter requesting animated images.

Signed-off-by: Robb Kidd <robb@thekidds.org>

plugins/image.rb

@@ -8,12 +8,18 @@
 class Image < Linkbot::Plugin
 
   def initialize
-    register :regex => /!image(?: (.+))?/
-    help "!image [searchity search] - Return a relevant picture"
+    register :regex => /\A!(gif|image)(?: (.+))?/i
+
+    help <<~HELP
+      !image [searchity search] - Return a relevant picture
+      !gif [searchity search] - make that an animated image, barkeep!
+    HELP
   end
 
   def on_message(message, matches)
     color = nil
+    gif_requested = message.body.start_with?('!gif ')
+
     searchterm = matches[0]
     if searchterm.nil?
       past_messages = message_history(message)
@@ -26,6 +32,7 @@ def on_message(message, matches)
 
     searchterm = URI.encode(searchterm)
     searchurl = "https://www.google.com/search?tbm=isch&q=#{searchterm}&safe=active"
+    searchurl += "&tbs=itp:animated" if gif_requested
 
     # this is an old iphone user agent. Seems to make google return good results.
     useragent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7"
@@ -56,7 +63,7 @@ def on_message(message, matches)
 
     url = images.sample
 
-    if wallpaper?(url)
+    if !gif_requested && wallpaper?(url)
       url = [url, "(dealwithit) WALLPAPER WALLPAPER WALLPAPER (dealwithit)"]
     end