From d3925e5540fd5a9fd3812cbf1d07201c43527686 Mon Sep 17 00:00:00 2001
From: Scott Ostler <scottbot9000@gmail.com>
Date: Sun, 8 Aug 2010 23:24:45 -0400
Subject: Add routes for stickers, dis-register, increase message posting
 timeout

---
 docs/reserved_nicks.txt | 3 +++
 src/site.clj            | 7 +++++--
 static/js/pichat.js     | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/reserved_nicks.txt b/docs/reserved_nicks.txt
index d7aad5b..fa016a0 100644
--- a/docs/reserved_nicks.txt
+++ b/docs/reserved_nicks.txt
@@ -17,6 +17,7 @@ cmd
 debug
 developers
 directory
+dis-register
 dump
 dumpfm
 error
@@ -69,6 +70,8 @@ room
 rooms
 search
 shop
+stickers
+swag
 tag
 tags
 team
diff --git a/src/site.clj b/src/site.clj
index 20bbf62..ba21fd4 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -1160,7 +1160,8 @@ order by count desc limit ? offset ?")
   ;; TODO: these shouldn't be GETs
   (GET "/login" (login session params cookies request))
   (GET "/logout" (logout session))
-  (GET "/register" (serve-static "static" "register.html"))
+  (GET "/register" (serve-static "static" "registerdis.html"))
+  (GET "/dis-register" (serve-static "static" "register.html"))
   (GET "/browser" (browser session))
   (GET "/refresh" (validated-refresh session params))
   (GET "/tag/:tag" (tagged-dumps session params (request-url request)))
@@ -1195,8 +1196,10 @@ order by count desc limit ? offset ?")
 
   ;; Memes
   (GET "/m/:m" (serve-meme session (params :m)))
-
   (GET "/hall" (hall-of-fame session))
+
+  ;; Store
+  (GET "/stickers" (serve-static "static" "sticker.html"))
   
   ;; Footer pages
   (GET "/about_us" (serve-template "about_us" session))
diff --git a/static/js/pichat.js b/static/js/pichat.js
index d81e5c6..aebe14e 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -365,7 +365,7 @@ function submitMessage() {
 
     $.ajax({
         type: 'POST',
-        timeout: 5000,
+        timeout: 15000,
         url: '/msg',
         data: { 'room': Room, 'content': content },
         cache: false,
-- 
cgit v1.2.3-70-g09d2