status-im
/
open-bounty
mirror of https://github.com/status-im/open-bounty.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

This commit is contained in:
Teemu Patja 2017-11-03 13:44:05 +02:00
parent 188193938e 29a5b808c3
commit d7d214098b
No known key found for this signature in database
GPG Key ID: F5B7035E6580FD4C
9 changed files with 125 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/sql/queries.sql
View File

@ -227,9 +227,18 @@ VALUES(:pr_id,
ON CONFLICT (pr_id) DO UPDATE
SET
state = :state,
issue_number = :issue_number,
issue_id = :issue_id,
updated = timezone('utc'::text, now()),
commit_sha = :commit_sha;
-- :name remove-pull-request! :! :n
-- :doc remove a PR by id
DELETE from pull_requests
WHERE pr_id = :pr_id;
-- Bounties ------------------------------------------------------------------------

6
src/clj/commiteth/db/pull_requests.clj
View File

@ -16,3 +16,9 @@
(jdbc/with-db-connection [con-db *db*]
(db/save-pull-request! con-db
(assoc pull-request :state state)))))
(defn remove
[pr-id]
(jdbc/with-db-connection [con-db *db*]
(db/remove-pull-request! con-db
{:pr_id pr-id})))

3
src/clj/commiteth/github/core.clj
View File

@ -227,7 +227,8 @@
(contract-addr-text contract-address)
"%s\n"
(network-text)
"To claim this bounty sign up at %s\n"
"To claim this bounty sign up at %s and make sure to update your Ethereum address "
"in `My Payment Details` so that the bounty is correctly allocated.\n"
(if (on-testnet?)
"To fund it, send test ETH or test ERC20/ERC223 tokens to the contract address."
"To fund it, send ETH or ERC20/ERC223 tokens to the contract address."))

6
src/clj/commiteth/routes/services.clj
View File

