🏗️ Maked architectural changes
This commit is contained in:
Maxim Lebedev
parent
4aaff889ea
commit
a65ca2e796
86 changed files with 1450 additions and 1069 deletions
10
.gitignore
vendored
10
.gitignore
vendored
|
|
@ -11,13 +11,13 @@
|
|||
# Output of the go coverage tool, specifically when used with LiteIDE
|
||||
*.out
|
||||
|
||||
# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
|
||||
# Project-local glide cache
|
||||
# RE: https://github.com/Masterminds/glide/issues/736
|
||||
.glide/
|
||||
|
||||
# Golang project vendor packages which should be ignored
|
||||
vendor/
|
||||
|
||||
# Production files must not be in public repository
|
||||
config.yaml
|
||||
MyPackBot
|
||||
stickers.db
|
||||
configs/config.yaml
|
||||
cert.key
|
||||
cert.pem
|
||||
11
Makefile
11
Makefile
|
|
@ -17,10 +17,15 @@ fmt:
|
|||
|
||||
# Build localization files with separated untranslated strings
|
||||
translation:
|
||||
goi18n merge -format yaml -sourceLanguage en -outdir ./i18n/ ./i18n/*/*
|
||||
goi18n merge -format yaml \
|
||||
-sourceLanguage en \
|
||||
-outdir ./translations/ \
|
||||
./translations/src/*/*
|
||||
|
||||
# Build localization files and merge untranslated strings
|
||||
localization:
|
||||
make translation
|
||||
goi18n -format yaml -sourceLanguage en -outdir ./i18n/ ./i18n/*.all.yaml \
|
||||
./i18n/*.untranslated.yaml
|
||||
goi18n -format yaml \
|
||||
-sourceLanguage en \
|
||||
-outdir ./translations/ \
|
||||
./translations/*.all.yaml ./translations/*.untranslated.yaml
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
# [Patrons!](https://www.patreon.com/bePatron?c=243288)
|
||||
**These people have sponsored the current version of the project:**
|
||||
- Daniil Tlenov
|
||||
- Aurielb
|
||||
- Yami Odymel
|
||||
- MoD21k
|
||||
31
actions.go
31
actions.go
|
|
@ -1,31 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
// actions function check Message update on commands, sended stickers or other user stuff
|
||||
func actions(msg *tg.Message) {
|
||||
state, err := dbGetUserState(msg.From.ID)
|
||||
errCheck(err)
|
||||
|
||||
log.Ln("state:", state)
|
||||
switch state {
|
||||
case stateAddSticker:
|
||||
actionAdd(msg, false)
|
||||
case stateAddPack:
|
||||
actionAdd(msg, true)
|
||||
case stateDeleteSticker:
|
||||
actionDelete(msg, false)
|
||||
case stateDeletePack:
|
||||
actionDelete(msg, true)
|
||||
case stateReset:
|
||||
actionReset(msg)
|
||||
default:
|
||||
err = dbChangeUserState(msg.From.ID, stateNone)
|
||||
errCheck(err)
|
||||
|
||||
actionError(msg)
|
||||
}
|
||||
}
|
||||
104
add.go
104
add.go
|
|
@ -1,104 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
func commandAdd(msg *tg.Message, pack bool) {
|
||||
T, err := switchLocale(msg.From.LanguageCode)
|
||||
errCheck(err)
|
||||
|
||||
_, err = bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errCheck(err)
|
||||
|
||||
reply := tg.NewMessage(msg.Chat.ID, T("reply_add_sticker"))
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
reply.ReplyMarkup = getCancelButton(T)
|
||||
|
||||
err = dbChangeUserState(msg.From.ID, stateAddSticker)
|
||||
errCheck(err)
|
||||
|
||||
if pack {
|
||||
reply.Text = T("reply_add_pack")
|
||||
|
||||
err = dbChangeUserState(msg.From.ID, stateAddPack)
|
||||
errCheck(err)
|
||||
}
|
||||
|
||||
log.Ln("Sending add reply...")
|
||||
_, err = bot.SendMessage(reply)
|
||||
errCheck(err)
|
||||
}
|
||||
|
||||
func actionAdd(msg *tg.Message, pack bool) {
|
||||
if !msg.IsSticker() {
|
||||
return
|
||||
}
|
||||
|
||||
T, err := switchLocale(msg.From.LanguageCode)
|
||||
errCheck(err)
|
||||
|
||||
_, err = bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errCheck(err)
|
||||
|
||||
reply := tg.NewMessage(msg.Chat.ID, T("success_add_sticker"))
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
|
||||
if !pack {
|
||||
var exist bool
|
||||
sticker := msg.Sticker
|
||||
exist, err = dbAddSticker(
|
||||
msg.From.ID, sticker.SetName, sticker.FileID, sticker.Emoji,
|
||||
)
|
||||
errCheck(err)
|
||||
|
||||
if exist {
|
||||
reply.Text = T("error_already_add_sticker")
|
||||
}
|
||||
|
||||
reply.ReplyMarkup = getCancelButton(T)
|
||||
_, err = bot.SendMessage(reply)
|
||||
errCheck(err)
|
||||
return
|
||||
}
|
||||
|
||||
reply.Text = T("error_empty_add_pack", map[string]interface{}{
|
||||
"AddStickerCommand": cmdAddSticker,
|
||||
})
|
||||
|
||||
if msg.Sticker.SetName != "" {
|
||||
var set *tg.StickerSet
|
||||
set, err = bot.GetStickerSet(msg.Sticker.SetName)
|
||||
errCheck(err)
|
||||
|
||||
log.Ln("SetTitle:", set.Title)
|
||||
reply.Text = T("success_add_pack", map[string]interface{}{
|
||||
"SetTitle": set.Title,
|
||||
})
|
||||
|
||||
allExists := true
|
||||
for _, sticker := range set.Stickers {
|
||||
var exist bool
|
||||
exist, err = dbAddSticker(
|
||||
msg.From.ID, sticker.SetName, sticker.FileID, sticker.Emoji,
|
||||
)
|
||||
errCheck(err)
|
||||
|
||||
if !exist {
|
||||
allExists = false
|
||||
}
|
||||
}
|
||||
|
||||
log.Ln("All exists?", allExists)
|
||||
if allExists {
|
||||
reply.Text = T("error_already_add_pack", map[string]interface{}{
|
||||
"SetTitle": set.Title,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
reply.ReplyMarkup = getCancelButton(T)
|
||||
_, err = bot.SendMessage(reply)
|
||||
errCheck(err)
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
language: go
|
||||
|
||||
go:
|
||||
- 1.9
|
||||
- tip
|
||||
|
||||
install:
|
||||
39
cancel.go
39
cancel.go
|
|
@ -1,39 +0,0 @@
|
|||
package main
|
||||
|
||||
import tg "github.com/toby3d/telegram"
|
||||
|
||||
func commandCancel(msg *tg.Message) {
|
||||
T, err := switchLocale(msg.From.LanguageCode)
|
||||
errCheck(err)
|
||||
|
||||
state, err := dbGetUserState(msg.From.ID)
|
||||
errCheck(err)
|
||||
|
||||
_, err = bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errCheck(err)
|
||||
|
||||
var text string
|
||||
switch state {
|
||||
case stateAddSticker:
|
||||
text = T("cancel_add_sticker")
|
||||
case stateAddPack:
|
||||
text = T("cancel_add_pack")
|
||||
case stateDeleteSticker:
|
||||
text = T("cancel_del_sticker")
|
||||
case stateDeletePack:
|
||||
text = T("cancel_del_pack")
|
||||
case stateReset:
|
||||
text = T("cancel_reset")
|
||||
default:
|
||||
text = T("cancel_error")
|
||||
}
|
||||
|
||||
err = dbChangeUserState(msg.From.ID, stateNone)
|
||||
errCheck(err)
|
||||
|
||||
reply := tg.NewMessage(msg.Chat.ID, text)
|
||||
reply.ReplyMarkup = getMenuKeyboard(T)
|
||||
|
||||
_, err = bot.SendMessage(reply)
|
||||
errCheck(err)
|
||||
}
|
||||
39
commands.go
39
commands.go
|
|
@ -1,39 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
const (
|
||||
cmdAddPack = "addPack"
|
||||
cmdAddSticker = "addSticker"
|
||||
cmdCancel = "cancel"
|
||||
cmdHelp = "help"
|
||||
cmdDeleteSticker = "delSticker"
|
||||
cmdDeletePack = "delPack"
|
||||
cmdReset = "reset"
|
||||
cmdStart = "start"
|
||||
)
|
||||
|
||||
func commands(msg *tg.Message) {
|
||||
log.Ln("command:", msg.Command())
|
||||
switch {
|
||||
case msg.IsCommand(cmdStart):
|
||||
commandStart(msg)
|
||||
case msg.IsCommand(cmdHelp):
|
||||
commandHelp(msg)
|
||||
case msg.IsCommand(cmdAddSticker):
|
||||
commandAdd(msg, false)
|
||||
case msg.IsCommand(cmdAddPack):
|
||||
commandAdd(msg, true)
|
||||
case msg.IsCommand(cmdDeleteSticker):
|
||||
commandDelete(msg, false)
|
||||
case msg.IsCommand(cmdDeletePack):
|
||||
commandDelete(msg, true)
|
||||
case msg.IsCommand(cmdReset):
|
||||
commandReset(msg)
|
||||
case msg.IsCommand(cmdCancel):
|
||||
commandCancel(msg)
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
telegram:
|
||||
token: 123456789:ABCd1efGhjKLM23O4pqR5stuvwx678yz90
|
||||
webhook:
|
||||
set: https://www.google.com
|
||||
set: https://toby3d.github.io
|
||||
listen: /bot
|
||||
serve: 0.0.0.0:2368
|
||||
channel: -1000000000000
|
||||
244
database.go
244
database.go
|
|
@ -1,244 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
"github.com/tidwall/buntdb"
|
||||
)
|
||||
|
||||
const (
|
||||
stateNone = "none"
|
||||
stateAddSticker = "addSticker"
|
||||
stateAddPack = "addPack"
|
||||
stateDeleteSticker = "delSticker"
|
||||
stateDeletePack = "delPack"
|
||||
stateReset = "reset"
|
||||
|
||||
setUploaded = "?"
|
||||
)
|
||||
|
||||
var db *buntdb.DB
|
||||
|
||||
func dbInit() {
|
||||
log.Ln("Open database file...")
|
||||
var err error
|
||||
db, err = buntdb.Open("stickers.db")
|
||||
errCheck(err)
|
||||
|
||||
select {}
|
||||
}
|
||||
|
||||
func dbGetUsers() ([]int, error) {
|
||||
var users []int
|
||||
err := db.View(func(tx *buntdb.Tx) error {
|
||||
return tx.AscendKeys(
|
||||
"user:*:state",
|
||||
func(key, val string) bool {
|
||||
subKeys := strings.Split(key, ":")
|
||||
id, err := strconv.Atoi(subKeys[1])
|
||||
if err == nil {
|
||||
users = append(users, id)
|
||||
}
|
||||
|
||||
return true
|
||||
},
|
||||
)
|
||||
})
|
||||
if err == buntdb.ErrNotFound {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
return users, err
|
||||
}
|
||||
|
||||
func dbChangeUserState(userID int, state string) error {
|
||||
log.Ln("Trying to change", userID, "state to", state)
|
||||
return db.Update(func(tx *buntdb.Tx) error {
|
||||
_, _, err := tx.Set(fmt.Sprint("user:", userID, ":state"), state, nil)
|
||||
return err
|
||||
})
|
||||
}
|
||||
|
||||
func dbGetUserState(userID int) (string, error) {
|
||||
log.Ln("Trying to get", userID, "state")
|
||||
var state string
|
||||
err := db.View(func(tx *buntdb.Tx) error {
|
||||
var err error
|
||||
state, err = tx.Get(fmt.Sprint("user:", userID, ":state"))
|
||||
return err
|
||||
})
|
||||
|
||||
switch err {
|
||||
case buntdb.ErrNotFound:
|
||||
log.Ln(userID, "not found, create new one")
|
||||
if err = dbChangeUserState(userID, stateNone); err != nil {
|
||||
return state, err
|
||||
}
|
||||
}
|
||||
|
||||
return state, err
|
||||
}
|
||||
|
||||
func dbAddSticker(userID int, setName, fileID, emoji string) (bool, error) {
|
||||
log.Ln("Trying to add", fileID, "sticker from", userID, "user")
|
||||
if setName == "" {
|
||||
setName = setUploaded
|
||||
}
|
||||
|
||||
var exists bool
|
||||
err := db.Update(func(tx *buntdb.Tx) error {
|
||||
var err error
|
||||
_, exists, err = tx.Set(
|
||||
fmt.Sprint("user:", userID, ":set:", setName, ":sticker:", fileID), // key
|
||||
emoji, // value
|
||||
nil, // options
|
||||
)
|
||||
|
||||
if err == buntdb.ErrIndexExists {
|
||||
exists = true
|
||||
return nil
|
||||
}
|
||||
|
||||
return err
|
||||
})
|
||||
|
||||
return exists, err
|
||||
}
|
||||
|
||||
func dbDeleteSticker(userID int, setName, fileID string) (bool, error) {
|
||||
log.Ln("Trying to remove", fileID, "sticker from", userID, "user")
|
||||
if setName == "" {
|
||||
setName = setUploaded
|
||||
}
|
||||
|
||||
err := db.Update(func(tx *buntdb.Tx) error {
|
||||
_, err := tx.Delete(
|
||||
fmt.Sprint("user:", userID, ":set:", setName, ":sticker:", fileID),
|
||||
)
|
||||
return err
|
||||
})
|
||||
|
||||
switch err {
|
||||
case buntdb.ErrNotFound:
|
||||
log.Ln(userID, "not found, create new one")
|
||||
return true, nil
|
||||
}
|
||||
|
||||
return false, err
|
||||
}
|
||||
|
||||
func dbDeletePack(userID int, setName string) (bool, error) {
|
||||
log.Ln("Trying to remove all", setName, "sticker from", userID, "user")
|
||||
if setName == "" {
|
||||
setName = setUploaded
|
||||
}
|
||||
|
||||
var fileIDs []string
|
||||
err := db.View(func(tx *buntdb.Tx) error {
|
||||
return tx.AscendKeys(
|
||||
fmt.Sprint("user:", userID, ":set:", setName, ":*"),
|
||||
func(key, val string) bool {
|
||||
keys := strings.Split(key, ":")
|
||||
fileIDs = append(fileIDs, keys[5])
|
||||
return true
|
||||
},
|
||||
)
|
||||
})
|
||||
|
||||
if len(fileIDs) == 0 {
|
||||
return true, nil
|
||||
}
|
||||
|
||||
for _, fileID := range fileIDs {
|
||||
var notExist bool
|
||||
notExist, err = dbDeleteSticker(userID, setName, fileID)
|
||||
if err != nil {
|
||||
return notExist, err
|
||||
}
|
||||
}
|
||||
|
||||
switch err {
|
||||
case buntdb.ErrNotFound:
|
||||
log.Ln(userID, "not found")
|
||||
return true, nil
|
||||
}
|
||||
|
||||
return false, err
|
||||
}
|
||||
|
||||
func dbResetUserStickers(userID int) error {
|
||||
log.Ln("Trying reset all stickers of", userID, "user")
|
||||
return db.Update(func(tx *buntdb.Tx) error {
|
||||
var keys []string
|
||||
if err := tx.AscendKeys(
|
||||
fmt.Sprint("user:", userID, ":set:*"), // index
|
||||
func(key, val string) bool { // iterator
|
||||
subKeys := strings.Split(key, ":")
|
||||
if subKeys[1] == strconv.Itoa(userID) {
|
||||
keys = append(keys, key)
|
||||
}
|
||||
return true
|
||||
},
|
||||
); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for i := range keys {
|
||||
_, err := tx.Delete(keys[i])
|
||||
if err != nil {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func dbGetUserStickers(userID, offset int, query string) ([]string, int, error) {
|
||||
log.Ln("Trying to get", userID, "stickers")
|
||||
var total, count int
|
||||
var stickers []string
|
||||
offset = offset * 50
|
||||
|
||||
err := db.View(func(tx *buntdb.Tx) error {
|
||||
return tx.AscendKeys(
|
||||
fmt.Sprint("user:", userID, ":set:*"), // index
|
||||
func(key, val string) bool { // iterator
|
||||
subKeys := strings.Split(key, ":")
|
||||
if subKeys[1] != strconv.Itoa(userID) {
|
||||
return true
|
||||
}
|
||||
|
||||
total++
|
||||
if count >= 51 {
|
||||
return true
|
||||
}
|
||||
|
||||
if total < offset {
|
||||
return true
|
||||
}
|
||||
|
||||
if query != "" && !strings.Contains(query, val) {
|
||||
return true
|
||||
}
|
||||
|
||||
count++
|
||||
stickers = append(stickers, subKeys[5])
|
||||
return true
|
||||
},
|
||||
)
|
||||
})
|
||||
|
||||
switch {
|
||||
case err == buntdb.ErrNotFound:
|
||||
log.Ln("Not found stickers")
|
||||
return nil, total, nil
|
||||
case err != nil:
|
||||
return nil, total, err
|
||||
}
|
||||
|
||||
return stickers, total, nil
|
||||
}
|
||||
95
delete.go
95
delete.go
|
|
@ -1,95 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
func commandDelete(msg *tg.Message, pack bool) {
|
||||
T, err := switchLocale(msg.From.LanguageCode)
|
||||
errCheck(err)
|
||||
|
||||
_, total, err := dbGetUserStickers(msg.From.ID, 0, "")
|
||||
errCheck(err)
|
||||
|
||||
_, err = bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errCheck(err)
|
||||
|
||||
if total <= 0 {
|
||||
err = dbChangeUserState(msg.From.ID, stateNone)
|
||||
errCheck(err)
|
||||
|
||||
reply := tg.NewMessage(msg.Chat.ID, T("error_empty_del"))
|
||||
reply.ReplyMarkup = getMenuKeyboard(T)
|
||||
_, err = bot.SendMessage(reply)
|
||||
errCheck(err)
|
||||
return
|
||||
}
|
||||
|
||||
reply := tg.NewMessage(msg.Chat.ID, T("reply_del_sticker"))
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
reply.ReplyMarkup = getCancelButton(T)
|
||||
|
||||
err = dbChangeUserState(msg.From.ID, stateDeleteSticker)
|
||||
errCheck(err)
|
||||
|
||||
if pack {
|
||||
err = dbChangeUserState(msg.From.ID, stateDeletePack)
|
||||
errCheck(err)
|
||||
|
||||
reply.Text = T("reply_del_pack")
|
||||
}
|
||||
|
||||
_, err = bot.SendMessage(reply)
|
||||
errCheck(err)
|
||||
|
||||
_, err = bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errCheck(err)
|
||||
|
||||
reply = tg.NewMessage(msg.Chat.ID, T("reply_switch_button"))
|
||||
reply.ReplyMarkup = getSwitchButton(T)
|
||||
_, err = bot.SendMessage(reply)
|
||||
errCheck(err)
|
||||
}
|
||||
|
||||
func actionDelete(msg *tg.Message, pack bool) {
|
||||
if !msg.IsSticker() {
|
||||
return
|
||||
}
|
||||
|
||||
T, err := switchLocale(msg.From.LanguageCode)
|
||||
errCheck(err)
|
||||
|
||||
_, err = bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errCheck(err)
|
||||
|
||||
reply := tg.NewMessage(msg.Chat.ID, T("success_del_sticker"))
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
reply.ReplyMarkup = getCancelButton(T)
|
||||
|
||||
var notExist bool
|
||||
if pack {
|
||||
var set *tg.StickerSet
|
||||
set, err = bot.GetStickerSet(msg.Sticker.SetName)
|
||||
errCheck(err)
|
||||
|
||||
log.Ln("SetName:", set.Title)
|
||||
reply.Text = T("success_del_pack", map[string]interface{}{
|
||||
"SetTitle": set.Title,
|
||||
})
|
||||
|
||||
notExist, err = dbDeletePack(msg.From.ID, msg.Sticker.SetName)
|
||||
if notExist {
|
||||
reply.Text = T("error_already_del_pack")
|
||||
}
|
||||
} else {
|
||||
notExist, err = dbDeleteSticker(msg.From.ID, msg.Sticker.SetName, msg.Sticker.FileID)
|
||||
if notExist {
|
||||
reply.Text = T("error_already_del_sticker")
|
||||
}
|
||||
}
|
||||
errCheck(err)
|
||||
|
||||
_, err = bot.SendMessage(reply)
|
||||
errCheck(err)
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@ services:
|
|||
- 2368
|
||||
volumes:
|
||||
- ./MyPackBot:/go/MyPackBot
|
||||
- ./i18n/:/go/i18n/
|
||||
- ./config.yaml:/go/config.yaml
|
||||
- ./translations/:/go/translations/
|
||||
- ./configs/config.yaml:/go/configs/config.yaml
|
||||
- ./stickers.db:/go/stickers.db
|
||||
entrypoint: ["/go/MyPackBot", "-webhook"]
|
||||
39
docs/CODE_OF_CONDUCT.md
Normal file
39
docs/CODE_OF_CONDUCT.md
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
# Contributor Covenant Code of Conduct
|
||||
## Our Pledge
|
||||
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
|
||||
|
||||
## Our Standards
|
||||
Examples of behavior that contributes to creating a positive environment include:
|
||||
|
||||
* Using welcoming and inclusive language
|
||||
* Being respectful of differing viewpoints and experiences
|
||||
* Gracefully accepting constructive criticism
|
||||
* Focusing on what is best for the community
|
||||
* Showing empathy towards other community members
|
||||
|
||||
Examples of unacceptable behavior by participants include:
|
||||
|
||||
* The use of sexualized language or imagery and unwelcome sexual attention or advances
|
||||
* Trolling, insulting/derogatory comments, and personal or political attacks
|
||||
* Public or private harassment
|
||||
* Publishing others' private information, such as a physical or electronic address, without explicit permission
|
||||
* Other conduct which could reasonably be considered inappropriate in a professional setting
|
||||
|
||||
## Our Responsibilities
|
||||
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
|
||||
|
||||
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
|
||||
|
||||
## Scope
|
||||
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
|
||||
|
||||
## Enforcement
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at git@toby3d.ru. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
|
||||
|
||||
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
|
||||
|
||||
## Attribution
|
||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
|
||||
|
||||
[homepage]: http://contributor-covenant.org
|
||||
[version]: http://contributor-covenant.org/version/1/4/
|
||||
43
docs/CONTRIBUTING.md
Normal file
43
docs/CONTRIBUTING.md
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
# Code standarts
|
||||
Standards help to keep the code readable and understandable, although they may seem strange or uncomfortable. Code style described below is not strict, but I give priority to those contributors who follow it. :heart:
|
||||
|
||||
## Rules
|
||||
- Format the changes via `go fmt` before committing.
|
||||
- Indents with tabs (with width 8), no spaces.
|
||||
- In `import` external packages are separated from native by empty line.
|
||||
- Maximum line lenght is 120 characters.
|
||||
- Do not forget to comment what do you do.
|
||||
- Check what you are writing, tests before commiting.
|
||||
- Double check what you are writing, remove all [gometalinter](https://github.com/alecthomas/gometalinter) warnings.
|
||||
|
||||
## Guidance
|
||||
Keep in mind the following before, while and after writing the code:
|
||||
- **Less is always more.**
|
||||
Write the least amount of code possible to solve just the problem at hand.
|
||||
- **Predicting the future is impossible.**
|
||||
Try to distinguish between anticipating potential future problems and potential future features. The former is usually good, the latter is usually bad.
|
||||
- **Functional programming is functional.**
|
||||
Functions should be small and single-purpose. Large variable lists are a sign your function does too much.
|
||||
|
||||
# Git workflow
|
||||
`master` contains a stable version of the project, when as `develop` it is constantly updated and contains the latest changes. When proposing changes, you must specify `develop` as the target branch of PR.
|
||||
|
||||
## Commits
|
||||
- First line of commit message should be to 80 chars long as public description of what you have achieved with the commit.
|
||||
- Leave a blank line after the first line.
|
||||
- The 3rd line can reference issue with `issue #000` if you just want to mention an issue or `closes #000` if your commit closes an issue. If you don't have an issue to reference or close, think carefully about whether you need to raise one before opening a PR.
|
||||
- Use bullet points on the following lines to explain what your changes achieve and in particular why you've used your approach.
|
||||
- Add a contextual emoji before commit title [based on its content](https://gitmoji.carloscuesta.me) (or [use appropriate tool for commiting](https://github.com/carloscuesta/gitmoji-cli)). This **greatly** helps visually to distinguish commits among themselves.
|
||||
|
||||
If you need to update your existing commit message, you can do this by running `git commit --amend` on your branch.
|
||||
|
||||
## Pull requests
|
||||
The easier it is for me to merge a PR, the faster we'll be able to do it. Please take steps to make merging easy and keep the history clean and useful.
|
||||
|
||||
- **Always work on a branch.**
|
||||
It will make your life much easier, really. Not touching the `master` branch will also simplify keeping your fork up-to-date.
|
||||
- **Use issues properly.**
|
||||
Bugs, changes and features are all different and should be treated differently. Use your commit message to close or reference issues. The more information you provide, the more likely your PR will get merged.
|
||||
|
||||
## Issues
|
||||
Feel free to pick up any issue which is not assigned. Please leave a comment on the issue to say you wish to pick it up, and it will get assigned to you.
|
||||
20
docs/ISSUE_TEMPLATE.md
Normal file
20
docs/ISSUE_TEMPLATE.md
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<!--
|
||||
Welcome to my repo! 👋
|
||||
|
||||
Need help or you have a question? Please come chat in Discord: https://discord.gg/KYQB9FR
|
||||
Found a bug? Want a new feature? Please fill out the sections below. Thanks! 👍
|
||||
-->
|
||||
### Summary
|
||||
<!-- A summary of the issue or, maybe, your ideas for the feature. -->
|
||||
|
||||
### How-To
|
||||
<!--
|
||||
1. This is the first step
|
||||
2. This is the second step, etc.
|
||||
|
||||
Any other info e.g. Why do you consider this to be a bug? What did you expect to happen instead?
|
||||
|
||||
If this is a feature, then describe how it works, what it can potentially be useful, and so on.
|
||||
|
||||
P.S.: Bugs are always in priority over the new functionality, unless, of course, it was offered by a sponsor on my Patreon: https://patreon.com/toby3d
|
||||
-->
|
||||
16
docs/PULL_REQUEST_TEMPLATE.md
Normal file
16
docs/PULL_REQUEST_TEMPLATE.md
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
<!--
|
||||
Thanks for your help to my repo! 👋
|
||||
|
||||
Need help or you have a question? Please come chat in Discord: https://discord.gg/KYQB9FR
|
||||
Fixed a bug? Added new feature? Make a new translation? Please fill out the section below. Thanks! 👍
|
||||
-->
|
||||
### Summary
|
||||
<!--
|
||||
Describe the essence of your commits.
|
||||
|
||||
- Is it a fix, feature or a translation?
|
||||
- What issue is closed by your commits?
|
||||
- You are totally sure what are you removed all warnings by [gometalinter](https://github.com/alecthomas/gometalinter)?
|
||||
- Your code is compiled without errors?
|
||||
- Your code works without obvious errors?
|
||||
-->
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
# [@MyPackBot](https://t.me/MyPackBot) [](https://discord.gg/KYQB9FR)
|
||||
|
||||
[](LICENSE)
|
||||
[](docs/LICENSE)
|
||||
[](https://travis-ci.org/toby3d/MyPackBot)
|
||||
[](https://goreportcard.com/report/github.com/toby3d/MyPackBot)
|
||||
[](https://github.com/toby3d/MyPackBot/releases/latest)
|
||||
[](https://www.patreon.com/toby3d)
|
||||
|
||||
|
||||
|
|
@ -16,7 +17,7 @@ This is a Telegram-bot that collects all the stickers sent to it in one (almost)
|
|||
- Keeps stickers belonging to their original sets;
|
||||
- Fully support the standard functionality of Telegram stickers (for example "add to favorites");
|
||||
- Avaliable anywhere in Telegram by typing `@MyPackBot ` in the input field;
|
||||
- Supports filtering of results by emoji: `@MyPackBot 😀`;
|
||||
- Supports filtering of results by emoji's: `@MyPackBot 😀👍`;
|
||||
- Fast as f\*\*\*king Sonic;
|
||||
- Worked with uploadable WebP stickers;
|
||||
- Worked with blocked by rightholders sets (but this is not exact);
|
||||
|
|
@ -66,7 +67,7 @@ Bot uses the following dependencies:
|
|||
|
||||
## Support
|
||||
### GitHub
|
||||
You can [request fix/add some things](https://github.com/toby3d/MyPackBot/issues/new), [make a patch](https://github.com/toby3d/MyPackBot/compare) or help with [translation and localization](https://github.com/toby3d/MyPackBot/tree/develop/i18n) on your language.
|
||||
You can [request fix/add some things](https://github.com/toby3d/MyPackBot/issues/new), [make a patch](https://github.com/toby3d/MyPackBot/compare) or help with [translation and localization](https://github.com/toby3d/MyPackBot/tree/develop/translations) on your language.
|
||||
|
||||
Ah, and star this repo, of course.
|
||||
|
||||
8
docs/SUPPORT.md
Normal file
8
docs/SUPPORT.md
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
# [Support me on Patreon!](https://www.patreon.com/bePatron?c=243288)
|
||||
I develop this project in my spare time, and I do it and I will do it free of charge. However, you can make a donation or become a sponsor to make sure that I have enough coffee and pizza for night coding.
|
||||
|
||||
**These people sponsored current version of the project:**
|
||||
- Yami Odymel
|
||||
- Daniil Tlenov
|
||||
- Aurielb
|
||||
- MoD21k
|
||||
12
err_check.go
12
err_check.go
|
|
@ -1,12 +0,0 @@
|
|||
package main
|
||||
|
||||
import "fmt"
|
||||
|
||||
// errCheck helps debug critical errors without warnings from 'gocyclo' linter
|
||||
func errCheck(err error) {
|
||||
if err != nil {
|
||||
fmt.Sprintln(err.Error())
|
||||
waitForwards.Wait() // Wait what all users get announcement message
|
||||
panic(err.Error())
|
||||
}
|
||||
}
|
||||
25
error.go
25
error.go
|
|
@ -1,25 +0,0 @@
|
|||
package main
|
||||
|
||||
import tg "github.com/toby3d/telegram"
|
||||
|
||||
func actionError(msg *tg.Message) {
|
||||
T, err := switchLocale(msg.From.LanguageCode)
|
||||
errCheck(err)
|
||||
|
||||
_, err = bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errCheck(err)
|
||||
|
||||
reply := tg.NewMessage(
|
||||
msg.Chat.ID, T("error_unknown", map[string]interface{}{
|
||||
"AddStickerCommand": cmdAddSticker,
|
||||
"AddPackCommand": cmdAddPack,
|
||||
"DeleteStickerCommand": cmdDeleteSticker,
|
||||
"DeletePackCommand": cmdDeletePack,
|
||||
}),
|
||||
)
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
reply.ReplyMarkup = getMenuKeyboard(T)
|
||||
|
||||
_, err = bot.SendMessage(reply)
|
||||
errCheck(err)
|
||||
}
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
// allowedUpdates is a value for parameter of updates configuration
|
||||
var allowedUpdates = []string{
|
||||
tg.UpdateInlineQuery, // For searching and sending stickers
|
||||
tg.UpdateMessage, // For get commands and messages
|
||||
tg.UpdateChannelPost,
|
||||
}
|
||||
|
||||
// getUpdatesChannel return webhook or long polling channel with bot updates
|
||||
func getUpdatesChannel() tg.UpdatesChannel {
|
||||
log.Ln("Preparing channel for updates...")
|
||||
if !*flagWebhook {
|
||||
log.Ln("Use LongPolling updates")
|
||||
|
||||
log.Ln("Deleting webhook if exists")
|
||||
_, err := bot.DeleteWebhook()
|
||||
errCheck(err)
|
||||
|
||||
return bot.NewLongPollingChannel(&tg.GetUpdatesParameters{
|
||||
Offset: 0,
|
||||
Limit: 100,
|
||||
Timeout: 60,
|
||||
AllowedUpdates: allowedUpdates,
|
||||
})
|
||||
}
|
||||
|
||||
set := cfg.UString("telegram.webhook.set")
|
||||
listen := cfg.UString("telegram.webhook.listen")
|
||||
serve := cfg.UString("telegram.webhook.serve")
|
||||
|
||||
log.Ln(
|
||||
"Trying set webhook on address:",
|
||||
fmt.Sprint(set, listen, bot.AccessToken),
|
||||
)
|
||||
|
||||
log.Ln("Creating new webhook...")
|
||||
webhook := tg.NewWebhook(fmt.Sprint(set, listen, bot.AccessToken), nil)
|
||||
webhook.MaxConnections = 40
|
||||
webhook.AllowedUpdates = allowedUpdates
|
||||
|
||||
return bot.NewWebhookChannel(
|
||||
webhook, // params
|
||||
"", // certFile
|
||||
"", // keyFile
|
||||
set, // set
|
||||
fmt.Sprint(listen, bot.AccessToken), // listen
|
||||
serve, // serve
|
||||
)
|
||||
}
|
||||
4
githooks/prepare-commit-msg
Normal file
4
githooks/prepare-commit-msg
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/sh
|
||||
# gitmoji as a commit hook
|
||||
exec < /dev/tty
|
||||
gitmoji --hook $1
|
||||
31
help.go
31
help.go
|
|
@ -1,31 +0,0 @@
|
|||
package main
|
||||
|
||||
import tg "github.com/toby3d/telegram"
|
||||
|
||||
func commandHelp(msg *tg.Message) {
|
||||
T, err := switchLocale(msg.From.LanguageCode)
|
||||
errCheck(err)
|
||||
|
||||
err = dbChangeUserState(msg.From.ID, stateNone)
|
||||
errCheck(err)
|
||||
|
||||
_, err = bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errCheck(err)
|
||||
|
||||
reply := tg.NewMessage(
|
||||
msg.Chat.ID, T("reply_help", map[string]interface{}{
|
||||
"AddStickerCommand": cmdAddSticker,
|
||||
"AddPackCommand": cmdAddPack,
|
||||
"DeleteStickerCommand": cmdDeleteSticker,
|
||||
"DeletePackCommand": cmdDeletePack,
|
||||
"ResetCommand": cmdReset,
|
||||
"CancelCommand": cmdCancel,
|
||||
"Username": bot.Self.Username,
|
||||
}),
|
||||
)
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
reply.ReplyMarkup = getMenuKeyboard(T)
|
||||
|
||||
_, err = bot.SendMessage(reply)
|
||||
errCheck(err)
|
||||
}
|
||||
58
helpers.go
58
helpers.go
|
|
@ -1,58 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"github.com/nicksnyder/go-i18n/i18n"
|
||||
tg "github.com/toby3d/telegram"
|
||||
"golang.org/x/text/runes"
|
||||
"golang.org/x/text/transform"
|
||||
)
|
||||
|
||||
var bannedSkins = []rune{127995, 127996, 127997, 127998, 127999}
|
||||
|
||||
var skinRemover = runes.Remove(runes.Predicate(
|
||||
func(r rune) bool {
|
||||
for _, skin := range bannedSkins {
|
||||
if r == skin {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
},
|
||||
))
|
||||
|
||||
func getMenuKeyboard(T i18n.TranslateFunc) *tg.ReplyKeyboardMarkup {
|
||||
return tg.NewReplyKeyboardMarkup(
|
||||
tg.NewReplyKeyboardRow(
|
||||
tg.NewReplyKeyboardButton(T("button_add_sticker")),
|
||||
tg.NewReplyKeyboardButton(T("button_add_pack")),
|
||||
),
|
||||
tg.NewReplyKeyboardRow(
|
||||
tg.NewReplyKeyboardButton(T("button_del_sticker")),
|
||||
tg.NewReplyKeyboardButton(T("button_del_pack")),
|
||||
),
|
||||
tg.NewReplyKeyboardRow(
|
||||
tg.NewReplyKeyboardButton(T("button_reset")),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func getCancelButton(T i18n.TranslateFunc) *tg.ReplyKeyboardMarkup {
|
||||
return tg.NewReplyKeyboardMarkup(
|
||||
tg.NewReplyKeyboardRow(
|
||||
tg.NewReplyKeyboardButton(T("button_cancel")),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func getSwitchButton(T i18n.TranslateFunc) *tg.InlineKeyboardMarkup {
|
||||
return tg.NewInlineKeyboardMarkup(
|
||||
tg.NewInlineKeyboardRow(
|
||||
tg.NewInlineKeyboardButtonSwitchSelf(T("button_inline_select"), " "),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func fixEmoji(raw string) (string, error) {
|
||||
result, _, err := transform.String(skinRemover, raw)
|
||||
return result, err
|
||||
}
|
||||
66
init.go
66
init.go
|
|
@ -1,66 +0,0 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
"github.com/nicksnyder/go-i18n/i18n"
|
||||
"github.com/olebedev/config"
|
||||
)
|
||||
|
||||
var (
|
||||
// Variables with types from imports
|
||||
cfg *config.Config
|
||||
channelID int64
|
||||
|
||||
// Setted variables
|
||||
flagWebhook = flag.Bool(
|
||||
"webhook",
|
||||
false,
|
||||
"enable work via webhooks (required valid certificates)",
|
||||
)
|
||||
)
|
||||
|
||||
// init prepare configuration and other things for successful start of main
|
||||
// function.
|
||||
func init() {
|
||||
log.Ln("Initializing...")
|
||||
log.Ln("Parse flags...")
|
||||
flag.Parse()
|
||||
|
||||
err := filepath.Walk("./i18n/", func(path string, info os.FileInfo, err error) error {
|
||||
if strings.HasSuffix(path, ".all.yaml") {
|
||||
i18n.MustLoadTranslationFile(path)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
errCheck(err)
|
||||
|
||||
log.Ln("Loading configuration file...")
|
||||
cfg, err = config.ParseYamlFile("config.yaml")
|
||||
errCheck(err)
|
||||
|
||||
log.Ln("Checking bot access token in configuration file...")
|
||||
_, err = cfg.String("telegram.token")
|
||||
errCheck(err)
|
||||
|
||||
if *flagWebhook {
|
||||
log.Ln("Enabled webhook mode, check configuration strings...")
|
||||
log.Ln("Checking webhook set string...")
|
||||
_, err = cfg.String("telegram.webhook.set")
|
||||
errCheck(err)
|
||||
|
||||
log.Ln("Checking webhook listen string...")
|
||||
_, err = cfg.String("telegram.webhook.listen")
|
||||
errCheck(err)
|
||||
|
||||
log.Ln("Checking webhook listen string...")
|
||||
_, err = cfg.String("telegram.webhook.serve")
|
||||
errCheck(err)
|
||||
}
|
||||
|
||||
channelID = int64(cfg.UInt("telegram.channel"))
|
||||
}
|
||||
18
init/init.go
Normal file
18
init/init.go
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
package init
|
||||
|
||||
import (
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
"github.com/toby3d/MyPackBot/internal/bot"
|
||||
"github.com/toby3d/MyPackBot/internal/config"
|
||||
"github.com/toby3d/MyPackBot/internal/db"
|
||||
"github.com/toby3d/MyPackBot/internal/i18n"
|
||||
)
|
||||
|
||||
// init prepare configuration and other things for successful start
|
||||
func init() {
|
||||
log.Ln("Initializing...")
|
||||
i18n.Open("translations/") // Preload localization strings
|
||||
config.Open("configs/config.yaml") // Preload configuration file
|
||||
db.Open("stickers.db") // Open database or create new one
|
||||
bot.New() // Create bot with credentials from config
|
||||
}
|
||||
35
internal/actions/action.go
Executable file
35
internal/actions/action.go
Executable file
|
|
@ -0,0 +1,35 @@
|
|||
package actions
|
||||
|
||||
import (
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
"github.com/toby3d/MyPackBot/internal/db"
|
||||
"github.com/toby3d/MyPackBot/internal/errors"
|
||||
"github.com/toby3d/MyPackBot/internal/models"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
// Action function check Message update on commands, sended stickers or other
|
||||
// user stuff if user state is not 'none'
|
||||
func Action(msg *tg.Message) {
|
||||
state, err := db.UserState(msg.From.ID)
|
||||
errors.Check(err)
|
||||
|
||||
log.Ln("state:", state)
|
||||
switch state {
|
||||
case models.StateAddSticker:
|
||||
Add(msg, false)
|
||||
case models.StateAddPack:
|
||||
Add(msg, true)
|
||||
case models.StateDeleteSticker:
|
||||
Delete(msg, false)
|
||||
case models.StateDeletePack:
|
||||
Delete(msg, true)
|
||||
case models.StateReset:
|
||||
Reset(msg)
|
||||
default:
|
||||
err = db.ChangeUserState(msg.From.ID, models.StateNone)
|
||||
errors.Check(err)
|
||||
|
||||
Error(msg)
|
||||
}
|
||||
}
|
||||
85
internal/actions/add.go
Normal file
85
internal/actions/add.go
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
package actions
|
||||
|
||||
import (
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
"github.com/toby3d/MyPackBot/internal/bot"
|
||||
"github.com/toby3d/MyPackBot/internal/db"
|
||||
"github.com/toby3d/MyPackBot/internal/errors"
|
||||
"github.com/toby3d/MyPackBot/internal/helpers"
|
||||
"github.com/toby3d/MyPackBot/internal/i18n"
|
||||
"github.com/toby3d/MyPackBot/internal/models"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
// Add action add sticker or set to user's pack
|
||||
func Add(msg *tg.Message, pack bool) {
|
||||
if !msg.IsSticker() {
|
||||
return
|
||||
}
|
||||
|
||||
T, err := i18n.SwitchTo(msg.From.LanguageCode)
|
||||
errors.Check(err)
|
||||
|
||||
_, err = bot.Bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errors.Check(err)
|
||||
|
||||
reply := tg.NewMessage(msg.Chat.ID, T("success_add_sticker"))
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
|
||||
if !pack {
|
||||
var exist bool
|
||||
sticker := msg.Sticker
|
||||
exist, err = db.AddSticker(
|
||||
msg.From.ID, sticker.SetName, sticker.FileID, sticker.Emoji,
|
||||
)
|
||||
errors.Check(err)
|
||||
|
||||
if exist {
|
||||
reply.Text = T("error_already_add_sticker")
|
||||
}
|
||||
|
||||
reply.ReplyMarkup = helpers.CancelButton(T)
|
||||
_, err = bot.Bot.SendMessage(reply)
|
||||
errors.Check(err)
|
||||
return
|
||||
}
|
||||
|
||||
reply.Text = T("error_empty_add_pack", map[string]interface{}{
|
||||
"AddStickerCommand": models.CommandAddSticker,
|
||||
})
|
||||
|
||||
if msg.Sticker.SetName != "" {
|
||||
var set *tg.StickerSet
|
||||
set, err = bot.Bot.GetStickerSet(msg.Sticker.SetName)
|
||||
errors.Check(err)
|
||||
|
||||
log.Ln("SetTitle:", set.Title)
|
||||
reply.Text = T("success_add_pack", map[string]interface{}{
|
||||
"SetTitle": set.Title,
|
||||
})
|
||||
|
||||
allExists := true
|
||||
for _, sticker := range set.Stickers {
|
||||
var exist bool
|
||||
exist, err = db.AddSticker(
|
||||
msg.From.ID, sticker.SetName, sticker.FileID, sticker.Emoji,
|
||||
)
|
||||
errors.Check(err)
|
||||
|
||||
if !exist {
|
||||
allExists = false
|
||||
}
|
||||
}
|
||||
|
||||
log.Ln("All exists?", allExists)
|
||||
if allExists {
|
||||
reply.Text = T("error_already_add_pack", map[string]interface{}{
|
||||
"SetTitle": set.Title,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
reply.ReplyMarkup = helpers.CancelButton(T)
|
||||
_, err = bot.Bot.SendMessage(reply)
|
||||
errors.Check(err)
|
||||
}
|
||||
58
internal/actions/delete.go
Normal file
58
internal/actions/delete.go
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
package actions
|
||||
|
||||
import (
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
"github.com/toby3d/MyPackBot/internal/bot"
|
||||
"github.com/toby3d/MyPackBot/internal/db"
|
||||
"github.com/toby3d/MyPackBot/internal/errors"
|
||||
"github.com/toby3d/MyPackBot/internal/helpers"
|
||||
"github.com/toby3d/MyPackBot/internal/i18n"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
// Delete action remove sticker or set from user's pack
|
||||
func Delete(msg *tg.Message, pack bool) {
|
||||
if !msg.IsSticker() {
|
||||
return
|
||||
}
|
||||
|
||||
T, err := i18n.SwitchTo(msg.From.LanguageCode)
|
||||
errors.Check(err)
|
||||
|
||||
_, err = bot.Bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errors.Check(err)
|
||||
|
||||
reply := tg.NewMessage(msg.Chat.ID, T("success_del_sticker"))
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
reply.ReplyMarkup = helpers.CancelButton(T)
|
||||
|
||||
var notExist bool
|
||||
if pack {
|
||||
var set *tg.StickerSet
|
||||
set, err = bot.Bot.GetStickerSet(msg.Sticker.SetName)
|
||||
errors.Check(err)
|
||||
|
||||
log.Ln("SetName:", set.Title)
|
||||
reply.Text = T("success_del_pack", map[string]interface{}{
|
||||
"SetTitle": set.Title,
|
||||
})
|
||||
|
||||
notExist, err = db.DeletePack(msg.From.ID, msg.Sticker.SetName)
|
||||
if notExist {
|
||||
reply.Text = T("error_already_del_pack")
|
||||
}
|
||||
} else {
|
||||
notExist, err = db.DeleteSticker(
|
||||
msg.From.ID,
|
||||
msg.Sticker.SetName,
|
||||
msg.Sticker.FileID,
|
||||
)
|
||||
if notExist {
|
||||
reply.Text = T("error_already_del_sticker")
|
||||
}
|
||||
}
|
||||
errors.Check(err)
|
||||
|
||||
_, err = bot.Bot.SendMessage(reply)
|
||||
errors.Check(err)
|
||||
}
|
||||
33
internal/actions/error.go
Normal file
33
internal/actions/error.go
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
package actions
|
||||
|
||||
import (
|
||||
"github.com/toby3d/MyPackBot/internal/bot"
|
||||
"github.com/toby3d/MyPackBot/internal/errors"
|
||||
"github.com/toby3d/MyPackBot/internal/helpers"
|
||||
"github.com/toby3d/MyPackBot/internal/i18n"
|
||||
"github.com/toby3d/MyPackBot/internal/models"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
// Error action send error reply about invalid user request
|
||||
func Error(msg *tg.Message) {
|
||||
T, err := i18n.SwitchTo(msg.From.LanguageCode)
|
||||
errors.Check(err)
|
||||
|
||||
_, err = bot.Bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errors.Check(err)
|
||||
|
||||
reply := tg.NewMessage(
|
||||
msg.Chat.ID, T("error_unknown", map[string]interface{}{
|
||||
"AddStickerCommand": models.CommandAddSticker,
|
||||
"AddPackCommand": models.CommandAddPack,
|
||||
"DeleteStickerCommand": models.CommandDeleteSticker,
|
||||
"DeletePackCommand": models.CommandDeletePack,
|
||||
}),
|
||||
)
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
reply.ReplyMarkup = helpers.MenuKeyboard(T)
|
||||
|
||||
_, err = bot.Bot.SendMessage(reply)
|
||||
errors.Check(err)
|
||||
}
|
||||
44
internal/actions/reset.go
Normal file
44
internal/actions/reset.go
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
package actions
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/toby3d/MyPackBot/internal/bot"
|
||||
"github.com/toby3d/MyPackBot/internal/db"
|
||||
"github.com/toby3d/MyPackBot/internal/errors"
|
||||
"github.com/toby3d/MyPackBot/internal/helpers"
|
||||
"github.com/toby3d/MyPackBot/internal/i18n"
|
||||
"github.com/toby3d/MyPackBot/internal/models"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
// Reset action checks key phrase and reset user's pack
|
||||
func Reset(msg *tg.Message) {
|
||||
T, err := i18n.SwitchTo(msg.From.LanguageCode)
|
||||
errors.Check(err)
|
||||
|
||||
err = db.ChangeUserState(msg.From.ID, models.StateNone)
|
||||
errors.Check(err)
|
||||
|
||||
_, err = bot.Bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errors.Check(err)
|
||||
|
||||
if !strings.EqualFold(msg.Text, T("key_phrase")) {
|
||||
reply := tg.NewMessage(msg.Chat.ID, T("error_reset_phrase"))
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
reply.ReplyMarkup = helpers.MenuKeyboard(T)
|
||||
|
||||
_, err = bot.Bot.SendMessage(reply)
|
||||
errors.Check(err)
|
||||
return
|
||||
}
|
||||
|
||||
err = db.ResetUser(msg.From.ID)
|
||||
errors.Check(err)
|
||||
|
||||
reply := tg.NewMessage(msg.Chat.ID, T("success_reset"))
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
reply.ReplyMarkup = helpers.MenuKeyboard(T)
|
||||
_, err = bot.Bot.SendMessage(reply)
|
||||
errors.Check(err)
|
||||
}
|
||||
18
internal/bot/new.go
Normal file
18
internal/bot/new.go
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
package bot
|
||||
|
||||
import (
|
||||
"github.com/toby3d/MyPackBot/internal/config"
|
||||
"github.com/toby3d/MyPackBot/internal/errors"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
var Bot *tg.Bot
|
||||
|
||||
// New just create new bot by configuration credentials
|
||||
func New() {
|
||||
accessToken, err := config.Config.String("telegram.token")
|
||||
errors.Check(err)
|
||||
|
||||
Bot, err = tg.NewBot(accessToken)
|
||||
errors.Check(err)
|
||||
}
|
||||
39
internal/commands/add.go
Normal file
39
internal/commands/add.go
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
package commands
|
||||
|
||||
import (
|
||||
log "github.com/kirillDanshin/dlog"
|
||||
"github.com/toby3d/MyPackBot/internal/bot"
|
||||
"github.com/toby3d/MyPackBot/internal/db"
|
||||
"github.com/toby3d/MyPackBot/internal/errors"
|
||||
"github.com/toby3d/MyPackBot/internal/helpers"
|
||||
"github.com/toby3d/MyPackBot/internal/i18n"
|
||||
"github.com/toby3d/MyPackBot/internal/models"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
// Add command prepare user for adding some stickers or sets to his pack
|
||||
func Add(msg *tg.Message, pack bool) {
|
||||
T, err := i18n.SwitchTo(msg.From.LanguageCode)
|
||||
errors.Check(err)
|
||||
|
||||
_, err = bot.Bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
|
||||
errors.Check(err)
|
||||
|
||||
reply := tg.NewMessage(msg.Chat.ID, T("reply_add_sticker"))
|
||||
reply.ParseMode = tg.ModeMarkdown
|
||||
reply.ReplyMarkup = helpers.CancelButton(T)
|
||||
|
||||
err = db.ChangeUserState(msg.From.ID, models.StateAddSticker)
|
||||
errors.Check(err)
|
||||
|
||||
if pack {
|
||||
reply.Text = T("reply_add_pack")
|
||||
|
||||
err = db.ChangeUserState(msg.From.ID, models.StateAddPack)
|
||||
errors.Check(err)
|
||||
}
|
||||
|
||||
log.Ln("Sending add reply...")
|
||||
_, err = bot.Bot.SendMessage(reply)
|
||||
errors.Check(err)
|
||||
}
|
||||
48
internal/commands/cancel.go
Executable file
48
internal/commands/cancel.go
Executable file
|
|
@ -0,0 +1,48 @@
|
|||
package commands
|
||||
|
||||
import (
|
||||
"github.com/toby3d/MyPackBot/internal/bot"
|
||||
"github.com/toby3d/MyPackBot/internal/db"
|
||||
"github.com/toby3d/MyPackBot/internal/errors"
|
||||
"github.com/toby3d/MyPackBot/internal/helpers"
|
||||
"github.com/toby3d/MyPackBot/internal/i18n"
|
||||
"github.com/toby3d/MyPackBot/internal/models"
|
||||
tg "github.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
// Cancel just cancel current user operation
|
||||
func Cancel(msg *tg.Message) {
|
||||
T, err | ||||