Merge remote-tracking branch 'origin/master'

# Conflicts:
#	djpianalto.com/goff/utils/tasks.go
pull/1/head
DustyP 6 years ago
commit e897b89d5c

@ -35,7 +35,7 @@ func addReminderCommand(ctx disgoman.Context, args []string) {
}
return
}
content := strings.Replace(text, r.Text, "", 1)
content := strings.Replace(text, r.Text+" ", "", 1)
query := "INSERT INTO tasks (type, content, guild_id, channel_id, user_id, trigger_time) " +
"VALUES ('Reminder', $1, $2, $3, $4, $5)"
_, err = utils.Database.Exec(query, content, ctx.Guild.ID, ctx.Channel.ID, ctx.User.ID, r.Time)

@ -46,9 +46,10 @@ func processTask(task *Task, s *discordgo.Session) {
e := discordgo.MessageEmbed{
Title: "REMINDER",
Description: task.Content,
Timestamp: task.CreationTime.Format(time.RFC3339),
Color: color,
Footer: &discordgo.MessageEmbedFooter{
Text: fmt.Sprintf("Created: %v", task.CreationTime.Format(time.RFC1123)),
Text: "Created: ",
},
}
msg := discordgo.MessageSend{

Loading…
Cancel
Save