@ -235,8 +235,10 @@
:body-params [user-id :- Long, address :- String]
:summary "Update user address"
(if-not (eth/valid-address? address)
{:status 400
:body "Invalid Ethereum address"}
(do
(log/debug "POST /address: invalid input" address)
{:status 400
:body (str "Invalid Ethereum address '" address "'")})
(let [result (users/update-user-address
user-id
address)]

122
src/clj/commiteth/routes/webhooks.clj
View File

@ -59,17 +59,17 @@
(issues/update-open-status issue-id false))
#_(when-let [commit-sha (find-commit-sha owner repo issue-number ["referenced" "closed"])]
(log/debug (format "Issue %s/%s/%s closed with commit %s"
owner repo issue-number commit-sha))
(log/info "NOT considering event as bounty winner")
;; TODO: disabled for now since the system is meant to be used
;; exclusively via pull requests. issue closed event without a PR
;; closed via merge first means that the referencing commit was
;; pushed directly to master and thus never accepted by the
;; maintainer (could be that the bounty hunter had write access
;; to master, but that scenario should be very rare and better
;; not to support it)
#_(issues/close commit-sha issue-id)))
(log/debug (format "Issue %s/%s/%s closed with commit %s"
owner repo issue-number commit-sha))
(log/info "NOT considering event as bounty winner")
;; TODO: disabled for now since the system is meant to be used
;; exclusively via pull requests. issue closed event without a PR
;; closed via merge first means that the referencing commit was
;; pushed directly to master and thus never accepted by the
;; maintainer (could be that the bounty hunter had write access
;; to master, but that scenario should be very rare and better
;; not to support it)
#_(issues/close commit-sha issue-id)))
(defn handle-issue-reopened
[{{issue-id :id} :issue}]
@ -111,6 +111,44 @@
issue-number)))
(defn handle-claim
[user-id login name avatar_url owner repo repo-id bounty-issue-number pr-id pr-number head-sha merged? event-type]
(users/create-user user-id login name nil avatar_url)
(let [issue (github/get-issue owner repo bounty-issue-number)
open-or-edit? (contains? #{:opened :edited} event-type)
close? (= :closed event-type)
pr-data {:repo_id repo-id
:pr_id pr-id
:pr_number pr-number
:user_id user-id
:issue_number bounty-issue-number
:issue_id (:id issue)
:state event-type}]
;; TODO: in the opened case if the submitting user has no
;; Ethereum address stored, we could post a comment to the
;; Github PR explaining that payout is not possible if the PR is
;; merged
(cond
open-or-edit? (do
(log/info "PR with reference to bounty issue"
bounty-issue-number "opened")
(pull-requests/save (merge pr-data {:state :opened
:commit_sha head-sha})))
close? (if merged?
(do (log/info "PR with reference to bounty issue"
bounty-issue-number "merged")
(pull-requests/save
(merge pr-data {:state :merged
:commit_sha head-sha}))
(issues/update-commit-sha (:id issue) head-sha))
(do (log/info "PR with reference to bounty issue"
bounty-issue-number "closed with no merge")
(pull-requests/save
(merge pr-data {:state :closed
:commit_sha head-sha})))))))
(defn handle-pull-request-event
;; when a PR is opened, only consider it as a claim if:
;; * PR references an existing bounty-issue
@ -127,7 +165,7 @@
login :login
avatar_url :avatar_url
name :name} :user
id :id
pr-id :id
merged? :merged
{head-sha :sha} :head
pr-number :number
@ -135,43 +173,26 @@
pr-title :title} :pull_request}]
(log/debug "handle-pull-request-event" event-type owner repo repo-id login pr-body pr-title)
(log/debug (extract-issue-number pr-body pr-title))
(when-let [bounty-issue-number (->>
(if-let [bounty-issue-number (->>
(extract-issue-number pr-body pr-title)
(first)
(ensure-bounty-issue owner repo))]
(log/debug "Referenced bounty issue found" repo bounty-issue-number)
(users/create-user user-id login name nil avatar_url)
(let [issue (github/get-issue owner repo bounty-issue-number)
pr-data {:repo_id repo-id
:pr_id id
:pr_number pr-number
:user_id user-id
:issue_number bounty-issue-number
:issue_id (:id issue)
:state event-type}]
(do
(log/debug "Referenced bounty issue found" owner repo bounty-issue-number)
(handle-claim user-id
login name
avatar_url
owner repo
repo-id
bounty-issue-number
pr-id
pr-number
head-sha
merged?
event-type))
(when (= :edited event-type)
(pull-requests/remove pr-id))))
;; TODO: in the opened case if the submitting user has no
;; Ethereum address stored, we could post a comment to the
;; Github PR explaining that payout is not possible if the PR is
;; merged
(case event-type
:opened (do
(log/info "PR with reference to bounty issue"
bounty-issue-number "opened")
(pull-requests/save (merge pr-data {:state :opened
:commit_sha head-sha})))
:closed (if merged?
(do (log/info "PR with reference to bounty issue"
bounty-issue-number "merged")
(pull-requests/save
(merge pr-data {:state :merged
:commit_sha head-sha}))
(issues/update-commit-sha (:id issue) head-sha))
(do (log/info "PR with reference to bounty issue"
bounty-issue-number "closed with no merge")
(pull-requests/save
(merge pr-data {:state :closed
:commit_sha head-sha}))))))))
(defn handle-issue-edited
[webhook-payload]
@ -200,11 +221,12 @@
(defn handle-pull-request
[pull-request]
(case (:action pull-request)
"opened" (handle-pull-request-event :opened pull-request)
"closed" (handle-pull-request-event :closed pull-request)
nil)
(ok))
(let [action (keyword (:action pull-request))]
(when (contains? #{:opened
:edited
:closed} action)
(handle-pull-request-event action pull-request))
(ok)))
(defn validate-secret [webhook-payload raw-payload github-signature]

1
src/cljs/commiteth/core.cljs
View File

@ -285,4 +285,5 @@
(load-interceptors!)
(hook-browser-navigation!)
(load-data true)
(.addEventListener js/window "click" #(rf/dispatch [:clear-flash-message]))
(on-js-load))

8
src/cljs/commiteth/handlers.cljs
View File

@ -324,9 +324,11 @@
(dispatch [:set-flash-message
:success
"Address saved"]))
:on-error #(dispatch [:set-flash-message
:error
(:response %)])
:on-error #(do
(println %)
(dispatch [:set-flash-message
:error
(:response %)]))
:finally #(dispatch [:clear-updating-address])
:params {:user-id user-id :address address}}}))

16
src/cljs/commiteth/update_address.cljs
View File

@ -33,10 +33,12 @@
:auto-correct "off"
:spell-check "false"
:max-length 42}]])]
[:button.ui.button (merge {:on-click
#(rf/dispatch [:save-user-address
(:id @user)
@address])}
(when @updating-address
{:class "busy loading"}))
"Update"]]]))))
[:button
(merge {:on-click
#(rf/dispatch [:save-user-address
(:id @user)
@address])
:class (str "ui button small update-address-button"
(when @updating-address
" busy loading"))})
"UPDATE"]]]))))

18
src/less/style.less
View File

@ -39,6 +39,14 @@
background-color: #57a7ed!important;
}
.update-address-button {
background-color: #57a7ed!important;
&:hover {
background-color: #57a7ed!important;
}
}
.login-button {
background-color: rgba(255,255,255,0.2)!important;
}
@ -599,11 +607,14 @@
&.error {
background-color: #e96868;
}
display: flex;
flex-direction: column;
color: #fff;
border-radius: 8px;
z-index: 100;
padding: 1.4em 1em 1.4em;
padding: 40px 60px 40px;
height: auto;
i {
position: absolute;
margin: 0;
@ -611,6 +622,11 @@
top: 1.5em;
cursor: pointer;
}
p {
font-family: "PostGrotesk-Book";
font-weight: 500;
font-size: 15px;
}
}