diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rooms.clj | 2 | ||||
| -rw-r--r-- | src/site.clj | 12 | ||||
| -rwxr-xr-x | src/utils.clj | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/rooms.clj b/src/rooms.clj index dd02219..c1b596b 100644 --- a/src/rooms.clj +++ b/src/rooms.clj @@ -36,7 +36,7 @@ (= (lower-case key) *default-room*)) (defn lookup-room [key] - (@rooms (lower-case key))) + (and key (@rooms (lower-case key)))) (defn fetch-room [key] (first (do-select ["SELECT * FROM rooms WHERE key = LOWER(?) AND active" key]))) diff --git a/src/site.clj b/src/site.clj index 8596021..a476638 100644 --- a/src/site.clj +++ b/src/site.clj @@ -497,10 +497,9 @@ FROM users u (def *chat-version-number* 1) (defn validate-room-access [room-key session] - (let [room (lookup-room room-key)] - (and room - (or (not (room :admin_only)) - (is-vip? session))))) + (if-let [room (lookup-room room-key)] + (or (not (room :admin_only)) + (is-vip? session)))) (defn chat [session room template] (let [now (System/currentTimeMillis) @@ -780,7 +779,6 @@ FROM users u avatar (:avatar user-info) url (str nick "/favorites") page-title (str nick "'s favorites")] - (println user-info) (tagged-dumps-template session params "favorite" url page-title :tag-user-id user-id :avatar avatar))) (defn json-favorites [session params] @@ -990,6 +988,7 @@ FROM users u (GET "/u/:nick/:offset" (profile session (params :nick) (params :offset))) (GET "/p/:nick/:postid" (single-message session (params :nick) (params :postid))) + ;; TODO: these shouldn't be GETs (GET "/login" (login session params cookies)) (GET "/logout" (logout session)) (GET "/register" (serve-static "static" "register.html")) @@ -1112,4 +1111,5 @@ FROM users u (start-user-flusher!) (start-session-pruner!) ;(start! feed-downloader) - (start! feed-inserter) +(start! feed-inserter) + diff --git a/src/utils.clj b/src/utils.clj index b0941f6..3f1a7b1 100755 --- a/src/utils.clj +++ b/src/utils.clj @@ -224,6 +224,7 @@ (defn url-decode [text] (URLDecoder/decode text "UTF-8")) +; TODO: this duplicates str-utils, should be removed (defn #^String lower-case "Converts string to all lower-case." [#^String s] |