The great configuration overhaul of 2020

config/sample.env

@@ -1,5 +1,6 @@
-# Sample env file, equivalent to config.sample.edn
+# vim: syntax=sh
 
+# Sample env file, equivalent to config.sample.edn
 YETIBOT_LOG_LEVEL="debug"
 
 # By default Yetibot uses the ! prefix to match commands.

src/yetibot/core/commands/karma.clj

@@ -22,7 +22,6 @@
 (s/def ::config any?)
 
 (def config (:value (get-config ::config [:karma])))
-
 (def pos-emoji (or (-> config :emoji :positive) ":rainbow:"))  ;; 🌈
 (def neg-emoji (or (-> config :emoji :negative) ":thunder_cloud_and_rain:"))  ;; ⛈
 
@@ -106,8 +105,10 @@
                                      reply-emoji user-id score)})))))))
 
 (cmd-hook
- "karma"
+ {:prefix
+  {"karma" #"karma"}
+  }
  #"^(?x) \s* @(\w[-\w]*\w) \s*$" get-score
-#"^(?x) \s* @(\w[-\w]*\w) \s{0,2} (--|\+\+) (?: \s+(.+) )? \s*$" adjust-score
+ #"^(?x) \s* @(\w[-\w]*\w) \s{0,2} (--|\+\+) (?: \s+(.+) )? \s*$" adjust-score
  #"all" get-all-high-scores
  _ get-high-scores)

src/yetibot/core/config.clj

@@ -1,6 +1,6 @@
 (ns yetibot.core.config
   "Config is made available via
-   [environ](https://github.com/weavejester/environ)"
+   environ: https://github.com/weavejester/environ"
   (:require [dec :refer [explode]]
             [clojure.string :refer [blank?]]
             [environ.core :refer [env]]

src/yetibot/core/hooks.clj

@@ -159,7 +159,6 @@
                                ;; else - just the pattern
                            {(str topic-and-pattern) topic-and-pattern})
         cmd-pairs (partition 2 cmds)]
-
     (run!
      (fn [[topic re-prefix]]
        (let [re-prefix (lockdown-prefix-regex re-prefix)]
@@ -182,18 +181,18 @@
   [prefix & cmds]
   (let [cmd-pairs (partition 2 cmds)]
     `(cmd-hook-resolved
-       ~prefix
-       ~@(mapcat (fn [[k# v#]]
-                   [(condp = k#
-                      '_ #".*"
-                      k#)
-                    ; Need to resolve the var in order to get at its docstring.
-                    ; This only applies to regular usage of cmd-hook. If using
-                    ; cmd-hook with unresolvable anonymous functions (such as in
-                    ; alias) the client must add the help metdata itself as
-                    ; cmd-hook cannot extract it.
-                    (if-let [resolved (resolve v#)] resolved v#)])
-                 cmd-pairs))))
+      ~prefix
+      ~@(mapcat (fn [[k# v#]]
+                  [(condp = k#
+                     '_ #".*"
+                     k#)
+                   ; Need to resolve the var in order to get at its docstring.
+                   ; This only applies to regular usage of cmd-hook. If using
+                   ; cmd-hook with unresolvable anonymous functions (such as in
+                   ; alias) the client must add the help metdata itself as
+                   ; cmd-hook cannot extract it.
+                   (if-let [resolved (resolve v#)] resolved v#)])
+                cmd-pairs))))
 
 ;; TODO make obs-hooks reloadable - maybe each one should have some metadata
 ;; like name and description of intent assocaited with it?

src/yetibot/core/models/channel.clj

@@ -38,7 +38,6 @@
   [uuid channel]
   (let [results (db/query {:where/map {:chat-source-adapter (pr-str uuid)
                                        :chat-source-channel channel}})]
-
     (->> results
          (map (fn [{:keys [key value]}]
                 [key