193 Hide myself from the top hunters and activity lists

.gitignore

@@ -24,3 +24,6 @@ profiles.clj
 resources/contracts
 node_modules
 .DS_Store
+src/java
+yarn.lock
+env/dev/resources/config.edn

Makefile

@@ -0,0 +1,41 @@
+
+all: uberjar
+
+.PHONY: contracts
+contracts:
+	./build_contracts.sh
+
+less:
+	lein less once
+
+less-auto:
+	lein less auto
+
+repl:
+	lein repl
+
+uberjar:
+	lein uberjar
+
+yarn:
+	yarn install
+
+cljsbuild: yarn
+	lein cljsbuild once
+
+figwheel: yarn
+	rlwrap lein figwheel
+
+.PHONY: test
+test:
+	lein test
+
+migrate:
+	lein migratus migrate
+
+create-migration:
+	@read -p "Enter migration name: " migration \
+	&& lein migratus create $$migration
+
+orig:
+	find . -name '*.orig' -delete

README.md

@@ -38,7 +38,14 @@ Web3j [2.3.0](https://github.com/web3j/web3j/releases/tag/v2.3.0) is required an
 
 ## Running
 
-Make sure `env/dev/resources/config.edn` is correctly populated.
+Prepare your local git-ignored config file:
+
+```
+cd env/dev/resources
+cp config.example.edn config.edn
+```
+
+Make sure `config.edn` is correctly populated.
 
 Lauch a local geth node with the bot account unlocked:
 

project.clj

@@ -69,10 +69,8 @@
             [lein-auto "0.1.2"]
             [lein-less "1.7.5"]
             [lein-shell "0.5.0"]
-            [cider/cider-nrepl "0.15.0-SNAPSHOT"]
             [lein-sha-version "0.1.1"]]
 
-
   :less {:source-paths ["src/less"]
          :target-path "resources/public/css"}
 

resources/migrations/20171226182259-hide-user.down.sql

@@ -0,0 +1,35 @@
+BEGIN;
+
+ALTER TABLE users
+    DROP COLUMN is_hidden;
+
+-- restore the previous version of the view
+CREATE OR REPLACE VIEW "public"."claims_view" AS
+SELECT
+    i.title AS issue_title,
+    i.issue_number,
+    r.repo AS repo_name,
+    r.owner AS repo_owner,
+    COALESCE(u.name, u.login) AS user_name,
+    u.avatar_url AS user_avatar_url,
+    i.payout_receipt,
+    p.updated,
+    i.updated AS issue_updated,
+    i.balance_eth,
+    i.tokens,
+    i.value_usd,
+    p.state AS pr_state,
+    i.is_open AS issue_open,
+    (case when u.address IS NULL THEN false ELSE true END) AS user_has_address
+   FROM issues i,
+    users u,
+    repositories r,
+    pull_requests p
+  WHERE r.repo_id = i.repo_id
+  AND p.issue_id = i.issue_id
+  AND p.user_id = u.id
+  AND i.contract_address IS NOT NULL
+  AND i.comment_id IS NOT NULL
+  ORDER BY p.updated;
+
+COMMIT;

resources/migrations/20171226182259-hide-user.up.sql

@@ -0,0 +1,35 @@
+BEGIN;
+
+ALTER TABLE users
+    ADD COLUMN is_hidden BOOLEAN NOT NULL DEFAULT FALSE;
+
+CREATE OR REPLACE VIEW "public"."claims_view" AS
+SELECT
+    i.title AS issue_title,
+    i.issue_number,
+    r.repo AS repo_name,
+    r.owner AS repo_owner,
+    COALESCE(u.name, u.login) AS user_name,
+    u.avatar_url AS user_avatar_url,
+    i.payout_receipt,
+    p.updated,
+    i.updated AS issue_updated,
+    i.balance_eth,
+    i.tokens,
+    i.value_usd,
+    p.state AS pr_state,
+    i.is_open AS issue_open,
+    (case when u.address IS NULL THEN false ELSE true END) AS user_has_address
+   FROM issues i,
+    users u,
+    repositories r,
+    pull_requests p
+  WHERE r.repo_id = i.repo_id
+  AND p.issue_id = i.issue_id
+  AND p.user_id = u.id
+  AND i.contract_address IS NOT NULL
+  AND i.comment_id IS NOT NULL
+  AND NOT u.is_hidden -- added
+  ORDER BY p.updated;
+
+COMMIT;

