Squashed version of @noisesmith's irclj version update

Author: amalloy

.gitignore

@@ -8,4 +8,6 @@ logs
 logs
 *log
 .cake
-target
+target
+.lein-failures
+.lein-repl-history

.lazybot/config.clj

@@ -1,7 +1,15 @@
-(let [plugins #{"dictionary" "lmgtfy" "google" "eball" "utils" "leet"
-                "clojure" "login" "log" "brainfuck" "whatis" "shorturl" "haskell"
-                "mail" "timer" "rss" "title" "operator" "seen" "sed" "help"
-                "load" "embedded" "karma" "fortune" "yesno" "autoreply" "weather" "unix-jokes"}]
+(let [plugins #{"autoreply" "brainfuck" "clojure" "clojuredocs" "debug" "dictionary" "eball"
+                "embedded" "fortune" "google" "haskell" "hello-world" "help" "javadoc"
+                "jruby" "karma" "leet" "lmgtfy" "load" "log" "logger" "login"
+                "macro" "mail" "max" "mute" "operator" "ping" "rss"
+                "sed" "seen" "shorturl" "timer" "title" "unix-jokes" "utils" "weather"
+                "whatis" "yesno"
+                ;; "github" how does this even work?
+                ;; "rotten-tomatoes", "lastfm" needs key to verify
+                ;; api broken -- "knowledge" "metacritic" (getting 403 error)
+                ;;               "notifo" this service went out of business
+                ;;               "shorturl" is.gd is good, bit.ly seems broken
+                }]
   {:servers ["irc.freenode.net"]        ; A list of servers.
    :prepends #{"@"}   ; The character you want for a prepend. Currently set to @
    :weather {:token ""} ; Wunderground token.

README.markdown

@@ -10,7 +10,7 @@ Several of this bot's plugins require that you have MongoDB installed and runnin
 
 As for what OSes this bot actually runs on: I have no clue. I've seen it run on several Ubuntu distros and OS X, but nobody (that I know of) has yet to venture into the world of lazybot-on-windows. If you do, please let me know how it goes.
 
-The easiest way to get the bot going is to pull the repository, install [leiningen](http://github.com/technomancy/leiningen), and run `lein deps`. Additionally, you will need MongoDB installed (in some future version, this will be an optional dependency). Edit .lazybot/info.clj to put the servers and other information the bot needs to have in there, get MongoDB running, and then run ./lazybot. After you run the bot the first time, you'll have to edit configuration in ~/.lazybot/info.clj (the .lazybot directory is copied to your home directory the first time).
+The easiest way to get the bot going is to pull the repository, install [leiningen](http://github.com/technomancy/leiningen), and run `lein deps`. Additionally, you will need MongoDB installed (in some future version, this will be an optional dependency). Edit .lazybot/config.clj to put the servers and other information the bot needs to have in there, get MongoDB running, and then run ./lazybot. After you run the bot the first time, you'll have to edit configuration in ~/.lazybot/config.clj (the .lazybot directory is copied to your home directory the first time).
 
 You can also run `lein uberjar` which will create a standalone jar file for you to use to run the bot. You can just do java -jar jarfile to run it.
 

project.clj

@@ -1,13 +1,13 @@
 (defproject lazybot "0.7.0-alpha1"
   :description "FIXME: write"
-  :dependencies [[org.clojure/clojure "1.4.0"]
+  :dependencies [[org.clojure/clojure "1.7.0-alpha1"]
                  [org.clojure/tools.reader "0.7.3"]
                  [commons-lang/commons-lang "2.5"]
                  [commons-io/commons-io "1.4"]
                  [clj-time "0.6.0"]
                  [clojail "1.0.6"]
                  [clj-http "0.2.6"]
-                 [irclj "0.4.1"]
+                 [irclj "0.5.0-alpha4"]
                  [congomongo "0.4.0"]
                  [clj-config "0.2.0"]
                  [compojure "1.1.5"]
@@ -30,7 +30,8 @@
                  [me.raynes/laser "0.1.16"]
                  [hiccup "1.0.2"]
                  [me.raynes/least "0.1.3"]
-                 [me.raynes/moments "0.1.1"]]
+                 [me.raynes/moments "0.1.1"]
+                 [org.clojure-grimoire/lib-grimoire "0.1.1"]]
   :uberjar-name "lazybot.jar"
   :main lazybot.run
   :copy-deps true

src/lazybot/core.clj

@@ -7,7 +7,8 @@
    [clojure.set :refer [intersection]]
    [compojure.core :refer [routes]]
    [ring.middleware.params :refer [wrap-params]]
-   [ring.adapter.jetty :refer [run-jetty]])
+   [ring.adapter.jetty :refer [run-jetty]]
+   [irclj.core :as ircb])
   (:import [java.io File FileReader]))
 
 ;; This is pretty much the only global mutable state in the entire bot, and it
@@ -34,10 +35,18 @@
     (doseq [hook (registry/pull-hooks bot hook-key)]
       (hook ircm))))
 
