use "optional" correctly

go-gitea · Dec 10, 2024 · 6feb95b · 6feb95b
1 parent f9dfaa2
commit 6feb95b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go
@@ -353,7 +353,7 @@ func issuePullAccessibleRepoCond(repoIDstr string, userID int64, org *organizati
 }
 
 func applyAssigneeCondition(sess *xorm.Session, assigneeID optional.Option[int64]) {
-	if assigneeID == nil || assigneeID.Value() == 0 {
+	if !assigneeID.Has() || assigneeID.Value() == 0 {
 		return
 	}
 	if assigneeID.Value() == db.NoConditionID {
@@ -365,7 +365,7 @@ func applyAssigneeCondition(sess *xorm.Session, assigneeID optional.Option[int64
 }
 
 func applyPosterCondition(sess *xorm.Session, posterID optional.Option[int64]) {
-	if posterID == nil {
+	if !posterID.Has() {
 		return
 	}
 	// poster doesn't need to support db.NoConditionID(-1), so just use the value as-is

diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go
@@ -339,7 +339,7 @@ func ViewProject(ctx *context.Context) {
 	if ctx.Written() {
 		return
 	}
-	assigneeID := ctx.FormInt64("assignee")
+	assigneeID := ctx.FormInt64("assignee") // TODO: use "optional" but not 0 in the future
 
 	issuesMap, err := issues_model.LoadIssuesFromColumnList(ctx, columns, &issues_model.IssuesOptions{
 		LabelIDs:   labelIDs,

diff --git a/routers/web/repo/issue_list.go b/routers/web/repo/issue_list.go
@@ -488,7 +488,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 		viewType = "all"
 	}
 
-	assigneeID := ctx.FormInt64("assignee")
+	assigneeID := ctx.FormInt64("assignee") // TODO: use "optional" but not 0 in the future
 	posterUsername := ctx.FormString("poster")
 	posterUserID := shared_user.GetFilterUserIDByName(ctx, posterUsername)
 	var mentionedID, reviewRequestedID, reviewedID int64

diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go
@@ -310,7 +310,7 @@ func ViewProject(ctx *context.Context) {
 
 	labelIDs := issue.PrepareFilterIssueLabels(ctx, ctx.Repo.Repository.ID, ctx.Repo.Owner)
 
-	assigneeID := ctx.FormInt64("assignee")
+	assigneeID := ctx.FormInt64("assignee") // TODO: use "optional" but not 0 in the future
 
 	issuesMap, err := issues_model.LoadIssuesFromColumnList(ctx, columns, &issues_model.IssuesOptions{
 		LabelIDs:   labelIDs,

diff --git a/routers/web/shared/user/helper.go b/routers/web/shared/user/helper.go
@@ -39,7 +39,7 @@ func MakeSelfOnTop(doer *user.User, users []*user.User) []*user.User {
 // * some(NonExistingID): match no issue (due to the user doesn't exist)
 func GetFilterUserIDByName(ctx context.Context, name string) optional.Option[int64] {
 	if name == "" {
-		return nil
+		return optional.None[int64]()
 	}
 	u, err := user.GetUserByName(ctx, name)
 	if err != nil {