External/grumble
1
0
Fork 1
mirror of https://github.com/mumble-voip/grumble.git synced 2025-12-20 06:10:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update for Go 1.

Browse source
This commit is contained in:
Mikkel Krautz 2012-02-06 22:16:16 +01:00
parent 4114a83d64
commit e46a65109f
31 changed files with 901 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/ban/ban.go
View file

@ -54,14 +54,14 @@ func (ban *Ban) SetISOStartDate(isodate string) {
if err != nil {
ban.Start = 0
} else {
ban.Start = startTime.Seconds()
ban.Start = startTime.Unix()
}
}
// Return the currently set start date as an ISO 8601-formatted
// date (in UTC).
func (ban Ban) ISOStartDate() string {
startTime := time.SecondsToUTC(ban.Start)
startTime := time.Unix(ban.Start, 0).UTC()
return startTime.Format(ISODate)
}
@ -74,7 +74,7 @@ func (ban Ban) IsExpired() bool {
// Expiry check
expiryTime := ban.Start + int64(ban.Duration)
if time.Seconds() > expiryTime {
if time.Now().Unix() > expiryTime {
return true
}
return false

14
pkg/ban/ban_test.go
View file

@ -28,7 +28,7 @@ func TestMaksPowerOf2(t *testing.T) {
func TestMatchV4(t *testing.T) {
b := Ban{}
b.IP = net.ParseIP("192.168.1.1")
b.Mask = 24+96 // ipv4 /24
b.Mask = 24 + 96 // ipv4 /24
if len(b.IP) == 0 {
t.Errorf("Invalid IP")
}
@ -46,7 +46,7 @@ func TestMatchV4(t *testing.T) {
func TestMismatchV4(t *testing.T) {
b := Ban{}
b.IP = net.ParseIP("192.168.1.1")
b.Mask = 24+96 // ipv4 /24
b.Mask = 24 + 96 // ipv4 /24
if len(b.IP) == 0 {
t.Errorf("Invalid IP")
}
@ -62,7 +62,7 @@ func TestMismatchV4(t *testing.T) {
}
func TestMatchV6(t *testing.T) {
b := Ban {}
b := Ban{}
b.IP = net.ParseIP("2a00:1450:400b:c00::63")
b.Mask = 64
if len(b.IP) == 0 {
@ -109,7 +109,7 @@ func TestISODate(t *testing.T) {
func TestInfiniteExpiry(t *testing.T) {
b := Ban{}
b.Start = time.Seconds()-10
b.Start = time.Now().Add(-10 * time.Second).Unix()
b.Duration = 0
if b.IsExpired() {
@ -119,7 +119,7 @@ func TestInfiniteExpiry(t *testing.T) {
func TestExpired(t *testing.T) {
b := Ban{}
b.Start = time.Seconds()-10
b.Start = time.Now().Add(-10 * time.Second).Unix()
b.Duration = 9
if !b.IsExpired() {
@ -129,8 +129,8 @@ func TestExpired(t *testing.T) {
func TestNotExpired(t *testing.T) {
b := Ban{}
b.Start = time.Seconds()
b.Duration = 60*60*24
b.Start = time.Now().Unix()
b.Duration = 60 * 60 * 24
if b.IsExpired() {
t.Errorf("Should expire in 24 hours")