+(defn join-channels
+  [irc-map]
+  (let [network (:network irc-map)
+        channels (-> irc-map :bot deref :config (get network) :channels)]
+    ;; delay here because join expects it should deref
+    (apply ircb/join (delay irc-map) channels)))
+
 ;; Note that even the actual handling of commands is done via a hook.
 (def initial-hooks
   "The hooks that every bot, even without plugins, needs to have."
-  {:on-message [{:fn (fn [irc-map] (registry/try-handle irc-map))}]
+  {:001 [{:fn join-channels}]
+   :privmsg [{:fn (fn [irc-map] (registry/try-handle irc-map))}]
    :on-quit []
    :on-join []})
 
@@ -67,8 +76,8 @@
 (defn load-plugins
   "Load all plugins specified in the bot's configuration."
   [irc refzors]
-  (let [info (:config @refzors)]
-    (doseq [plug (:plugins (info (:server @irc)))]
+  (let [plugins (-> @refzors :config (get (:network @irc)) :plugins)]
+    (doseq [plug plugins]
       (load-plugin irc refzors plug))))
 
 (defn reload-configs
@@ -111,3 +120,5 @@
      (alter bot assoc-in [:modules :internal :hooks] initial-hooks)
      (reload-config bot))
     (load-plugins com bot)))
+
+(comment (apply lz/reload-all (vals @lz/bots)))

src/lazybot/irc.clj

@@ -1,54 +1,64 @@
 (ns lazybot.irc
-  (:require [lazybot.core :as core]
+  (:require [lazybot.core :as lazybot]
             [lazybot.info :as info]
             [useful.fn :refer [decorate]]
             [useful.map :refer [keyed]]
             [irclj.core :as ircb]))
 
+(defn make-hook
+  [actions]
+  (fn [& args]
+    (when-not (empty? @actions)
+      (doseq [action @actions]
+        (apply action args)))))
+
 (defn base-maps
   "Create the base callback and bot maps."
   [config]
-  (let [refzors (ref {:modules {:internal {:hooks core/initial-hooks}}
+  (let [refzors (ref {:modules {:internal {:hooks lazybot/initial-hooks}}
                       :config config
                       :pending-ops 0})]
     [(into {}
            (map
             (decorate
-             #(fn [irc-map]
-                (core/call-all (-> irc-map
-                                   (assoc :bot refzors :com (:irc irc-map))
-                                   (dissoc :irc))
-                               %)))
-            [:on-any :on-message :on-quit :on-join]))
+             #(fn dispatch-hooks [irc-map event]
+                (dosync (alter irc-map assoc :server (:network @irc-map)))
+                (lazybot/call-all (-> @irc-map
+                                      (assoc :bot refzors :com irc-map)
+                                      (dissoc :irc)
+                                      (assoc :event event)
+                                      (assoc :bot-nick (:nick @irc-map))
+                                      (assoc :nick (:nick event))
+                                      (assoc :message (:text event))
+                                      (assoc :channel ((:params event) 0)))
+                                  %)))
+            [:001 :privmsg :quit :join]))
      refzors]))
 
-(defn make-bot-run
-  "Create an irclj param map to pass to connect."
-  [name password server fnmap]
-  (ircb/create-irc (keyed [name password server fnmap])))
-
 (defn make-bot
   "Creates a new bot and connects it."
   [server]
   (let [bot-config (info/read-config)
+        port 6667
         [name pass channels] ((juxt :bot-name :bot-password :channels)
-                              (bot-config server))
+                                   (bot-config server))
         [fnmap refzors] (base-maps bot-config)
-        irc (ircb/connect (make-bot-run name pass server fnmap)
-                          :channels channels, :identify-after-secs 3)]
+        irc (ircb/connect server port name
+                          :callbacks fnmap
+                          :identify-after-secs 3)]
     [irc refzors]))
 
 (defn init-bot
   "Initialize a new bot."
   [server]
   (let [[irc refzors] (make-bot server)]
-    (swap! core/bots assoc server {:com irc :bot refzors})
-    (dosync (core/reload-config refzors))
-    (core/load-plugins irc refzors)))
+    (swap! lazybot/bots assoc server {:com irc :bot refzors})
+    (dosync (lazybot/reload-config refzors))
+    (lazybot/load-plugins irc refzors)))
 
 (defn start-bots
   "Starts bots for servers."
   [servers]
   (doseq [serv servers]
     (init-bot serv))
-  (core/route (core/extract-routes (vals @core/bots))))
+  (lazybot/route (lazybot/extract-routes (vals @lazybot/bots))))

