Skip to content

Commit

Permalink
Mass rename sexpbot=>lazybot
Browse files Browse the repository at this point in the history
  • Loading branch information
amalloy committed Jul 15, 2011
1 parent 0d3605f commit 6d5c431
Show file tree
Hide file tree
Showing 52 changed files with 151 additions and 151 deletions.
2 changes: 1 addition & 1 deletion .sexpbot/info.clj
Expand Up @@ -16,7 +16,7 @@
"#clojure" [","]} ; let clojurebot have this one "#clojure" [","]} ; let clojurebot have this one
:servers-port 8080 ; port for plugins that require webserver :servers-port 8080 ; port for plugins that require webserver
"irc.freenode.net" {:channels ["#tempchan"] "irc.freenode.net" {:channels ["#tempchan"]
:bot-name "sexpbot-test" :bot-name "lazybot-test"
:bot-password nil :bot-password nil
:users {"JohnDoe" {:pass "iliekpie", :privs :admin} :users {"JohnDoe" {:pass "iliekpie", :privs :admin}
"JaneDoe" {:pass "ohai", :privs :admin}} "JaneDoe" {:pass "ohai", :privs :admin}}
Expand Down
26 changes: 13 additions & 13 deletions README.markdown
@@ -1,31 +1,31 @@
# sexpbot # lazybot


[sexpbot](http://github.com/Raynes/sexpbot) is an IRC bot written in Clojure. Under the hood, it uses [irclj](http://github.com/Raynes/irclj) for talking to IRC. The bot is highly extensible via plugins. Plugins are written in Clojure, using a lightweight DSL. There are already plugins for tons of stuff, including Haskell and Clojure code evaluation, googling, and using the bot as an operator bot. You can view all of the plugins in src/sexpbot/plugins. [lazybot](http://github.com/Raynes/lazybot) is an IRC bot written in Clojure. Under the hood, it uses [irclj](http://github.com/Raynes/irclj) for talking to IRC. The bot is highly extensible via plugins. Plugins are written in Clojure, using a lightweight DSL. There are already plugins for tons of stuff, including Haskell and Clojure code evaluation, googling, and using the bot as an operator bot. You can view all of the plugins in src/lazybot/plugins.


The project aims to create what will eventually be a user-friendly and powerful IRC bot. Whereas clojurebot is mostly aimed at providing helpful services in the #clojure IRC channel, sexpbot is focused on being generally useful to people who aren't Clojurians. However, sexpbot also provides Clojure code evaluation, and is used by some Clojurians in their respective IRC channels primarily for that purpose. The project aims to create what will eventually be a user-friendly and powerful IRC bot. Whereas clojurebot is mostly aimed at providing helpful services in the #clojure IRC channel, lazybot is focused on being generally useful to people who aren't Clojurians. However, lazybot also provides Clojure code evaluation, and is used by some Clojurians in their respective IRC channels primarily for that purpose.


## Usage ## Usage


Several of this bot's plugins require that you have MongoDB installed and running. The core plugins that currently do are mail, whatis, macro, seen, help, fortune and karma. You can find some quickstart guides for setting up MongoDB here: http://www.mongodb.org/display/DOCS/Quickstart. It's usually pretty painless and fast. Several of this bot's plugins require that you have MongoDB installed and running. The core plugins that currently do are mail, whatis, macro, seen, help, fortune and karma. You can find some quickstart guides for setting up MongoDB here: http://www.mongodb.org/display/DOCS/Quickstart. It's usually pretty painless and fast.


As for what OSes this bot actually runs on: I have no clue. I've seen it run on several Ubuntu distros, but nobody (that I know of) has yet to venture into the world of sexpbot-on-windows or mac. If you do, please let me know how it goes. As for what OSes this bot actually runs on: I have no clue. I've seen it run on several Ubuntu distros, but nobody (that I know of) has yet to venture into the world of lazybot-on-windows or mac. If you do, please let me know how it goes.


Right now, there are no distributions, so the easiest way to run the bot is to clone the repository. Install leiningen or cake and do 'lein deps' or 'cake deps' to install the project's dependencies into the lib/ directory. Additionally, you will need MongoDB installed (in some future version, this will be an optional dependency). Edit .sexpbot/info.clj to put the servers and other information the bot needs to have in there, get MongoDB running, and then run ./sexpbot. After you run the bot the first time, you'll have to edit configuration in ~/.sexpbot/info.clj (the .sexpbot directory is copied to your home directory the first time). Right now, there are no distributions, so the easiest way to run the bot is to clone the repository. Install leiningen or cake and do 'lein deps' or 'cake deps' to install the project's dependencies into the lib/ directory. 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).


You can also run `lein uberjar` or `cake 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. You can also run `lein uberjar` or `cake 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.


Sexpbot has some basic background functionality. In order to use it, you must have sexpbot uberjar'd. Create a file with any name. This will be your log file, where all the output from the bot is put. Next, rename sexpbot-<version>-standalone.jar to sexpbot.jar (this step will become unnecessary soon). After that, run `java -jar sexpbot.jar --background --logpath /path/to/your/logfile`. sexpbot will then start up and pump logs into the log file. Note however that this is NOT daemon functionality. If you start the bot this way, in order to kill him, you'll have to use the admin-only `die` command from the utils plugin, or look up the process id and kill him the low-level way. I may add full daemon functionality eventually, but this will suffice for now. Sexpbot has some basic background functionality. In order to use it, you must have lazybot uberjar'd. Create a file with any name. This will be your log file, where all the output from the bot is put. Next, rename lazybot-<version>-standalone.jar to lazybot.jar (this step will become unnecessary soon). After that, run `java -jar lazybot.jar --background --logpath /path/to/your/logfile`. lazybot will then start up and pump logs into the log file. Note however that this is NOT daemon functionality. If you start the bot this way, in order to kill him, you'll have to use the admin-only `die` command from the utils plugin, or look up the process id and kill him the low-level way. I may add full daemon functionality eventually, but this will suffice for now.


**IMPORTANT: If you load the clojure plugin, you must rename and move "example.policy" to "~/.java.policy" to avoid some troublesome security errors!** **IMPORTANT: If you load the clojure plugin, you must rename and move "example.policy" to "~/.java.policy" to avoid some troublesome security errors!**




## Commands ## Commands


The current list of commands is maintained at [https://github.com/Raynes/sexpbot/wiki/Commands](), and you can find help on any particular command with $help <command> (eg $help fcst). The current list of commands is maintained at [https://github.com/Raynes/lazybot/wiki/Commands](), and you can find help on any particular command with $help <command> (eg $help fcst).


## Development ## Development


Contributions to sexpbot are welcome, most often in the form of new plugins. If you have a great idea for something sexpbot could do that would be useful or neat, don't just sit on it: Write a plugin, and send a pull request! But before you get started, take a look at [our plugin policy][before-plugin] and the [plugin quick-start guide][plugin-guide]. If you want to see how much work it takes to write a plugin, take a look at a couple plugins added by developers not on the core team: Contributions to lazybot are welcome, most often in the form of new plugins. If you have a great idea for something lazybot could do that would be useful or neat, don't just sit on it: Write a plugin, and send a pull request! But before you get started, take a look at [our plugin policy][before-plugin] and the [plugin quick-start guide][plugin-guide]. If you want to see how much work it takes to write a plugin, take a look at a couple plugins added by developers not on the core team:


* [$tell][], an improvement to $whatis from [ghoseb][] * [$tell][], an improvement to $whatis from [ghoseb][]


Expand All @@ -36,16 +36,16 @@ Contributions to sexpbot are welcome, most often in the form of new plugins. If
Licensed under the same thing Clojure is licensed under, [the EPL](http://www.eclipse.org/legal/epl-v10.html). You can find a copy in the root of this directory. Licensed under the same thing Clojure is licensed under, [the EPL](http://www.eclipse.org/legal/epl-v10.html). You can find a copy in the root of this directory.




[before-plugin]: https://github.com/Raynes/sexpbot/wiki/Read-this-before-writing-your-plugin [before-plugin]: https://github.com/Raynes/lazybot/wiki/Read-this-before-writing-your-plugin
[plugin-guide]: https://github.com/Raynes/sexpbot/wiki/Plugin-quick-start-guide [plugin-guide]: https://github.com/Raynes/lazybot/wiki/Plugin-quick-start-guide
[$findfn]: https://github.com/Raynes/sexpbot/compare/544566f7ee740731ca69...da4fcae5f3afe6cc9e6c [$findfn]: https://github.com/Raynes/lazybot/compare/544566f7ee740731ca69...da4fcae5f3afe6cc9e6c
[$tell]: https://github.com/Raynes/sexpbot/commit/b94c36c52271766c07de9f6bfb7c4d2a429ba498 [$tell]: https://github.com/Raynes/lazybot/commit/b94c36c52271766c07de9f6bfb7c4d2a429ba498
[ghoseb]: https://github.com/ghoseb [ghoseb]: https://github.com/ghoseb
[jColeChanged]: https://github.com/jColeChanged [jColeChanged]: https://github.com/jColeChanged


## Contributors ## Contributors


These are people who have contributed to sexpbot since the beginning. These may not all be active contributors. Even one-off contributors will be added to this list. These are people who have contributed to lazybot since the beginning. These may not all be active contributors. Even one-off contributors will be added to this list.


* Anthony Grimes ([Raynes](https://github.com/Raynes)) * Anthony Grimes ([Raynes](https://github.com/Raynes))
* Alan Malloy ([amalloy](https://github.com/amalloy)) * Alan Malloy ([amalloy](https://github.com/amalloy))
Expand Down
6 changes: 3 additions & 3 deletions project.clj
@@ -1,4 +1,4 @@
(defproject sexpbot "0.6.2" (defproject lazybot "0.6.2"
:description "FIXME: write" :description "FIXME: write"
:dependencies [[org.clojure/clojure "1.2.0"] :dependencies [[org.clojure/clojure "1.2.0"]
[org.clojure/clojure-contrib "1.2.0"] [org.clojure/clojure-contrib "1.2.0"]
Expand All @@ -21,6 +21,6 @@
[fnparse "2.2.7"] [fnparse "2.2.7"]
[amalloy/utils "[0.3.6,)"]] [amalloy/utils "[0.3.6,)"]]
:dev-dependencies [[swank-clojure "1.2.1"]] :dev-dependencies [[swank-clojure "1.2.1"]]
:uberjar-name "sexpbot" :uberjar-name "lazybot"
:main sexpbot.run :main lazybot.run
:resources-path "resource") :resources-path "resource")
2 changes: 1 addition & 1 deletion sexpbot
@@ -1 +1 @@
java -cp lib/*:src/:resource clojure.main -e "(use 'sexpbot.run) (-main)" java -cp lib/*:src/:resource clojure.main -e "(use 'lazybot.run) (-main)"
2 changes: 1 addition & 1 deletion sexpbot-opt
@@ -1 +1 @@
java -XX:ReservedCodeCacheSize=6m -Xms10m -Xmx120m -cp lib/*:src/ clojure.main -e "(use 'sexpbot.run) (-main)" java -XX:ReservedCodeCacheSize=6m -Xms10m -Xmx120m -cp lib/*:src/ clojure.main -e "(use 'lazybot.run) (-main)"
20 changes: 10 additions & 10 deletions src/sexpbot/core.clj
@@ -1,5 +1,5 @@
(ns sexpbot.core (ns lazybot.core
(:use [sexpbot registry info] (:use [lazybot registry info]
[clj-config.core :only [read-config]] [clj-config.core :only [read-config]]
[clojure.stacktrace :only [root-cause]] [clojure.stacktrace :only [root-cause]]
[somnium.congomongo :only [mongo!]] [somnium.congomongo :only [mongo!]]
Expand All @@ -13,7 +13,7 @@
(defonce initial-info (eval (read-config info-file))) (defonce initial-info (eval (read-config info-file)))


(try (try
(mongo! :db (or (:db initial-info) "sexpbot")) (mongo! :db (or (:db initial-info) "lazybot"))
(catch Throwable e (catch Throwable e
(println "Error starting mongo (see below), carrying on without it") (println "Error starting mongo (see below), carrying on without it")
(.printStackTrace e *out*))) (.printStackTrace e *out*)))
Expand All @@ -35,10 +35,10 @@
(alter bot assoc :config (eval (read-config info-file)))) (alter bot assoc :config (eval (read-config info-file))))


(defn require-plugin [plugin] (defn require-plugin [plugin]
(require (symbol (str "sexpbot.plugins." plugin)) :reload)) (require (symbol (str "lazybot.plugins." plugin)) :reload))


(defn load-plugin [irc refzors plugin] (defn load-plugin [irc refzors plugin]
((resolve (symbol (str "sexpbot.plugins." plugin "/load-this-plugin"))) irc refzors)) ((resolve (symbol (str "lazybot.plugins." plugin "/load-this-plugin"))) irc refzors))


(defn require-plugins [] (defn require-plugins []
(doseq [plug ((eval (read-config info-file)) :plugins)] (doseq [plug ((eval (read-config info-file)) :plugins)]
Expand Down Expand Up @@ -74,17 +74,17 @@
(def sroutes nil) (def sroutes nil)


(defn route [rs] (defn route [rs]
(alter-var-root #'sexpbot.core/sroutes (constantly (apply routes rs)))) (alter-var-root #'lazybot.core/sroutes (constantly (apply routes rs))))


(defn reload-all (defn reload-all
"A clever function to reload everything when running sexpbot from SLIME. "A clever function to reload everything when running lazybot from SLIME.
Do not try to reload anything individually. It doesn't work because of the nature Do not try to reload anything individually. It doesn't work because of the nature
of plugins. This makes sure everything is reset to the way it was of plugins. This makes sure everything is reset to the way it was
when the bot was first loaded." when the bot was first loaded."
[& bots] [& bots]
(require 'sexpbot.registry :reload) (require 'lazybot.registry :reload)
(require 'sexpbot.utilities :reload) (require 'lazybot.utilities :reload)
(require 'sexpbot.twitter :reload) (require 'lazybot.twitter :reload)
(require-plugins) (require-plugins)
(route (extract-routes bots)) (route (extract-routes bots))
(doseq [{:keys [com bot]} bots] (doseq [{:keys [com bot]} bots]
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/gist.clj
@@ -1,6 +1,6 @@
(ns sexpbot.gist (ns lazybot.gist
(:use [clj-github.gists :only [new-gist]] (:use [clj-github.gists :only [new-gist]]
[sexpbot.utilities :only [trim-string]]) [lazybot.utilities :only [trim-string]])
(:require [clojure.contrib.string :as string]) (:require [clojure.contrib.string :as string])
(:import [java.io IOException])) (:import [java.io IOException]))


Expand Down
6 changes: 3 additions & 3 deletions src/sexpbot/info.clj
@@ -1,9 +1,9 @@
(ns sexpbot.info (ns lazybot.info
(:import java.io.File (:import java.io.File
org.apache.commons.io.FileUtils)) org.apache.commons.io.FileUtils))


(def sexpdir (File. (str (System/getProperty "user.home") "/.sexpbot" ))) (def sexpdir (File. (str (System/getProperty "user.home") "/.lazybot" )))
(def info-file (str sexpdir "/info.clj")) (def info-file (str sexpdir "/info.clj"))


(when-not (.exists sexpdir) (when-not (.exists sexpdir)
(FileUtils/copyDirectory (File. (str (System/getProperty "user.dir") "/.sexpbot")) sexpdir)) (FileUtils/copyDirectory (File. (str (System/getProperty "user.dir") "/.lazybot")) sexpdir))
4 changes: 2 additions & 2 deletions src/sexpbot/irc.clj
@@ -1,5 +1,5 @@
(ns sexpbot.irc (ns lazybot.irc
(:use [sexpbot core info] (:use [lazybot core info]
[clj-config.core :only [read-config]] [clj-config.core :only [read-config]]
[amalloy.utils :only [decorate keywordize]]) [amalloy.utils :only [decorate keywordize]])
(:require [irclj.core :as ircb])) (:require [irclj.core :as ircb]))
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/brainfuck.clj
@@ -1,5 +1,5 @@
(ns sexpbot.plugins.brainfuck (ns lazybot.plugins.brainfuck
(:use sexpbot.registry)) (:use lazybot.registry))
;;; From Rosettacode ;;; ;;; From Rosettacode ;;;
(def *input*) (def *input*)


Expand Down
10 changes: 5 additions & 5 deletions src/sexpbot/plugins/clojure.clj
@@ -1,11 +1,11 @@
(ns sexpbot.plugins.clojure (ns lazybot.plugins.clojure
(:use clojure.stacktrace (:use clojure.stacktrace
(clojail testers core) (clojail testers core)
sexpbot.registry lazybot.registry
clojure.contrib.logging clojure.contrib.logging
[sexpbot.utilities :only [on-thread]] [lazybot.utilities :only [on-thread]]
[sexpbot.plugins.shorturl :only [is-gd]] [lazybot.plugins.shorturl :only [is-gd]]
[sexpbot.gist :only [trim-with-gist]] [lazybot.gist :only [trim-with-gist]]
[name.choi.joshua.fnparse :only [rule-match term failpoint alt complex rep*]] [name.choi.joshua.fnparse :only [rule-match term failpoint alt complex rep*]]
[amalloy.utils :only [verify]] [amalloy.utils :only [verify]]
(amalloy.utils [transform :only [transform-if]] (amalloy.utils [transform :only [transform-if]]
Expand Down
6 changes: 3 additions & 3 deletions src/sexpbot/plugins/debug.clj
@@ -1,6 +1,6 @@
(ns sexpbot.plugins.debug (ns lazybot.plugins.debug
(:use sexpbot.registry (:use lazybot.registry
[sexpbot.plugins.login :only [when-privs]]) [lazybot.plugins.login :only [when-privs]])
(:require [clojure.string :as string])) (:require [clojure.string :as string]))


(defn get-mode [old-mode user-arg] (defn get-mode [old-mode user-arg]
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/dictionary.clj
@@ -1,5 +1,5 @@
(ns sexpbot.plugins.dictionary (ns lazybot.plugins.dictionary
(:use [sexpbot registry] (:use [lazybot registry]
[clojure-http.client :only [add-query-params]] [clojure-http.client :only [add-query-params]]
[clojure.contrib.json :only [read-json]]) [clojure.contrib.json :only [read-json]])
(:require [clojure-http.resourcefully :as res]) (:require [clojure-http.resourcefully :as res])
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/eball.clj
@@ -1,5 +1,5 @@
(ns sexpbot.plugins.eball (ns lazybot.plugins.eball
(:use [sexpbot registry])) (:use [lazybot registry]))


(def responses (def responses
["As I see it, yes." ["As I see it, yes."
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/embedded.clj
@@ -1,5 +1,5 @@
(ns sexpbot.plugins.embedded (ns lazybot.plugins.embedded
(:use [sexpbot registry])) (:use [lazybot registry]))


(defplugin :irc (defplugin :irc
(:hook (:hook
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/fortune.clj
@@ -1,7 +1,7 @@
; Written by Programble <programble@gmail.com> ; Written by Programble <programble@gmail.com>
; Licensed under the EPL ; Licensed under the EPL
(ns sexpbot.plugins.fortune (ns lazybot.plugins.fortune
(:use [sexpbot registry info] (:use [lazybot registry info]
[somnium.congomongo :only [fetch fetch-one insert! destroy!]])) [somnium.congomongo :only [fetch fetch-one insert! destroy!]]))


(defplugin (defplugin
Expand Down
6 changes: 3 additions & 3 deletions src/sexpbot/plugins/github.clj
@@ -1,6 +1,6 @@
(ns sexpbot.plugins.github (ns lazybot.plugins.github
(:use sexpbot.registry (:use lazybot.registry
[sexpbot.plugins.shorturl :only [is-gd]] [lazybot.plugins.shorturl :only [is-gd]]
[compojure.core :only [POST]] [compojure.core :only [POST]]
clojure.contrib.json) clojure.contrib.json)
(:require [clojure.contrib.string :as s]) (:require [clojure.contrib.string :as s])
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/google.clj
@@ -1,5 +1,5 @@
(ns sexpbot.plugins.google (ns lazybot.plugins.google
(:use [sexpbot registry [utilities :only [trim-string]]] (:use [lazybot registry [utilities :only [trim-string]]]
[clojure-http.client :only [add-query-params]] [clojure-http.client :only [add-query-params]]
[clojure.contrib.json :only [read-json]]) [clojure.contrib.json :only [read-json]])
(:require [clojure-http.resourcefully :as res] (:require [clojure-http.resourcefully :as res]
Expand Down
6 changes: 3 additions & 3 deletions src/sexpbot/plugins/haskell.clj
@@ -1,9 +1,9 @@
(ns sexpbot.plugins.haskell (ns lazybot.plugins.haskell
(:use [sexpbot registry] (:use [lazybot registry]
[clojure.contrib.json :only [read-json]] [clojure.contrib.json :only [read-json]]
[clojure-http.client :only [add-query-params]] [clojure-http.client :only [add-query-params]]
[clojure.java.shell :only [sh]] [clojure.java.shell :only [sh]]
[sexpbot.gist :only [trim-with-gist]]) [lazybot.gist :only [trim-with-gist]])
(:require [clojure-http.resourcefully :as res])) (:require [clojure-http.resourcefully :as res]))


(def tryurl "http://tryhaskell.org/haskell.json") (def tryurl "http://tryhaskell.org/haskell.json")
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/hello_world.clj
@@ -1,5 +1,5 @@
(ns sexpbot.plugins.hello-world (ns lazybot.plugins.hello-world
(:use sexpbot.registry)) (:use lazybot.registry))


(defplugin (defplugin
(:cmd (:cmd
Expand Down
6 changes: 3 additions & 3 deletions src/sexpbot/plugins/help.clj
@@ -1,7 +1,7 @@
;; Written by Erik (boredomist) ;; Written by Erik (boredomist)
(ns sexpbot.plugins.help (ns lazybot.plugins.help
(:use [sexpbot registry info] (:use [lazybot registry info]
[sexpbot.plugins.login :only [when-privs]] [lazybot.plugins.login :only [when-privs]]
[clojure.string :only [join]] [clojure.string :only [join]]
[somnium.congomongo :only [fetch fetch-one insert! destroy!]])) [somnium.congomongo :only [fetch fetch-one insert! destroy!]]))


Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/javadoc.clj
@@ -1,5 +1,5 @@
(ns sexpbot.plugins.javadoc (ns lazybot.plugins.javadoc
(:use sexpbot.registry) (:use lazybot.registry)
(:require [clojure.string :as s])) (:require [clojure.string :as s]))


(def ^{:dynamic true} (def ^{:dynamic true}
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/karma.clj
@@ -1,8 +1,8 @@
; Written by Michael D. Ivey <ivey@gweezlebur.com> ; Written by Michael D. Ivey <ivey@gweezlebur.com>
; Licensed under the EPL ; Licensed under the EPL


(ns sexpbot.plugins.karma (ns lazybot.plugins.karma
(:use [sexpbot registry info] (:use [lazybot registry info]
[amalloy.utils :only [keywordize]] [amalloy.utils :only [keywordize]]
[somnium.congomongo :only [fetch-one insert! destroy!]])) [somnium.congomongo :only [fetch-one insert! destroy!]]))


Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/leet.clj
@@ -1,5 +1,5 @@
(ns sexpbot.plugins.leet (ns lazybot.plugins.leet
(:use sexpbot.registry)) (:use lazybot.registry))


(defn char-to-leet [c] (defn char-to-leet [c]
(condp = c (condp = c
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/lmgtfy.clj
@@ -1,5 +1,5 @@
(ns sexpbot.plugins.lmgtfy (ns lazybot.plugins.lmgtfy
(:use [sexpbot registry])) (:use [lazybot registry]))


(defn create-url [args] (defn create-url [args]
(str "http://www.lmgtfy.com/?q=" (apply str (interpose "+" args)))) (str "http://www.lmgtfy.com/?q=" (apply str (interpose "+" args))))
Expand Down
6 changes: 3 additions & 3 deletions src/sexpbot/plugins/load.clj
@@ -1,6 +1,6 @@
(ns sexpbot.plugins.load (ns lazybot.plugins.load
(:use [sexpbot registry core irc] (:use [lazybot registry core irc]
[sexpbot.plugins.login :only [when-privs]])) [lazybot.plugins.login :only [when-privs]]))


(defplugin (defplugin
(:cmd (:cmd
Expand Down
8 changes: 4 additions & 4 deletions src/sexpbot/plugins/log.clj
@@ -1,13 +1,13 @@
(ns sexpbot.plugins.log (ns lazybot.plugins.log
(:use (sexpbot registry utilities) (:use (lazybot registry utilities)
[sexpbot.plugins.login :only [when-privs]] [lazybot.plugins.login :only [when-privs]]
clojure.contrib.logging) clojure.contrib.logging)
(:import [org.apache.log4j Level])) (:import [org.apache.log4j Level]))


(defn str->package [s] (defn str->package [s]
(if (not= (.indexOf s ".") -1) (if (not= (.indexOf s ".") -1)
s s
(str "sexpbot.plugins." s))) (str "lazybot.plugins." s)))


(defn all-loaded-plugins [bot] (defn all-loaded-plugins [bot]
(let [module-list (-> bot :modules keys)] (let [module-list (-> bot :modules keys)]
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/logger.clj
@@ -1,5 +1,5 @@
(ns sexpbot.plugins.logger (ns lazybot.plugins.logger
(:use [sexpbot registry] (:use [lazybot registry]
[clj-time.core :only [now from-time-zone time-zone-for-offset]] [clj-time.core :only [now from-time-zone time-zone-for-offset]]
[clj-time.format :only [unparse formatters]] [clj-time.format :only [unparse formatters]]
[clojure.java.io :only [file]]) [clojure.java.io :only [file]])
Expand Down
4 changes: 2 additions & 2 deletions src/sexpbot/plugins/login.clj
@@ -1,5 +1,5 @@
(ns sexpbot.plugins.login (ns lazybot.plugins.login
(:use [sexpbot registry])) (:use [lazybot registry]))


(defn logged-in [bot] (defn logged-in [bot]
(or (:logged-in bot) (or (:logged-in bot)
Expand Down
6 changes: 3 additions & 3 deletions src/sexpbot/plugins/macro.clj
@@ -1,6 +1,6 @@
(ns sexpbot.plugins.macro (ns lazybot.plugins.macro
(:use [sexpbot registry info] (:use [lazybot registry info]
[sexpbot.plugins.login :only [when-privs]] [lazybot.plugins.login :only [when-privs]]
clj-config.core clj-config.core
[somnium.congomongo :only [fetch fetch-one insert! destroy!]])) [somnium.congomongo :only [fetch fetch-one insert! destroy!]]))


Expand Down
6 changes: 3 additions & 3 deletions src/sexpbot/plugins/mail.clj
@@ -1,7 +1,7 @@
(ns sexpbot.plugins.mail (ns lazybot.plugins.mail
(:refer-clojure :exclude [extend]) (:refer-clojure :exclude [extend])
(:use [sexpbot registry info] (:use [lazybot registry info]
[sexpbot.plugins.login :only [when-privs]] [lazybot.plugins.login :only [when-privs]]
[clj-time core format] [clj-time core format]
[somnium.congomongo :only [fetch fetch-one insert! destroy!]])) [somnium.congomongo :only [fetch fetch-one insert! destroy!]]))


Expand Down

0 comments on commit 6d5c431

Please sign in to comment.