Refactor names (#31405)
This PR only does "renaming": * `Route` should be `Router` (and chi router is also called "router") * `Params` should be `PathParam` (to distingush it from URL query param, and to match `FormString`) * Use lower case for private functions to avoid exposing or abusing
This commit is contained in:
@ -16,9 +16,9 @@ import (
|
||||
|
||||
// SetDefaultBranch updates the default branch
|
||||
func SetDefaultBranch(ctx *gitea_context.PrivateContext) {
|
||||
ownerName := ctx.Params(":owner")
|
||||
repoName := ctx.Params(":repo")
|
||||
branch := ctx.Params(":branch")
|
||||
ownerName := ctx.PathParam(":owner")
|
||||
repoName := ctx.PathParam(":repo")
|
||||
branch := ctx.PathParam(":branch")
|
||||
|
||||
ctx.Repo.Repository.DefaultBranch = branch
|
||||
if err := gitrepo.SetDefaultBranch(ctx, ctx.Repo.Repository, ctx.Repo.Repository.DefaultBranch); err != nil {
|
||||
|
@ -40,8 +40,8 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) {
|
||||
// b) our update function will likely change the repository in the db so we will need to refresh it
|
||||
// c) we don't always need the repo
|
||||
|
||||
ownerName := ctx.Params(":owner")
|
||||
repoName := ctx.Params(":repo")
|
||||
ownerName := ctx.PathParam(":owner")
|
||||
repoName := ctx.PathParam(":repo")
|
||||
|
||||
// defer getting the repository at this point - as we should only retrieve it if we're going to call update
|
||||
var (
|
||||
|
@ -48,8 +48,8 @@ func bind[T any](_ T) any {
|
||||
|
||||
// Routes registers all internal APIs routes to web application.
|
||||
// These APIs will be invoked by internal commands for example `gitea serv` and etc.
|
||||
func Routes() *web.Route {
|
||||
r := web.NewRoute()
|
||||
func Routes() *web.Router {
|
||||
r := web.NewRouter()
|
||||
r.Use(context.PrivateContexter())
|
||||
r.Use(CheckInternalToken)
|
||||
// Log the real ip address of the request from SSH is really helpful for diagnosing sometimes.
|
||||
|
@ -19,8 +19,8 @@ import (
|
||||
|
||||
// RepoAssignment assigns the repository and gitrepository to the private context
|
||||
func RepoAssignment(ctx *gitea_context.PrivateContext) context.CancelFunc {
|
||||
ownerName := ctx.Params(":owner")
|
||||
repoName := ctx.Params(":repo")
|
||||
ownerName := ctx.PathParam(":owner")
|
||||
repoName := ctx.PathParam(":repo")
|
||||
|
||||
repo := loadRepository(ctx, ownerName, repoName)
|
||||
if ctx.Written() {
|
||||
|
@ -14,8 +14,8 @@ import (
|
||||
|
||||
// UpdatePublicKeyInRepo update public key and deploy key updates
|
||||
func UpdatePublicKeyInRepo(ctx *context.PrivateContext) {
|
||||
keyID := ctx.ParamsInt64(":id")
|
||||
repoID := ctx.ParamsInt64(":repoid")
|
||||
keyID := ctx.PathParamInt64(":id")
|
||||
repoID := ctx.PathParamInt64(":repoid")
|
||||
if err := asymkey_model.UpdatePublicKeyUpdated(ctx, keyID); err != nil {
|
||||
ctx.JSON(http.StatusInternalServerError, private.Response{
|
||||
Err: err.Error(),
|
||||
|
@ -88,8 +88,8 @@ func SetLogSQL(ctx *context.PrivateContext) {
|
||||
|
||||
// RemoveLogger removes a logger
|
||||
func RemoveLogger(ctx *context.PrivateContext) {
|
||||
logger := ctx.Params("logger")
|
||||
writer := ctx.Params("writer")
|
||||
logger := ctx.PathParam("logger")
|
||||
writer := ctx.PathParam("writer")
|
||||
err := log.GetManager().GetLogger(logger).RemoveWriter(writer)
|
||||
if err != nil {
|
||||
ctx.JSON(http.StatusInternalServerError, private.Response{
|
||||
|
@ -25,7 +25,7 @@ import (
|
||||
|
||||
// ServNoCommand returns information about the provided keyid
|
||||
func ServNoCommand(ctx *context.PrivateContext) {
|
||||
keyID := ctx.ParamsInt64(":keyid")
|
||||
keyID := ctx.PathParamInt64(":keyid")
|
||||
if keyID <= 0 {
|
||||
ctx.JSON(http.StatusBadRequest, private.Response{
|
||||
UserMsg: fmt.Sprintf("Bad key id: %d", keyID),
|
||||
@ -77,9 +77,9 @@ func ServNoCommand(ctx *context.PrivateContext) {
|
||||
|
||||
// ServCommand returns information about the provided keyid
|
||||
func ServCommand(ctx *context.PrivateContext) {
|
||||
keyID := ctx.ParamsInt64(":keyid")
|
||||
ownerName := ctx.Params(":owner")
|
||||
repoName := ctx.Params(":repo")
|
||||
keyID := ctx.PathParamInt64(":keyid")
|
||||
ownerName := ctx.PathParam(":owner")
|
||||
repoName := ctx.PathParam(":repo")
|
||||
mode := perm.AccessMode(ctx.FormInt("mode"))
|
||||
|
||||
// Set the basic parts of the results to return
|
||||
|
Reference in New Issue
Block a user