src/lazybot/plugins/autoreply.clj

@@ -4,11 +4,11 @@
 
 (registry/defplugin
   (:hook
-   :on-message
-   (fn [{:keys [bot com message channel] :as com-m}]
-     (when-let [reply (first
-                       (for [[find replace]
-                             (get-in @bot [:config (:server @com) :autoreply :autoreplies channel])
-                             :when (re-find find message)]
-                         (s/replace message find replace)))]
-       (registry/send-message com-m reply)))))
+   :privmsg
+   (fn [{:keys [bot com message channel network] :as com-m}]
+     (let [autos (get-in @bot [:config network :autoreply :autoreplies channel])]
+       (when-let [reply (first
+                         (for [[find replace] autos
+                               :when (re-find find message)]
+                           (s/replace message find replace)))]
+         (registry/send-message com-m reply))))))

src/lazybot/plugins/clojure.clj

@@ -177,7 +177,7 @@
 
 (registry/defplugin
   (:hook
-   :on-message
+   :privmsg
    (fn [{:keys [com bot nick channel message] :as com-m}]
      (let [config (:config @bot)
            clj-config (:clojure config)

src/lazybot/plugins/debug.clj

@@ -1,5 +1,6 @@
 (ns lazybot.plugins.debug
   (:require [clojure.string :as string]
+            [clojure.pprint :as pprint]
             [lazybot.registry :as registry]
             [lazybot.plugins.login :refer [when-privs]]))
 
@@ -39,4 +40,4 @@
      (when (get-in @bot debug-keypath)
        (when-privs com-m :admin
         (let [code (string/join " " args)]
-          (println (str code " evaluates to:\n" (eval (read-string code))))))))))
+          (println (str code " evaluates to:\n" (pprint/pprint (eval (read-string code)))))))))))

src/lazybot/plugins/embedded.clj

