sha256, move query language selection to client

matthiasn · matthiasn · commit f225def027ee · 2014-09-01T00:24:52.000+02:00
diff --git a/Clojure-Websockets/project.clj b/Clojure-Websockets/project.clj
@@ -12,14 +12,13 @@
                  [com.taoensso/sente "0.15.1" :exclusions [org.clojure/clojure]]
                  [http-kit "2.1.18"]
                  [compojure "1.1.8"]
-                 [ring "1.3.0"]
+                 [ring "1.3.1"]
                  [ring/ring-defaults "0.1.1"]
                  [clj-time "0.8.0"]
-
+                 [pandect "0.3.4"]
                  [org.clojure/clojurescript "0.0-2268"]
                  [tailrecursion/cljs-priority-map "1.1.0"]
-                 [om "0.7.1"]
-                 ]
+                 [om "0.7.1"]]
 
   :source-paths ["src/clj/"]
 
@@ -47,7 +46,6 @@
 
                                    ;:preamble ["react/react.min.js"]
                                    :externs ["externs/react.js" "externs/misc.js"]
-
                                    }}
                        {:id "test"
                         :source-paths ["src/cljs" "test/cljs"]
@@ -60,5 +58,4 @@
               :test-commands {"unit-tests" ["phantomjs" :runner
                                             "js/react.min.js"
                                             "js/moment.min.js"
-                                            "test-out/cljs_om.js"]}}
-  )
+                                            "test-out/cljs_om.js"]}})
diff --git a/Clojure-Websockets/src/clj/birdwatch/main.clj b/Clojure-Websockets/src/clj/birdwatch/main.clj
@@ -16,6 +16,7 @@
    [twitter-streaming-client.core :as client]
 
    [clj-time.core :as t]
+   [pandect.core :refer [sha256]]
 
    [org.httpkit.server :as http-kit-server]
    [ring.middleware.defaults]
@@ -41,7 +42,10 @@
                                    (:user-access-token twitter-conf) (:user-access-token-secret twitter-conf)))
 
 (let [{:keys [ch-recv send-fn ajax-post-fn ajax-get-or-ws-handshake-fn connected-uids]}
-      (sente/make-channel-socket! {:user-id-fn (fn [req] (let [uid (str (java.util.UUID/randomUUID))] (log/info "Connected:" (:remote-addr req) uid) uid))})]
+      (sente/make-channel-socket! {:user-id-fn (fn [req]
+                                                 (let [uid (str (java.util.UUID/randomUUID))]
+                                                   (log/info "Connected:" (:remote-addr req) uid)
+                                                   uid))})]
   (def ring-ajax-post                ajax-post-fn)
   (def ring-ajax-get-or-ws-handshake ajax-get-or-ws-handshake-fn)
   (def ch-chsk                       ch-recv) ; ChannelSocket's receive channel
@@ -51,18 +55,20 @@
 
 (defn query [params]
   (let [conn (esr/connect (:es-address twitter-conf))
+        q (:query params)
         res  (esd/search conn (:es-index twitter-conf)
                          "tweet"
                          :query {:query_string {:default_field "text"
                                                 :default_operator "AND"
-                                                :query (str "("(:query params)") AND lang:en")}}
+                                                :query q}}
                          :size (:n params)
                          :from (:from params)
                          :sort {:id "desc"}
                          )
         n    (esrsp/total-hits res)
         hits (esrsp/hits-from res)]
     (log/info "Total hits:" n "Retrieved:" (count hits))
+    (log/info "Query" q "with SHA256" (sha256 q))
     hits))
 
 (defn- event-msg-handler
diff --git a/Clojure-Websockets/src/cljs/birdwatch/tweets.cljs b/Clojure-Websockets/src/cljs/birdwatch/tweets.cljs
@@ -73,9 +73,12 @@
 
 (def prev-chunks-loaded (atom 0))
 (def chunks-to-load 10)
+
 (defn load-prev []
   (when (< @prev-chunks-loaded chunks-to-load)
-    (chsk-send! [:cmd/query {:query (:search @state/app) :n 200 :uid (:uid @chsk-state) :from (* 200 @prev-chunks-loaded)}])
+    (chsk-send! [:cmd/query {:query (str "(" (:search @state/app) ") AND lang:en")
+                             :n 200 :uid (:uid @chsk-state)
+                             :from (* 200 @prev-chunks-loaded)}])
     (swap! prev-chunks-loaded inc)))
 
 (defn start-search []
