Skip to content

Commit 8f3ca79

Browse files
committed
Revert "Revert "Short-circuit UserCtrl#hasStarredRepo calls when unrestricted (#69)""
This reverts commit 47f0f0c.
1 parent 9383602 commit 8f3ca79

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/kotlin/app/Main.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,23 @@ fun main(args: Array<String>) {
3939

4040
get("/api/user/:user") { ctx ->
4141
val user = ctx.param("user")!!
42-
when (UserCtrl.hasStarredRepo(user) || unrestricted) {
42+
when (unrestricted || UserCtrl.hasStarredRepo(user)) {
4343
true -> ctx.json(UserCtrl.getUserProfile(ctx.param("user")!!))
4444
false -> ctx.status(400)
4545
}
4646
}
4747

4848
get("/user/:user") { ctx ->
4949
val user = ctx.param("user")!!
50-
when (UserCtrl.hasStarredRepo(user) || unrestricted) {
50+
when (unrestricted || UserCtrl.hasStarredRepo(user)) {
5151
true -> ctx.renderVelocity("user.vm", model("user", user, "gtmId", gtmId))
5252
false -> ctx.redirect("/search?q=$user")
5353
}
5454
}
5555

5656
get("/search") { ctx ->
5757
val user = ctx.queryParam("q")?.trim() ?: ""
58-
when (UserCtrl.hasStarredRepo(user) || (unrestricted && user != "")) {
58+
when ((unrestricted && user != "") || UserCtrl.hasStarredRepo(user)) {
5959
true -> ctx.redirect("/user/$user")
6060
false -> ctx.renderVelocity("search.vm", model("q", escapeHtml(user), "gtmId", gtmId))
6161
}

0 commit comments

Comments
 (0)