Skip to content

Commit 47f0f0c

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

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
@@ -38,23 +38,23 @@ fun main(args: Array<String>) {
3838

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

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

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

0 commit comments

Comments
 (0)