Clean up code based on lint

Author: RedCocoon

models/conversations/comment.go

@@ -5,6 +5,7 @@ package conversations
 import (
 	"context"
 	"fmt"
+	"html/template"
 
 	"code.gitea.io/gitea/models/db"
 	repo_model "code.gitea.io/gitea/models/repo"
@@ -17,8 +18,6 @@ import (
 	"code.gitea.io/gitea/modules/translation"
 	"code.gitea.io/gitea/modules/util"
 
-	"html/template"
-
 	"xorm.io/builder"
 )
 
@@ -527,11 +526,11 @@ func (c *Comment) UpdateAttachments(ctx context.Context, uuids []string) error {
 }
 
 // HashTag returns unique hash tag for conversation.
-func (comment *Comment) HashTag() string {
-	return fmt.Sprintf("comment-%d", comment.ID)
+func (c *Comment) HashTag() string {
+	return fmt.Sprintf("comment-%d", c.ID)
 }
 
-func (c *Comment) hashLink(ctx context.Context) string {
+func (c *Comment) hashLink() string {
 	return "#" + c.HashTag()
 }
 
@@ -547,7 +546,7 @@ func (c *Comment) HTMLURL(ctx context.Context) string {
 		log.Error("loadRepo(%d): %v", c.Conversation.RepoID, err)
 		return ""
 	}
-	return c.Conversation.HTMLURL() + c.hashLink(ctx)
+	return c.Conversation.HTMLURL() + c.hashLink()
 }
 
 // APIURL formats a API-string to the conversation-comment

models/conversations/comment_list.go

@@ -189,9 +189,5 @@ func (comments CommentList) LoadAttributes(ctx context.Context) (err error) {
 		return err
 	}
 
-	if err = comments.LoadConversations(ctx); err != nil {
-		return err
-	}
-
-	return nil
+	return comments.LoadConversations(ctx)
 }

models/conversations/conversation.go

@@ -211,11 +211,7 @@ func (conversation *Conversation) LoadAttributes(ctx context.Context) (err error
 		return err
 	}
 
-	if err = conversation.Comments.LoadAttributes(ctx); err != nil {
-		return err
-	}
-
-	return nil
+	return conversation.Comments.LoadAttributes(ctx)
 }
 
 // LoadRepo loads conversation's repository

models/conversations/conversation_search.go

