merge

.gitignore

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

alfred.go

@@ -2,28 +2,42 @@
 * @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 20:55:53
  */
 
 package main
 
 import (
+	"./commands"
 	"./plugin_manager"
 	"./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,
+		"/setgender": commands.SetGender,
+		"/gender":    commands.Gender,
+		"/roll":      commands.Dice,
+	}
+
 	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("Initialize users infos")
+	shared.InitUsers(settings.Settings["users file"].(string))
 
 	log.Println("Bot initialisation")
 	b, err := tb.NewBot(tb.Settings{
@@ -34,35 +48,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.")
-	})
 
 	plugin_manager.Init("plugin", b)
 	b.Handle(tb.OnText, plugin_manager.HandleMessage)

commands/dice.go

@@ -0,0 +1,30 @@
+/*
+* @Author: Bartuccio Antoine
+* @Date:   2018-07-24 20:50:04
+* @Last Modified by:   klmp200
+* @Last Modified time: 2018-07-24 21:00:59
+ */
+
+package commands
+
+import (
+	"../shared"
+	tb "gopkg.in/tucnak/telebot.v2"
+	"math/rand"
+	"strconv"
+	"strings"
+)
+
+func Dice(m *tb.Message) {
+	split := strings.Split(m.Text, " ")
+	if len(split) < 2 {
+		shared.Bot.Send(m.Chat, "Pour lancer un dé, il faut préciser combien de faces il a.")
+		return
+	}
+	up, err := strconv.Atoi(split[1])
+	if err != nil || up <= 0 {
+		shared.Bot.Send(m.Chat, split[1]+" n'est pas un nombre valide.")
+		return
+	}
+	shared.Bot.Send(m.Chat, strconv.Itoa(rand.Intn(up+1)))
+}

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/gender.go

@@ -0,0 +1,68 @@
+/*
+* @Author: Bartuccio Antoine
+* @Date:   2018-07-24 14:55:33
+* @Last Modified by:   klmp200
+* @Last Modified time: 2018-07-24 20:29:36
+ */
+
+package commands
+
+import (
+	"../shared"
+	tb "gopkg.in/tucnak/telebot.v2"
+	"strings"
+)
+
+func SetGender(m *tb.Message) {
+	if m.Sender.Username == "" {
+		shared.Bot.Send(m.Chat, "Il faut avoir enregistré un username pour pouvoir utiliser cette fonction")
+		return
+	}
+	split := cleanGender(strings.Split(m.Text, " ")[1:])
+	if len(split) == 0 {
+		shared.Bot.Send(m.Chat, "Désolé, mais je n'ai pas compris.")
+		return
+	}
+	data := strings.Join(split, " ")
+	shared.Users.Set(m.Sender.Username, "gender", data)
+	shared.Bot.Send(m.Chat, "Votre genre est enregistré, je vous considère maintenant comme « "+data+" ».")
+}
+
+func Gender(m *tb.Message) {
+	split := strings.Split(m.Text, " ")
+	if len(split) > 1 {
+		// Username asked
+		username := split[1]
+		username = strings.Replace(username, "@", "", 1)
+		data, exists := shared.Users.Get(username, "gender")
+		if !exists {
+			shared.Bot.Send(m.Chat, username+" n'est pas un utilisateur existant ou n'a pas renseigné son genre.")
+			return
+		}
+		shared.Bot.Send(m.Chat, "L'utilisateur "+username+" a pour genre « "+data+" ».")
+	} else {
+		data, exists := shared.Users.Get(m.Sender.Username, "gender")
+		if !exists {
+			shared.Bot.Send(m.Chat, "Vous n'avez pas enregistré votre genre, je ne voudrais pas l'assumer.")
+		} else {
+			shared.Bot.Send(m.Chat, data)
+		}
+	}
+}
+
+func cleanGender(slice []string) []string {
+	for i := range slice {
+		clean := false
+		for !clean {
+			clean = true
+			if strings.HasPrefix(slice[i], "@") {
+				slice[i] = strings.Replace(slice[i], "@", "", 1)
+				clean = false
+			} else if strings.HasPrefix(slice[i], "/") {
+				slice[i] = strings.Replace(slice[i], "/", "", 1)
+				clean = false
+			}
+		}
+	}
+	return slice
+}

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,7 @@
 {
-	"token": "646721001:AAHuCB0uqW1u94GD_BGTUrz-ECaGwGJRm2E",
+
-	"history size": 10
+	"token": "INSERT TOKEN HERE",
+	"history size": 10,
+	"history file": "history.json",
+	"users file": "users.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)
 }

shared/users.go

@@ -0,0 +1,82 @@
+/*
+* @Author: Bartuccio Antoine
+* @Date:   2018-07-24 14:41:03
+* @Last Modified by:   klmp200
+* @Last Modified time: 2018-07-24 17:49:51
+ */
+
+package shared
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"sync"
+)
+
+type users struct {
+	mutex sync.Mutex
+	data  map[string]map[string]string
+}
+
+type usersFile struct {
+	mutex sync.Mutex
+	path  string
+}
+
+var Users users
+var uf usersFile
+
+func InitUsers(users_file_path string) {
+	uf = usersFile{}
+	uf.path = users_file_path
+	Users = users{}
+	Users.mutex.Lock()
+	defer Users.mutex.Unlock()
+	Users.data = make(map[string]map[string]string)
+	uf.read()
+}
+
+// Get an info about a given user
+func (u users) Get(username string, key string) (string, bool) {
+	u.mutex.Lock()
+	defer u.mutex.Unlock()
+	user, exists := u.data[username]
+	if !exists {
+		return "", false
+	}
+	if _, exists = user[key]; !exists {
+		return "", false
+	}
+	return user[key], true
+}
+
+// Add an info about a given user
+func (u users) Set(username string, key, data string) {
+	u.mutex.Lock()
+	defer u.mutex.Unlock()
+	if _, exists := u.data[username]; !exists {
+		u.data[username] = make(map[string]string)
+	}
+	u.data[username][key] = data
+	go uf.write()
+}
+
+func (u usersFile) read() {
+	u.mutex.Lock()
+	defer u.mutex.Unlock()
+	data, err := ioutil.ReadFile(u.path)
+	if err != nil {
+		// File doesn't exist, skip import
+		return
+	}
+	json.Unmarshal(data, &Users.data)
+}
+
+func (u usersFile) write() {
+	u.mutex.Lock()
+	defer u.mutex.Unlock()
+	Users.mutex.Lock()
+	defer Users.mutex.Unlock()
+	data, _ := json.Marshal(Users.data)
+	ioutil.WriteFile(u.path, data, 0770)
+}