Remove durationfromexpiry function
This commit is contained in:
parent
277cfdefff
commit
99bcfa067f
12
pastebin.go
12
pastebin.go
|
@ -104,14 +104,6 @@ func Sha1(paste string) string {
|
||||||
return sha
|
return sha
|
||||||
}
|
}
|
||||||
|
|
||||||
// DurationFromExpiry takes the expiry in string format and returns the duration
|
|
||||||
// that the paste will exist for
|
|
||||||
func DurationFromExpiry(expiry string) time.Duration {
|
|
||||||
duration, err := time.ParseDuration(expiry)
|
|
||||||
Check(err)
|
|
||||||
return duration
|
|
||||||
}
|
|
||||||
|
|
||||||
// Save function handles the saving of each paste.
|
// Save function handles the saving of each paste.
|
||||||
// raw string is the raw paste input
|
// raw string is the raw paste input
|
||||||
// lang string is the user specified language for syntax highlighting
|
// lang string is the user specified language for syntax highlighting
|
||||||
|
@ -144,7 +136,9 @@ func Save(raw string, lang string, title string, expiry string) Response {
|
||||||
}
|
}
|
||||||
|
|
||||||
const timeFormat = "2006-01-02 15:04:05"
|
const timeFormat = "2006-01-02 15:04:05"
|
||||||
expiryTime := time.Now().Add(DurationFromExpiry(expiry)).Format(timeFormat)
|
duration, err := time.ParseDuration(expiry)
|
||||||
|
Check(err)
|
||||||
|
expiryTime := time.Now().Add(duration).Format(timeFormat)
|
||||||
|
|
||||||
delKey := uniuri.NewLen(40)
|
delKey := uniuri.NewLen(40)
|
||||||
dataEscaped := html.EscapeString(raw)
|
dataEscaped := html.EscapeString(raw)
|
||||||
|
|
Loading…
Reference in New Issue