resources/sql/queries.sql

@@ -571,6 +571,7 @@ WHERE
 pr.commit_sha = i.commit_sha
 AND u.id = pr.user_id
 AND i.payout_receipt IS NOT NULL
+AND NOT u.is_hidden
 GROUP BY u.id
 ORDER BY total_usd DESC
 LIMIT 5;

src/clj/commiteth/config.clj

@@ -1,10 +1,16 @@
 (ns commiteth.config
   (:require [cprop.core :refer [load-config]]
             [cprop.source :as source]
-            [mount.core :refer [args defstate]]))
+            [mount.core :refer [args defstate] :as mount]))
 
 (defstate env :start (load-config
                        :merge
                        [(args)
                         (source/from-system-props)
                         (source/from-env)]))
+
+(defn start! []
+  (mount/start #'env))
+
+(defn stop! []
+  (mount/stop #'env))

src/clj/commiteth/core.clj

@@ -16,17 +16,23 @@
     :parse-fn #(Integer/parseInt %)]])
 
 (mount/defstate
-http-server
+  http-server
   :start
   (http/start
-    (-> env
-      (assoc :handler (handler/app))
-      (update :port #(or (-> env :options :port) %))))
+   (-> env
+       (assoc :handler (handler/app))
+       (update :port #(or (-> env :options :port) %))))
   :stop
   (http/stop http-server))
 
+(defn start! []
+  (mount/start #'http-server))
+
+(defn stop! []
+  (mount/stop #'http-server))
+
 (mount/defstate ^{:on-reload :noop}
-repl-server
+  repl-server
   :start
   (when-let [nrepl-port (env :nrepl-port)]
     (log/info "Starting NREPL server on port" nrepl-port)

src/clj/commiteth/db/core.clj

@@ -4,7 +4,7 @@
    [clojure.java.jdbc :as jdbc]
    [conman.core :as conman]
    [commiteth.config :refer [env]]
-   [mount.core :refer [defstate]]
+   [mount.core :refer [defstate] :as mount]
    [migratus.core :as migratus]
    [mpg.core :as mpg]
    [clojure.string :as str])
@@ -20,21 +20,26 @@
 
 (mpg/patch)
 
-(defn start []
+(defn db-start []
   (let [db (env :jdbc-database-url)
         migratus-config {:store :database
                          :migration-dir "migrations/"
                          :migration-table-name "schema_migrations"
                          :db db}]
     (migratus/migrate migratus-config)
-    (conman/bind-connection db "sql/queries.sql")
     (conman/connect! {:jdbc-url db})
     db))
 
 (defstate ^:dynamic *db*
-  :start (start)
+  :start (db-start)
   :stop (conman/disconnect! *db*))
 
+(defn start! []
+  (mount/start #'*db*))
+
+(defn stop! []
+  (mount/stop #'*db*))
+
 (conman/bind-connection *db* "sql/queries.sql")
 
 (defn to-date [^java.sql.Date sql-date]
@@ -85,3 +90,11 @@
   (sql-value [value] (to-pg-json value))
   IPersistentVector
   (sql-value [value] (to-pg-json value)))
+
+(defmacro with-trx [& body]
+  "Performs a set of queries in transaction."
+  `(conman/with-transaction [*db*]
+     ~@body))
+
+(defn update! [& args]
+  (apply jdbc/update! *db* args))

src/clj/commiteth/routes/services.clj

@@ -5,6 +5,7 @@
             [compojure.api.meta :refer [restructure-param]]
             [buddy.auth.accessrules :refer [restrict]]
             [buddy.auth :refer [authenticated?]]
+            [commiteth.db.core :as db]
             [commiteth.db.users :as users]
             [commiteth.db.usage-metrics :as usage-metrics]
             [commiteth.db.repositories :as repositories]
@@ -234,6 +235,14 @@
                               (if (= 1 result)
                                 (ok)
                                 (internal-server-error)))))
+
+                    (POST "/hidden" []
+                          :auth-rules authenticated?
+                          :body-params [user-id :- Long, hidden :- Boolean]
+                          :summary "(Un)mark a user as being hidden (not visible in rating tables)."
+                          (db/update! :users {:is_hidden hidden} ["id = ?" user-id])
+                          (ok))
+
                     (GET "/repositories" {:keys [params]}
                          :auth-rules authenticated?
                          :current-user user

src/cljs/commiteth/handlers.cljs

@@ -311,7 +311,6 @@
    {:db db
     :dispatch [:set-active-page :update-address]}))
 
-
 (reg-event-fx
  :save-user-address
  (fn [{:keys [db]} [_ user-id address]]
@@ -320,7 +319,7 @@
     :http {:method     POST
            :url        "/api/user/address"
            :on-success #(do
-                          (dispatch [:assoc-in [:user [:address] address]])
+                          (dispatch [:assoc-in [:user :address] address])
                           (dispatch [:set-flash-message
                                      :success
                                      "Address saved"]))
@@ -332,6 +331,23 @@
            :finally    #(dispatch [:clear-updating-address])
            :params     {:user-id user-id :address address}}}))
 
+(reg-event-fx
+ :mark-user-hidden
+ (fn [{:keys [db]} [_ user-id hidden]]
+   {:http {:method     POST
+           :url        "/api/user/hidden"
+           :on-success #(do
+                          (dispatch [:assoc-in [:user :is_hidden] hidden])
+                          (dispatch [:set-flash-message
+                                     :success
+                                     "Settings saved"]))
+           :on-error   #(do
+                          (dispatch [:set-flash-message
+                                     :error (:response %)]))
+           :params     {:user-id user-id :hidden hidden}}}))
+
+
+
 (reg-event-db
  :clear-updating-address
  (fn [db _]

src/cljs/commiteth/update_address.cljs

@@ -5,17 +5,17 @@
             [reagent.crypt :as crypt]
             [cljs-web3.eth :as web3-eth]))
 
-
 (defn update-address-page []
   (let [db (rf/subscribe [:db])
         user (rf/subscribe [:user])
         updating-address (rf/subscribe [:get-in [:updating-address]])
-        address (r/atom @(rf/subscribe [:get-in [:user :address]]))]
+        address (r/atom @(rf/subscribe [:get-in [:user :address]]))
+        hidden (rf/subscribe [:get-in [:user :is_hidden]])]
+
     (fn []
       (let [web3 (:web3 @db)
             web3-accounts (when web3
                             (web3-eth/accounts web3))]
-        (println "web3-accounts" web3-accounts)
         [:div.ui.container.grid
          [:div.ui.form.sixteen.wide.column
           [:h3 "Update address"]
@@ -41,4 +41,18 @@
                    :class (str "ui button small update-address-button"
                                (when @updating-address
                                  " busy loading"))})
-           "UPDATE"]]]))))
+           "UPDATE"]
+
+          [:h3 "Settings"]
+          [:div
+
+           [:input
+            {:type :checkbox
+             :id :input-hidden
+             :checked @hidden
+             :on-change
+             (fn [e]
+               (let [value (-> e .-target .-checked)]
+                 (rf/dispatch [:mark-user-hidden (:id @user) value])))}]
+
+           [:label {:for :input-hidden} "Disguise myself from the top hunters and activity lists."]]]]))))

src/less/style.less

@@ -46,12 +46,20 @@
     }
 }
 
+label[for="input-hidden"] {
+  padding-left: 8px;
+}
+
+#input-hidden {
+  vertical-align: bottom;
+  position: relative;
+  top: -4px;
+}
 
 .login-button {
     background-color: rgba(255,255,255,0.2)!important;
 }
 
-
 .commiteth-header {
     background-color: #57a7ed!important;
     border-radius: 0em;