From 65624b18745a7060c4f213937631bd1cce3ca248 Mon Sep 17 00:00:00 2001 From: Eliot Whalan Date: Fri, 15 Jul 2016 14:42:14 +1000 Subject: [PATCH] Reintroduce duration function --- pastebin.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pastebin.go b/pastebin.go index 5ebd5d2..601d52b 100644 --- a/pastebin.go +++ b/pastebin.go @@ -105,6 +105,17 @@ func Sha1(paste string) string { 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 { + dura, err := duration.FromString(expiry) // dura is time.Duration type + Check(err) + + duration := dura.ToDuration() + + return duration +} + // Save function handles the saving of each paste. // raw string is the raw paste input // lang string is the user specified language for syntax highlighting @@ -137,12 +148,7 @@ func Save(raw string, lang string, title string, expiry string) Response { } const timeFormat = "2006-01-02 15:04:05" - - dura, err := duration.FromString(expiry) // dura is time.Duration type - Check(err) - - duration := dura.ToDuration() - expiryTime := time.Now().Add(duration).Format(timeFormat) + expiryTime := time.Now().Add(DurationFromExpiry(expiry)).Format(timeFormat) delKey := uniuri.NewLen(40) dataEscaped := html.EscapeString(raw)