Removed topic code

1 files changed, 8 insertions, 69 deletions

diff --git a/src/site.clj b/src/site.clj
index abf1446..eefbbc3 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -105,14 +105,9 @@
   (map process-user (vals @(room :users))))
 
 (defn updates [room since]
-  (let [m {"users"    (prepare-user-list room)
-           "messages" (map process-message-for-json
-                           (new-messages room since))}
-        topic @(room :topic)]
-    (if topic
-      (assoc m "topic" topic)
-      m)))
-
+  {"users"    (prepare-user-list room)
+   "messages" (map process-message-for-json
+                   (new-messages room since))})
 
 (defn count-messages-by-nick [nick image-only]
   (let [query (str "SELECT COUNT(*)
@@ -496,59 +491,6 @@ FROM   users u
     (resp-error "NO_USER")))
 
 
-;; Topics
-
-(defn valid-topic? [topic]
-  topic)
-
-(defn valid-deadline? [deadline]
-  deadline)
-
-(defn topic-map-from-room [r]
-  (let [topic (or @(r :topic) {})]
-    {"key"      (r :key)
-     "topic"    (topic :topic)
-     "deadline" (topic :deadline)
-     "maker"    (topic :maker)}))
-
-(defn validate-topic-list [session]
-  (if-vip
-   (let [st (fetch-template "topic_list" session)]
-     (.setAttribute st "rooms"
-                    (map topic-map-from-room (vals @rooms)))
-     (.toString st))))
-
-(defn set-topic! [room topic deadline maker]
-  (dosync (ref-set (room :topic) 
-                   {:topic    topic
-                    :deadline deadline
-                    :maker    maker})))
-
-(defn end-topic! [room]
-  (dosync (ref-set (room :topic) nil)))
-
-(defn validate-set-topic [session params]
-  (if-vip
-   (let [room     (lookup-room (params :room))
-         topic    (params :topic)
-         deadline (params :deadline)
-         maker    (params :maker)]
-     (cond (not (valid-topic? topic))       (resp-error "INVALID_TOPIC")
-           (not (valid-deadline? deadline)) (resp-error "INVALID_DEADLINE")
-           (not room)                       (resp-error "INVALID_ROOM")
-           (not maker)                      (resp-error "NOT_MAKER")
-           :else (do
-                   (set-topic! room topic deadline maker)
-                   (resp-success "OK"))))))
-
-(defn validate-end-topic [session params]
-  (if-vip
-   (if-let [room (lookup-room (params :room))]
-     (do
-       (end-topic! room)
-       (resp-success "OK"))
-     (resp-error "INVALID_ROOM"))))
-
 ;; Chat
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -602,16 +544,16 @@ FROM   users u
 
 (defn refresh [session params room]
   (dosync
-   (let [now (System/currentTimeMillis)
-         since (maybe-parse-long (params :since) now)
-         nick (session :nick)
-         users (room :users)]
+   (let [now      (System/currentTimeMillis)
+         since    (maybe-parse-long (params :since) now)
+         nick     (session :nick)
+         users    (room :users)]
      (if nick
        (if-let [user-info (@users nick)]
          ; Incorporate avatar updates
          (commute users assoc nick (merge user-info {:last-seen now
                                                      :avatar (session :avatar)}))
-         (commute (room :users) assoc nick (user-struct-from-session session))))
+         (commute users assoc nick (user-struct-from-session session))))
      (resp-success (assoc (updates room since) :timestamp now :v *chat-version-number*)))))
 
 (defn validated-refresh [session params]
@@ -1014,9 +956,6 @@ FROM   users u
   (POST "/msg" (validated-msg session params))
   (POST "/submit-registration" (register session params))
   (POST "/update-profile" (update-profile session params))
-  (GET "/topic-list" (validate-topic-list session))
-  (POST "/set-topic" (validate-set-topic session params))
-  (POST "/end-topic" (validate-end-topic session params))
   (GET "/directory" (directory session 0))
   (GET "/directory/:offset"
        (directory session (maybe-parse-int (params :offset) 0)))