aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/action.go10
-rw-r--r--models/admin.go4
-rw-r--r--models/git_diff.go4
-rw-r--r--models/issue.go4
-rw-r--r--models/issue_label.go6
-rw-r--r--models/migrations/migrations.go6
-rw-r--r--models/repo_branch.go14
-rw-r--r--models/ssh_key.go4
-rw-r--r--models/token.go4
-rw-r--r--models/user.go32
10 files changed, 44 insertions, 44 deletions
diff --git a/models/action.go b/models/action.go
index e1378e99..0ad5f287 100644
--- a/models/action.go
+++ b/models/action.go
@@ -21,7 +21,7 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/tool"
"github.com/gogits/gogs/pkg/setting"
)
@@ -108,7 +108,7 @@ func (a *Action) GetActUserName() string {
}
func (a *Action) ShortActUserName() string {
- return base.EllipsisString(a.ActUserName, 20)
+ return tool.EllipsisString(a.ActUserName, 20)
}
func (a *Action) GetRepoUserName() string {
@@ -116,7 +116,7 @@ func (a *Action) GetRepoUserName() string {
}
func (a *Action) ShortRepoUserName() string {
- return base.EllipsisString(a.RepoUserName, 20)
+ return tool.EllipsisString(a.RepoUserName, 20)
}
func (a *Action) GetRepoName() string {
@@ -124,7 +124,7 @@ func (a *Action) GetRepoName() string {
}
func (a *Action) ShortRepoName() string {
- return base.EllipsisString(a.RepoName, 33)
+ return tool.EllipsisString(a.RepoName, 33)
}
func (a *Action) GetRepoPath() string {
@@ -305,7 +305,7 @@ func (push *PushCommits) AvatarLink(email string) string {
if !ok {
u, err := GetUserByEmail(email)
if err != nil {
- push.avatars[email] = base.AvatarLink(email)
+ push.avatars[email] = tool.AvatarLink(email)
if !errors.IsUserNotExist(err) {
log.Error(4, "GetUserByEmail: %v", err)
}
diff --git a/models/admin.go b/models/admin.go
index bad7a3bf..8816786d 100644
--- a/models/admin.go
+++ b/models/admin.go
@@ -15,7 +15,7 @@ import (
"github.com/go-xorm/xorm"
log "gopkg.in/clog.v1"
- "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/tool"
"github.com/gogits/gogs/pkg/setting"
)
@@ -128,6 +128,6 @@ func DeleteNoticesByIDs(ids []int64) error {
if len(ids) == 0 {
return nil
}
- _, err := x.Where("id IN (" + strings.Join(base.Int64sToStrings(ids), ",") + ")").Delete(new(Notice))
+ _, err := x.Where("id IN (" + strings.Join(tool.Int64sToStrings(ids), ",") + ")").Delete(new(Notice))
return err
}
diff --git a/models/git_diff.go b/models/git_diff.go
index f8282940..3a47533f 100644
--- a/models/git_diff.go
+++ b/models/git_diff.go
@@ -17,7 +17,7 @@ import (
"github.com/gogits/git-module"
- "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/tool"
"github.com/gogits/gogs/pkg/setting"
"github.com/gogits/gogs/pkg/template/highlight"
)
@@ -145,7 +145,7 @@ func NewDiff(gitDiff *git.Diff) *Diff {
}
}
- charsetLabel, err := base.DetectEncoding(buf.Bytes())
+ charsetLabel, err := tool.DetectEncoding(buf.Bytes())
if charsetLabel != "UTF-8" && err == nil {
encoding, _ := charset.Lookup(charsetLabel)
if encoding != nil {
diff --git a/models/issue.go b/models/issue.go
index 789165c4..cf49f173 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -16,7 +16,7 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models/errors"
- "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/tool"
"github.com/gogits/gogs/pkg/setting"
)
@@ -1213,7 +1213,7 @@ func GetIssueStats(opts *IssueStatsOptions) *IssueStats {
sess := x.Where("issue.repo_id = ?", opts.RepoID).And("is_pull = ?", opts.IsPull)
if len(opts.Labels) > 0 && opts.Labels != "0" {
- labelIDs := base.StringsToInt64s(strings.Split(opts.Labels, ","))
+ labelIDs := tool.StringsToInt64s(strings.Split(opts.Labels, ","))
if len(labelIDs) > 0 {
sess.Join("INNER", "issue_label", "issue.id = issue_id").In("label_id", labelIDs)
}
diff --git a/models/issue_label.go b/models/issue_label.go
index 096bba25..1ce5df07 100644
--- a/models/issue_label.go
+++ b/models/issue_label.go
@@ -15,7 +15,7 @@ import (
api "github.com/gogits/go-gogs-client"
- "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/tool"
)
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")
@@ -138,7 +138,7 @@ func GetLabelOfRepoByID(repoID, labelID int64) (*Label, error) {
// it silently ignores label IDs that are not belong to the repository.
func GetLabelsInRepoByIDs(repoID int64, labelIDs []int64) ([]*Label, error) {
labels := make([]*Label, 0, len(labelIDs))
- return labels, x.Where("repo_id = ?", repoID).In("id", base.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
+ return labels, x.Where("repo_id = ?", repoID).In("id", tool.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
}
// GetLabelsByRepoID returns all labels that belong to given repository by ID.
@@ -161,7 +161,7 @@ func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) {
}
labels := make([]*Label, 0, len(labelIDs))
- return labels, e.Where("id > 0").In("id", base.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
+ return labels, e.Where("id > 0").In("id", tool.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
}
// GetLabelsByIssueID returns all labels that belong to given issue by ID.
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 2f6f828f..30733423 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -13,7 +13,7 @@ import (
"github.com/go-xorm/xorm"
log "gopkg.in/clog.v1"
- "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/tool"
)
const _MIN_DB_VER = 10
@@ -159,10 +159,10 @@ func generateOrgRandsAndSalt(x *xorm.Engine) (err error) {
}
for _, org := range orgs {
- if org.Rands, err = base.GetRandomString(10); err != nil {
+ if org.Rands, err = tool.GetRandomString(10); err != nil {
return err
}
- if org.Salt, err = base.GetRandomString(10); err != nil {
+ if org.Salt, err = tool.GetRandomString(10); err != nil {
return err
}
if _, err = sess.Id(org.ID).Update(org); err != nil {
diff --git a/models/repo_branch.go b/models/repo_branch.go
index b0c7d55d..8c2bbd33 100644
--- a/models/repo_branch.go
+++ b/models/repo_branch.go
@@ -11,7 +11,7 @@ import (
"github.com/Unknwon/com"
"github.com/gogits/git-module"
- "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/tool"
)
type Branch struct {
@@ -149,10 +149,10 @@ func UpdateOrgProtectBranch(repo *Repository, protectBranch *ProtectBranch, whit
}
hasUsersChanged := false
- validUserIDs := base.StringsToInt64s(strings.Split(protectBranch.WhitelistUserIDs, ","))
+ validUserIDs := tool.StringsToInt64s(strings.Split(protectBranch.WhitelistUserIDs, ","))
if protectBranch.WhitelistUserIDs != whitelistUserIDs {
hasUsersChanged = true
- userIDs := base.StringsToInt64s(strings.Split(whitelistUserIDs, ","))
+ userIDs := tool.StringsToInt64s(strings.Split(whitelistUserIDs, ","))
validUserIDs = make([]int64, 0, len(userIDs))
for _, userID := range userIDs {
has, err := HasAccess(userID, repo, ACCESS_MODE_WRITE)
@@ -165,14 +165,14 @@ func UpdateOrgProtectBranch(repo *Repository, protectBranch *ProtectBranch, whit
validUserIDs = append(validUserIDs, userID)
}
- protectBranch.WhitelistUserIDs = strings.Join(base.Int64sToStrings(validUserIDs), ",")
+ protectBranch.WhitelistUserIDs = strings.Join(tool.Int64sToStrings(validUserIDs), ",")
}
hasTeamsChanged := false
- validTeamIDs := base.StringsToInt64s(strings.Split(protectBranch.WhitelistTeamIDs, ","))
+ validTeamIDs := tool.StringsToInt64s(strings.Split(protectBranch.WhitelistTeamIDs, ","))
if protectBranch.WhitelistTeamIDs != whitelistTeamIDs {
hasTeamsChanged = true
- teamIDs := base.StringsToInt64s(strings.Split(whitelistTeamIDs, ","))
+ teamIDs := tool.StringsToInt64s(strings.Split(whitelistTeamIDs, ","))
teams, err := GetTeamsHaveAccessToRepo(repo.OwnerID, repo.ID, ACCESS_MODE_WRITE)
if err != nil {
return fmt.Errorf("GetTeamsHaveAccessToRepo [org_id: %d, repo_id: %d]: %v", repo.OwnerID, repo.ID, err)
@@ -184,7 +184,7 @@ func UpdateOrgProtectBranch(repo *Repository, protectBranch *ProtectBranch, whit
}
}
- protectBranch.WhitelistTeamIDs = strings.Join(base.Int64sToStrings(validTeamIDs), ",")
+ protectBranch.WhitelistTeamIDs = strings.Join(tool.Int64sToStrings(validTeamIDs), ",")
}
// Make sure protectBranch.ID is not 0 for whitelists
diff --git a/models/ssh_key.go b/models/ssh_key.go
index b8a5095b..7fa5c908 100644
--- a/models/ssh_key.go
+++ b/models/ssh_key.go
@@ -23,7 +23,7 @@ import (
"golang.org/x/crypto/ssh"
log "gopkg.in/clog.v1"
- "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/tool"
"github.com/gogits/gogs/pkg/process"
"github.com/gogits/gogs/pkg/setting"
)
@@ -484,7 +484,7 @@ func deletePublicKeys(e *xorm.Session, keyIDs ...int64) error {
return nil
}
- _, err := e.In("id", strings.Join(base.Int64sToStrings(keyIDs), ",")).Delete(new(PublicKey))
+ _, err := e.In("id", strings.Join(tool.Int64sToStrings(keyIDs), ",")).Delete(new(PublicKey))
return err
}
diff --git a/models/token.go b/models/token.go
index c18a6616..6824e43c 100644
--- a/models/token.go
+++ b/models/token.go
@@ -10,7 +10,7 @@ import (
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
- "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/tool"
)
// AccessToken represents a personal access token.
@@ -49,7 +49,7 @@ func (t *AccessToken) AfterSet(colName string, _ xorm.Cell) {
// NewAccessToken creates new access token.
func NewAccessToken(t *AccessToken) error {
- t.Sha1 = base.EncodeSha1(gouuid.NewV4().String())
+ t.Sha1 = tool.EncodeSha1(gouuid.NewV4().String())
_, err := x.Insert(t)
return err
}
diff --git a/models/user.go b/models/user.go
index 13f37f6b..1c733d6e 100644
--- a/models/user.go
+++ b/models/user.go
@@ -31,7 +31,7 @@ import (
"github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/pkg/avatar"
- "github.com/gogits/gogs/pkg/base"
+ "github.com/gogits/gogs/pkg/tool"
"github.com/gogits/gogs/pkg/setting"
)
@@ -191,7 +191,7 @@ func (u *User) HTMLURL() string {
// GenerateEmailActivateCode generates an activate code based on user information and given e-mail.
func (u *User) GenerateEmailActivateCode(email string) string {
- code := base.CreateTimeLimitCode(
+ code := tool.CreateTimeLimitCode(
com.ToStr(u.ID)+email+u.LowerName+u.Passwd+u.Rands,
setting.Service.ActiveCodeLives, nil)
@@ -262,7 +262,7 @@ func (u *User) RelAvatarLink() string {
return setting.AppSubUrl + "/avatars/" + com.ToStr(u.ID)
}
- return base.AvatarLink(u.AvatarEmail)
+ return tool.AvatarLink(u.AvatarEmail)
}
// AvatarLink returns user avatar absolute link.
@@ -462,7 +462,7 @@ func (u *User) DisplayName() string {
}
func (u *User) ShortName(length int) string {
- return base.EllipsisString(u.Name, length)
+ return tool.EllipsisString(u.Name, length)
}
// IsMailable checks if a user is elegible
@@ -484,7 +484,7 @@ func IsUserExist(uid int64, name string) (bool, error) {
// GetUserSalt returns a ramdom user salt token.
func GetUserSalt() (string, error) {
- return base.GetRandomString(10)
+ return tool.GetRandomString(10)
}
// NewGhostUser creates and returns a fake user for someone has deleted his/her account.
@@ -553,7 +553,7 @@ func CreateUser(u *User) (err error) {
u.LowerName = strings.ToLower(u.Name)
u.AvatarEmail = u.Email
- u.Avatar = base.HashEmail(u.AvatarEmail)
+ u.Avatar = tool.HashEmail(u.AvatarEmail)
if u.Rands, err = GetUserSalt(); err != nil {
return err
}
@@ -596,12 +596,12 @@ func Users(page, pageSize int) ([]*User, error) {
// get user by erify code
func getVerifyUser(code string) (user *User) {
- if len(code) <= base.TimeLimitCodeLength {
+ if len(code) <= tool.TimeLimitCodeLength {
return nil
}
// use tail hex username query user
- hexStr := code[base.TimeLimitCodeLength:]
+ hexStr := code[tool.TimeLimitCodeLength:]
if b, err := hex.DecodeString(hexStr); err == nil {
if user, err = GetUserByName(string(b)); user != nil {
return user
@@ -618,10 +618,10 @@ func VerifyUserActiveCode(code string) (user *User) {
if user = getVerifyUser(code); user != nil {
// time limit code
- prefix := code[:base.TimeLimitCodeLength]
+ prefix := code[:tool.TimeLimitCodeLength]
data := com.ToStr(user.ID) + user.Email + user.LowerName + user.Passwd + user.Rands
- if base.VerifyTimeLimitCode(data, minutes, prefix) {
+ if tool.VerifyTimeLimitCode(data, minutes, prefix) {
return user
}
}
@@ -634,10 +634,10 @@ func VerifyActiveEmailCode(code, email string) *EmailAddress {
if user := getVerifyUser(code); user != nil {
// time limit code
- prefix := code[:base.TimeLimitCodeLength]
+ prefix := code[:tool.TimeLimitCodeLength]
data := com.ToStr(user.ID) + email + user.LowerName + user.Passwd + user.Rands
- if base.VerifyTimeLimitCode(data, minutes, prefix) {
+ if tool.VerifyTimeLimitCode(data, minutes, prefix) {
emailAddress := &EmailAddress{Email: email}
if has, _ := x.Get(emailAddress); has {
return emailAddress
@@ -696,13 +696,13 @@ func updateUser(e Engine, u *User) error {
if len(u.AvatarEmail) == 0 {
u.AvatarEmail = u.Email
}
- u.Avatar = base.HashEmail(u.AvatarEmail)
+ u.Avatar = tool.HashEmail(u.AvatarEmail)
}
u.LowerName = strings.ToLower(u.Name)
- u.Location = base.TruncateString(u.Location, 255)
- u.Website = base.TruncateString(u.Website, 255)
- u.Description = base.TruncateString(u.Description, 255)
+ u.Location = tool.TruncateString(u.Location, 255)
+ u.Website = tool.TruncateString(u.Website, 255)
+ u.Description = tool.TruncateString(u.Description, 255)
_, err := e.Id(u.ID).AllCols().Update(u)
return err
Powered by cgit, Themed by Ted Yin.