diff --git a/plugins/fact/factoid.go b/plugins/fact/factoid.go
index ef1f1db..a33eb1f 100644
--- a/plugins/fact/factoid.go
+++ b/plugins/fact/factoid.go
@@ -609,7 +609,7 @@ func (p *Factoid) randomFact() *factoid {
// factTimer spits out a fact at a given interval and with given probability
func (p *Factoid) factTimer(channel string) {
- duration := time.Duration(p.Bot.Config().Factoid.QuoteTime) * time.Second
+ duration := time.Duration(p.Bot.Config().Factoid.QuoteTime) * time.Minute
myLastMsg := time.Now()
for {
time.Sleep(time.Duration(5) * time.Second) // why 5?
diff --git a/plugins/fact/webTemplates.go b/plugins/fact/webTemplates.go
index cb56ea8..d3f7ee6 100644
--- a/plugins/fact/webTemplates.go
+++ b/plugins/fact/webTemplates.go
@@ -12,16 +12,16 @@ var factoidIndex string = `
Factoids
-
+
-
+
-
+
-
+
diff --git a/slack/slack.go b/slack/slack.go
index ead635f..cf453e5 100644
--- a/slack/slack.go
+++ b/slack/slack.go
@@ -11,6 +11,7 @@ import (
"log"
"net/http"
"net/url"
+ "regexp"
"strconv"
"strings"
"sync/atomic"
@@ -158,11 +159,16 @@ func (s *Slack) Serve() {
}
}
+var urlDetector = regexp.MustCompile(`<(.+)://([^|^>]+).*>`)
+
// Convert a slackMessage to a msg.Message
func (s *Slack) buildMessage(m slackMessage) msg.Message {
log.Printf("DEBUG: msg: %#v", m)
text := html.UnescapeString(m.Text)
+ // remove <> from URLs, URLs may also be
+ text = urlDetector.ReplaceAllString(text, "${1}://${2}")
+
isCmd, text := bot.IsCmd(s.config, text)
isAction := strings.HasPrefix(text, "/me ")