nyanloutre
/
ALFRED
forked from git.klmp200.net/ALFRED
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'features' of ALFRED/ALFRED into master

This commit is contained in:
Antoine Bartuccio 2018-07-24 15:53:21 +00:00 committed by Gitea
parent 62188a005d 3128e836ea
commit 7ec9a97b74
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
commands/gender.go
View File

@ -2,7 +2,7 @@
* @Author: Bartuccio Antoine * @Author: Bartuccio Antoine
* @Date: 2018-07-24 14:55:33 * @Date: 2018-07-24 14:55:33
* @Last Modified by: klmp200 * @Last Modified by: klmp200
* @Last Modified time: 2018-07-24 17:26:57 * @Last Modified time: 2018-07-24 17:50:19
*/ */
package commands package commands
@ -14,18 +14,22 @@ import (
) )
func SetGender(m *tb.Message) { 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:]) split := cleanGender(strings.Split(m.Text, " ")[1:])
if len(split) == 0 { if len(split) == 0 {
shared.Bot.Send(m.Chat, "Désolé, mais je n'ai pas compris.") shared.Bot.Send(m.Chat, "Désolé, mais je n'ai pas compris.")
return return
} }
data := strings.Join(split, " ") data := strings.Join(split, " ")
shared.Users.Set(m.Sender.ID, "gender", data) shared.Users.Set(m.Sender.Username, "gender", data)
shared.Bot.Send(m.Chat, "Votre genre est enregistré, je vous considère maintenant comme « "+data+" ».") shared.Bot.Send(m.Chat, "Votre genre est enregistré, je vous considère maintenant comme « "+data+" ».")
} }
func Gender(m *tb.Message) { func Gender(m *tb.Message) {
data, exists := shared.Users.Get(m.Sender.ID, "gender") data, exists := shared.Users.Get(m.Sender.Username, "gender")
if !exists { if !exists {
shared.Bot.Send(m.Chat, "Vous n'avez pas enregistré votre genre, je ne voudrais pas l'assumer.") shared.Bot.Send(m.Chat, "Vous n'avez pas enregistré votre genre, je ne voudrais pas l'assumer.")
} else { } else {

18
shared/users.go
View File

@ -2,7 +2,7 @@
* @Author: Bartuccio Antoine * @Author: Bartuccio Antoine
* @Date: 2018-07-24 14:41:03 * @Date: 2018-07-24 14:41:03
* @Last Modified by: klmp200 * @Last Modified by: klmp200
* @Last Modified time: 2018-07-24 15:23:06 * @Last Modified time: 2018-07-24 17:49:51
*/ */
package shared package shared
@ -15,7 +15,7 @@ import (
type users struct { type users struct {
mutex sync.Mutex mutex sync.Mutex
data map[int]map[string]string data map[string]map[string]string
} }
type usersFile struct { type usersFile struct {
@ -32,15 +32,15 @@ func InitUsers(users_file_path string) {
Users = users{} Users = users{}
Users.mutex.Lock() Users.mutex.Lock()
defer Users.mutex.Unlock() defer Users.mutex.Unlock()
Users.data = make(map[int]map[string]string) Users.data = make(map[string]map[string]string)
uf.read() uf.read()
} }
// Get an info about a given user // Get an info about a given user
func (u users) Get(id int, key string) (string, bool) { func (u users) Get(username string, key string) (string, bool) {
u.mutex.Lock() u.mutex.Lock()
defer u.mutex.Unlock() defer u.mutex.Unlock()
user, exists := u.data[id] user, exists := u.data[username]
if !exists { if !exists {
return "", false return "", false
} }
@ -51,13 +51,13 @@ func (u users) Get(id int, key string) (string, bool) {
} }
// Add an info about a given user // Add an info about a given user
func (u users) Set(id int, key, data string) { func (u users) Set(username string, key, data string) {
u.mutex.Lock() u.mutex.Lock()
defer u.mutex.Unlock() defer u.mutex.Unlock()
if _, exists := u.data[id]; !exists { if _, exists := u.data[username]; !exists {
u.data[id] = make(map[string]string) u.data[username] = make(map[string]string)
} }
u.data[id][key] = data u.data[username][key] = data
go uf.write() go uf.write()
} }