diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/feed.clj | 2 | ||||
| -rw-r--r-- | src/rooms.clj | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/feed.clj b/src/feed.clj index d192e9e..43ad077 100755 --- a/src/feed.clj +++ b/src/feed.clj @@ -89,7 +89,7 @@ WHERE NOT EXISTS (SELECT 1 [good bad time] (classify-images-from-feed feed) filtered-good (filter-posted-images good room-id)] (doseq [img filtered-good] - (println (format "Inserting %s into room-id %s" img room-key)) + (println (format "Inserting %s into %s from %s" img room-key feed)) (let [msg-id (insert-feed-image-to-db! room-id feed img bot-id) msg {:msg_id msg-id :nick bot-nick diff --git a/src/rooms.clj b/src/rooms.clj index 736a96e..5e1feb1 100644 --- a/src/rooms.clj +++ b/src/rooms.clj @@ -85,6 +85,7 @@ (alter (room :messages) (swap cons) msg)) (defn create-and-add-room! [key] + (println "Creating room " key) (do-select ["INSERT INTO rooms (key, name, description) VALUES (?, ?, ?) RETURNING room_id" key key key]) @@ -98,16 +99,18 @@ (:room_id (or (first (do-select ["SELECT room_id FROM rooms WHERE lower(key) = ?" (lower-case key)])) - (create-and-add-room!) + (create-and-add-room! key) (throw (Exception. (str "Unable to create room " key)))))) (defn- get-or-create-room-bot-id! [nick] ((comp :user_id first) (or (do-select ["SELECT user_id FROM users WHERE lower(nick) = ?" (lower-case nick)]) - (do-select ["INSERT INTO users (nick, hash, email) + (do + (do-select ["INSERT INTO users (nick, hash, email) VALUES (?, ?, ?) RETURNING user_id" - nick "GARBAGE" "info@dump.fm"])))) + nick "GARBAGE" "info@dump.fm"]) + (println "Creating bot " nick))))) (defn get-or-create-room-bot! [key] (let [nick (str "~" key)] |