Mergione dopo il refactorone

Makefile

@@ -6,6 +6,7 @@ deps:
 	go get github.com/llgcode/draw2d
 	go get github.com/llgcode/draw2d/draw2dimg
 	go get github.com/disintegration/imaging
+	go get github.com/simon-weber/gomarkov
 
 install-tg:
 	go get -u github.com/hamcha/tg

mods/main.go

@@ -12,40 +12,47 @@ import (
 )
 
 type Mod struct {
-	OnInit    func()
+	Description string
-	OnMessage func(*tg.Broker, tg.APIMessage)
+	OnInit      func()
+	OnMessage   func(*tg.Broker, tg.APIMessage)
+	Help        func(*tg.Broker, tg.APIMessage)
 }
 
 var mods = map[string]Mod{
 	"metafora": {
-		OnMessage: metafora_message,
+		Description: "( ͡° ͜ʖ ͡°)",
-	},
+		OnMessage:   metafora_message,
-	"dantes": {
-		OnMessage: dantes_message,
 	},
 	"viaggi": {
-		OnInit:    viaggi_init,
+		Description: "Calcola itinerari",
-		OnMessage: viaggi_message,
+		OnInit:      viaggi_init,
+		OnMessage:   viaggi_message,
+		Help:        viaggi_help,
 	},
 	"meme": {
-		OnInit:    meme_init,
+		Description: "Crea macro da immagini",
-		OnMessage: meme_message,
+		OnInit:      meme_init,
+		OnMessage:   meme_message,
 	},
 	"unsplash": {
-		OnInit:    unsplash_init,
+		Description: "Presenta messaggi in modo hipster",
-		OnMessage: unsplash_message,
+		OnInit:      unsplash_init,
+		OnMessage:   unsplash_message,
 	},
 	"macro": {
-		OnInit:    macro_init,
+		Description: "Salva/leggi messaggi",
-		OnMessage: macro_message,
+		OnInit:      macro_init,
+		OnMessage:   macro_message,
 	},
 	"snapchat": {
-		OnInit:    snapchat_init,
+		Description: "Crea immagini stile snapchat",
-		OnMessage: snapchat_message,
+		OnInit:      snapchat_init,
+		OnMessage:   snapchat_message,
 	},
 	"proverbio": {
-		OnInit:    proverbio_init,
+		Description: "Generatore di proverbi",
-		OnMessage: proverbio_message,
+		OnInit:      proverbio_init,
+		OnMessage:   proverbio_message,
 	},
 	/*
 		"talk": {
@@ -54,20 +61,24 @@ var mods = map[string]Mod{
 		},
 	*/
 	"stt": {
-		OnInit:    stt_init,
+		Description: "Trascrivi messaggi vocali",
-		OnMessage: stt_message,
+		OnInit:      stt_init,
+		OnMessage:   stt_message,
 	},
 	"remind": {
-		OnInit:    remind_init,
+		Description: "Reminder",
-		OnMessage: remind_message,
+		OnInit:      remind_init,
+		OnMessage:   remind_message,
 	},
 	"search": {
-		OnInit:    search_init,
+		Description: "Cerca sul Knowledge graph",
-		OnMessage: search_message,
+		OnInit:      search_init,
+		OnMessage:   search_message,
 	},
 	"oroscopo": {
-		OnInit:    oroscopo_init,
+		Description: "Generatore di oroscopi",
-		OnMessage: oroscopo_message,
+		OnInit:      oroscopo_init,
+		OnMessage:   oroscopo_message,
 	},
 }
 
@@ -99,17 +110,18 @@ func isCommand(update tg.APIMessage, cmdname string) bool {
 		return false
 	}
 
-	text := *(update.Text)
+	text := strings.TrimSpace(*(update.Text))
 
-	// Check without bot suffix
+	shortcmd := "/" + cmdname
-	prefix := "/" + cmdname
+	fullcmd := shortcmd + "@" + *botname
-	if text == prefix || strings.HasPrefix(text, prefix+" ") {
+
+	// Check short form
+	if text == shortcmd || strings.HasPrefix(text, shortcmd+" ") {
 		return true
 	}
 
-	// Check with bot suffix
+	// Check long form
-	prefix = "/" + cmdname + "@" + *botname
+	if text == fullcmd || strings.HasPrefix(text, fullcmd+" ") {
-	if text == prefix || strings.HasPrefix(text, prefix+" ") {
 		return true
 	}
 

mods/oroscopo.go

@@ -9,7 +9,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/hamcha/clessy/tg"
+	"github.com/hamcha/tg"
 	gomarkov "github.com/simon-weber/gomarkov"
 )
 

mods/unsplash.go

@@ -57,12 +57,22 @@ func unsplash_message(broker *tg.Broker, update tg.APIMessage) {
 		user := update.User
 
 		if update.ReplyTo != nil {
-			if update.ReplyTo.Text == nil {
+			switch {
+			case update.ReplyTo.Text != nil:
+				text = *(update.ReplyTo.Text)
+			case update.ReplyTo.Caption != nil:
+				text = *(update.ReplyTo.Caption)
+			default:
 				broker.SendTextMessage(update.Chat, "Non c'e' niente di 'ispiratore' in questo..", &update.MessageID)
 				return
 			}
-			text = *(update.ReplyTo.Text)
+
-			user = update.ReplyTo.User
+			// For forwarded message take the original user
+			if update.FwdUser != nil {
+				user = update.FwdUser.Message.User
+			} else {
+				user = update.ReplyTo.User
+			}
 		} else {
 			if strings.Index(*(update.Text), " ") > 0 {
 				text = strings.TrimSpace(strings.SplitN(*(update.Text), " ", 2)[1])

mods/viaggi.go

@@ -23,19 +23,15 @@ func viaggi_init() {
 
 func viaggi_message(broker *tg.Broker, update tg.APIMessage) {
 	if isCommand(update, "viaggi") {
-		usage := func() {
-			broker.SendTextMessage(update.Chat, "Formato: /viaggi <i>&lt;PARTENZA&gt;</i> -> <i>&lt;DESTINAZIONE&gt;</i>", &update.MessageID)
-		}
-
 		parts := strings.SplitN(*(update.Text), " ", 2)
 		if len(parts) < 2 {
-			usage()
+			viaggi_help(broker, update)
 			return
 		}
 		text := parts[1]
 		msgs := reg.FindStringSubmatch(text)
 		if len(msgs) <= 2 {
-			usage()
+			viaggi_help(broker, update)
 			return
 		}
 
@@ -55,6 +51,10 @@ func viaggi_message(broker *tg.Broker, update tg.APIMessage) {
 	}
 }
 
+func viaggi_help(broker *tg.Broker, update tg.APIMessage) {
+	broker.SendTextMessage(update.Chat, "Formato: /viaggi <i>&lt;PARTENZA&gt;</i> -> <i>&lt;DESTINAZIONE&gt;</i>", &update.MessageID)
+}
+
 func parseData(route Romeroute) string {
 	// Get time
 	minutes := int(route.Duration)