summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/action.go8
-rw-r--r--models/admin.go6
-rw-r--r--models/attachment.go8
-rw-r--r--models/branches.go35
-rw-r--r--models/commit_status.go6
-rw-r--r--models/gpg_key.go28
-rw-r--r--models/gpg_key_test.go6
-rw-r--r--models/issue.go17
-rw-r--r--models/issue_comment.go17
-rw-r--r--models/issue_dependency.go14
-rw-r--r--models/issue_milestone.go9
-rw-r--r--models/issue_milestone_test.go6
-rw-r--r--models/issue_reaction.go16
-rw-r--r--models/issue_stopwatch.go10
-rw-r--r--models/issue_stopwatch_test.go4
-rw-r--r--models/issue_tracked_time.go2
-rw-r--r--models/issue_watch.go14
-rw-r--r--models/lfs.go14
-rw-r--r--models/login_source.go14
-rw-r--r--models/mail.go7
-rw-r--r--models/migrations/v54.go4
-rw-r--r--models/migrations/v57.go4
-rw-r--r--models/migrations/v64.go14
-rw-r--r--models/migrations/v65.go7
-rw-r--r--models/migrations/v71.go12
-rw-r--r--models/migrations/v72.go6
-rw-r--r--models/migrations/v76.go4
-rw-r--r--models/migrations/v83.go8
-rw-r--r--models/migrations/v85.go14
-rw-r--r--models/notification.go6
-rw-r--r--models/oauth2_application.go17
-rw-r--r--models/pull.go14
-rw-r--r--models/release.go20
-rw-r--r--models/repo.go8
-rw-r--r--models/repo_mirror.go13
-rw-r--r--models/repo_unit.go10
-rw-r--r--models/review.go8
-rw-r--r--models/ssh_key.go24
-rw-r--r--models/token.go16
-rw-r--r--models/topic.go6
-rw-r--r--models/twofactor.go14
-rw-r--r--models/u2f.go8
-rw-r--r--models/update.go6
-rw-r--r--models/user.go9
-rw-r--r--models/user_heatmap.go8
-rw-r--r--models/webhook.go7
46 files changed, 257 insertions, 251 deletions
diff --git a/models/action.go b/models/action.go
index ab8a657e0d..4b0a55921b 100644
--- a/models/action.go
+++ b/models/action.go
@@ -20,7 +20,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"xorm.io/builder"
@@ -91,9 +91,9 @@ type Action struct {
Comment *Comment `xorm:"-"`
IsDeleted bool `xorm:"INDEX NOT NULL DEFAULT false"`
RefName string
- IsPrivate bool `xorm:"INDEX NOT NULL DEFAULT false"`
- Content string `xorm:"TEXT"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
+ IsPrivate bool `xorm:"INDEX NOT NULL DEFAULT false"`
+ Content string `xorm:"TEXT"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
}
// GetOpType gets the ActionType of this action.
diff --git a/models/admin.go b/models/admin.go
index 4480d11480..4585657e9f 100644
--- a/models/admin.go
+++ b/models/admin.go
@@ -9,7 +9,7 @@ import (
"os"
"code.gitea.io/gitea/modules/log"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
)
@@ -26,8 +26,8 @@ const (
type Notice struct {
ID int64 `xorm:"pk autoincr"`
Type NoticeType
- Description string `xorm:"TEXT"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
+ Description string `xorm:"TEXT"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
}
// TrStr returns a translation format string.
diff --git a/models/attachment.go b/models/attachment.go
index 1740f065d0..7fbf9dde99 100644
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -12,7 +12,7 @@ import (
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
@@ -27,9 +27,9 @@ type Attachment struct {
UploaderID int64 `xorm:"INDEX DEFAULT 0"` // Notice: will be zero before this column added
CommentID int64
Name string
- DownloadCount int64 `xorm:"DEFAULT 0"`
- Size int64 `xorm:"DEFAULT 0"`
- CreatedUnix util.TimeStamp `xorm:"created"`
+ DownloadCount int64 `xorm:"DEFAULT 0"`
+ Size int64 `xorm:"DEFAULT 0"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created"`
}
// IncreaseDownloadCount is update download count + 1
diff --git a/models/branches.go b/models/branches.go
index 3d3cff84d3..62b1c208f6 100644
--- a/models/branches.go
+++ b/models/branches.go
@@ -11,6 +11,7 @@ import (
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/Unknwon/com"
@@ -30,16 +31,16 @@ type ProtectedBranch struct {
BranchName string `xorm:"UNIQUE(s)"`
CanPush bool `xorm:"NOT NULL DEFAULT false"`
EnableWhitelist bool
- WhitelistUserIDs []int64 `xorm:"JSON TEXT"`
- WhitelistTeamIDs []int64 `xorm:"JSON TEXT"`
- EnableMergeWhitelist bool `xorm:"NOT NULL DEFAULT false"`
- MergeWhitelistUserIDs []int64 `xorm:"JSON TEXT"`
- MergeWhitelistTeamIDs []int64 `xorm:"JSON TEXT"`
- ApprovalsWhitelistUserIDs []int64 `xorm:"JSON TEXT"`
- ApprovalsWhitelistTeamIDs []int64 `xorm:"JSON TEXT"`
- RequiredApprovals int64 `xorm:"NOT NULL DEFAULT 0"`
- CreatedUnix util.TimeStamp `xorm:"created"`
- UpdatedUnix util.TimeStamp `xorm:"updated"`
+ WhitelistUserIDs []int64 `xorm:"JSON TEXT"`
+ WhitelistTeamIDs []int64 `xorm:"JSON TEXT"`
+ EnableMergeWhitelist bool `xorm:"NOT NULL DEFAULT false"`
+ MergeWhitelistUserIDs []int64 `xorm:"JSON TEXT"`
+ MergeWhitelistTeamIDs []int64 `xorm:"JSON TEXT"`
+ ApprovalsWhitelistUserIDs []int64 `xorm:"JSON TEXT"`
+ ApprovalsWhitelistTeamIDs []int64 `xorm:"JSON TEXT"`
+ RequiredApprovals int64 `xorm:"NOT NULL DEFAULT 0"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"updated"`
}
// IsProtected returns if the branch is protected
@@ -374,13 +375,13 @@ func (repo *Repository) DeleteProtectedBranch(id int64) (err error) {
// DeletedBranch struct
type DeletedBranch struct {
- ID int64 `xorm:"pk autoincr"`
- RepoID int64 `xorm:"UNIQUE(s) INDEX NOT NULL"`
- Name string `xorm:"UNIQUE(s) NOT NULL"`
- Commit string `xorm:"UNIQUE(s) NOT NULL"`
- DeletedByID int64 `xorm:"INDEX"`
- DeletedBy *User `xorm:"-"`
- DeletedUnix util.TimeStamp `xorm:"INDEX created"`
+ ID int64 `xorm:"pk autoincr"`
+ RepoID int64 `xorm:"UNIQUE(s) INDEX NOT NULL"`
+ Name string `xorm:"UNIQUE(s) NOT NULL"`
+ Commit string `xorm:"UNIQUE(s) NOT NULL"`
+ DeletedByID int64 `xorm:"INDEX"`
+ DeletedBy *User `xorm:"-"`
+ DeletedUnix timeutil.TimeStamp `xorm:"INDEX created"`
}
// AddDeletedBranch adds a deleted branch to the database
diff --git a/models/commit_status.go b/models/commit_status.go
index e864dc3036..9f0a32cdfb 100644
--- a/models/commit_status.go
+++ b/models/commit_status.go
@@ -13,7 +13,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/go-xorm/xorm"
)
@@ -66,8 +66,8 @@ type CommitStatus struct {
Creator *User `xorm:"-"`
CreatorID int64
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
func (status *CommitStatus) loadRepo(e Engine) (err error) {
diff --git a/models/gpg_key.go b/models/gpg_key.go
index 8300cdbd21..72c6891d4d 100644
--- a/models/gpg_key.go
+++ b/models/gpg_key.go
@@ -17,7 +17,7 @@ import (
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/go-xorm/xorm"
"github.com/keybase/go-crypto/openpgp"
@@ -27,14 +27,14 @@ import (
// GPGKey represents a GPG key.
type GPGKey struct {
- ID int64 `xorm:"pk autoincr"`
- OwnerID int64 `xorm:"INDEX NOT NULL"`
- KeyID string `xorm:"INDEX CHAR(16) NOT NULL"`
- PrimaryKeyID string `xorm:"CHAR(16)"`
- Content string `xorm:"TEXT NOT NULL"`
- CreatedUnix util.TimeStamp `xorm:"created"`
- ExpiredUnix util.TimeStamp
- AddedUnix util.TimeStamp
+ ID int64 `xorm:"pk autoincr"`
+ OwnerID int64 `xorm:"INDEX NOT NULL"`
+ KeyID string `xorm:"INDEX CHAR(16) NOT NULL"`
+ PrimaryKeyID string `xorm:"CHAR(16)"`
+ Content string `xorm:"TEXT NOT NULL"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created"`
+ ExpiredUnix timeutil.TimeStamp
+ AddedUnix timeutil.TimeStamp
SubsKey []*GPGKey `xorm:"-"`
Emails []*EmailAddress
CanSign bool
@@ -51,7 +51,7 @@ type GPGKeyImport struct {
// BeforeInsert will be invoked by XORM before inserting a record
func (key *GPGKey) BeforeInsert() {
- key.AddedUnix = util.TimeStampNow()
+ key.AddedUnix = timeutil.TimeStampNow()
}
// AfterLoad is invoked from XORM after setting the values of all fields of this object.
@@ -223,8 +223,8 @@ func parseSubGPGKey(ownerID int64, primaryID string, pubkey *packet.PublicKey, e
KeyID: pubkey.KeyIdString(),
PrimaryKeyID: primaryID,
Content: content,
- CreatedUnix: util.TimeStamp(pubkey.CreationTime.Unix()),
- ExpiredUnix: util.TimeStamp(expiry.Unix()),
+ CreatedUnix: timeutil.TimeStamp(pubkey.CreationTime.Unix()),
+ ExpiredUnix: timeutil.TimeStamp(expiry.Unix()),
CanSign: pubkey.CanSign(),
CanEncryptComms: pubkey.PubKeyAlgo.CanEncrypt(),
CanEncryptStorage: pubkey.PubKeyAlgo.CanEncrypt(),
@@ -301,8 +301,8 @@ func parseGPGKey(ownerID int64, e *openpgp.Entity) (*GPGKey, error) {
KeyID: pubkey.KeyIdString(),
PrimaryKeyID: "",
Content: content,
- CreatedUnix: util.TimeStamp(pubkey.CreationTime.Unix()),
- ExpiredUnix: util.TimeStamp(expiry.Unix()),
+ CreatedUnix: timeutil.TimeStamp(pubkey.CreationTime.Unix()),
+ ExpiredUnix: timeutil.TimeStamp(expiry.Unix()),
Emails: emails,
SubsKey: subkeys,
CanSign: pubkey.CanSign(),
diff --git a/models/gpg_key_test.go b/models/gpg_key_test.go
index 7880046b2e..e2f92e7f81 100644
--- a/models/gpg_key_test.go
+++ b/models/gpg_key_test.go
@@ -8,7 +8,7 @@ import (
"testing"
"time"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/stretchr/testify/assert"
)
@@ -112,7 +112,7 @@ MkM/fdpyc2hY7Dl/+qFmN5MG5yGmMpQcX+RNNR222ibNC1D3wg==
key := &GPGKey{
KeyID: pubkey.KeyIdString(),
Content: content,
- CreatedUnix: util.TimeStamp(pubkey.CreationTime.Unix()),
+ CreatedUnix: timeutil.TimeStamp(pubkey.CreationTime.Unix()),
CanSign: pubkey.CanSign(),
CanEncryptComms: pubkey.PubKeyAlgo.CanEncrypt(),
CanEncryptStorage: pubkey.PubKeyAlgo.CanEncrypt(),
@@ -122,7 +122,7 @@ MkM/fdpyc2hY7Dl/+qFmN5MG5yGmMpQcX+RNNR222ibNC1D3wg==
cannotsignkey := &GPGKey{
KeyID: pubkey.KeyIdString(),
Content: content,
- CreatedUnix: util.TimeStamp(pubkey.CreationTime.Unix()),
+ CreatedUnix: timeutil.TimeStamp(pubkey.CreationTime.Unix()),
CanSign: false,
CanEncryptComms: false,
CanEncryptStorage: false,
diff --git a/models/issue.go b/models/issue.go
index 7561083e0f..ddfa2a2e14 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -16,6 +16,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/Unknwon/com"
@@ -49,11 +50,11 @@ type Issue struct {
NumComments int
Ref string
- DeadlineUnix util.TimeStamp `xorm:"INDEX"`
+ DeadlineUnix timeutil.TimeStamp `xorm:"INDEX"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
- ClosedUnix util.TimeStamp `xorm:"INDEX"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
+ ClosedUnix timeutil.TimeStamp `xorm:"INDEX"`
Attachments []*Attachment `xorm:"-"`
Comments []*Comment `xorm:"-"`
@@ -90,7 +91,7 @@ func (issue *Issue) loadTotalTimes(e Engine) (err error) {
// IsOverdue checks if the issue is overdue
func (issue *Issue) IsOverdue() bool {
- return util.TimeStampNow() >= issue.DeadlineUnix
+ return timeutil.TimeStampNow() >= issue.DeadlineUnix
}
// LoadRepo loads issue's repository
@@ -744,7 +745,7 @@ func (issue *Issue) changeStatus(e *xorm.Session, doer *User, isClosed bool) (er
issue.IsClosed = isClosed
if isClosed {
- issue.ClosedUnix = util.TimeStampNow()
+ issue.ClosedUnix = timeutil.TimeStampNow()
} else {
issue.ClosedUnix = 0
}
@@ -991,7 +992,7 @@ func (issue *Issue) GetTasksDone() int {
}
// GetLastEventTimestamp returns the last user visible event timestamp, either the creation of this issue or the close.
-func (issue *Issue) GetLastEventTimestamp() util.TimeStamp {
+func (issue *Issue) GetLastEventTimestamp() timeutil.TimeStamp {
if issue.IsClosed {
return issue.ClosedUnix
}
@@ -1794,7 +1795,7 @@ func UpdateIssue(issue *Issue) error {
}
// UpdateIssueDeadline updates an issue deadline and adds comments. Setting a deadline to 0 means deleting it.
-func UpdateIssueDeadline(issue *Issue, deadlineUnix util.TimeStamp, doer *User) (err error) {
+func UpdateIssueDeadline(issue *Issue, deadlineUnix timeutil.TimeStamp, doer *User) (err error) {
// if the deadline hasn't changed do nothing
if issue.DeadlineUnix == deadlineUnix {
diff --git a/models/issue_comment.go b/models/issue_comment.go
index 32bb925e9b..3a94a6b5be 100644
--- a/models/issue_comment.go
+++ b/models/issue_comment.go
@@ -12,17 +12,16 @@ import (
"strings"
"code.gitea.io/gitea/modules/git"
+ "code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/markup/markdown"
"code.gitea.io/gitea/modules/setting"
+ api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/modules/timeutil"
+
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"xorm.io/builder"
-
- api "code.gitea.io/gitea/modules/structs"
-
- "code.gitea.io/gitea/modules/log"
- "code.gitea.io/gitea/modules/markup"
- "code.gitea.io/gitea/modules/util"
)
// CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.
@@ -130,8 +129,8 @@ type Comment struct {
// Path represents the 4 lines of code cemented by this comment
Patch string `xorm:"TEXT"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
// Reference issue in commit message
CommitSHA string `xorm:"VARCHAR(40)"`
@@ -711,7 +710,7 @@ func createAssigneeComment(e *xorm.Session, doer *User, repo *Repository, issue
})
}
-func createDeadlineComment(e *xorm.Session, doer *User, issue *Issue, newDeadlineUnix util.TimeStamp) (*Comment, error) {
+func createDeadlineComment(e *xorm.Session, doer *User, issue *Issue, newDeadlineUnix timeutil.TimeStamp) (*Comment, error) {
var content string
var commentType CommentType
diff --git a/models/issue_dependency.go b/models/issue_dependency.go
index ffa972c106..c880bd59c5 100644
--- a/models/issue_dependency.go
+++ b/models/issue_dependency.go
@@ -7,17 +7,17 @@ package models
import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
)
// IssueDependency represents an issue dependency
type IssueDependency struct {
- ID int64 `xorm:"pk autoincr"`
- UserID int64 `xorm:"NOT NULL"`
- IssueID int64 `xorm:"UNIQUE(issue_dependency) NOT NULL"`
- DependencyID int64 `xorm:"UNIQUE(issue_dependency) NOT NULL"`
- CreatedUnix util.TimeStamp `xorm:"created"`
- UpdatedUnix util.TimeStamp `xorm:"updated"`
+ ID int64 `xorm:"pk autoincr"`
+ UserID int64 `xorm:"NOT NULL"`
+ IssueID int64 `xorm:"UNIQUE(issue_dependency) NOT NULL"`
+ DependencyID int64 `xorm:"UNIQUE(issue_dependency) NOT NULL"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"updated"`
}
// DependencyType Defines Dependency Type Constants
diff --git a/models/issue_milestone.go b/models/issue_milestone.go
index f279dda195..b1505c12cb 100644
--- a/models/issue_milestone.go
+++ b/models/issue_milestone.go
@@ -10,7 +10,8 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
+
"github.com/go-xorm/xorm"
)
@@ -29,8 +30,8 @@ type Milestone struct {
IsOverdue bool `xorm:"-"`
DeadlineString string `xorm:"-"`
- DeadlineUnix util.TimeStamp
- ClosedDateUnix util.TimeStamp
+ DeadlineUnix timeutil.TimeStamp
+ ClosedDateUnix timeutil.TimeStamp
TotalTrackedTime int64 `xorm:"-"`
}
@@ -53,7 +54,7 @@ func (m *Milestone) AfterLoad() {
}
m.DeadlineString = m.DeadlineUnix.Format("2006-01-02")
- if util.TimeStampNow() >= m.DeadlineUnix {
+ if timeutil.TimeStampNow() >= m.DeadlineUnix {
m.IsOverdue = true
}
}
diff --git a/models/issue_milestone_test.go b/models/issue_milestone_test.go
index f9e51aff31..09c6ff7595 100644
--- a/models/issue_milestone_test.go
+++ b/models/issue_milestone_test.go
@@ -10,7 +10,7 @@ import (
"time"
api "code.gitea.io/gitea/modules/structs"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/stretchr/testify/assert"
)
@@ -29,7 +29,7 @@ func TestMilestone_APIFormat(t *testing.T) {
IsClosed: false,
NumOpenIssues: 5,
NumClosedIssues: 6,
- DeadlineUnix: util.TimeStamp(time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC).Unix()),
+ DeadlineUnix: timeutil.TimeStamp(time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC).Unix()),
}
assert.Equal(t, api.Milestone{
ID: milestone.ID,
@@ -237,7 +237,7 @@ func TestChangeMilestoneIssueStats(t *testing.T) {
"is_closed=0").(*Issue)
issue.IsClosed = true
- issue.ClosedUnix = util.TimeStampNow()
+ issue.ClosedUnix = timeutil.TimeStampNow()
_, err := x.Cols("is_closed", "closed_unix").Update(issue)
assert.NoError(t, err)
assert.NoError(t, changeMilestoneIssueStats(x.NewSession(), issue))
diff --git a/models/issue_reaction.go b/models/issue_reaction.go
index e0df6f757b..ab644b4b3e 100644
--- a/models/issue_reaction.go
+++ b/models/issue_reaction.go
@@ -9,7 +9,7 @@ import (
"fmt"
"code.gitea.io/gitea/modules/setting"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/go-xorm/xorm"
"xorm.io/builder"
@@ -17,13 +17,13 @@ import (
// Reaction represents a reactions on issues and comments.
type Reaction struct {
- ID int64 `xorm:"pk autoincr"`
- Type string `xorm:"INDEX UNIQUE(s) NOT NULL"`
- IssueID int64 `xorm:"INDEX UNIQUE(s) NOT NULL"`
- CommentID int64 `xorm:"INDEX UNIQUE(s)"`
- UserID int64 `xorm:"INDEX UNIQUE(s) NOT NULL"`
- User *User `xorm:"-"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
+ ID int64 `xorm:"pk autoincr"`
+ Type string `xorm:"INDEX UNIQUE(s) NOT NULL"`
+ IssueID int64 `xorm:"INDEX UNIQUE(s) NOT NULL"`
+ CommentID int64 `xorm:"INDEX UNIQUE(s)"`
+ UserID int64 `xorm:"INDEX UNIQUE(s) NOT NULL"`
+ User *User `xorm:"-"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
}
// FindReactionsOptions describes the conditions to Find reactions
diff --git a/models/issue_stopwatch.go b/models/issue_stopwatch.go
index d754e7e19e..d7c3a9f73b 100644
--- a/models/issue_stopwatch.go
+++ b/models/issue_stopwatch.go
@@ -8,15 +8,15 @@ import (
"fmt"
"time"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
)
// Stopwatch represents a stopwatch for time tracking.
type Stopwatch struct {
- ID int64 `xorm:"pk autoincr"`
- IssueID int64 `xorm:"INDEX"`
- UserID int64 `xorm:"INDEX"`
- CreatedUnix util.TimeStamp `xorm:"created"`
+ ID int64 `xorm:"pk autoincr"`
+ IssueID int64 `xorm:"INDEX"`
+ UserID int64 `xorm:"INDEX"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created"`
}
func getStopwatch(e Engine, userID, issueID int64) (sw *Stopwatch, exists bool, err error) {
diff --git a/models/issue_stopwatch_test.go b/models/issue_stopwatch_test.go
index 7983240476..41d93c8a14 100644
--- a/models/issue_stopwatch_test.go
+++ b/models/issue_stopwatch_test.go
@@ -3,7 +3,7 @@ package models
import (
"testing"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/stretchr/testify/assert"
)
@@ -63,7 +63,7 @@ func TestCreateOrStopIssueStopwatch(t *testing.T) {
assert.NoError(t, CreateOrStopIssueStopwatch(user3, issue1))
sw := AssertExistsAndLoadBean(t, &Stopwatch{UserID: 3, IssueID: 1}).(*Stopwatch)
- assert.Equal(t, true, sw.CreatedUnix <= util.TimeStampNow())
+ assert.Equal(t, true, sw.CreatedUnix <= timeutil.TimeStampNow())
assert.NoError(t, CreateOrStopIssueStopwatch(user2, issue2))
AssertNotExistsBean(t, &Stopwatch{UserID: 2, IssueID: 2})
diff --git a/models/issue_tracked_time.go b/models/issue_tracked_time.go
index 5482a45f2a..f9313b7653 100644
--- a/models/issue_tracked_time.go
+++ b/models/issue_tracked_time.go
@@ -26,7 +26,7 @@ type TrackedTime struct {
// AfterLoad is invoked from XORM after setting the values of all fields of this object.
func (t *TrackedTime) AfterLoad() {
- t.Created = time.Unix(t.CreatedUnix, 0).In(setting.UILocation)
+ t.Created = time.Unix(t.CreatedUnix, 0).In(setting.DefaultUILocation)
}
// APIFormat converts TrackedTime to API format
diff --git a/models/issue_watch.go b/models/issue_watch.go
index 579c915476..2f55c6a84d 100644
--- a/models/issue_watch.go
+++ b/models/issue_watch.go
@@ -4,16 +4,16 @@
package models
-import "code.gitea.io/gitea/modules/util"
+import "code.gitea.io/gitea/modules/timeutil"
// IssueWatch is connection request for receiving issue notification.
type IssueWatch struct {
- ID int64 `xorm:"pk autoincr"`
- UserID int64 `xorm:"UNIQUE(watch) NOT NULL"`
- IssueID int64 `xorm:"UNIQUE(watch) NOT NULL"`
- IsWatching bool `xorm:"NOT NULL"`
- CreatedUnix util.TimeStamp `xorm:"created NOT NULL"`
- UpdatedUnix util.TimeStamp `xorm:"updated NOT NULL"`
+ ID int64 `xorm:"pk autoincr"`
+ UserID int64 `xorm:"UNIQUE(watch) NOT NULL"`
+ IssueID int64 `xorm:"UNIQUE(watch) NOT NULL"`
+ IsWatching bool `xorm:"NOT NULL"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created NOT NULL"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"updated NOT NULL"`
}
// CreateOrUpdateIssueWatch set watching for a user and issue
diff --git a/models/lfs.go b/models/lfs.go
index 94d3f57905..9b20642777 100644
--- a/models/lfs.go
+++ b/models/lfs.go
@@ -7,17 +7,17 @@ import (
"fmt"
"io"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
)
// LFSMetaObject stores metadata for LFS tracked files.
type LFSMetaObject struct {
- ID int64 `xorm:"pk autoincr"`
- Oid string `xorm:"UNIQUE(s) INDEX NOT NULL"`
- Size int64 `xorm:"NOT NULL"`
- RepositoryID int64 `xorm:"UNIQUE(s) INDEX NOT NULL"`
- Existing bool `xorm:"-"`
- CreatedUnix util.TimeStamp `xorm:"created"`
+ ID int64 `xorm:"pk autoincr"`
+ Oid string `xorm:"UNIQUE(s) INDEX NOT NULL"`
+ Size int64 `xorm:"NOT NULL"`
+ RepositoryID int64 `xorm:"UNIQUE(s) INDEX NOT NULL"`
+ Existing bool `xorm:"-"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created"`
}
// Pointer returns the string representation of an LFS pointer file
diff --git a/models/login_source.go b/models/login_source.go
index 26544588c1..f52679dab6 100644
--- a/models/login_source.go
+++ b/models/login_source.go
@@ -14,16 +14,16 @@ import (
"regexp"
"strings"
- "github.com/Unknwon/com"
- "github.com/go-xorm/xorm"
- "xorm.io/core"
-
"code.gitea.io/gitea/modules/auth/ldap"
"code.gitea.io/gitea/modules/auth/oauth2"
"code.gitea.io/gitea/modules/auth/pam"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
+
+ "github.com/Unknwon/com"
+ "github.com/go-xorm/xorm"
+ "xorm.io/core"
)
// LoginType represents an login type.
@@ -148,8 +148,8 @@ type LoginSource struct {
IsSyncEnabled bool `xorm:"INDEX NOT NULL DEFAULT false"`
Cfg core.Conversion `xorm:"TEXT"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
// Cell2Int64 converts a xorm.Cell type to int64,
diff --git a/models/mail.go b/models/mail.go
index cd4e4bc804..31f22519cf 100644
--- a/models/mail.go
+++ b/models/mail.go
@@ -16,6 +16,7 @@ import (
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/markup/markdown"
"code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/timeutil"
"gopkg.in/gomail.v2"
)
@@ -47,8 +48,8 @@ func SendTestMail(email string) error {
func SendUserMail(language string, u *User, tpl base.TplName, code, subject, info string) {
data := map[string]interface{}{
"DisplayName": u.DisplayName(),
- "ActiveCodeLives": base.MinutesToFriendly(setting.Service.ActiveCodeLives, language),
- "ResetPwdCodeLives": base.MinutesToFriendly(setting.Service.ResetPwdCodeLives, language),
+ "ActiveCodeLives": timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, language),
+ "ResetPwdCodeLives": timeutil.MinutesToFriendly(setting.Service.ResetPwdCodeLives, language),
"Code": code,
}
@@ -85,7 +86,7 @@ func SendResetPasswordMail(locale Locale, u *User) {
func SendActivateEmailMail(locale Locale, u *User, email *EmailAddress) {
data := map[string]interface{}{
"DisplayName": u.DisplayName(),
- "ActiveCodeLives": base.MinutesToFriendly(setting.Service.ActiveCodeLives, locale.Language()),
+ "ActiveCodeLives": timeutil.MinutesToFriendly(setting.Service.ActiveCodeLives, locale.Language()),
"Code": u.GenerateEmailActivateCode(email.Email),
"Email": email.Email,
}
diff --git a/models/migrations/v54.go b/models/migrations/v54.go
index 96c26739c6..5194624f69 100644
--- a/models/migrations/v54.go
+++ b/models/migrations/v54.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/go-xorm/xorm"
)
@@ -19,7 +19,7 @@ func addPullRequestOptions(x *xorm.Engine) error {
RepoID int64 `xorm:"INDEX(s)"`
Type int `xorm:"INDEX(s)"`
Config map[string]interface{} `xorm:"JSON"`
- CreatedUnix util.TimeStamp `xorm:"INDEX CREATED"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX CREATED"`
}
sess := x.NewSession()
diff --git a/models/migrations/v57.go b/models/migrations/v57.go
index 3a79a5cca7..fe4bf6b0ee 100644
--- a/models/migrations/v57.go
+++ b/models/migrations/v57.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/go-xorm/xorm"
)
@@ -15,7 +15,7 @@ import (
func addIssueClosedTime(x *xorm.Engine) error {
// Issue see models/issue.go
type Issue struct {
- ClosedUnix util.TimeStamp `xorm:"INDEX"`
+ ClosedUnix timeutil.TimeStamp `xorm:"INDEX"`
}
if err := x.Sync2(new(Issue)); err != nil {
diff --git a/models/migrations/v64.go b/models/migrations/v64.go
index e4a360f578..00637ca046 100644
--- a/models/migrations/v64.go
+++ b/models/migrations/v64.go
@@ -5,7 +5,7 @@
package migrations
import (
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/go-xorm/xorm"
)
@@ -27,10 +27,10 @@ func addMultipleAssignees(x *xorm.Engine) error {
IsPull bool `xorm:"INDEX"` // Indicates whether is a pull request or not.
NumComments int
- DeadlineUnix util.TimeStamp `xorm:"INDEX"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
- ClosedUnix util.TimeStamp `xorm:"INDEX"`
+ DeadlineUnix timeutil.TimeStamp `xorm:"INDEX"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
+ ClosedUnix timeutil.TimeStamp `xorm:"INDEX"`
}
// Updated the comment table
@@ -53,8 +53,8 @@ func addMultipleAssignees(x *xorm.Engine) error {
Content string `xorm:"TEXT"`
RenderedContent string `xorm:"-"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
// Reference issue in commit message
CommitSHA string `xorm:"VARCHAR(40)"`
diff --git a/models/migrations/v65.go b/models/migrations/v65.go
index f73e632877..cc199d34e2 100644
--- a/models/migrations/v65.go
+++ b/models/migrations/v65.go
@@ -1,7 +1,8 @@
package migrations
import (
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
+
"github.com/go-xorm/xorm"
)
@@ -12,8 +13,8 @@ func addU2FReg(x *xorm.Engine) error {
UserID int64 `xorm:"INDEX"`
Raw []byte
Counter uint32
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
return x.Sync2(&U2FRegistration{})
}
diff --git a/models/migrations/v71.go b/models/migrations/v71.go
index 8594460370..004f0a3f51 100644
--- a/models/migrations/v71.go
+++ b/models/migrations/v71.go
@@ -8,11 +8,11 @@ import (
"crypto/sha256"
"fmt"
+ "code.gitea.io/gitea/modules/generate"
+ "code.gitea.io/gitea/modules/timeutil"
+
"github.com/go-xorm/xorm"
"golang.org/x/crypto/pbkdf2"
-
- "code.gitea.io/gitea/modules/generate"
- "code.gitea.io/gitea/modules/util"
)
func addScratchHash(x *xorm.Engine) error {
@@ -24,9 +24,9 @@ func addScratchHash(x *xorm.Engine) error {
ScratchToken string
ScratchSalt string
ScratchHash string
- LastUsedPasscode string `xorm:"VARCHAR(10)"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ LastUsedPasscode string `xorm:"VARCHAR(10)"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
if err := x.Sync2(new(TwoFactor)); err != nil {
diff --git a/models/migrations/v72.go b/models/migrations/v72.go
index 4924b41ceb..c99b46afd2 100644
--- a/models/migrations/v72.go
+++ b/models/migrations/v72.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/go-xorm/xorm"
)
@@ -20,8 +20,8 @@ func addReview(x *xorm.Engine) error {
ReviewerID int64 `xorm:"index"`
IssueID int64 `xorm:"index"`
Content string
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
if err := x.Sync2(new(Review)); err != nil {
diff --git a/models/migrations/v76.go b/models/migrations/v76.go
index efab7e0cf0..e1fd6f100b 100644
--- a/models/migrations/v76.go
+++ b/models/migrations/v76.go
@@ -7,7 +7,7 @@ package migrations
import (
"fmt"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/go-xorm/xorm"
)
@@ -19,7 +19,7 @@ func addPullRequestRebaseWithMerge(x *xorm.Engine) error {
RepoID int64 `xorm:"INDEX(s)"`
Type int `xorm:"INDEX(s)"`
Config map[string]interface{} `xorm:"JSON"`
- CreatedUnix util.TimeStamp `xorm:"INDEX CREATED"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX CREATED"`
}
sess := x.NewSession()
diff --git a/models/migrations/v83.go b/models/migrations/v83.go
index 947645153c..cdc59292ab 100644
--- a/models/migrations/v83.go
+++ b/models/migrations/v83.go
@@ -5,7 +5,7 @@
package migrations
import (
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/go-xorm/xorm"
)
@@ -19,9 +19,9 @@ func addUploaderIDForAttachment(x *xorm.Engine) error {
UploaderID int64 `xorm:"INDEX DEFAULT 0"`
CommentID int64
Name string
- DownloadCount int64 `xorm:"DEFAULT 0"`
- Size int64 `xorm:"DEFAULT 0"`
- CreatedUnix util.TimeStamp `xorm:"created"`
+ DownloadCount int64 `xorm:"DEFAULT 0"`
+ Size int64 `xorm:"DEFAULT 0"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created"`
}
return x.Sync2(new(Attachment))
diff --git a/models/migrations/v85.go b/models/migrations/v85.go
index 157c06d7ba..6066d5ebe9 100644
--- a/models/migrations/v85.go
+++ b/models/migrations/v85.go
@@ -7,11 +7,11 @@ package migrations
import (
"fmt"
- "github.com/go-xorm/xorm"
-
"code.gitea.io/gitea/modules/generate"
"code.gitea.io/gitea/modules/log"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
+
+ "github.com/go-xorm/xorm"
)
func hashAppToken(x *xorm.Engine) error {
@@ -26,10 +26,10 @@ func hashAppToken(x *xorm.Engine) error {
TokenSalt string
TokenLastEight string `xorm:"token_last_eight"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
- HasRecentActivity bool `xorm:"-"`
- HasUsed bool `xorm:"-"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
+ HasRecentActivity bool `xorm:"-"`
+ HasUsed bool `xorm:"-"`
}
// First remove the index
diff --git a/models/notification.go b/models/notification.go
index f83fe63e5a..5b6ce597d1 100644
--- a/models/notification.go
+++ b/models/notification.go
@@ -7,7 +7,7 @@ package models
import (
"fmt"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
)
type (
@@ -52,8 +52,8 @@ type Notification struct {
Issue *Issue `xorm:"-"`
Repository *Repository `xorm:"-"`
- CreatedUnix util.TimeStamp `xorm:"created INDEX NOT NULL"`
- UpdatedUnix util.TimeStamp `xorm:"updated INDEX NOT NULL"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created INDEX NOT NULL"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"updated INDEX NOT NULL"`
}
// CreateOrUpdateIssueNotifications creates an issue notification
diff --git a/models/oauth2_application.go b/models/oauth2_application.go
index 63d2e7ce5e..04c3d7721c 100644
--- a/models/oauth2_application.go
+++ b/models/oauth2_application.go
@@ -11,15 +11,14 @@ import (
"net/url"
"time"
- "github.com/go-xorm/xorm"
- uuid "github.com/satori/go.uuid"
-
"code.gitea.io/gitea/modules/secret"
"code.gitea.io/gitea/modules/setting"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/dgrijalva/jwt-go"
+ "github.com/go-xorm/xorm"
+ uuid "github.com/satori/go.uuid"
"golang.org/x/crypto/bcrypt"
)
@@ -36,8 +35,8 @@ type OAuth2Application struct {
RedirectURIs []string `xorm:"redirect_uris JSON TEXT"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
// TableName sets the table name to `oauth2_application`
@@ -264,7 +263,7 @@ type OAuth2AuthorizationCode struct {
CodeChallenge string
CodeChallengeMethod string
RedirectURI string
- ValidUntil util.TimeStamp `xorm:"index"`
+ ValidUntil timeutil.TimeStamp `xorm:"index"`
}
// TableName sets the table name to `oauth2_authorization_code`
@@ -348,8 +347,8 @@ type OAuth2Grant struct {
Application *OAuth2Application `xorm:"-"`
ApplicationID int64 `xorm:"INDEX unique(user_application)"`
Counter int64 `xorm:"NOT NULL DEFAULT 1"`
- CreatedUnix util.TimeStamp `xorm:"created"`
- UpdatedUnix util.TimeStamp `xorm:"updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"updated"`
}
// TableName sets the table name to `oauth2_grant`
diff --git a/models/pull.go b/models/pull.go
index 7dd6050c67..8728fa11cb 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -23,7 +23,7 @@ import (
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/sync"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
@@ -72,11 +72,11 @@ type PullRequest struct {
ProtectedBranch *ProtectedBranch `xorm:"-"`
MergeBase string `xorm:"VARCHAR(40)"`
- HasMerged bool `xorm:"INDEX"`
- MergedCommitID string `xorm:"VARCHAR(40)"`
- MergerID int64 `xorm:"INDEX"`
- Merger *User `xorm:"-"`
- MergedUnix util.TimeStamp `xorm:"updated INDEX"`
+ HasMerged bool `xorm:"INDEX"`
+ MergedCommitID string `xorm:"VARCHAR(40)"`
+ MergerID int64 `xorm:"INDEX"`
+ Merger *User `xorm:"-"`
+ MergedUnix timeutil.TimeStamp `xorm:"updated INDEX"`
}
// Note: don't try to get Issue because will end up recursive querying.
@@ -443,7 +443,7 @@ func (pr *PullRequest) manuallyMerged() bool {
}
if commit != nil {
pr.MergedCommitID = commit.ID.String()
- pr.MergedUnix = util.TimeStamp(commit.Author.When.Unix())
+ pr.MergedUnix = timeutil.TimeStamp(commit.Author.When.Unix())
pr.Status = PullRequestStatusManuallyMerged
merger, _ := GetUserByEmail(commit.Author.Email)
diff --git a/models/release.go b/models/release.go
index ecb9d1e44a..7ef0134c9d 100644
--- a/models/release.go
+++ b/models/release.go
@@ -14,7 +14,7 @@ import (
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"xorm.io/builder"
)
@@ -32,13 +32,13 @@ type Release struct {
Title string
Sha1 string `xorm:"VARCHAR(40)"`
NumCommits int64
- NumCommitsBehind int64 `xorm:"-"`
- Note string `xorm:"TEXT"`
- IsDraft bool `xorm:"NOT NULL DEFAULT false"`
- IsPrerelease bool `xorm:"NOT NULL DEFAULT false"`
- IsTag bool `xorm:"NOT NULL DEFAULT false"`
- Attachments []*Attachment `xorm:"-"`
- CreatedUnix util.TimeStamp `xorm:"INDEX"`
+ NumCommitsBehind int64 `xorm:"-"`
+ Note string `xorm:"TEXT"`
+ IsDraft bool `xorm:"NOT NULL DEFAULT false"`
+ IsPrerelease bool `xorm:"NOT NULL DEFAULT false"`
+ IsTag bool `xorm:"NOT NULL DEFAULT false"`
+ Attachments []*Attachment `xorm:"-"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX"`
}
func (r *Release) loadAttributes(e Engine) error {
@@ -137,13 +137,13 @@ func createTag(gitRepo *git.Repository, rel *Release) error {
}
rel.Sha1 = commit.ID.String()
- rel.CreatedUnix = util.TimeStamp(commit.Author.When.Unix())
+ rel.CreatedUnix = timeutil.TimeStamp(commit.Author.When.Unix())
rel.NumCommits, err = commit.CommitsCount()
if err != nil {
return fmt.Errorf("CommitsCount: %v", err)
}
} else {
- rel.CreatedUnix = util.TimeStampNow()
+ rel.CreatedUnix = timeutil.TimeStampNow()
}
return nil
}
diff --git a/models/repo.go b/models/repo.go
index b0e59f26b6..50e1ad0bb7 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -34,7 +34,7 @@ import (
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/sync"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
@@ -175,8 +175,8 @@ type Repository struct {
// Avatar: ID(10-20)-md5(32) - must fit into 64 symbols
Avatar string `xorm:"VARCHAR(64)"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
// ColorFormat returns a colored string to represent this repo
@@ -971,7 +971,7 @@ func MigrateRepository(doer, u *User, opts MigrateRepoOptions) (*Repository, err
RepoID: repo.ID,
Interval: setting.Mirror.DefaultInterval,
EnablePrune: true,
- NextUpdateUnix: util.TimeStampNow().AddDuration(setting.Mirror.DefaultInterval),
+ NextUpdateUnix: timeutil.TimeStampNow().AddDuration(setting.Mirror.DefaultInterval),
}); err != nil {
return repo, fmt.Errorf("InsertOne: %v", err)
}
diff --git a/models/repo_mirror.go b/models/repo_mirror.go
index 528e9daa8b..7f703a1c97 100644
--- a/models/repo_mirror.go
+++ b/models/repo_mirror.go
@@ -16,6 +16,7 @@ import (
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/sync"
+ "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/Unknwon/com"
@@ -34,8 +35,8 @@ type Mirror struct {
Interval time.Duration
EnablePrune bool `xorm:"NOT NULL DEFAULT true"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX"`
- NextUpdateUnix util.TimeStamp `xorm:"INDEX"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX"`
+ NextUpdateUnix timeutil.TimeStamp `xorm:"INDEX"`
address string `xorm:"-"`
}
@@ -43,8 +44,8 @@ type Mirror struct {
// BeforeInsert will be invoked by XORM before inserting a record
func (m *Mirror) BeforeInsert() {
if m != nil {
- m.UpdatedUnix = util.TimeStampNow()
- m.NextUpdateUnix = util.TimeStampNow()
+ m.UpdatedUnix = timeutil.TimeStampNow()
+ m.NextUpdateUnix = timeutil.TimeStampNow()
}
}
@@ -64,7 +65,7 @@ func (m *Mirror) AfterLoad(session *xorm.Session) {
// ScheduleNextUpdate calculates and sets next update time.
func (m *Mirror) ScheduleNextUpdate() {
if m.Interval != 0 {
- m.NextUpdateUnix = util.TimeStampNow().AddDuration(m.Interval)
+ m.NextUpdateUnix = timeutil.TimeStampNow().AddDuration(m.Interval)
} else {
m.NextUpdateUnix = 0
}
@@ -277,7 +278,7 @@ func (m *Mirror) runSync() ([]*mirrorSyncResult, bool) {
cache.Remove(m.Repo.GetCommitsCountCacheKey(branches[i].Name, true))
}
- m.UpdatedUnix = util.TimeStampNow()
+ m.UpdatedUnix = timeutil.TimeStampNow()
return parseRemoteUpdateOutput(output), true
}
diff --git a/models/repo_unit.go b/models/repo_unit.go
index 80126270de..b2c88d3193 100644
--- a/models/repo_unit.go
+++ b/models/repo_unit.go
@@ -7,7 +7,7 @@ package models
import (
"encoding/json"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
@@ -17,10 +17,10 @@ import (
// RepoUnit describes all units of a repository
type RepoUnit struct {
ID int64
- RepoID int64 `xorm:"INDEX(s)"`
- Type UnitType `xorm:"INDEX(s)"`
- Config core.Conversion `xorm:"TEXT"`
- CreatedUnix util.TimeStamp `xorm:"INDEX CREATED"`
+ RepoID int64 `xorm:"INDEX(s)"`
+ Type UnitType `xorm:"INDEX(s)"`
+ Config core.Conversion `xorm:"TEXT"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX CREATED"`
}
// UnitConfig describes common unit config
diff --git a/models/review.go b/models/review.go
index e31e936bcc..454d16ee88 100644
--- a/models/review.go
+++ b/models/review.go
@@ -8,7 +8,7 @@ import (
"fmt"
"code.gitea.io/gitea/modules/log"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/go-xorm/xorm"
"xorm.io/builder"
@@ -56,8 +56,8 @@ type Review struct {
IssueID int64 `xorm:"index"`
Content string
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
// CodeComments are the initial code comments of the review
CodeComments CodeComments `xorm:"-"`
@@ -279,7 +279,7 @@ func UpdateReview(r *Review) error {
type PullReviewersWithType struct {
User `xorm:"extends"`
Type ReviewType
- ReviewUpdatedUnix util.TimeStamp `xorm:"review_updated_unix"`
+ ReviewUpdatedUnix timeutil.TimeStamp `xorm:"review_updated_unix"`
}
// GetReviewersByPullID gets all reviewers for a pull request with the statuses
diff --git a/models/ssh_key.go b/models/ssh_key.go
index 4f93b5c44f..874f6b19f7 100644
--- a/models/ssh_key.go
+++ b/models/ssh_key.go
@@ -26,7 +26,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
@@ -62,16 +62,16 @@ type PublicKey struct {
Type KeyType `xorm:"NOT NULL DEFAULT 1"`
LoginSourceID int64 `xorm:"NOT NULL DEFAULT 0"`
- CreatedUnix util.TimeStamp `xorm:"created"`
- UpdatedUnix util.TimeStamp `xorm:"updated"`
- HasRecentActivity bool `xorm:"-"`
- HasUsed bool `xorm:"-"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"updated"`
+ HasRecentActivity bool `xorm:"-"`
+ HasUsed bool `xorm:"-"`
}
// AfterLoad is invoked from XORM after setting the values of all fields of this object.
func (key *PublicKey) AfterLoad() {
key.HasUsed = key.UpdatedUnix > key.CreatedUnix
- key.HasRecentActivity = key.UpdatedUnix.AddDuration(7*24*time.Hour) > util.TimeStampNow()
+ key.HasRecentActivity = key.UpdatedUnix.AddDuration(7*24*time.Hour) > timeutil.TimeStampNow()
}
// OmitEmail returns content of public key without email address.
@@ -581,7 +581,7 @@ func UpdatePublicKeyUpdated(id int64) error {
}
_, err := x.ID(id).Cols("updated_unix").Update(&PublicKey{
- UpdatedUnix: util.TimeStampNow(),
+ UpdatedUnix: timeutil.TimeStampNow(),
})
if err != nil {
return err
@@ -714,16 +714,16 @@ type DeployKey struct {
Mode AccessMode `xorm:"NOT NULL DEFAULT 1"`
- CreatedUnix util.TimeStamp `xorm:"created"`
- UpdatedUnix util.TimeStamp `xorm:"updated"`
- HasRecentActivity bool `xorm:"-"`
- HasUsed bool `xorm:"-"`
+ CreatedUnix timeutil.TimeStamp `xorm:"created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"updated"`
+ HasRecentActivity bool `xorm:"-"`
+ HasUsed bool `xorm:"-"`
}
// AfterLoad is invoked from XORM after setting the values of all fields of this object.
func (key *DeployKey) AfterLoad() {
key.HasUsed = key.UpdatedUnix > key.CreatedUnix
- key.HasRecentActivity = key.UpdatedUnix.AddDuration(7*24*time.Hour) > util.TimeStampNow()
+ key.HasRecentActivity = key.UpdatedUnix.AddDuration(7*24*time.Hour) > timeutil.TimeStampNow()
}
// GetContent gets associated public key content.
diff --git a/models/token.go b/models/token.go
index 030bff8e1b..8bd20a6916 100644
--- a/models/token.go
+++ b/models/token.go
@@ -9,11 +9,11 @@ import (
"crypto/subtle"
"time"
- gouuid "github.com/satori/go.uuid"
-
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/generate"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
+
+ gouuid "github.com/satori/go.uuid"
)
// AccessToken represents a personal access token.
@@ -26,16 +26,16 @@ type AccessToken struct {
TokenSalt string
TokenLastEight string `xorm:"token_last_eight"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
- HasRecentActivity bool `xorm:"-"`
- HasUsed bool `xorm:"-"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
+ HasRecentActivity bool `xorm:"-"`
+ HasUsed bool `xorm:"-"`
}
// AfterLoad is invoked from XORM after setting the values of all fields of this object.
func (t *AccessToken) AfterLoad() {
t.HasUsed = t.UpdatedUnix > t.CreatedUnix
- t.HasRecentActivity = t.UpdatedUnix.AddDuration(7*24*time.Hour) > util.TimeStampNow()
+ t.HasRecentActivity = t.UpdatedUnix.AddDuration(7*24*time.Hour) > timeutil.TimeStampNow()
}
// NewAccessToken creates new access token.
diff --git a/models/topic.go b/models/topic.go
index 666196ba8e..8a587acc3a 100644
--- a/models/topic.go
+++ b/models/topic.go
@@ -9,7 +9,7 @@ import (
"regexp"
"strings"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"xorm.io/builder"
)
@@ -28,8 +28,8 @@ type Topic struct {
ID int64
Name string `xorm:"UNIQUE VARCHAR(25)"`
RepoCount int
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
// RepoTopic represents associated repositories and topics
diff --git a/models/twofactor.go b/models/twofactor.go
index 7f260248bc..00a465353a 100644
--- a/models/twofactor.go
+++ b/models/twofactor.go
@@ -16,12 +16,12 @@ import (
"fmt"
"io"
- "github.com/pquerna/otp/totp"
- "golang.org/x/crypto/pbkdf2"
-
"code.gitea.io/gitea/modules/generate"
"code.gitea.io/gitea/modules/setting"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
+
+ "github.com/pquerna/otp/totp"
+ "golang.org/x/crypto/pbkdf2"
)
// TwoFactor represents a two-factor authentication token.
@@ -31,9 +31,9 @@ type TwoFactor struct {
Secret string
ScratchSalt string
ScratchHash string
- LastUsedPasscode string `xorm:"VARCHAR(10)"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ LastUsedPasscode string `xorm:"VARCHAR(10)"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
// GenerateScratchToken recreates the scratch token the user is using.
diff --git a/models/u2f.go b/models/u2f.go
index 1224b4a5fb..28341906fa 100644
--- a/models/u2f.go
+++ b/models/u2f.go
@@ -6,7 +6,7 @@ package models
import (
"code.gitea.io/gitea/modules/log"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
"github.com/tstranex/u2f"
)
@@ -17,9 +17,9 @@ type U2FRegistration struct {
Name string
UserID int64 `xorm:"INDEX"`
Raw []byte
- Counter uint32 `xorm:"BIGINT"`
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ Counter uint32 `xorm:"BIGINT"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
// TableName returns a better table name for U2FRegistration
diff --git a/models/update.go b/models/update.go
index a19df70b3b..c6ea1a845e 100644
--- a/models/update.go
+++ b/models/update.go
@@ -11,7 +11,7 @@ import (
"time"
"code.gitea.io/gitea/modules/git"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
)
// env keys for git hooks need
@@ -140,7 +140,7 @@ func PushUpdateAddTag(repo *Repository, gitRepo *git.Repository, tagName string)
IsDraft: false,
IsPrerelease: false,
IsTag: true,
- CreatedUnix: util.TimeStamp(createdAt.Unix()),
+ CreatedUnix: timeutil.TimeStamp(createdAt.Unix()),
}
if author != nil {
rel.PublisherID = author.ID
@@ -151,7 +151,7 @@ func PushUpdateAddTag(repo *Repository, gitRepo *git.Repository, tagName string)
}
} else {
rel.Sha1 = commit.ID.String()
- rel.CreatedUnix = util.TimeStamp(createdAt.Unix())
+ rel.CreatedUnix = timeutil.TimeStamp(createdAt.Unix())
rel.NumCommits = commitsCount
rel.IsDraft = false
if rel.IsTag && author != nil {
diff --git a/models/user.go b/models/user.go
index 2e4f971662..3c0c581a1d 100644
--- a/models/user.go
+++ b/models/user.go
@@ -29,6 +29,7 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"
api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/Unknwon/com"
@@ -110,9 +111,9 @@ type User struct {
Language string `xorm:"VARCHAR(5)"`
Description string
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
- LastLoginUnix util.TimeStamp `xorm:"INDEX"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
+ LastLoginUnix timeutil.TimeStamp `xorm:"INDEX"`
// Remember visibility choice for convenience, true for private
LastRepoVisibility bool
@@ -190,7 +191,7 @@ func (u *User) AfterLoad() {
// SetLastLogin set time to last login
func (u *User) SetLastLogin() {
- u.LastLoginUnix = util.TimeStampNow()
+ u.LastLoginUnix = timeutil.TimeStampNow()
}
// UpdateDiffViewStyle updates the users diff view style
diff --git a/models/user_heatmap.go b/models/user_heatmap.go
index 3fdabbbf79..b511b5fa62 100644
--- a/models/user_heatmap.go
+++ b/models/user_heatmap.go
@@ -6,13 +6,13 @@ package models
import (
"code.gitea.io/gitea/modules/setting"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
)
// UserHeatmapData represents the data needed to create a heatmap
type UserHeatmapData struct {
- Timestamp util.TimeStamp `json:"timestamp"`
- Contributions int64 `json:"contributions"`
+ Timestamp timeutil.TimeStamp `json:"timestamp"`
+ Contributions int64 `json:"contributions"`
}
// GetUserHeatmapDataByUser returns an array of UserHeatmapData
@@ -35,7 +35,7 @@ func GetUserHeatmapDataByUser(user *User) ([]*UserHeatmapData, error) {
sess := x.Select(groupBy+" AS timestamp, count(user_id) as contributions").
Table("action").
Where("user_id = ?", user.ID).
- And("created_unix > ?", (util.TimeStampNow() - 31536000))
+ And("created_unix > ?", (timeutil.TimeStampNow() - 31536000))
// * Heatmaps for individual users only include actions that the user themself
// did.
diff --git a/models/webhook.go b/models/webhook.go
index ac39501ca1..1d41f2a969 100644
--- a/models/webhook.go
+++ b/models/webhook.go
@@ -23,7 +23,8 @@ import (
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/sync"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/timeutil"
+
"github.com/Unknwon/com"
gouuid "github.com/satori/go.uuid"
)
@@ -118,8 +119,8 @@ type Webhook struct {
Meta string `xorm:"TEXT"` // store hook-specific attributes
LastStatus HookStatus // Last delivery status
- CreatedUnix util.TimeStamp `xorm:"INDEX created"`
- UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
+ CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
+ UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
// AfterLoad updates the webhook object upon setting a column