diff options
author | Gusted <postmaster@gusted.xyz> | 2022-12-20 03:04:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-20 10:04:55 +0800 |
commit | 40ba750c4bf1f3f5f8dff5af57b2db4b600f237f (patch) | |
tree | 5860955fb996143a3f1091949331fee6130ff972 /modules | |
parent | 27746715842da4739d3dba2f3c423df520113a18 (diff) | |
download | gitea-40ba750c4bf1f3f5f8dff5af57b2db4b600f237f.tar.gz gitea-40ba750c4bf1f3f5f8dff5af57b2db4b600f237f.zip |
Check for zero time instant in `TimeStamp.IsZero()` (#22171)
- Currently, the 'IsZero' function for 'TimeStamp' just checks if the
unix time is zero, which is not the behavior of 'Time.IsZero()', but
Gitea is using this method in accordance with the behavior of
'Time.IsZero()'.
- Adds a new condition to check for the zero time instant.
- Fixes a bug where non-expiring GPG keys where shown as they expired on
Jan 01, 0001.
- Related https://codeberg.org/Codeberg/Community/issues/791
Before:
![image](https://user-images.githubusercontent.com/25481501/208509035-ecc5fa4a-3bd1-4fa3-beba-90875719163c.png)
After:
![image](https://user-images.githubusercontent.com/25481501/208508950-3e7f6eeb-be83-432a-89a6-d738553dafe4.png)
Diffstat (limited to 'modules')
-rw-r--r-- | modules/timeutil/timestamp.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/modules/timeutil/timestamp.go b/modules/timeutil/timestamp.go index 4618db9a76..c8e0d4bdc1 100644 --- a/modules/timeutil/timestamp.go +++ b/modules/timeutil/timestamp.go @@ -12,8 +12,13 @@ import ( // TimeStamp defines a timestamp type TimeStamp int64 -// mock is NOT concurrency-safe!! -var mock time.Time +var ( + // mock is NOT concurrency-safe!! + mock time.Time + + // Used for IsZero, to check if timestamp is the zero time instant. + timeZeroUnix = time.Time{}.Unix() +) // Set sets the time to a mocked time.Time func Set(now time.Time) { @@ -102,5 +107,5 @@ func (ts TimeStamp) FormatDate() string { // IsZero is zero time func (ts TimeStamp) IsZero() bool { - return int64(ts) == 0 + return int64(ts) == 0 || int64(ts) == timeZeroUnix } |