Merge branch 'features' of ALFRED/ALFRED into master

.gitignore

@@ -14,4 +14,5 @@
 # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
 .glide/
 
-settings_custom.json
+settings_custom.json
+history.json

alfred.go

@@ -2,27 +2,36 @@
 * @Author: Bartuccio Antoine
 * @Date:   2018-07-23 15:24:22
 * @Last Modified by:   klmp200
-* @Last Modified time: 2018-07-24 03:05:51
+* @Last Modified time: 2018-07-24 12:44:38
  */
 
 package main
 
 import (
+	"./commands"
 	"./settings"
 	"./shared"
 	tb "gopkg.in/tucnak/telebot.v2"
 	"log"
-	"strings"
 	"time"
 )
 
 func main() {
+	registered_commands := map[string]func(*tb.Message){
+		tb.OnText:   commands.OnText,
+		"/hello":    commands.Hello,
+		"/sponge":   commands.Sponge,
+		"/git":      commands.Git,
+		"/framapad": commands.Framapad,
+	}
+
 	if err := settings.LoadSettings("settings.json", "settings_custom.json"); err != nil {
 		log.Fatal(err)
 	}
 
 	log.Println("Initialize history")
-	shared.InitHistory(int(settings.Settings["history size"].(float64)))
+	shared.InitHistory(int(settings.Settings["history size"].(float64)),
+		settings.Settings["history file"].(string))
 
 	log.Println("Bot initialisation")
 	b, err := tb.NewBot(tb.Settings{
@@ -33,35 +42,11 @@ func main() {
 		log.Fatal(err)
 		return
 	}
+	shared.Bot = b
 
-	b.Handle("/hello", func(m *tb.Message) {
+	for key, value := range registered_commands {
-		b.Send(m.Chat, "Bonjour "+m.Sender.Username)
+		b.Handle(key, value)
-	})
+	}
-
-	b.Handle(tb.OnText, func(m *tb.Message) {
-		shared.History.AddMessage(m.Chat.ID, m.Text)
-	})
-
-	b.Handle("/sponge", func(m *tb.Message) {
-		message := ""
-		for i, char := range shared.History.LastMessage(m.Chat.ID) {
-			if i%2 == 0 {
-				message += strings.ToLower(string(char))
-			} else {
-				message += strings.ToUpper(string(char))
-			}
-		}
-		b.Send(m.Chat, message)
-
-	})
-
-	b.Handle("/git", func(m *tb.Message) {
-		b.Send(m.Chat, "Mon code est accessible librement à l'adresse https://git.klmp200.net/ALFRED/ALFRED. Venez contribuer :)")
-	})
-
-	b.Handle("/framapad", func(m *tb.Message) {
-		b.Send(m.Chat, "Venez participer à mon développement en posant vos idées ici : https://mensuel.framapad.org/p/ALFRED2LERETOUR.")
-	})
 
 	log.Println("Starting bot")
 	b.Start()

commands/framapad.go

@@ -0,0 +1,17 @@
+/*
+* @Author: Bartuccio Antoine
+* @Date:   2018-07-24 12:11:26
+* @Last Modified by:   klmp200
+* @Last Modified time: 2018-07-24 12:12:58
+ */
+
+package commands
+
+import (
+	"../shared"
+	tb "gopkg.in/tucnak/telebot.v2"
+)
+
+func Framapad(m *tb.Message) {
+	shared.Bot.Send(m.Chat, "Venez participer à mon développement en posant vos idées ici : https://mensuel.framapad.org/p/ALFRED2LERETOUR.")
+}

commands/git.go

@@ -0,0 +1,17 @@
+/*
+* @Author: Bartuccio Antoine
+* @Date:   2018-07-24 12:07:34
+* @Last Modified by:   klmp200
+* @Last Modified time: 2018-07-24 12:08:49
+ */
+
+package commands
+
+import (
+	"../shared"
+	tb "gopkg.in/tucnak/telebot.v2"
+)
+
+func Git(m *tb.Message) {
+	shared.Bot.Send(m.Chat, "Mon code source est accessible librement à l'adresse https://git.klmp200.net/ALFRED/ALFRED. Venez contribuer :)")
+}

commands/hello.go

@@ -0,0 +1,17 @@
+/*
+* @Author: Bartuccio Antoine
+* @Date:   2018-07-24 12:05:45
+* @Last Modified by:   klmp200
+* @Last Modified time: 2018-07-24 12:06:39
+ */
+
+package commands
+
+import (
+	"../shared"
+	tb "gopkg.in/tucnak/telebot.v2"
+)
+
+func Hello(m *tb.Message) {
+	shared.Bot.Send(m.Chat, "Bonjour "+m.Sender.Username)
+}

commands/on_text.go

@@ -0,0 +1,17 @@
+/*
+* @Author: Bartuccio Antoine
+* @Date:   2018-07-24 12:09:37
+* @Last Modified by:   klmp200
+* @Last Modified time: 2018-07-24 12:10:26
+ */
+
+package commands
+
+import (
+	"../shared"
+	tb "gopkg.in/tucnak/telebot.v2"
+)
+
+func OnText(m *tb.Message) {
+	shared.History.AddMessage(m.Chat.ID, m.Text)
+}

commands/sponge.go

@@ -0,0 +1,27 @@
+/*
+* @Author: Bartuccio Antoine
+* @Date:   2018-07-24 11:52:11
+* @Last Modified by:   klmp200
+* @Last Modified time: 2018-07-24 11:58:42
+ */
+
+package commands
+
+import (
+	"../shared"
+	tb "gopkg.in/tucnak/telebot.v2"
+	"strings"
+)
+
+func Sponge(m *tb.Message) {
+	message := ""
+	for i, char := range shared.History.LastMessage(m.Chat.ID) {
+		if i%2 == 0 {
+			message += strings.ToLower(string(char))
+		} else {
+			message += strings.ToUpper(string(char))
+		}
+	}
+	shared.Bot.Send(m.Chat, message)
+
+}

settings.json

@@ -1,4 +1,5 @@
 {
 	"token": "INSERT TOKEN HERE",
-	"history size": 10
+	"history size": 10,
+	"history file": "history.json"
 }

shared/bot.go

@@ -0,0 +1,14 @@
+/*
+* @Author: Bartuccio Antoine
+* @Date:   2018-07-24 11:56:47
+* @Last Modified by:   klmp200
+* @Last Modified time: 2018-07-24 11:58:34
+ */
+
+package shared
+
+import (
+	tb "gopkg.in/tucnak/telebot.v2"
+)
+
+var Bot *tb.Bot

shared/history.go

@@ -2,12 +2,14 @@
 * @Author: Bartuccio Antoine
 * @Date:   2018-07-24 01:27:11
 * @Last Modified by:   klmp200
-* @Last Modified time: 2018-07-24 02:09:53
+* @Last Modified time: 2018-07-24 12:54:21
  */
 
 package shared
 
 import (
+	"encoding/json"
+	"io/ioutil"
 	"sync"
 )
 
@@ -17,22 +19,34 @@ type history struct {
 	data  map[int64][]string
 }
 
-var History history
+type historyFile struct {
+	mutex sync.Mutex
+	path  string
+}
 
-func InitHistory(size int) {
+var History history
+var hf historyFile
+
+// Init a chat history of a given size
+func InitHistory(size int, history_file_path string) {
+	hf = historyFile{}
+	hf.path = history_file_path
 	History = history{}
 	History.mutex.Lock()
 	defer History.mutex.Unlock()
 	History.size = size
 	History.data = make(map[int64][]string)
+	hf.read()
 }
 
+// Get the number of messages saved in the history
 func (h history) Size() int {
 	h.mutex.Lock()
 	defer h.mutex.Unlock()
 	return h.size
 }
 
+// Get a selected message in a chat history
 func (h history) Message(chatID int64, n int) string {
 	h.mutex.Lock()
 	defer h.mutex.Unlock()
@@ -43,6 +57,7 @@ func (h history) Message(chatID int64, n int) string {
 	return ""
 }
 
+// Append a message to a given chat
 func (h history) AddMessage(chatID int64, m string) {
 	h.mutex.Lock()
 	defer h.mutex.Unlock()
@@ -52,6 +67,7 @@ func (h history) AddMessage(chatID int64, m string) {
 	h.append(chatID, m)
 }
 
+// Get the last message of a given chat
 func (h history) LastMessage(chatID int64) string {
 	h.mutex.Lock()
 	defer h.mutex.Unlock()
@@ -61,6 +77,7 @@ func (h history) LastMessage(chatID int64) string {
 	return ""
 }
 
+// Get a copy of a given chat history
 func (h history) ChatHistory(chatID int64) []string {
 	h.mutex.Lock()
 	defer h.mutex.Unlock()
@@ -73,6 +90,7 @@ func (h history) ChatHistory(chatID int64) []string {
 	return nil
 }
 
+// Add a message at the end of a chat and move everithyng up
 // Assert that the slice exists and mutex already locked
 func (h history) append(chatID int64, m string) {
 	c := make([]string, h.size-1, h.size-1)
@@ -82,4 +100,25 @@ func (h history) append(chatID int64, m string) {
 		array[i] = val
 	}
 	array[h.size-1] = m
+	go hf.write()
+}
+
+func (h historyFile) read() {
+	h.mutex.Lock()
+	defer h.mutex.Unlock()
+	data, err := ioutil.ReadFile(h.path)
+	if err != nil {
+		// File doesn't exist, skip import
+		return
+	}
+	json.Unmarshal(data, &History.data)
+}
+
+func (h historyFile) write() {
+	h.mutex.Lock()
+	defer h.mutex.Unlock()
+	History.mutex.Lock()
+	defer History.mutex.Unlock()
+	data, _ := json.Marshal(History.data)
+	ioutil.WriteFile(h.path, data, 0770)
 }