@@ -7,12 +7,10 @@ import (
 	"context"
 	"fmt"
 	"strconv"
-	"strings"
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/organization"
 	repo_model "code.gitea.io/gitea/models/repo"
-	"code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/container"
 	"code.gitea.io/gitea/modules/optional"
@@ -259,48 +257,6 @@ func applyConditions(sess *xorm.Session, opts *ConversationsOptions) {
 	applyLabelsCondition(sess, opts)
 }
 
-// teamUnitsRepoCond returns query condition for those repo id in the special org team with special units access
-func teamUnitsRepoCond(id string, userID, orgID, teamID int64, units ...unit.Type) builder.Cond {
-	return builder.In(id,
-		builder.Select("repo_id").From("team_repo").Where(
-			builder.Eq{
-				"team_id": teamID,
-			}.And(
-				builder.Or(
-					// Check if the user is member of the team.
-					builder.In(
-						"team_id", builder.Select("team_id").From("team_user").Where(
-							builder.Eq{
-								"uid": userID,
-							},
-						),
-					),
-					// Check if the user is in the owner team of the organisation.
-					builder.Exists(builder.Select("team_id").From("team_user").
-						Where(builder.Eq{
-							"org_id": orgID,
-							"team_id": builder.Select("id").From("team").Where(
-								builder.Eq{
-									"org_id":     orgID,
-									"lower_name": strings.ToLower(organization.OwnerTeamName),
-								}),
-							"uid": userID,
-						}),
-					),
-				)).And(
-				builder.In(
-					"team_id", builder.Select("team_id").From("team_unit").Where(
-						builder.Eq{
-							"`team_unit`.org_id": orgID,
-						}.And(
-							builder.In("`team_unit`.type", units),
-						),
-					),
-				),
-			),
-		))
-}
-
 func applyPosterCondition(sess *xorm.Session, posterID int64) {
 	sess.And("conversation.poster_id=?", posterID)
 }

models/conversations/conversation_user.go

@@ -66,7 +66,6 @@ func GetConversationMentionIDs(ctx context.Context, conversationID int64) ([]int
 
 // NewConversationUsers inserts an conversation related users
 func NewConversationUsers(ctx context.Context, repo *repo_model.Repository, conversation *Conversation) error {
-
 	// Leave a seat for poster itself to append later, but if poster is one of assignee
 	// and just waste 1 unit is cheaper than re-allocate memory once.
 	conversationUsers := make([]*ConversationUser, 0, 1)

models/unit/unit.go

@@ -31,7 +31,7 @@ const (
 	TypeProjects                    // 8 Projects
 	TypePackages                    // 9 Packages
 	TypeActions                     // 10 Actions
-	TypeConversations               //11 Conversations
+	TypeConversations               // 11 Conversations
 )
 
 // Value returns integer value for unit type (used by template)

modules/structs/conversation.go

@@ -16,22 +16,11 @@ import (
 // Conversation represents an conversation in a repository
 // swagger:model
 type Conversation struct {
-	ID               int64         `json:"id"`
-	URL              string        `json:"url"`
-	HTMLURL          string        `json:"html_url"`
-	Index            int64         `json:"number"`
-	Poster           *User         `json:"user"`
-	OriginalAuthor   string        `json:"original_author"`
-	OriginalAuthorID int64         `json:"original_author_id"`
-	Title            string        `json:"title"`
-	Body             string        `json:"body"`
-	Ref              string        `json:"ref"`
-	Attachments      []*Attachment `json:"assets"`
-	Labels           []*Label      `json:"labels"`
-	Milestone        *Milestone    `json:"milestone"`
-	// deprecated
-	Assignee  *User   `json:"assignee"`
-	Assignees []*User `json:"assignees"`
+	ID      int64  `json:"id"`
+	URL     string `json:"url"`
+	HTMLURL string `json:"html_url"`
+	Index   int64  `json:"number"`
+	Ref     string `json:"ref"`
 	// Whether the conversation is open or locked
 	//
 	// type: string
@@ -48,35 +37,12 @@ type Conversation struct {
 	// swagger:strfmt date-time
 	Deadline *time.Time `json:"due_date"`
 
-	PullRequest *PullRequestMeta `json:"pull_request"`
-	Repo        *RepositoryMeta  `json:"repository"`
-
-	PinOrder int `json:"pin_order"`
+	Repo *RepositoryMeta `json:"repository"`
 }
 
 // CreateConversationOption options to create one conversation
 type CreateConversationOption struct {
-	// required:true
-	Title string `json:"title" binding:"Required"`
-	Body  string `json:"body"`
-	Ref   string `json:"ref"`
-	// deprecated
-	Assignee  string   `json:"assignee"`
-	Assignees []string `json:"assignees"`
-	// swagger:strfmt date-time
-	Deadline *time.Time `json:"due_date"`
-	// milestone id
-	Milestone int64 `json:"milestone"`
-	// list of label ids
-	Labels []int64 `json:"labels"`
-	Locked bool    `json:"locked"`
-}
-
-// EditConversationOption options for editing an conversation
-type EditConversationOption struct {
-	Title string  `json:"title"`
-	Body  *string `json:"body"`
-	Ref   *string `json:"ref"`
+	Locked bool `json:"locked"`
 }
 
 // ConversationFormFieldType defines conversation form field type, can be "markdown", "textarea", "input", "dropdown" or "checkboxes"

routers/api/v1/api.go

@@ -672,7 +672,6 @@ func mustEnableConversations(ctx *context.APIContext) {
 		ctx.NotFound()
 		return
 	}
-
 }
 
 func mustEnableIssuesOrPulls(ctx *context.APIContext) {
@@ -1514,7 +1513,6 @@ func Routes() *web.Router {
 							// m.Combo("/{id}", reqToken()).Patch(bind(api.EditIssueCommentOption{}), repo.EditIssueCommentDeprecated).
 							// 	Delete(repo.DeleteIssueCommentDeprecated)
 						})
-
 					}, mustEnableConversations)
 				})
 			})