@@ -3,11 +3,11 @@
 
 (registry/defplugin
   (:hook
-   :on-message
+   :privmsg
    (fn [{:keys [message bot] :as irc-map}]
-     (doseq [x (reverse (re-seq #"\$#(.*?)#\$" message))]
-       (->> x
-            second
-            (-> @bot :config :prepends first str)
-            (assoc irc-map :message)
-            registry/try-handle)))))
+     (doseq [command (reverse (re-seq #"\$#(.*?)#\$" message))]
+       (as-> command x
+             (second x)
+             (str (->  @bot :config :prepends first) x)
+             (assoc irc-map :message x)
+             (registry/try-handle x))))))

src/lazybot/plugins/github.clj

@@ -5,7 +5,6 @@
             [clojure.string :as s]
             [tentacles.issues :refer [specific-issue]]
             [useful.map :refer [update]]
-            [clojure.pprint :refer [pprint]]
             [cheshire.core :refer [parse-string]])
   (:import java.net.InetAddress))
 
@@ -105,13 +104,13 @@ specified in config.clj."
 (defplugin
   (:init
    (fn [com bot]
-     (swap! bots assoc (:server @com) {:com com :bot bot})))
+     (swap! bots assoc (:network @com) {:com com :bot bot})))
   (:routes (POST "/commits" req (handler req)))
 
   (:hook
-   :on-message
+   :privmsg
    (fn [{:keys [message nick bot com] :as com-m}]
-     (when-not ((get-in @bot [:config (:server @com) :user-blacklist]) nick)
+     (when-not ((get-in @bot [:config (:network @com) :user-blacklist]) nick)
        (doseq [issue (extract-issues message)]
          (when-let [message (issue-message (parse-issue issue))]
-           (send-message com-m message)))))))
+           (send-message com-m message)))))))

src/lazybot/plugins/grimoire.clj

@@ -0,0 +1,43 @@
+(ns lazybot.plugins.grimoire
+  (:require [grimoire.util :as util]
+            [lazybot.registry :refer [defplugin send-message]]))
+
+(def nss #{"clojure.core"
+           "clojure.core.protocols"
+           "clojure.core.reducers"
+           "clojure.data"
+           "clojure.edn"
+           "clojure.inspector"
+           "clojure.instant"
+           "clojure.java.browse"
+           "clojure.java.io"
+           "clojure.java.javadoc"
+           "clojure.java.shell"
+           "clojure.main"
+           "clojure.pprint"
+           "clojure.reflect"
+           "clojure.repl"
+           "clojure.set"
+           "clojure.stacktrace"
+           "clojure.string"
+           "clojure.template"
+           "clojure.test"
+           "clojure.test.junit"
+           "clojure.test.tap"
+           "clojure.uuid"
+           "clojure.walk"
+           "clojure.xml"
+           "clojure.zip"})
+
+(defplugin
+  (:cmd
+   "Print the Grimoire URL for a symbol"
+   #{"grim"}
+   (fn [{:keys [args] :as com-m}]
+     (let [sym      (first args)
+           [_ ns s] (re-matches #"(.*?)/(.*)" sym)]
+       (when (nss ns)
+         (send-message
+          com-m
+          (format "http://grimoire.arrdem.com/1.6.0/%s/%s"
+                  ns (util/munge s))))))))

src/lazybot/plugins/haskell.clj

@@ -55,4 +55,4 @@
   (:cmd
    "Gets the type of an expression via GHC's :t."
    #{"htype" "ht"}
-   (heval-cmd ghc-type)))
+   (heval-cmd ghc-type)))

src/lazybot/plugins/help.clj

@@ -59,8 +59,8 @@
             (not topic) (registry/send-message com-m "You're going to need to tell me what you want help with.")
             content (registry/send-message com-m (prefix nick (:content content)))
             :else (registry/send-message com-m (str "Topic: \"" topic "\" doesn't exist!"))))
-         (registry/send-message com-m (prefix  nick help-msg))))))
-  
+         (registry/send-message com-m (prefix nick help-msg))))))
+
   (:cmd
    "Lists the available help topics in the DB."
    #{"list"}