a
/
nat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove durationfromexpiry function

This commit is contained in:
Eliot Whalan 2016-07-15 12:41:42 +10:00
parent 5ae8540ad7
commit 8c26aa72c0
No known key found for this signature in database
GPG Key ID: C0A42175139840D6
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pastebin.go
View File

@ -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)