diff --git a/routers/web/admin/federation_host.go b/routers/web/admin/federation_host.go index 278509f217..fa7ac80c30 100644 --- a/routers/web/admin/federation_host.go +++ b/routers/web/admin/federation_host.go @@ -20,10 +20,7 @@ const ( func FederationHost(ctx *context.Context) { federationHostID := ctx.ParamsInt64("id") - page := ctx.FormInt("page") - if page < 1 { - page = 1 - } + page := max(ctx.FormInt("page"), 1) host, err := forgefed.GetFederationHost(ctx, federationHostID) if err != nil { @@ -33,7 +30,7 @@ func FederationHost(ctx *context.Context) { users, err := user_model.FindFederatedUsersByHostID(ctx, federationHostID, db.ListOptions{ PageSize: setting.UI.Admin.FederationUserPagingNum, - Page: int(page), + Page: page, }) if err != nil { ctx.ServerError("FindFederatedUsersByHostID", err) diff --git a/routers/web/admin/federation_hosts.go b/routers/web/admin/federation_hosts.go index e710f0aba5..a371b2c064 100644 --- a/routers/web/admin/federation_hosts.go +++ b/routers/web/admin/federation_hosts.go @@ -19,10 +19,7 @@ const ( func FederationHosts(ctx *context.Context) { sort := ctx.FormTrim("sort") - page := ctx.FormInt("page") - if page < 1 { - page = 1 - } + page := max(ctx.FormInt("page"), 1) hosts, err := forgefed.FindFederationHosts(ctx, db.ListOptions{ Page: page, diff --git a/routers/web/admin/federation_users.go b/routers/web/admin/federation_users.go index 098479dcc1..f7e89e164f 100644 --- a/routers/web/admin/federation_users.go +++ b/routers/web/admin/federation_users.go @@ -18,10 +18,7 @@ const ( ) func FederationUsers(ctx *context.Context) { - page := ctx.FormInt("page") - if page < 1 { - page = 1 - } + page := max(ctx.FormInt("page"), 1) users, err := user_model.FindFederatedUsers(ctx, db.ListOptions{ Page: page,