Docker/forgejo
Docker/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-02 16:35:19 +02:00
Code Issues Releases Activity

Move user related model into models/user (#17781)

Browse source 
* Move user related model into models/user

* Fix lint for windows

* Fix windows lint

* Fix windows lint

* Move some tests in models

* Merge
This commit is contained in:
Lunny Xiao 2021-11-24 17:49:20 +08:00 • committed by GitHub
parent 4e7ca946da
commit a666829a37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
345 changed files with 4230 additions and 3813 deletions
Download patch file Download diff file Expand all files Collapse all files

11
models/issue_comment_list.go
View file

@ -7,6 +7,7 @@ package models
import (
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
)
// CommentList defines a list of comments
@ -28,7 +29,7 @@ func (comments CommentList) loadPosters(e db.Engine) error {
}
posterIDs := comments.getPosterIDs()
posterMaps := make(map[int64]*User, len(posterIDs))
posterMaps := make(map[int64]*user_model.User, len(posterIDs))
left := len(posterIDs)
for left > 0 {
limit := defaultMaxInSize
@ -51,7 +52,7 @@ func (comments CommentList) loadPosters(e db.Engine) error {
}
var ok bool
if comment.Poster, ok = posterMaps[comment.PosterID]; !ok {
comment.Poster = NewGhostUser()
comment.Poster = user_model.NewGhostUser()
}
}
return nil
@ -217,7 +218,7 @@ func (comments CommentList) loadAssignees(e db.Engine) error {
}
assigneeIDs := comments.getAssigneeIDs()
assignees := make(map[int64]*User, len(assigneeIDs))
assignees := make(map[int64]*user_model.User, len(assigneeIDs))
left := len(assigneeIDs)
for left > 0 {
limit := defaultMaxInSize
@ -226,13 +227,13 @@ func (comments CommentList) loadAssignees(e db.Engine) error {
}
rows, err := e.
In("id", assigneeIDs[:limit]).
Rows(new(User))
Rows(new(user_model.User))
if err != nil {
return err
}
for rows.Next() {
var user User
var user user_model.User
err = rows.Scan(&user)
if err != nil {
rows.Close()