Refactor User.Id to User.ID

4 files changed, 41 insertions, 36 deletions

diff --git a/routers/user/auth.go b/routers/user/auth.go
index df79ecbe..40687fca 100644
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -60,7 +60,7 @@ func AutoSignIn(ctx *context.Context) (bool, error) {
 	}
 
 	isSucceed = true
-	ctx.Session.Set("uid", u.Id)
+	ctx.Session.Set("uid", u.ID)
 	ctx.Session.Set("uname", u.Name)
 	ctx.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubUrl)
 	return true, nil
@@ -114,7 +114,7 @@ func SignInPost(ctx *context.Context, form auth.SignInForm) {
 			setting.CookieRememberName, u.Name, days, setting.AppSubUrl)
 	}
 
-	ctx.Session.Set("uid", u.Id)
+	ctx.Session.Set("uid", u.ID)
 	ctx.Session.Set("uname", u.Name)
 
 	// Clear whatever CSRF has right now, force to generate a new one
@@ -220,7 +220,7 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo
 	}
 
 	// Send confirmation email, no need for social account.
-	if setting.Service.RegisterEmailConfirm && u.Id > 1 {
+	if setting.Service.RegisterEmailConfirm && u.ID > 1 {
 		models.SendActivateAccountMail(ctx.Context, u)
 		ctx.Data["IsSendRegisterMail"] = true
 		ctx.Data["Email"] = u.Email
@@ -278,7 +278,7 @@ func Activate(ctx *context.Context) {
 
 		log.Trace("User activated: %s", user.Name)
 
-		ctx.Session.Set("uid", user.Id)
+		ctx.Session.Set("uid", user.ID)
 		ctx.Session.Set("uname", user.Name)
 		ctx.Redirect(setting.AppSubUrl + "/")
 		return
diff --git a/routers/user/home.go b/routers/user/home.go
index aaf660d4..5316830b 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -24,6 +24,7 @@ const (
 	ORG_HOME  base.TplName = "org/home"
 )
 
+// getDashboardContextUser finds out dashboard is viewing as which context user.
 func getDashboardContextUser(ctx *context.Context) *models.User {
 	ctxUser := ctx.User
 	orgName := ctx.Params(":org")
@@ -51,6 +52,9 @@ func getDashboardContextUser(ctx *context.Context) *models.User {
 	return ctxUser
 }
 
+// retrieveFeeds loads feeds from database by given context user.
+// The user could be organization so it is not always the logged in user,
+// which is why we have to explicitly pass the context user ID.
 func retrieveFeeds(ctx *context.Context, ctxUserID, userID, offset int64, isProfile bool) {
 	actions, err := models.GetFeeds(ctxUserID, userID, offset, isProfile)
 	if err != nil {
@@ -84,14 +88,15 @@ func retrieveFeeds(ctx *context.Context, ctxUserID, userID, offset int64, isProf
 
 func Dashboard(ctx *context.Context) {
 	ctxUser := getDashboardContextUser(ctx)
-	ctx.Data["Title"] = ctxUser.DisplayName() + " - " + ctx.Tr("dashboard")
-	ctx.Data["PageIsDashboard"] = true
-	ctx.Data["PageIsNews"] = true
-
 	if ctx.Written() {
 		return
 	}
 
+	ctx.Data["Title"] = ctxUser.DisplayName() + " - " + ctx.Tr("dashboard")
+	ctx.Data["PageIsDashboard"] = true
+	ctx.Data["PageIsNews"] = true
+
+	// Only user can have collaborative repositories.
 	if !ctxUser.IsOrganization() {
 		collaborateRepos, err := ctx.User.GetAccessibleRepositories()
 		if err != nil {
@@ -111,14 +116,14 @@ func Dashboard(ctx *context.Context) {
 
 	var repos []*models.Repository
 	if ctxUser.IsOrganization() {
-		if err := ctxUser.GetUserRepositories(ctx.User.Id); err != nil {
+		if err := ctxUser.GetUserRepositories(ctx.User.ID); err != nil {
 			ctx.Handle(500, "GetUserRepositories", err)
 			return
 		}
 		repos = ctxUser.Repos
 	} else {
 		var err error
-		repos, err = models.GetRepositories(ctxUser.Id, true)
+		repos, err = models.GetRepositories(ctxUser.ID, true)
 		if err != nil {
 			ctx.Handle(500, "GetRepositories", err)
 			return
@@ -140,7 +145,7 @@ func Dashboard(ctx *context.Context) {
 	ctx.Data["MirrorCount"] = len(mirrors)
 	ctx.Data["Mirrors"] = mirrors
 
-	retrieveFeeds(ctx, ctxUser.Id, ctx.User.Id, 0, false)
+	retrieveFeeds(ctx, ctxUser.ID, ctx.User.ID, 0, false)
 	if ctx.Written() {
 		return
 	}
@@ -182,10 +187,10 @@ func Issues(ctx *context.Context) {
 		switch viewType {
 		case "assigned":
 			filterMode = models.FM_ASSIGN
-			assigneeID = ctxUser.Id
+			assigneeID = ctxUser.ID
 		case "created_by":
 			filterMode = models.FM_CREATE
-			posterID = ctxUser.Id
+			posterID = ctxUser.ID
 		}
 	}
 
@@ -194,7 +199,7 @@ func Issues(ctx *context.Context) {
 
 	// Get repositories.
 	if ctxUser.IsOrganization() {
-		if err := ctxUser.GetUserRepositories(ctx.User.Id); err != nil {
+		if err := ctxUser.GetUserRepositories(ctx.User.ID); err != nil {
 			ctx.Handle(500, "GetRepositories", err)
 			return
 		}
@@ -227,7 +232,7 @@ func Issues(ctx *context.Context) {
 
 		if filterMode != models.FM_ALL {
 			// Calculate repository issue count with filter mode.
-			numOpen, numClosed := repo.IssueStats(ctxUser.Id, filterMode, isPullList)
+			numOpen, numClosed := repo.IssueStats(ctxUser.ID, filterMode, isPullList)
 			repo.NumOpenIssues, repo.NumClosedIssues = int(numOpen), int(numClosed)
 		}
 
@@ -239,7 +244,7 @@ func Issues(ctx *context.Context) {
 	}
 	ctx.Data["Repos"] = showRepos
 
-	issueStats := models.GetUserIssueStats(repoID, ctxUser.Id, repoIDs, filterMode, isPullList)
+	issueStats := models.GetUserIssueStats(repoID, ctxUser.ID, repoIDs, filterMode, isPullList)
 	issueStats.AllCount = int64(allCount)
 
 	page := ctx.QueryInt("page")
@@ -257,7 +262,7 @@ func Issues(ctx *context.Context) {
 
 	// Get issues.
 	issues, err := models.Issues(&models.IssuesOptions{
-		UserID:     ctxUser.Id,
+		UserID:     ctxUser.ID,
 		AssigneeID: assigneeID,
 		RepoID:     repoID,
 		PosterID:   posterID,
@@ -328,21 +333,21 @@ func showOrgProfile(ctx *context.Context) {
 
 	if ctx.IsSigned {
 		if ctx.User.IsAdmin {
-			repos, err := models.GetRepositories(org.Id, true)
+			repos, err := models.GetRepositories(org.ID, true)
 			if err != nil {
 				ctx.Handle(500, "GetRepositoriesAsAdmin", err)
 				return
 			}
 			ctx.Data["Repos"] = repos
 		} else {
-			if err := org.GetUserRepositories(ctx.User.Id); err != nil {
+			if err := org.GetUserRepositories(ctx.User.ID); err != nil {
 				ctx.Handle(500, "GetUserRepositories", err)
 				return
 			}
 			ctx.Data["Repos"] = org.Repos
 		}
 	} else {
-		repos, err := models.GetRepositories(org.Id, false)
+		repos, err := models.GetRepositories(org.ID, false)
 		if err != nil {
 			ctx.Handle(500, "GetRepositories", err)
 			return
diff --git a/routers/user/profile.go b/routers/user/profile.go
index 847cffdd..0e436eac 100644
--- a/routers/user/profile.go
+++ b/routers/user/profile.go
@@ -62,7 +62,7 @@ func Profile(ctx *context.Context) {
 
 	// Show SSH keys.
 	if isShowKeys {
-		ShowSSHKeys(ctx, u.Id)
+		ShowSSHKeys(ctx, u.ID)
 		return
 	}
 
@@ -75,7 +75,7 @@ func Profile(ctx *context.Context) {
 	ctx.Data["PageIsUserProfile"] = true
 	ctx.Data["Owner"] = u
 
-	orgs, err := models.GetOrgsByUserID(u.Id, ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.Id == u.Id))
+	orgs, err := models.GetOrgsByUserID(u.ID, ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.ID == u.ID))
 	if err != nil {
 		ctx.Handle(500, "GetOrgsByUserIDDesc", err)
 		return
@@ -87,13 +87,13 @@ func Profile(ctx *context.Context) {
 	ctx.Data["TabName"] = tab
 	switch tab {
 	case "activity":
-		retrieveFeeds(ctx, u.Id, -1, 0, true)
+		retrieveFeeds(ctx, u.ID, -1, 0, true)
 		if ctx.Written() {
 			return
 		}
 	default:
 		var err error
-		ctx.Data["Repos"], err = models.GetRepositories(u.Id, ctx.IsSigned && ctx.User.Id == u.Id)
+		ctx.Data["Repos"], err = models.GetRepositories(u.ID, ctx.IsSigned && ctx.User.ID == u.ID)
 		if err != nil {
 			ctx.Handle(500, "GetRepositories", err)
 			return
@@ -140,9 +140,9 @@ func Action(ctx *context.Context) {
 	var err error
 	switch ctx.Params(":action") {
 	case "follow":
-		err = models.FollowUser(ctx.User.Id, u.Id)
+		err = models.FollowUser(ctx.User.ID, u.ID)
 	case "unfollow":
-		err = models.UnfollowUser(ctx.User.Id, u.Id)
+		err = models.UnfollowUser(ctx.User.ID, u.ID)
 	}
 
 	if err != nil {
diff --git a/routers/user/setting.go b/routers/user/setting.go
index c910cd4e..7412ce34 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -131,7 +131,7 @@ func UpdateAvatarSetting(ctx *context.Context, form auth.UploadAvatarForm, ctxUs
 		// generate a random one when needed.
 		if form.Enable && !com.IsFile(ctxUser.CustomAvatarPath()) {
 			if err := ctxUser.GenerateRandomAvatar(); err != nil {
-				log.Error(4, "GenerateRandomAvatar[%d]: %v", ctxUser.Id, err)
+				log.Error(4, "GenerateRandomAvatar[%d]: %v", ctxUser.ID, err)
 			}
 		}
 	}
@@ -199,7 +199,7 @@ func SettingsEmails(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsEmails"] = true
 
-	emails, err := models.GetEmailAddresses(ctx.User.Id)
+	emails, err := models.GetEmailAddresses(ctx.User.ID)
 	if err != nil {
 		ctx.Handle(500, "GetEmailAddresses", err)
 		return
@@ -226,7 +226,7 @@ func SettingsEmailPost(ctx *context.Context, form auth.AddEmailForm) {
 	}
 
 	// Add Email address.
-	emails, err := models.GetEmailAddresses(ctx.User.Id)
+	emails, err := models.GetEmailAddresses(ctx.User.ID)
 	if err != nil {
 		ctx.Handle(500, "GetEmailAddresses", err)
 		return
@@ -239,7 +239,7 @@ func SettingsEmailPost(ctx *context.Context, form auth.AddEmailForm) {
 	}
 
 	email := &models.EmailAddress{
-		UID:         ctx.User.Id,
+		UID:         ctx.User.ID,
 		Email:       form.Email,
 		IsActivated: !setting.Service.RegisterEmailConfirm,
 	}
@@ -285,7 +285,7 @@ func SettingsSSHKeys(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsSSHKeys"] = true
 
-	keys, err := models.ListPublicKeys(ctx.User.Id)
+	keys, err := models.ListPublicKeys(ctx.User.ID)
 	if err != nil {
 		ctx.Handle(500, "ListPublicKeys", err)
 		return
@@ -299,7 +299,7 @@ func SettingsSSHKeysPost(ctx *context.Context, form auth.AddSSHKeyForm) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsSSHKeys"] = true
 
-	keys, err := models.ListPublicKeys(ctx.User.Id)
+	keys, err := models.ListPublicKeys(ctx.User.ID)
 	if err != nil {
 		ctx.Handle(500, "ListPublicKeys", err)
 		return
@@ -322,7 +322,7 @@ func SettingsSSHKeysPost(ctx *context.Context, form auth.AddSSHKeyForm) {
 		}
 	}
 
-	if _, err = models.AddPublicKey(ctx.User.Id, form.Title, content); err != nil {
+	if _, err = models.AddPublicKey(ctx.User.ID, form.Title, content); err != nil {
 		ctx.Data["HasError"] = true
 		switch {
 		case models.IsErrKeyAlreadyExist(err):
@@ -357,7 +357,7 @@ func SettingsApplications(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsApplications"] = true
 
-	tokens, err := models.ListAccessTokens(ctx.User.Id)
+	tokens, err := models.ListAccessTokens(ctx.User.ID)
 	if err != nil {
 		ctx.Handle(500, "ListAccessTokens", err)
 		return
@@ -372,7 +372,7 @@ func SettingsApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm
 	ctx.Data["PageIsSettingsApplications"] = true
 
 	if ctx.HasError() {
-		tokens, err := models.ListAccessTokens(ctx.User.Id)
+		tokens, err := models.ListAccessTokens(ctx.User.ID)
 		if err != nil {
 			ctx.Handle(500, "ListAccessTokens", err)
 			return
@@ -383,7 +383,7 @@ func SettingsApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm
 	}
 
 	t := &models.AccessToken{
-		UID:  ctx.User.Id,
+		UID:  ctx.User.ID,
 		Name: form.Name,
 	}
 	if err := models.NewAccessToken(t); err != nil {