Skip to content

Commit d56d255

Browse files
committed
var naming to satisfy linter
1 parent 1859577 commit d56d255

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

cmd/serv.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -228,42 +228,42 @@ func runServ(ctx context.Context, c *cli.Command) error {
228228
}
229229

230230
username := repoPathFields[0]
231-
var uid int64
231+
var userID int64
232232

233233
if err := initDB(ctx); err != nil {
234234
return fail(ctx, "DB initialization error", "Error while initializing Gitea database")
235235
}
236236

237-
real_uid, err := user_model.LookupUserRedirect(ctx, username)
237+
redirectedUserID, err := user_model.LookupUserRedirect(ctx, username)
238238
if err == nil {
239-
uid = real_uid
239+
userID = redirectedUserID
240240
} else {
241241
user, err := user_model.GetUserByName(ctx, username)
242242
if err == nil {
243-
uid = user.ID
243+
userID = user.ID
244244
} else {
245245
return fail(ctx, "Invalid username", "Could not find user or org: %s", username)
246246
}
247247
}
248248

249249
// We need the uid for repo redirect lookup
250-
real_user, err := user_model.GetUserByID(ctx, uid)
250+
real_user, err := user_model.GetUserByID(ctx, userID)
251251
if err == nil {
252252
username = real_user.Name
253253
} else {
254-
return fail(ctx, "User ID lookup failed", "Could not find user with ID: %d", uid)
254+
return fail(ctx, "User ID lookup failed", "Could not find user with ID: %d", userID)
255255
}
256256

257257
reponame := strings.TrimSuffix(repoPathFields[1], ".git") // “the-repo-name" or "the-repo-name.wiki"
258258

259-
real_rid, err := repo.LookupRedirect(ctx, uid, reponame)
259+
redirectedRepoID, err := repo.LookupRedirect(ctx, userID, reponame)
260260
if err == nil {
261-
real_repo, err := repo.GetRepositoryByID(ctx, real_rid)
261+
redirectedRepo, err := repo.GetRepositoryByID(ctx, redirectedRepoID)
262262
if err == nil {
263-
reponame = real_repo.Name
264-
username = real_repo.OwnerName
263+
reponame = redirectedRepo.Name
264+
username = redirectedRepo.OwnerName
265265
} else {
266-
return fail(ctx, "Repo ID lookup failed", "Could not find repo with ID: %d", real_rid)
266+
return fail(ctx, "Repo ID lookup failed", "Could not find repo with ID: %d", redirectedRepoID)
267267
}
268268
}
269269

0 commit comments

Comments
 (0)