Compare commits
No commits in common. "master" and "normalization" have entirely different histories.
master
...
normalizat
76
.drone.yml
76
.drone.yml
|
|
@ -1,40 +1,36 @@
|
|||
kind: pipeline
|
||||
type: docker
|
||||
name: default
|
||||
|
||||
steps:
|
||||
- name: build
|
||||
image: golang:1.14
|
||||
commands:
|
||||
- go build
|
||||
|
||||
- name: publish
|
||||
image: plugins/docker
|
||||
settings:
|
||||
repo: klmp200/alfred
|
||||
username:
|
||||
from_secret: docker_username
|
||||
password:
|
||||
from_secret: docker_password
|
||||
when:
|
||||
branch: master
|
||||
event: push
|
||||
|
||||
- name: deploy
|
||||
image: appleboy/drone-ssh
|
||||
environment:
|
||||
SSH_PASSWORD:
|
||||
from_secret: ssh_password
|
||||
settings:
|
||||
host:
|
||||
from_secret: ssh_host
|
||||
username:
|
||||
from_secret: ssh_username
|
||||
password:
|
||||
from_secret: ssh_password
|
||||
envs: [ SSH_PASSWORD ]
|
||||
script:
|
||||
- echo $SSH_PASSWORD | sudo -S systemctl restart alfred-bot
|
||||
when:
|
||||
branch: master
|
||||
event: push
|
||||
pipeline:
|
||||
build:
|
||||
image: golang:1.11
|
||||
group: build
|
||||
commands:
|
||||
- export GOPATH=/drone
|
||||
- go get -v -d ./...
|
||||
- go build .
|
||||
test:
|
||||
image: golang:1.11
|
||||
group: test
|
||||
secrets: [ test_api_token ]
|
||||
environment: [ test_api_token ]
|
||||
commands:
|
||||
- export GOPATH=/drone
|
||||
- go get -v -d ./...
|
||||
- go test ./...
|
||||
publish:
|
||||
image: plugins/docker
|
||||
repo: klmp200/alfred
|
||||
secrets: [ docker_username, docker_password ]
|
||||
when:
|
||||
branch: master
|
||||
event: push
|
||||
deploy:
|
||||
image: appleboy/drone-ssh
|
||||
host:
|
||||
- ollivander.diagon-alley
|
||||
username: dronedeploy
|
||||
secrets: [ ssh_password ]
|
||||
envs: [ ssh_password ]
|
||||
script:
|
||||
- echo $SSH_PASSWORD | sudo -S systemctl restart alfred-bot
|
||||
when:
|
||||
branch: master
|
||||
event: push
|
||||
30
Dockerfile
30
Dockerfile
|
|
@ -1,16 +1,30 @@
|
|||
FROM golang:1.14 AS builder
|
||||
RUN mkdir /build
|
||||
WORKDIR /build
|
||||
FROM golang:1.11 AS builder
|
||||
|
||||
# Download and install the latest release of dep
|
||||
# ADD https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 /usr/bin/dep
|
||||
# RUN chmod +x /usr/bin/dep
|
||||
|
||||
# Copy the code from the host and compile it
|
||||
COPY . .
|
||||
RUN mkdir -p src/git.klmp200.net/ALFRED/ALFRED
|
||||
|
||||
COPY . src/git.klmp200.net/ALFRED/ALFRED
|
||||
|
||||
WORKDIR "src/git.klmp200.net/ALFRED/ALFRED"
|
||||
|
||||
RUN go get -v -d ./...
|
||||
|
||||
RUN mkdir res
|
||||
|
||||
COPY settings.json res
|
||||
COPY quotes.json res
|
||||
|
||||
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix nocgo -o /app .
|
||||
FROM scratch
|
||||
# We need ca-certifactes for http calls
|
||||
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
|
||||
|
||||
# We use Alpine for it's ca-certificates needed by http lib
|
||||
FROM alpine:3.4
|
||||
RUN apk add --no-cache ca-certificates apache2-utils
|
||||
COPY --from=builder /app ./
|
||||
COPY --from=builder /build/res ./
|
||||
COPY --from=builder /go/src/git.klmp200.net/ALFRED/ALFRED/res ./
|
||||
|
||||
|
||||
ENTRYPOINT ["./app"]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: Bartuccio Antoine
|
||||
* @Date: 2018-07-23 15:24:22
|
||||
* @Last Modified by: Bartuccio Antoine
|
||||
* @Last Modified time: 2019-01-05 17:47:10
|
||||
* @Last Modified time: 2019-01-04 10:52:37
|
||||
*/
|
||||
|
||||
package main
|
||||
|
|
@ -19,7 +19,6 @@ import (
|
|||
)
|
||||
|
||||
func main() {
|
||||
|
||||
registeredCommands := map[string]func(*tb.Message){
|
||||
tb.OnText: commands.OnText,
|
||||
"/registerprivate": commands.RegisterPrivate,
|
||||
|
|
|
|||
|
|
@ -15,25 +15,15 @@ import (
|
|||
tb "gopkg.in/tucnak/telebot.v2"
|
||||
)
|
||||
|
||||
func spongify(inputMessage string) string {
|
||||
spongifiedMessage := ""
|
||||
for i, char := range inputMessage {
|
||||
if i%2 == 0 {
|
||||
spongifiedMessage += strings.ToLower(string(char))
|
||||
} else {
|
||||
spongifiedMessage += strings.ToUpper(string(char))
|
||||
}
|
||||
}
|
||||
return spongifiedMessage
|
||||
}
|
||||
|
||||
func Sponge(m *tb.Message) {
|
||||
message := ""
|
||||
if m.IsReply() {
|
||||
message = spongify(m.ReplyTo.Text)
|
||||
} else {
|
||||
message = spongify(shared.History.LastMessage(m.Chat.ID))
|
||||
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)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: Bartuccio Antoine
|
||||
* @Date: 2018-07-25 18:51:38
|
||||
* @Last Modified by: Bartuccio Antoine
|
||||
* @Last Modified time: 2019-01-04 11:44:47
|
||||
* @Last Modified time: 2019-01-04 10:47:25
|
||||
*/
|
||||
|
||||
package commands
|
||||
|
|
@ -93,21 +93,19 @@ func TwitterSJW(m *tb.Message) {
|
|||
testOrInitTwitter()
|
||||
lastUse, exists := shared.ChatData.Get(m.Chat.ID, "last chaos use")
|
||||
if exists {
|
||||
date := time.Now()
|
||||
switch serializedDate := lastUse.(type) {
|
||||
case string:
|
||||
parsedDate, err := time.Parse(time.RFC3339, serializedDate)
|
||||
var date *time.Time
|
||||
if lastUseConverted, isString := lastUse.(string); isString {
|
||||
parsedDate, err := time.Parse(time.RFC3339, lastUseConverted)
|
||||
if err == nil {
|
||||
date = parsedDate
|
||||
date = &parsedDate
|
||||
}
|
||||
case time.Time:
|
||||
date = serializedDate
|
||||
default:
|
||||
shared.Bot.Send(m.Chat, "Arioch ne répondra pas à votre appel.")
|
||||
return
|
||||
}
|
||||
|
||||
if time.Now().Before(date.Add(time.Hour * 24)) {
|
||||
if lastUseConverted, isDate := lastUse.(time.Time); isDate {
|
||||
date = &lastUseConverted
|
||||
}
|
||||
|
||||
if date != nil || time.Now().Before(date.Add(time.Hour*24)) {
|
||||
shared.Bot.Send(m.Chat, "Arioch ne répondra pas à votre appel.")
|
||||
return
|
||||
}
|
||||
|
|
|
|||
11
go.mod
11
go.mod
|
|
@ -1,11 +0,0 @@
|
|||
module git.klmp200.net/klmp200/abitbol
|
||||
|
||||
go 1.15
|
||||
|
||||
require (
|
||||
git.klmp200.net/ALFRED/ALFRED v0.0.0-20201109182945-7b26cc3640f2
|
||||
github.com/PuerkitoBio/goquery v1.6.0 // indirect
|
||||
github.com/dghubble/go-twitter v0.0.0-20201011215211-4b180d0cc78d // indirect
|
||||
github.com/dghubble/oauth1 v0.6.0 // indirect
|
||||
gopkg.in/tucnak/telebot.v2 v2.3.5
|
||||
)
|
||||
33
go.sum
33
go.sum
|
|
@ -1,33 +0,0 @@
|
|||
git.klmp200.net/ALFRED/ALFRED v0.0.0-20201109182945-7b26cc3640f2 h1:aFcX//JwBBVDBRxycyzBC+mJ+cuTQKrM6wIeVmdEHLM=
|
||||
git.klmp200.net/ALFRED/ALFRED v0.0.0-20201109182945-7b26cc3640f2/go.mod h1:j6PTiwlXECBIqwIm/4zbrXrwfXoWYD+EY7BPZWYTKrs=
|
||||
github.com/PuerkitoBio/goquery v1.6.0 h1:j7taAbelrdcsOlGeMenZxc2AWXD5fieT1/znArdnx94=
|
||||
github.com/PuerkitoBio/goquery v1.6.0/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
|
||||
github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo=
|
||||
github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
|
||||
github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY=
|
||||
github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dghubble/go-twitter v0.0.0-20201011215211-4b180d0cc78d h1:sBKr0A8iQ1qAOozedZ8Aox+Jpv+TeP1Qv7dcQyW8V+M=
|
||||
github.com/dghubble/go-twitter v0.0.0-20201011215211-4b180d0cc78d/go.mod h1:xfg4uS5LEzOj8PgZV7SQYRHbG7jPUnelEiaAVJxmhJE=
|
||||
github.com/dghubble/oauth1 v0.6.0 h1:m1yC01Ohc/eF38jwZ8JUjL1a+XHHXtGQgK+MxQbmSx0=
|
||||
github.com/dghubble/oauth1 v0.6.0/go.mod h1:8pFdfPkv/jr8mkChVbNVuJ0suiHe278BtWI4Tk1ujxk=
|
||||
github.com/dghubble/sling v1.3.0 h1:pZHjCJq4zJvc6qVQ5wN1jo5oNZlNE0+8T/h0XeXBUKU=
|
||||
github.com/dghubble/sling v1.3.0/go.mod h1:XXShWaBWKzNLhu2OxikSNFrlsvowtz4kyRuXUG7oQKY=
|
||||
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
|
||||
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
|
||||
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
|
||||
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/tucnak/telebot.v2 v2.3.5 h1:TdMJTlG8kvepsvZdy/gPeYEBdwKdwFFjH1AQTua9BOU=
|
||||
gopkg.in/tucnak/telebot.v2 v2.3.5/go.mod h1:BgaIIx50PSRS9pG59JH+geT82cfvoJU/IaI5TJdN3v8=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
|
|
@ -2,14 +2,13 @@
|
|||
* @Author: Bartuccio Antoine
|
||||
* @Date: 2018-07-27 15:37:59
|
||||
* @Last Modified by: Bartuccio Antoine
|
||||
* @Last Modified time: 2019-01-05 17:46:26
|
||||
* @Last Modified time: 2019-01-04 10:49:45
|
||||
*/
|
||||
|
||||
package shared
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"sync"
|
||||
)
|
||||
|
|
@ -26,28 +25,23 @@ type chatDataFile struct {
|
|||
}
|
||||
|
||||
// ChatData manage access to stored data about a chat
|
||||
var ChatData *chatData
|
||||
var ChatData chatData
|
||||
var cdf chatDataFile
|
||||
|
||||
// InitChatData is meant to store infos about a chat.
|
||||
func InitChatData(chatDataFilePath string) {
|
||||
|
||||
cdf = chatDataFile{path: chatDataFilePath}
|
||||
ChatData = &chatData{data: make(map[int64]map[string]interface{})}
|
||||
|
||||
func InitChatData(path string) {
|
||||
cdf = chatDataFile{path: path}
|
||||
ChatData = chatData{data: make(map[int64]map[string]interface{})}
|
||||
ChatData.mutex.Lock()
|
||||
defer ChatData.mutex.Unlock()
|
||||
|
||||
cdf.read()
|
||||
|
||||
}
|
||||
|
||||
// Set stores data about a chat
|
||||
func (c *chatData) Set(chat int64, key string, data interface{}) {
|
||||
|
||||
func (c chatData) Set(chat int64, key string, data interface{}) {
|
||||
c.mutex.Lock()
|
||||
defer c.mutex.Unlock()
|
||||
|
||||
if _, exists := c.data[chat]; !exists {
|
||||
c.data[chat] = make(map[string]interface{})
|
||||
}
|
||||
|
|
@ -56,11 +50,9 @@ func (c *chatData) Set(chat int64, key string, data interface{}) {
|
|||
}
|
||||
|
||||
// Get retrieves data about a chat
|
||||
func (c *chatData) Get(chat int64, key string) (interface{}, bool) {
|
||||
|
||||
func (c chatData) Get(chat int64, key string) (interface{}, bool) {
|
||||
c.mutex.Lock()
|
||||
defer c.mutex.Unlock()
|
||||
|
||||
m, exists := c.data[chat]
|
||||
if !exists {
|
||||
return nil, false
|
||||
|
|
@ -72,35 +64,22 @@ func (c *chatData) Get(chat int64, key string) (interface{}, bool) {
|
|||
return data, true
|
||||
}
|
||||
|
||||
func (c *chatDataFile) read() {
|
||||
|
||||
func (c chatDataFile) read() {
|
||||
c.mutex.Lock()
|
||||
defer c.mutex.Unlock()
|
||||
|
||||
data, err := ioutil.ReadFile(c.path)
|
||||
if err != nil {
|
||||
// File doesn't exist, skip import
|
||||
return
|
||||
}
|
||||
if err := json.Unmarshal(data, &ChatData.data); err != nil {
|
||||
fmt.Printf("Error while unmarshaling chat data with path %s, error : %v\n", c.path, err)
|
||||
}
|
||||
json.Unmarshal(data, &ChatData.data)
|
||||
}
|
||||
|
||||
func (c *chatDataFile) write() {
|
||||
|
||||
func (c chatDataFile) write() {
|
||||
c.mutex.Lock()
|
||||
defer c.mutex.Unlock()
|
||||
|
||||
ChatData.mutex.Lock()
|
||||
defer ChatData.mutex.Unlock()
|
||||
|
||||
data, err := json.Marshal(ChatData.data)
|
||||
if err != nil {
|
||||
fmt.Printf("Error while marshaling chat data file with path %s, error : %v\n", c.path, err)
|
||||
return
|
||||
}
|
||||
if err := ioutil.WriteFile(c.path, data, 0770); err != nil {
|
||||
fmt.Printf("Error writing chat data file with path %s, error %v\n", c.path, err)
|
||||
}
|
||||
data, _ := json.Marshal(ChatData.data)
|
||||
ioutil.WriteFile(c.path, data, 0770)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,13 @@
|
|||
* @Author: Bartuccio Antoine
|
||||
* @Date: 2018-07-24 01:27:11
|
||||
* @Last Modified by: Bartuccio Antoine
|
||||
* @Last Modified time: 2019-01-05 17:45:18
|
||||
* @Last Modified time: 2019-01-04 10:51:32
|
||||
*/
|
||||
|
||||
package shared
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"sync"
|
||||
)
|
||||
|
|
@ -26,39 +25,32 @@ type historyFile struct {
|
|||
}
|
||||
|
||||
// History manages acces to chat history
|
||||
var History *history
|
||||
var History history
|
||||
var hf historyFile
|
||||
|
||||
// InitHistory init a chit history of a given size
|
||||
func InitHistory(size int, historyFilePath string) {
|
||||
|
||||
func InitHistory(size int, history_file_path string) {
|
||||
hf = historyFile{}
|
||||
hf.path = historyFilePath
|
||||
History = &history{}
|
||||
|
||||
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()
|
||||
}
|
||||
|
||||
// Size get the number of messages saved in the history
|
||||
func (h *history) Size() int {
|
||||
|
||||
func (h history) Size() int {
|
||||
h.mutex.Lock()
|
||||
defer h.mutex.Unlock()
|
||||
|
||||
return h.size
|
||||
}
|
||||
|
||||
// Message get a selected message in a chat history
|
||||
func (h *history) Message(chatID int64, n int) string {
|
||||
|
||||
func (h history) Message(chatID int64, n int) string {
|
||||
h.mutex.Lock()
|
||||
defer h.mutex.Unlock()
|
||||
|
||||
array, exists := h.data[chatID]
|
||||
if exists && n >= 0 && n < len(array) {
|
||||
return array[n]
|
||||
|
|
@ -67,11 +59,9 @@ func (h *history) Message(chatID int64, n int) string {
|
|||
}
|
||||
|
||||
// AddMessage append a message to a given chat
|
||||
func (h *history) AddMessage(chatID int64, m string) {
|
||||
|
||||
func (h history) AddMessage(chatID int64, m string) {
|
||||
h.mutex.Lock()
|
||||
defer h.mutex.Unlock()
|
||||
|
||||
if _, exists := h.data[chatID]; !exists {
|
||||
h.data[chatID] = make([]string, h.size, h.size)
|
||||
}
|
||||
|
|
@ -79,11 +69,9 @@ func (h *history) AddMessage(chatID int64, m string) {
|
|||
}
|
||||
|
||||
// LastMessage get the last message of a given chat
|
||||
func (h *history) LastMessage(chatID int64) string {
|
||||
|
||||
func (h history) LastMessage(chatID int64) string {
|
||||
h.mutex.Lock()
|
||||
defer h.mutex.Unlock()
|
||||
|
||||
if _, exists := h.data[chatID]; exists {
|
||||
return h.data[chatID][h.size-1]
|
||||
}
|
||||
|
|
@ -91,11 +79,9 @@ func (h *history) LastMessage(chatID int64) string {
|
|||
}
|
||||
|
||||
// ChatHistory get a copy of a given chat history
|
||||
func (h *history) ChatHistory(chatID int64) []string {
|
||||
|
||||
func (h history) ChatHistory(chatID int64) []string {
|
||||
h.mutex.Lock()
|
||||
defer h.mutex.Unlock()
|
||||
|
||||
array, exists := h.data[chatID]
|
||||
if exists {
|
||||
c := make([]string, h.size, h.size)
|
||||
|
|
@ -107,8 +93,7 @@ func (h *history) ChatHistory(chatID int64) []string {
|
|||
|
||||
// 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) {
|
||||
|
||||
func (h history) append(chatID int64, m string) {
|
||||
c := make([]string, h.size-1, h.size-1)
|
||||
array, _ := h.data[chatID]
|
||||
copy(c, array[1:])
|
||||
|
|
@ -119,35 +104,22 @@ func (h *history) append(chatID int64, m string) {
|
|||
go hf.write()
|
||||
}
|
||||
|
||||
func (h *historyFile) read() {
|
||||
|
||||
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
|
||||
}
|
||||
if err := json.Unmarshal(data, &History.data); err != nil {
|
||||
fmt.Printf("Error while unmarshaling user history with path %s, error : %v\n", h.path, err)
|
||||
}
|
||||
json.Unmarshal(data, &History.data)
|
||||
}
|
||||
|
||||
func (h *historyFile) write() {
|
||||
|
||||
func (h historyFile) write() {
|
||||
h.mutex.Lock()
|
||||
defer h.mutex.Unlock()
|
||||
|
||||
History.mutex.Lock()
|
||||
defer History.mutex.Unlock()
|
||||
|
||||
data, err := json.Marshal(History.data)
|
||||
if err != nil {
|
||||
fmt.Printf("Error while marshaling history file with path %s, error : %v\n", h.path, err)
|
||||
return
|
||||
}
|
||||
if err := ioutil.WriteFile(h.path, data, 0770); err != nil {
|
||||
fmt.Printf("Error writing history file with path %s, error %v\n", h.path, err)
|
||||
}
|
||||
data, _ := json.Marshal(History.data)
|
||||
ioutil.WriteFile(h.path, data, 0770)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: Bartuccio Antoine
|
||||
* @Date: 2018-07-24 14:41:03
|
||||
* @Last Modified by: Bartuccio Antoine
|
||||
* @Last Modified time: 2019-01-05 17:45:59
|
||||
* @Last Modified time: 2019-01-04 10:52:13
|
||||
*/
|
||||
|
||||
package shared
|
||||
|
|
@ -27,29 +27,24 @@ type usersFile struct {
|
|||
}
|
||||
|
||||
// Users shared user for commands
|
||||
var Users *users
|
||||
var Users users
|
||||
var uf usersFile
|
||||
|
||||
// InitUsers inits the User info storage
|
||||
func InitUsers(usersFilePath string) {
|
||||
|
||||
func InitUsers(users_file_path string) {
|
||||
uf = usersFile{}
|
||||
uf.path = usersFilePath
|
||||
Users = &users{}
|
||||
|
||||
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) {
|
||||
|
||||
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
|
||||
|
|
@ -61,11 +56,9 @@ func (u *users) Get(username string, key string) (string, bool) {
|
|||
}
|
||||
|
||||
// Set add an info about a given user
|
||||
func (u *users) Set(username string, key, data string) {
|
||||
|
||||
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)
|
||||
}
|
||||
|
|
@ -74,11 +67,9 @@ func (u *users) Set(username string, key, data string) {
|
|||
}
|
||||
|
||||
// GetUsernames get all usernames stored in settings
|
||||
func (u *users) GetUsernames() []string {
|
||||
|
||||
func (u users) GetUsernames() []string {
|
||||
u.mutex.Lock()
|
||||
defer u.mutex.Unlock()
|
||||
|
||||
var usernames []string
|
||||
for username := range u.data {
|
||||
usernames = append(usernames, username)
|
||||
|
|
@ -87,8 +78,7 @@ func (u *users) GetUsernames() []string {
|
|||
}
|
||||
|
||||
// GetUserChat retrieve the chat of the user if registered
|
||||
func (u *users) GetUserChat(username string) (*tb.Chat, error) {
|
||||
|
||||
func (u users) GetUserChat(username string) (*tb.Chat, error) {
|
||||
serializedChat, exists := u.Get(username, "private_chat")
|
||||
if !exists {
|
||||
return nil, fmt.Errorf("No private chat registered for %s", username)
|
||||
|
|
@ -103,8 +93,7 @@ func (u *users) GetUserChat(username string) (*tb.Chat, error) {
|
|||
}
|
||||
|
||||
// SetUserChat register a private chat for an user
|
||||
func (u *users) SetUserChat(username string, chat *tb.Chat) {
|
||||
|
||||
func (u users) SetUserChat(username string, chat *tb.Chat) {
|
||||
serializedChat, err := json.Marshal(chat)
|
||||
if err != nil {
|
||||
return
|
||||
|
|
@ -113,35 +102,22 @@ func (u *users) SetUserChat(username string, chat *tb.Chat) {
|
|||
u.Set(username, "private_chat", string(serializedChat))
|
||||
}
|
||||
|
||||
func (u *usersFile) read() {
|
||||
|
||||
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
|
||||
}
|
||||
if err := json.Unmarshal(data, &Users.data); err != nil {
|
||||
fmt.Printf("Error while unmarshaling user file with path %s, error : %v\n", u.path, err)
|
||||
}
|
||||
json.Unmarshal(data, &Users.data)
|
||||
}
|
||||
|
||||
func (u *usersFile) write() {
|
||||
|
||||
func (u usersFile) write() {
|
||||
u.mutex.Lock()
|
||||
defer u.mutex.Unlock()
|
||||
|
||||
Users.mutex.Lock()
|
||||
defer Users.mutex.Unlock()
|
||||
|
||||
data, err := json.Marshal(Users.data)
|
||||
if err != nil {
|
||||
fmt.Printf("Error while marshaling user file with path %s, error : %v\n", u.path, err)
|
||||
return
|
||||
}
|
||||
if err := ioutil.WriteFile(u.path, data, 0770); err != nil {
|
||||
fmt.Printf("Error writing user file with path %s, error : %v\n", u.path, err)
|
||||
}
|
||||
data, _ := json.Marshal(Users.data)
|
||||
ioutil.WriteFile(u.path, data, 0770)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue