🔀 Merge branch 'develop'

I add /stats command and counters later

.gitignore

@@ -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

.gitlab-ci.yml

@@ -0,0 +1,47 @@
+image: golang:alpine
+
+cache:
+  paths:
+    - /go/src/github.com
+    - /go/src/gitlab.com
+    - /go/src/golang.org
+    - /go/src/google.golang.org
+    - /go/src/gopkg.in
+
+stages:
+  - test
+  - build
+
+before_script:
+  - apk add --no-cache git build-base bash
+  - mkdir -p /go/src/gitlab.com/$CI_PROJECT_NAMESPACE /go/src/_/builds
+  - cp -r $CI_PROJECT_DIR /go/src/gitlab.com/$CI_PROJECT_PATH
+  - ln -s /go/src/gitlab.com/$CI_PROJECT_NAMESPACE /go/src/_/builds/$CI_PROJECT_NAMESPACE
+  - make dep
+
+unit_tests:
+  stage: test
+  script:
+    - make test
+
+.race_detector:
+  stage: test
+  script:
+    - make race
+
+code_coverage:
+  stage: test
+  script:
+    - make coverage
+
+lint_code:
+  stage: test
+  script:
+    - go get github.com/go-critic/go-critic/cmd/gocritic
+    - go install github.com/go-critic/go-critic/cmd/gocritic
+    - make lint
+
+build:
+  stage: build
+  script:
+    - make

.travis.yml

@@ -1,9 +0,0 @@
-language: go
-
-go:
-  - 1.9
-  - tip
-
-install:
-  - go get -tags=debug
-  - go get -u github.com/nicksnyder/go-i18n/goi18n

Makefile

@@ -1,26 +1,32 @@
-# Build package by default with all general tools and things
-all:
-	make localization
-	make build
+PROJECT_NAMESPACE := $(CI_PROJECT_NAMESPACE)
+PROJECT_NAME := $(CI_PROJECT_NAME)
+PROJECT_PATH := $(PROJECT_NAMESPACE)/$(PROJECT_NAME)
+PACKAGE_NAME := "gitlab.com/$(PROJECT_PATH)"
+PACKAGE_PATH := $(GOPATH)/src/$(PACKAGE_NAME)
+PACKAGE_LIST := $(shell go list $(PACKAGE_NAME)/... | grep -v /vendor/)
+GO_FILES := $(shell find . -name '*.go' | grep -v /vendor/ | grep -v _test.go)
 
-# Build minimal package only
-build:
-	go build
+.PHONY: all lint test rase coverage dep build clean
 
-# Build debug version with more logs
-debug:
-	go build -tags=debug
+all: build
 
-# Format the source code
-fmt:
-	go fmt
+lint: ## Lint the files
+	@gocritic check-project $(PACKAGE_PATH)
 
-# Build localization files with separated untranslated strings
-translation:
-	goi18n merge -format yaml -sourceLanguage en -outdir ./i18n/ ./i18n/*/*
+race: dep ## Run data race detector
+	@go test -race -short ${PACKAGE_LIST}
 
-# Build localization files and merge untranslated strings
-localization:
-	make translation
-	goi18n -format yaml -sourceLanguage en -outdir ./i18n/ ./i18n/*.all.yaml \
-	./i18n/*.untranslated.yaml
+coverage: ## Generate global code coverage report
+	@go test -cover -v -coverpkg=$(PACKAGE_NAME) ${PACKAGE_LIST}
+
+dep: ## Get the dependencies
+	@go get -v -d -t ${PACKAGE_LIST}
+
+build: dep ## Build the binary file
+	@go build -i -v $(PACKAGE_NAME)
+
+clean: ## Remove previous build
+	@rm -f $(PROJECT_NAME)
+
+help: ## Display this help screen
+	@grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

PATRONS.md

@@ -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

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)
-	}
-}

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.Sticker == nil {
-		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)
-}

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)
-}

commands.go

@@ -1,41 +0,0 @@
-package main
-
-import (
-	"strings"
-
-	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 strings.ToLower(msg.Command()) {
-	case strings.ToLower(cmdStart):
-		commandStart(msg)
-	case strings.ToLower(cmdHelp):
-		commandHelp(msg)
-	case strings.ToLower(cmdAddSticker):
-		commandAdd(msg, false)
-	case strings.ToLower(cmdAddPack):
-		commandAdd(msg, true)
-	case strings.ToLower(cmdDeleteSticker):
-		commandDelete(msg, false)
-	case strings.ToLower(cmdDeletePack):
-		commandDelete(msg, true)
-	case strings.ToLower(cmdReset):
-		commandReset(msg)
-	case strings.ToLower(cmdCancel):
-		commandCancel(msg)
-	}
-}

configs/config.example.yaml

@@ -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

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
-}

delete.go

@@ -1,93 +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.Sticker == nil {
-		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)
-	} else {
-		notExist, err = dbDeleteSticker(msg.From.ID, msg.Sticker.SetName, msg.Sticker.FileID)
-	}
-	errCheck(err)
-
-	if notExist {
-		reply.Text = T("error_already_del")
-	}
-
-	_, err = bot.SendMessage(reply)
-	errCheck(err)
-}

deployments/docker-compose.yaml

@@ -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"]

docs/CODE_OF_CONDUCT.md

@@ -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/

docs/CONTRIBUTING.md

@@ -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.

docs/README.md

@@ -3,6 +3,7 @@
 [![License](https://img.shields.io/crates/l/rustc-serialize.svg)](LICENSE)
 [![Build Status](https://travis-ci.org/toby3d/MyPackBot.svg)](https://travis-ci.org/toby3d/MyPackBot)
 [![Go Report](https://goreportcard.com/badge/github.com/toby3d/MyPackBot)](https://goreportcard.com/report/github.com/toby3d/MyPackBot)
+[![Release](https://img.shields.io/github/release/toby3d/MyPackBot.svg)](https://github.com/toby3d/MyPackBot/releases/latest)
 [![Patreon](https://img.shields.io/badge/support-patreon-E6461A.svg?maxAge=2592000)](https://www.patreon.com/toby3d)
 
 ![bot logo](https://raw.githubusercontent.com/toby3d/MyPackBot/gh-pages/static/social/og-image.jpg)
@@ -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.
 

docs/SUPPORT.md

@@ -0,0 +1,9 @@
+# [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:**
+- Aurielb
+- Daniil Tlenov
+- @kirillDanshin
+- MoD21k
+- @YamiOdymel

err_check.go

@@ -1,8 +0,0 @@
-package main
-
-// errCheck helps debug critical errors without warnings from 'gocyclo' linter
-func errCheck(err error) {
-	if err != nil {
-		panic(err.Error())
-	}
-}

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)
-}

get_updates_channel.go

@@ -1,59 +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
-	)
-}

githooks/prepare-commit-msg

@@ -0,0 +1,4 @@
+#!/bin/sh
+# gitmoji as a commit hook
+exec < /dev/tty
+gitmoji --hook $1

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)
-}

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
-}

i18n/src/en/en.buttons.yaml

@@ -12,11 +12,11 @@ button_share:
 button_add_sticker:
   other: ➕ Add sticker
 button_add_pack:
-  other: 📦 Add pack
+  other: 📦 Add set
 button_del_sticker:
   other: 🗑 Delete sticker
 button_del_pack:
-  other: 🗑 Delete pack
+  other: 🗑 Delete set
 button_reset:
   other: 🔥 Reset pack
 button_cancel:

i18n/src/en/en.cancel.yaml

@@ -1,11 +1,11 @@
 cancel_add_sticker:
   other: You cancelled the process of adding a new stickers to your pack.
 cancel_add_pack:
-  other: You cancelled the process of adding a new packs to yours.
+  other: You cancelled the process of adding a new sets to your pack.
 cancel_del_sticker:
   other: You cancelled the process of removing a stickers from your pack.
 cancel_del_pack:
-  other: You cancelled the process of removing a sticker packs from yours.
+  other: You cancelled the process of removing a sets from your pack.
 cancel_reset:
   other: You cancelled the process of reseting your stickers pack.
 cancel_error:

i18n/src/en/en.errors.yaml

@@ -1,17 +1,17 @@
 error_already_add_sticker:
   other: This sticker is already in your pack.
 error_already_add_pack:
-  other: All stickers from *{{.SetTitle}}* pack is already in yours.
+  other: All stickers from *{{.SetTitle}}* set is already in yours.
 error_already_del_sticker:
   other: Maybe this sticker is already removed from your pack.
 error_already_del_pack:
-  other: Maybe this pack is already removed from yours.
+  other: Maybe this set is already removed from your pack.
 error_already_reset:
   other: There is nothing to reset, pack is already empty.
 error_reset_phrase:
   other: Invalid phrase of resetting. This action has been canceled.
 error_empty_del:
-  other: There is nothing to remove, pack is empty.
+  other: There is nothing to remove, your pack is empty.
 error_empty_add_pack:
   other: You try to add a sticker that exists outside the packs. Use /{{.AddStickerCommand}} instead.
 error_unknown:

i18n/src/en/en.replies.yaml

@@ -1,12 +1,12 @@
 reply_start:
   other: |
     Hello, I'm the [@{{.Username}}](tg://user?id={{.ID}})!
-    I can create your personal pack with stickers from others packs.
+    I can create your personal stickers pack with stickers from others sets.
     Without limits and installing. In any chat. For free.
 reply_add_sticker:
-  other: Send an existing stickers from any other packs to add it to yourself.
+  other: Send an existing stickers from any other sets to add it to your pack.
 reply_add_pack:
-  other: Send an existing stickers from any other packs to add the entire packs to yourself.
+  other: Send an existing stickers from any other sets to add the entire sets to your pack.
 reply_del_sticker:
   other: Send an existing stickers from your pack for removing it.
 reply_del_pack:
@@ -20,7 +20,7 @@ reply_reset:
 reply_help:
   other: |
     /{{.AddStickerCommand}} - add a single sticker to your pack
-    /{{.AddPackCommand}} - add a full other pack to your pack
+    /{{.AddPackCommand}} - add a full stickers set to your pack
     /{{.DeleteStickerCommand}} - remove a single sticker from your pack
     /{{.DeletePackCommand}} - remove a sticker set from your pack
     /{{.ResetCommand}} - remove all stickers from your pack

i18n/src/en/en.success.yaml

@@ -7,4 +7,4 @@ success_del_sticker:
 success_del_pack:
   other: The sticker pack *{{.SetTitle}}* was successfully removed from yours!
 success_reset:
-  other: The contents of your pack are completely reset!..
+  other: The contents of your pack are completely reset!

i18n/src/ru/ru.success.yaml

@@ -7,4 +7,4 @@ success_del_sticker:
 success_del_pack:
   other: Набор *{{.SetTitle}}* успешно удалён из твоего набора!
 success_reset:
-  other: Сброс твоего набора успешно произведён!..
+  other: Сброс твоего набора успешно произведён!

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"))
-}

internal/actions/action.go

@@ -0,0 +1,35 @@
+package actions
+
+import (
+	log "github.com/kirillDanshin/dlog"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	tg "gitlab.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.DB.GetUserState(msg.From)
+	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.DB.ChangeUserState(msg.From, models.StateNone)
+		errors.Check(err)
+
+		Error(msg)
+	}
+}

internal/actions/add.go

@@ -0,0 +1,81 @@
+package actions
+
+import (
+	log "github.com/kirillDanshin/dlog"
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	"gitlab.com/toby3d/mypackbot/internal/utils"
+	tg "gitlab.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.StyleMarkdown
+
+	if !pack {
+		var exist bool
+		sticker := msg.Sticker
+		exist, err = db.DB.AddSticker(msg.From, sticker)
+		errors.Check(err)
+
+		if exist {
+			reply.Text = t("error_already_add_sticker")
+		}
+
+		reply.ReplyMarkup = utils.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 i := range set.Stickers {
+			var exist bool
+			exist, err = db.DB.AddSticker(msg.From, &set.Stickers[i])
+			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 = utils.CancelButton(t)
+	_, err = bot.Bot.SendMessage(reply)
+	errors.Check(err)
+}

internal/actions/delete.go

@@ -0,0 +1,54 @@
+package actions
+
+import (
+	log "github.com/kirillDanshin/dlog"
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/utils"
+	tg "gitlab.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.StyleMarkdown
+	reply.ReplyMarkup = utils.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.DB.DeletePack(msg.From, msg.Sticker)
+		if notExist {
+			reply.Text = t("error_already_del_pack")
+		}
+	} else {
+		notExist, err = db.DB.DeleteSticker(msg.From, msg.Sticker)
+		if notExist {
+			reply.Text = t("error_already_del_sticker")
+		}
+	}
+	errors.Check(err)
+
+	_, err = bot.Bot.SendMessage(reply)
+	errors.Check(err)
+}

internal/actions/error.go

@@ -0,0 +1,33 @@
+package actions
+
+import (
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	"gitlab.com/toby3d/mypackbot/internal/utils"
+	tg "gitlab.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.StyleMarkdown
+	reply.ReplyMarkup = utils.MenuKeyboard(t)
+
+	_, err = bot.Bot.SendMessage(reply)
+	errors.Check(err)
+}

internal/actions/reset.go

@@ -0,0 +1,44 @@
+package actions
+
+import (
+	"strings"
+
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	"gitlab.com/toby3d/mypackbot/internal/utils"
+	tg "gitlab.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.DB.ChangeUserState(msg.From, 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.StyleMarkdown
+		reply.ReplyMarkup = utils.MenuKeyboard(t)
+
+		_, err = bot.Bot.SendMessage(reply)
+		errors.Check(err)
+		return
+	}
+
+	err = db.DB.ResetUser(msg.From)
+	errors.Check(err)
+
+	reply := tg.NewMessage(msg.Chat.ID, t("success_reset"))
+	reply.ParseMode = tg.StyleMarkdown
+	reply.ReplyMarkup = utils.MenuKeyboard(t)
+	_, err = bot.Bot.SendMessage(reply)
+	errors.Check(err)
+}

internal/bot/new.go

@@ -0,0 +1,11 @@
+package bot
+
+import tg "gitlab.com/toby3d/telegram"
+
+// Bot is a main object of Telegram bot
+var Bot *tg.Bot
+
+// New just create new bot by configuration credentials
+func New(accessToken string) (bot *tg.Bot, err error) {
+	return tg.New(accessToken)
+}

internal/commands/add.go

@@ -0,0 +1,39 @@
+package commands
+
+import (
+	log "github.com/kirillDanshin/dlog"
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	"gitlab.com/toby3d/mypackbot/internal/utils"
+	tg "gitlab.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.StyleMarkdown
+	reply.ReplyMarkup = utils.CancelButton(t)
+
+	err = db.DB.ChangeUserState(msg.From, models.StateAddSticker)
+	errors.Check(err)
+
+	if pack {
+		reply.Text = t("reply_add_pack")
+
+		err = db.DB.ChangeUserState(msg.From, models.StateAddPack)
+		errors.Check(err)
+	}
+
+	log.Ln("Sending add reply...")
+	_, err = bot.Bot.SendMessage(reply)
+	errors.Check(err)
+}

internal/commands/cancel.go

@@ -0,0 +1,48 @@
+package commands
+
+import (
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	"gitlab.com/toby3d/mypackbot/internal/utils"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// Cancel just cancel current user operation
+func Cancel(msg *tg.Message) {
+	t, err := i18n.SwitchTo(msg.From.LanguageCode)
+	errors.Check(err)
+
+	state, err := db.DB.GetUserState(msg.From)
+	errors.Check(err)
+
+	_, err = bot.Bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
+	errors.Check(err)
+
+	var text string
+	switch state {
+	case models.StateAddSticker:
+		text = t("cancel_add_sticker")
+	case models.StateAddPack:
+		text = t("cancel_add_pack")
+	case models.StateDeleteSticker:
+		text = t("cancel_del_sticker")
+	case models.StateDeletePack:
+		text = t("cancel_del_pack")
+	case models.StateReset:
+		text = t("cancel_reset")
+	default:
+		text = t("cancel_error")
+	}
+
+	err = db.DB.ChangeUserState(msg.From, models.StateNone)
+	errors.Check(err)
+
+	reply := tg.NewMessage(msg.Chat.ID, text)
+	reply.ReplyMarkup = utils.MenuKeyboard(t)
+
+	_, err = bot.Bot.SendMessage(reply)
+	errors.Check(err)
+}

internal/commands/command.go

@@ -0,0 +1,30 @@
+package commands
+
+import (
+	log "github.com/kirillDanshin/dlog"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// Command check's got user command
+func Command(msg *tg.Message) {
+	log.Ln("command:", msg.Command())
+	switch {
+	case msg.IsCommandEqual(tg.CommandStart):
+		Start(msg)
+	case msg.IsCommandEqual(tg.CommandHelp):
+		Help(msg)
+	case msg.IsCommandEqual(models.CommandAddSticker):
+		Add(msg, false)
+	case msg.IsCommandEqual(models.CommandAddPack):
+		Add(msg, true)
+	case msg.IsCommandEqual(models.CommandDeleteSticker):
+		Delete(msg, false)
+	case msg.IsCommandEqual(models.CommandDeletePack):
+		Delete(msg, true)
+	case msg.IsCommandEqual(models.CommandReset):
+		Reset(msg)
+	case msg.IsCommandEqual(models.CommandCancel):
+		Cancel(msg)
+	}
+}

internal/commands/delete.go

@@ -0,0 +1,59 @@
+package commands
+
+import (
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	"gitlab.com/toby3d/mypackbot/internal/utils"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// Delete prepare user to remove some stickers or sets from his pack
+func Delete(msg *tg.Message, pack bool) {
+	t, err := i18n.SwitchTo(msg.From.LanguageCode)
+	errors.Check(err)
+
+	stickers, err := db.DB.GetUserStickers(msg.From, &tg.InlineQuery{})
+	errors.Check(err)
+
+	_, err = bot.Bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
+	errors.Check(err)
+
+	if len(stickers) <= 0 {
+		err = db.DB.ChangeUserState(msg.From, models.StateNone)
+		errors.Check(err)
+
+		reply := tg.NewMessage(msg.Chat.ID, t("error_empty_del"))
+		reply.ReplyMarkup = utils.MenuKeyboard(t)
+		_, err = bot.Bot.SendMessage(reply)
+		errors.Check(err)
+		return
+	}
+
+	reply := tg.NewMessage(msg.Chat.ID, t("reply_del_sticker"))
+	reply.ParseMode = tg.StyleMarkdown
+	reply.ReplyMarkup = utils.CancelButton(t)
+
+	err = db.DB.ChangeUserState(msg.From, models.StateDeleteSticker)
+	errors.Check(err)
+
+	if pack {
+		err = db.DB.ChangeUserState(msg.From, models.StateDeletePack)
+		errors.Check(err)
+
+		reply.Text = t("reply_del_pack")
+	}
+
+	_, err = bot.Bot.SendMessage(reply)
+	errors.Check(err)
+
+	_, err = bot.Bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
+	errors.Check(err)
+
+	reply = tg.NewMessage(msg.Chat.ID, t("reply_switch_button"))
+	reply.ReplyMarkup = utils.SwitchButton(t)
+	_, err = bot.Bot.SendMessage(reply)
+	errors.Check(err)
+}

internal/commands/help.go

@@ -0,0 +1,40 @@
+package commands
+
+import (
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	"gitlab.com/toby3d/mypackbot/internal/utils"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// Help just send instructions about bot usage
+func Help(msg *tg.Message) {
+	t, err := i18n.SwitchTo(msg.From.LanguageCode)
+	errors.Check(err)
+
+	err = db.DB.ChangeUserState(msg.From, models.StateNone)
+	errors.Check(err)
+
+	_, err = bot.Bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
+	errors.Check(err)
+
+	reply := tg.NewMessage(
+		msg.Chat.ID, t("reply_help", map[string]interface{}{
+			"AddStickerCommand":    models.CommandAddSticker,
+			"AddPackCommand":       models.CommandAddPack,
+			"DeleteStickerCommand": models.CommandDeleteSticker,
+			"DeletePackCommand":    models.CommandDeletePack,
+			"ResetCommand":         models.CommandReset,
+			"CancelCommand":        models.CommandCancel,
+			"Username":             bot.Bot.Username,
+		}),
+	)
+	reply.ParseMode = tg.StyleMarkdown
+	reply.ReplyMarkup = utils.MenuKeyboard(t)
+
+	_, err = bot.Bot.SendMessage(reply)
+	errors.Check(err)
+}

internal/commands/reset.go

@@ -0,0 +1,47 @@
+package commands
+
+import (
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	"gitlab.com/toby3d/mypackbot/internal/utils"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// Reset prepare user to reset his pack
+func Reset(msg *tg.Message) {
+	t, err := i18n.SwitchTo(msg.From.LanguageCode)
+	errors.Check(err)
+
+	stickers, err := db.DB.GetUserStickers(msg.From, &tg.InlineQuery{})
+	errors.Check(err)
+
+	_, err = bot.Bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
+	errors.Check(err)
+
+	if len(stickers) <= 0 {
+		err = db.DB.ChangeUserState(msg.From, models.StateNone)
+		errors.Check(err)
+
+		reply := tg.NewMessage(msg.Chat.ID, t("error_already_reset"))
+		reply.ParseMode = tg.StyleMarkdown
+		reply.ReplyMarkup = utils.MenuKeyboard(t)
+		_, err = bot.Bot.SendMessage(reply)
+		errors.Check(err)
+		return
+	}
+
+	err = db.DB.ChangeUserState(msg.From, models.StateReset)
+	errors.Check(err)
+
+	reply := tg.NewMessage(msg.Chat.ID, t("reply_reset", map[string]interface{}{
+		"KeyPhrase":     t("key_phrase"),
+		"CancelCommand": models.CommandCancel,
+	}))
+	reply.ParseMode = tg.StyleMarkdown
+	reply.ReplyMarkup = utils.CancelButton(t)
+	_, err = bot.Bot.SendMessage(reply)
+	errors.Check(err)
+}

internal/commands/start.go

@@ -0,0 +1,47 @@
+package commands
+
+import (
+	"strings"
+
+	log "github.com/kirillDanshin/dlog"
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	"gitlab.com/toby3d/mypackbot/internal/utils"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// Start just send introduction about bot to user
+func Start(msg *tg.Message) {
+	err := db.DB.ChangeUserState(msg.From, models.StateNone)
+	errors.Check(err)
+
+	_, err = bot.Bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
+	errors.Check(err)
+
+	if msg.HasCommandArgument() {
+		log.Ln("Received a", msg.Command(), "command with", msg.CommandArgument(), "argument")
+		if strings.EqualFold(msg.CommandArgument(), tg.CommandHelp) {
+			Help(msg)
+			return
+		}
+	}
+
+	t, err := i18n.SwitchTo(msg.From.LanguageCode)
+	errors.Check(err)
+
+	reply := tg.NewMessage(
+		msg.Chat.ID,
+		t("reply_start", map[string]interface{}{
+			"Username": bot.Bot.Username,
+			"ID":       bot.Bot.ID,
+		}),
+	)
+	reply.ParseMode = tg.StyleMarkdown
+	reply.ReplyMarkup = utils.MenuKeyboard(t)
+
+	_, err = bot.Bot.SendMessage(reply)
+	errors.Check(err)
+}

internal/config/open.go

@@ -0,0 +1,17 @@
+package config
+
+import "github.com/spf13/viper"
+
+var Config *viper.Viper
+
+// Open just open configuration file for parsing some data in other functions
+func Open(path string) (*viper.Viper, error) {
+	cfg := viper.New()
+
+	cfg.AddConfigPath(path)
+	cfg.SetConfigName("config")
+	cfg.SetConfigType("yaml")
+
+	err := cfg.ReadInConfig()
+	return cfg, err
+}

internal/db/add_sticker.go

@@ -0,0 +1,36 @@
+package db
+
+import (
+	"fmt"
+
+	log "github.com/kirillDanshin/dlog"
+	"github.com/tidwall/buntdb"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// AddSticker add sticker FileID, Emoji and SetName meta for UserID
+func (db *DataBase) AddSticker(user *tg.User, sticker *tg.Sticker) (bool, error) {
+	log.Ln("Trying to add", sticker.FileID, "sticker from", user.ID, "user")
+	if sticker.SetName == "" {
+		sticker.SetName = models.SetUploaded
+	}
+
+	var exists bool
+	err := db.Update(func(tx *buntdb.Tx) error {
+		var err error
+		_, exists, err = tx.Set(
+			fmt.Sprint("user:", user.ID, ":set:", sticker.SetName, ":sticker:", sticker.FileID), // key
+			sticker.Emoji, // value
+			nil,           // options
+		)
+		if err == buntdb.ErrIndexExists {
+			exists = true
+			return nil
+		}
+
+		return err
+	})
+
+	return exists, err
+}

internal/db/change_user_state.go

@@ -0,0 +1,18 @@
+package db
+
+import (
+	"fmt"
+
+	log "github.com/kirillDanshin/dlog"
+	"github.com/tidwall/buntdb"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// ChangeUserState change current user state on input state.
+func (db *DataBase) ChangeUserState(user *tg.User, state string) error {
+	log.Ln("Trying to change", user.ID, "state to", state)
+	return db.Update(func(tx *buntdb.Tx) error {
+		_, _, err := tx.Set(fmt.Sprint("user:", user.ID, ":state"), state, nil)
+		return err
+	})
+}

internal/db/delete_pack.go

@@ -0,0 +1,50 @@
+package db
+
+import (
+	"fmt"
+	"strings"
+
+	log "github.com/kirillDanshin/dlog"
+	"github.com/tidwall/buntdb"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// DeletePack remove all keys for UserID which contains input SetName
+func (db *DataBase) DeletePack(user *tg.User, sticker *tg.Sticker) (bool, error) {
+	log.Ln("Trying to remove all", sticker.SetName, "sticker from", user.ID, "user")
+	if sticker.SetName == "" {
+		sticker.SetName = models.SetUploaded
+	}
+
+	var ids []string
+	err := db.View(func(tx *buntdb.Tx) error {
+		return tx.AscendKeys(
+			fmt.Sprint("user:", user.ID, ":set:", sticker.SetName, ":*"),
+			func(key, val string) bool {
+				keys := strings.Split(key, ":")
+				ids = append(ids, keys[5])
+				return true
+			},
+		)
+	})
+
+	if len(ids) == 0 {
+		return true, nil
+	}
+
+	for _, id := range ids {
+		var notExist bool
+		notExist, err = db.DeleteSticker(user, &tg.Sticker{FileID: id})
+		if err != nil {
+			return notExist, err
+		}
+	}
+
+	if err == buntdb.ErrNotFound {
+		log.Ln(user.ID, "not found")
+		return true, nil
+	}
+
+	return false, err
+}

internal/db/delete_sticker.go

@@ -0,0 +1,31 @@
+package db
+
+import (
+	"fmt"
+
+	log "github.com/kirillDanshin/dlog"
+	"github.com/tidwall/buntdb"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// DeleteSticker just remove specified sticker key from database.
+func (db *DataBase) DeleteSticker(user *tg.User, sticker *tg.Sticker) (bool, error) {
+	log.Ln("Trying to remove", sticker.FileID, "sticker from", user.ID, "user")
+	if sticker.SetName == "" {
+		sticker.SetName = models.SetUploaded
+	}
+
+	err := db.Update(func(tx *buntdb.Tx) error {
+		_, err := tx.Delete(
+			fmt.Sprint("user:", user.ID, ":set:", sticker.SetName, ":sticker:", sticker.FileID),
+		)
+		return err
+	})
+	if err == buntdb.ErrNotFound {
+		log.Ln(user.ID, "not found, create new one")
+		return true, nil
+	}
+
+	return false, err
+}

internal/db/get_user_state.go

@@ -0,0 +1,29 @@
+package db
+
+import (
+	"fmt"
+
+	log "github.com/kirillDanshin/dlog"
+	"github.com/tidwall/buntdb"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// UserState return current state for UserID
+func (db *DataBase) GetUserState(user *tg.User) (string, error) {
+	log.Ln("Trying to get", user.ID, "state")
+	var state string
+	err := db.View(func(tx *buntdb.Tx) error {
+		var err error
+		state, err = tx.Get(fmt.Sprint("user:", user.ID, ":state"))
+		return err
+	})
+	if err == buntdb.ErrNotFound {
+		log.Ln(user.ID, "not found, create new one")
+		if err = db.ChangeUserState(user, models.StateNone); err != nil {
+			return state, err
+		}
+	}
+
+	return state, err
+}

internal/db/get_user_stickers.go

@@ -0,0 +1,55 @@
+package db
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	log "github.com/kirillDanshin/dlog"
+	"github.com/tidwall/buntdb"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// GetUserStickers return array of saved stickers for input UserID and his total count
+func (db *DataBase) GetUserStickers(user *tg.User, query *tg.InlineQuery) ([]string, error) {
+	log.Ln("Trying to get", user.ID, "stickers")
+	var i int
+	var stickers []string
+	offset, _ := strconv.Atoi(query.Offset)
+	offset *= 50
+
+	err := db.View(func(tx *buntdb.Tx) error {
+		return tx.AscendKeys(
+			fmt.Sprint("user:", user.ID, ":set:*"), // index
+			func(key, val string) bool { // iterator
+				subKeys := strings.Split(key, ":")
+				if subKeys[1] != strconv.Itoa(user.ID) {
+					return true
+				}
+
+				if len(stickers) == 50 {
+					return false
+				}
+
+				i++
+				if i < offset {
+					return true
+				}
+
+				if query.Query != "" && !strings.Contains(query.Query, val) {
+					return true
+				}
+
+				stickers = append(stickers, subKeys[5])
+				return true
+			},
+		)
+	})
+
+	if err == buntdb.ErrNotFound {
+		log.Ln("Not found stickers")
+		return nil, nil
+	}
+
+	return stickers, err
+}

internal/db/get_users.go

@@ -0,0 +1,33 @@
+package db
+
+import (
+	"strconv"
+	"strings"
+
+	// log "github.com/kirillDanshin/dlog"
+	"github.com/tidwall/buntdb"
+)
+
+// GetUsers return array of all available UserID in database
+func (db *DataBase) GetUsers() ([]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
+}

internal/db/open.go

@@ -0,0 +1,18 @@
+package db
+
+import (
+	log "github.com/kirillDanshin/dlog"
+	"github.com/tidwall/buntdb"
+)
+
+type DataBase struct{ *buntdb.DB }
+
+// DB is a main object of current database connection
+var DB *DataBase
+
+// Open just open connection to database for work
+func Open(path string) (*DataBase, error) {
+	log.Ln("Open database file...")
+	db, err := buntdb.Open(path)
+	return &DataBase{db}, err
+}

internal/db/reset.go

@@ -0,0 +1,40 @@
+package db
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	log "github.com/kirillDanshin/dlog"
+	"github.com/tidwall/buntdb"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// ResetUser just drop out all stickers keys for input UserID
+func (db *DataBase) ResetUser(user *tg.User) error {
+	log.Ln("Trying reset all stickers of", user.ID, "user")
+	return db.Update(func(tx *buntdb.Tx) error {
+		var keys []string
+		if err := tx.AscendKeys(
+			fmt.Sprint("user:", user.ID, ":set:*"), // index
+			func(key, val string) bool { // iterator
+				subKeys := strings.Split(key, ":")
+				if subKeys[1] == strconv.Itoa(user.ID) {
+					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
+	})
+}

internal/db/user_state.go

@@ -0,0 +1,30 @@
+package db
+
+import (
+	"fmt"
+
+	log "github.com/kirillDanshin/dlog"
+	"github.com/tidwall/buntdb"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// UserState return current state for UserID
+func (db *DataBase) UserState(usr *tg.User) (string, error) {
+	log.Ln("Trying to get", usr.ID, "state")
+	var state string
+	err := DB.View(func(tx *buntdb.Tx) error {
+		var err error
+		state, err = tx.Get(fmt.Sprint("user:", usr.ID, ":state"))
+		return err
+	})
+
+	if err == buntdb.ErrNotFound {
+		log.Ln(usr.ID, "not found, create new one")
+		if err = db.ChangeUserState(usr, models.StateNone); err != nil {
+			return state, err
+		}
+	}
+
+	return state, err
+}

internal/errors/check.go

@@ -0,0 +1,32 @@
+package errors
+
+import (
+	"log"
+	"log/syslog"
+	"os"
+	"sync"
+)
+
+var (
+	// WaitForwards is a wait group which wait send all announcements before panic
+	WaitForwards = new(sync.WaitGroup)
+
+	sysLogger *syslog.Writer
+)
+
+// Check helps debug critical errors without warnings from 'gocyclo' linter
+func Check(err error) {
+	if err != nil {
+		log.Println(err.Error())
+
+		// Wait what all users get announcement message first
+		WaitForwards.Wait()
+
+		err = sysLogger.Crit(err.Error())
+		if err != nil {
+			log.Panicln(err.Error())
+		}
+
+		os.Exit(1)
+	}
+}

internal/i18n/open.go

@@ -0,0 +1,20 @@
+package i18n
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/nicksnyder/go-i18n/i18n"
+)
+
+// Open just walk in input path for preloading localization files
+func Open(path string) error {
+	return filepath.Walk(path, func(path string, info os.FileInfo, err error) error {
+		if !strings.HasSuffix(path, ".all.yaml") {
+			return err
+		}
+
+		return i18n.LoadTranslationFile(path)
+	})
+}

internal/i18n/switch_to.go

@@ -0,0 +1,13 @@
+package i18n
+
+import (
+	"github.com/nicksnyder/go-i18n/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+)
+
+// SwitchTo try load locales by input language codes and return TranslateFunc
+func SwitchTo(codes ...string) (t i18n.TranslateFunc, err error) {
+	codes = append(codes, models.LanguageFallback)
+	t, err = i18n.Tfunc(codes[0], codes[1:]...)
+	return
+}

internal/messages/message.go

@@ -0,0 +1,35 @@
+package messages
+
+import (
+	"strings"
+
+	"gitlab.com/toby3d/mypackbot/internal/actions"
+	"gitlab.com/toby3d/mypackbot/internal/commands"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// Message checks user message on response, stickers, reset key phrase, else do
+// Actions
+func Message(msg *tg.Message) {
+	t, err := i18n.SwitchTo(msg.From.LanguageCode)
+	errors.Check(err)
+
+	switch {
+	case strings.EqualFold(msg.Text, t("button_add_sticker")):
+		commands.Add(msg, false)
+	case strings.EqualFold(msg.Text, t("button_add_pack")):
+		commands.Add(msg, true)
+	case strings.EqualFold(msg.Text, t("button_del_sticker")):
+		commands.Delete(msg, false)
+	case strings.EqualFold(msg.Text, t("button_del_pack")):
+		commands.Delete(msg, true)
+	case strings.EqualFold(msg.Text, t("button_reset")):
+		commands.Reset(msg)
+	case strings.EqualFold(msg.Text, t("button_cancel")):
+		commands.Cancel(msg)
+	default:
+		actions.Action(msg)
+	}
+}

internal/models/models.go

@@ -0,0 +1,37 @@
+package models
+
+import tg "gitlab.com/toby3d/telegram"
+
+// Commands... represents available and supported bot commands
+const (
+	CommandAddPack       = "addPack"
+	CommandAddSticker    = "addSticker"
+	CommandCancel        = "cancel"
+	CommandDeleteSticker = "delSticker"
+	CommandDeletePack    = "delPack"
+	CommandReset         = "reset"
+)
+
+// State... represents current state of user action
+const (
+	StateNone          = "none"
+	StateAddSticker    = CommandAddSticker
+	StateAddPack       = CommandAddPack
+	StateDeleteSticker = CommandDeleteSticker
+	StateDeletePack    = CommandDeletePack
+	StateReset         = CommandReset
+)
+
+// SetUploaded is a mimic set name of uploaded stickers without any parent set
+const SetUploaded = "?"
+
+// LanguageFallback is a default language code in case what current user language
+// is not support yet
+const LanguageFallback = "en"
+
+// AllowedUpdates is
+var AllowedUpdates = []string{
+	tg.UpdateInlineQuery, // For searching and sending stickers
+	tg.UpdateMessage,     // For get commands and messages
+	tg.UpdateChannelPost, // For forwarding announcements
+}

internal/updates/channel.go

@@ -0,0 +1,68 @@
+package updates
+
+import (
+	"fmt"
+	"net/url"
+
+	log "github.com/kirillDanshin/dlog"
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/config"
+	"gitlab.com/toby3d/mypackbot/internal/models"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// Channel return webhook or long polling channel with bot updates
+func Channel(webhookMode bool) (updates tg.UpdatesChannel, err error) {
+	log.Ln("Preparing channel for updates...")
+	if !webhookMode {
+		log.Ln("Use LongPolling updates")
+
+		var info *tg.WebhookInfo
+		info, err = bot.Bot.GetWebhookInfo()
+		if err != nil {
+			return
+		}
+
+		if info.URL != "" {
+			log.Ln("Deleting webhook...")
+			_, err = bot.Bot.DeleteWebhook()
+			return
+		}
+
+		updates = bot.Bot.NewLongPollingChannel(&tg.GetUpdatesParameters{
+			Offset:         0,
+			Limit:          100,
+			Timeout:        60,
+			AllowedUpdates: models.AllowedUpdates,
+		})
+		return
+	}
+
+	set, err := url.Parse(config.Config.GetString("telegram.webhook.set"))
+	if err != nil {
+		return nil, err
+	}
+
+	listen := config.Config.GetString("telegram.webhook.listen")
+	serve := config.Config.GetString("telegram.webhook.serve")
+
+	log.Ln(
+		"Trying set webhook on address:",
+		fmt.Sprint(set.String(), bot.Bot.AccessToken),
+	)
+
+	log.Ln("Creating new webhook...")
+	params := tg.NewWebhook(fmt.Sprint(set, listen, bot.Bot.AccessToken), nil)
+	params.MaxConnections = 40
+	params.AllowedUpdates = models.AllowedUpdates
+
+	updates = bot.Bot.NewWebhookChannel(
+		set,
+		params, // params
+		"",     // certFile
+		"",     // keyFile
+		serve,  // serve
+	)
+
+	return
+}

internal/updates/channel_post.go

@@ -0,0 +1,36 @@
+package updates
+
+import (
+	"time"
+
+	log "github.com/kirillDanshin/dlog"
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/config"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// ChannelPost checks ChannelPost update for forwarding content to bot users
+func ChannelPost(post *tg.Message) {
+	channelID := config.Config.GetInt64("telegram.channel")
+	if post.Chat.ID != channelID {
+		log.Ln(post.Chat.ID, "!=", channelID)
+		return
+	}
+
+	users, err := db.DB.GetUsers()
+	errors.Check(err)
+
+	for i := range users {
+		errors.WaitForwards.Add(1)
+		if _, err = bot.Bot.ForwardMessage(
+			tg.NewForwardMessage(post.Chat.ID, int64(users[i]), post.ID),
+		); err != nil {
+			log.Ln(err.Error())
+		}
+		errors.WaitForwards.Done()
+
+		time.Sleep(time.Second / 10) // For avoid spamming
+	}
+}

internal/updates/inline_query.go

@@ -0,0 +1,86 @@
+package updates
+
+import (
+	"strconv"
+
+	log "github.com/kirillDanshin/dlog"
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/utils"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// InlineQuery checks InlineQuery updates for answer with personal results
+func InlineQuery(inlineQuery *tg.InlineQuery) {
+	fixedQuery, err := utils.FixEmoji(inlineQuery.Query)
+	if err == nil {
+		inlineQuery.Query = fixedQuery
+	}
+
+	answer := new(tg.AnswerInlineQueryParameters)
+	answer.InlineQueryID = inlineQuery.ID
+	answer.CacheTime = 1
+	answer.IsPersonal = true
+
+	if len([]rune(inlineQuery.Query)) >= 256 {
+		_, err = bot.Bot.AnswerInlineQuery(answer)
+		errors.Check(err)
+		return
+	}
+
+	log.Ln("Let's preparing answer...")
+	t, err := i18n.SwitchTo(inlineQuery.From.LanguageCode)
+	errors.Check(err)
+
+	log.Ln("INLINE OFFSET:", inlineQuery.Offset)
+	if inlineQuery.Offset == "" {
+		inlineQuery.Offset = "-1"
+	}
+	offset, err := strconv.Atoi(inlineQuery.Offset)
+	errors.Check(err)
+	offset++
+
+	stickers, err := db.DB.GetUserStickers(
+		inlineQuery.From,
+		&tg.InlineQuery{
+			Offset: strconv.Itoa(offset),
+			Query:  inlineQuery.Query,
+		},
+	)
+	errors.Check(err)
+
+	if len(stickers) == 0 {
+		if offset == 0 && inlineQuery.Query != "" {
+			// If search stickers by emoji return 0 results
+			answer.SwitchPrivateMessageText = t(
+				"button_inline_nothing", map[string]interface{}{
+					"Query": inlineQuery.Query,
+				},
+			)
+
+			answer.SwitchPrivateMessageParameter = tg.CommandHelp
+		}
+
+		answer.Results = nil
+	} else {
+		log.Ln("STICKERS FROM REQUEST:", len(stickers))
+		if len(stickers) == 50 {
+			answer.NextOffset = strconv.Itoa(offset)
+			log.Ln("NEXT OFFSET:", answer.NextOffset)
+		}
+
+		var results = make([]interface{}, len(stickers))
+		for i, sticker := range stickers {
+			results[i] = tg.NewInlineQueryResultCachedSticker(sticker, sticker)
+		}
+
+		answer.Results = results
+	}
+
+	log.Ln("CacheTime:", answer.CacheTime)
+
+	_, err = bot.Bot.AnswerInlineQuery(answer)
+	errors.Check(err)
+}

internal/updates/message.go

@@ -0,0 +1,29 @@
+package updates
+
+import (
+	log "github.com/kirillDanshin/dlog"
+	"gitlab.com/toby3d/mypackbot/internal/actions"
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/commands"
+	"gitlab.com/toby3d/mypackbot/internal/messages"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// Message checks Message updates for answer to user commands, replies or sended
+// stickers
+func Message(msg *tg.Message) {
+	if bot.Bot.IsMessageFromMe(msg) ||
+		bot.Bot.IsForwardFromMe(msg) {
+		log.Ln("Ignore message update")
+		return
+	}
+
+	switch {
+	case bot.Bot.IsCommandToMe(msg):
+		commands.Command(msg)
+	case msg.IsText():
+		messages.Message(msg)
+	default:
+		actions.Action(msg)
+	}
+}

internal/utils/cancel_button.go

@@ -0,0 +1,15 @@
+package utils
+
+import (
+	"github.com/nicksnyder/go-i18n/i18n"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// CancelButton helper just generate ReplyMarkup with cancel button
+func CancelButton(t i18n.TranslateFunc) *tg.ReplyKeyboardMarkup {
+	return tg.NewReplyKeyboardMarkup(
+		tg.NewReplyKeyboardRow(
+			tg.NewReplyKeyboardButton(t("button_cancel")),
+		),
+	)
+}

internal/utils/fix_emoji.go

@@ -0,0 +1,27 @@
+package utils
+
+import (
+	"golang.org/x/text/runes"
+	"golang.org/x/text/transform"
+)
+
+// Skin colors for remove
+var bannedSkins = []rune{127995, 127996, 127997, 127998, 127999}
+
+// Transformer for remove skin colors
+var skinRemover = runes.Remove(runes.Predicate(
+	func(r rune) bool {
+		for _, skin := range bannedSkins {
+			if r == skin {
+				return true
+			}
+		}
+		return false
+	},
+))
+
+// FixEmoji fixes user input by remove all potential skin colors
+func FixEmoji(raw string) (string, error) {
+	result, _, err := transform.String(skinRemover, raw)
+	return result, err
+}

internal/utils/menu_keyboard.go

@@ -0,0 +1,23 @@
+package utils
+
+import (
+	"github.com/nicksnyder/go-i18n/i18n"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// MenuKeyboard helper just generate ReplyMarkup with menu buttons
+func MenuKeyboard(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")),
+		),
+	)
+}

internal/utils/switch_button.go

@@ -0,0 +1,15 @@
+package utils
+
+import (
+	"github.com/nicksnyder/go-i18n/i18n"
+	tg "gitlab.com/toby3d/telegram"
+)
+
+// SwitchButton helper just generate ReplyMarkup with SelfSwitch button
+func SwitchButton(t i18n.TranslateFunc) *tg.InlineKeyboardMarkup {
+	return tg.NewInlineKeyboardMarkup(
+		tg.NewInlineKeyboardRow(
+			tg.NewInlineKeyboardButtonSwitchSelf(t("button_inline_select"), " "),
+		),
+	)
+}

main.go

@@ -1,41 +1,57 @@
 package main
 
 import (
+	"flag"
+
 	log "github.com/kirillDanshin/dlog"
-	tg "github.com/toby3d/telegram"
+	"gitlab.com/toby3d/mypackbot/internal/bot"
+	"gitlab.com/toby3d/mypackbot/internal/config"
+	"gitlab.com/toby3d/mypackbot/internal/db"
+	"gitlab.com/toby3d/mypackbot/internal/errors"
+	"gitlab.com/toby3d/mypackbot/internal/i18n"
+	"gitlab.com/toby3d/mypackbot/internal/updates"
 )
 
-// bot is general structure of the bot
-var bot *tg.Bot
+var flagWebhook = flag.Bool(
+	"webhook", false,
+	"enable work via webhooks (required valid certificates)",
+)
+
+// init prepare configuration and other things for successful start
+func init() {
+	log.Ln("Initializing...")
+
+	// Preload localization strings
+	err := i18n.Open("i18n/")
+	errors.Check(err)
+
+	// Preload configuration file
+	config.Open("configs/config.yaml")
+
+	// Open database or create new one
+	db.Open("stickers.db")
+
+	// Create bot with credentials from config
+	bot.Bot, err = bot.New(config.Config.GetString("telegram.token"))
+	errors.Check(err)
+}
 
 // main function is a general function for work of this bot
 func main() {
-	log.Ln("Let'g Get It Started...")
-	var err error
+	flag.Parse() // Parse flagWebhook
 
-	go dbInit()
+	channel, err := updates.Channel(*flagWebhook)
+	errors.Check(err)
 
-	log.Ln("Initializing new bot via checking access_token...")
-	bot, err = tg.NewBot(cfg.UString("telegram.token"))
-	errCheck(err)
-
-	log.Ln("Let's check updates channel!")
-	for update := range getUpdatesChannel() {
+	for update := range channel {
+		log.D(update)
 		switch {
-		case update.InlineQuery != nil:
-			log.D(update.InlineQuery)
-			updateInlineQuery(update.InlineQuery)
-		case update.Message != nil:
-			log.D(update.Message)
-			updateMessage(update.Message)
-		case update.ChannelPost != nil:
-			log.D(update.ChannelPost)
-			updateChannelPost(update.ChannelPost)
-		default:
-			log.D(update)
+		case update.IsInlineQuery():
+			updates.InlineQuery(update.InlineQuery)
+		case update.IsMessage():
+			updates.Message(update.Message)
+		case update.IsChannelPost():
+			updates.ChannelPost(update.ChannelPost)
 		}
 	}
-
-	err = db.Close()
-	errCheck(err)
 }

messages.go

@@ -1,29 +0,0 @@
-package main
-
-import (
-	"strings"
-
-	tg "github.com/toby3d/telegram"
-)
-
-func messages(msg *tg.Message) {
-	T, err := switchLocale(msg.From.LanguageCode)
-	errCheck(err)
-
-	switch {
-	case strings.EqualFold(msg.Text, T("button_add_sticker")):
-		commandAdd(msg, false)
-	case strings.EqualFold(msg.Text, T("button_add_pack")):
-		commandAdd(msg, true)
-	case strings.EqualFold(msg.Text, T("button_del_sticker")):
-		commandDelete(msg, false)
-	case strings.EqualFold(msg.Text, T("button_del_pack")):
-		commandDelete(msg, true)
-	case strings.EqualFold(msg.Text, T("button_reset")):
-		commandReset(msg)
-	case strings.EqualFold(msg.Text, T("button_cancel")):
-		commandCancel(msg)
-	case strings.EqualFold(msg.Text, T("meta_key_phrase")):
-		actions(msg)
-	}
-}

reset.go

@@ -1,71 +0,0 @@
-package main
-
-import (
-	"strings"
-
-	tg "github.com/toby3d/telegram"
-)
-
-func commandReset(msg *tg.Message) {
-	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_already_reset"))
-		reply.ParseMode = tg.ModeMarkdown
-		reply.ReplyMarkup = getMenuKeyboard(T)
-		_, err = bot.SendMessage(reply)
-		errCheck(err)
-		return
-	}
-
-	err = dbChangeUserState(msg.From.ID, stateReset)
-	errCheck(err)
-
-	reply := tg.NewMessage(msg.Chat.ID, T("reply_reset", map[string]interface{}{
-		"KeyPhrase":     T("meta_key_phrase"),
-		"CancelCommand": cmdCancel,
-	}))
-	reply.ParseMode = tg.ModeMarkdown
-	reply.ReplyMarkup = getCancelButton(T)
-	_, err = bot.SendMessage(reply)
-	errCheck(err)
-}
-
-func actionReset(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)
-
-	if !strings.EqualFold(msg.Text, T("meta_key_phrase")) {
-		reply := tg.NewMessage(msg.Chat.ID, T("error_reset_phrase"))
-		reply.ParseMode = tg.ModeMarkdown
-		reply.ReplyMarkup = getMenuKeyboard(T)
-		_, err = bot.SendMessage(reply)
-		errCheck(err)
-		return
-	}
-
-	err = dbResetUserStickers(msg.From.ID)
-	errCheck(err)
-
-	reply := tg.NewMessage(msg.Chat.ID, T("success_reset"))
-	reply.ParseMode = tg.ModeMarkdown
-	reply.ReplyMarkup = getMenuKeyboard(T)
-	_, err = bot.SendMessage(reply)
-	errCheck(err)
-}

start.go

@@ -1,37 +0,0 @@
-package main
-
-import (
-	"strings"
-
-	log "github.com/kirillDanshin/dlog"
-	tg "github.com/toby3d/telegram"
-)
-
-func commandStart(msg *tg.Message) {
-	err := dbChangeUserState(msg.From.ID, stateNone)
-	errCheck(err)
-
-	_, err = bot.SendChatAction(msg.Chat.ID, tg.ActionTyping)
-	errCheck(err)
-
-	if msg.HasArgument() {
-		log.Ln("Received a", msg.Command(), "command with", msg.CommandArgument(), "argument")
-		if strings.ToLower(msg.CommandArgument()) == strings.ToLower(cmdHelp) {
-			commandHelp(msg)
-			return
-		}
-	}
-
-	T, err := switchLocale(msg.From.LanguageCode)
-	errCheck(err)
-
-	reply := tg.NewMessage(msg.Chat.ID, T("reply_start", map[string]interface{}{
-		"Username": bot.Self.Username,
-		"ID":       bot.Self.ID,
-	}))
-	reply.ParseMode = tg.ModeMarkdown
-	reply.ReplyMarkup = getMenuKeyboard(T)
-
-	_, err = bot.SendMessage(reply)
-	errCheck(err)
-}

switch_locale.go

@@ -1,13 +0,0 @@
-package main
-
-import (
-	log "github.com/kirillDanshin/dlog"
-	"github.com/nicksnyder/go-i18n/i18n"
-)
-
-const langFallback = "en"
-
-func switchLocale(langCode string) (i18n.TranslateFunc, error) {
-	log.Ln("Check", langCode, "localization")
-	return i18n.Tfunc(langCode, langFallback)
-}

update_channel_post.go

@@ -1,28 +0,0 @@
-package main
-
-import (
-	"time"
-
-	log "github.com/kirillDanshin/dlog"
-	tg "github.com/toby3d/telegram"
-)
-
-func updateChannelPost(post *tg.Message) {
-	if post.Chat.ID != channelID {
-		log.Ln(post.Chat.ID, "!=", channelID)
-		return
-	}
-
-	users, err := dbGetUsers()
-	errCheck(err)
-
-	for i := range users {
-		if _, err = bot.ForwardMessage(
-			tg.NewForwardMessage(post.Chat.ID, int64(users[i]), post.ID),
-		); err != nil {
-			log.Ln(err.Error())
-		}
-
-		time.Sleep(time.Second / 10) // For avoid spamming
-	}
-}

update_inline_query.go

@@ -1,91 +0,0 @@
-package main
-
-import (
-	"strconv"
-
-	log "github.com/kirillDanshin/dlog"
-	tg "github.com/toby3d/telegram"
-)
-
-func updateInlineQuery(inlineQuery *tg.InlineQuery) {
-	fixedQuery, err := fixEmoji(inlineQuery.Query)
-	if err == nil {
-		inlineQuery.Query = fixedQuery
-	}
-
-	answer := &tg.AnswerInlineQueryParameters{}
-	answer.InlineQueryID = inlineQuery.ID
-	answer.CacheTime = 1
-	answer.IsPersonal = true
-
-	if len([]rune(inlineQuery.Query)) >= 256 {
-		_, err = bot.AnswerInlineQuery(answer)
-		errCheck(err)
-		return
-	}
-
-	log.Ln("Let's preparing answer...")
-	T, err := switchLocale(inlineQuery.From.LanguageCode)
-	errCheck(err)
-
-	log.Ln("INLINE OFFSET:", inlineQuery.Offset)
-	if inlineQuery.Offset == "" {
-		inlineQuery.Offset = "-1"
-	}
-	offset, err := strconv.Atoi(inlineQuery.Offset)
-	errCheck(err)
-	offset++
-
-	stickers, packSize, err := dbGetUserStickers(
-		inlineQuery.From.ID, offset, inlineQuery.Query,
-	)
-	errCheck(err)
-
-	totalStickers := len(stickers)
-	if totalStickers == 0 {
-		if offset == 0 {
-			if inlineQuery.Query != "" {
-				// If search stickers by emoji return 0 results
-				answer.SwitchPrivateMessageText = T(
-					"button_inline_nothing", map[string]interface{}{
-						"Query": inlineQuery.Query,
-					},
-				)
-				answer.SwitchPrivateMessageParameter = cmdAddSticker
-			} else {
-				// If query is empty and get 0 stickers
-				answer.SwitchPrivateMessageText = T("button_inline_empty")
-				answer.SwitchPrivateMessageParameter = cmdAddSticker
-			}
-			answer.Results = nil
-		}
-	} else {
-		log.Ln("STICKERS FROM REQUEST:", totalStickers)
-		if totalStickers > 50 {
-			answer.NextOffset = strconv.Itoa(offset)
-			log.Ln("NEXT OFFSET:", answer.NextOffset)
-
-			stickers = stickers[:totalStickers-1]
-		}
-
-		log.Ln("Stickers after checks:", len(stickers))
-
-		var results = make([]interface{}, len(stickers))
-		for i, sticker := range stickers {
-			results[i] = tg.NewInlineQueryResultCachedSticker(sticker, sticker)
-		}
-
-		answer.SwitchPrivateMessageText = T(
-			"button_inline_search", packSize, map[string]interface{}{
-				"Count": packSize,
-			},
-		)
-		answer.SwitchPrivateMessageParameter = cmdHelp
-		answer.Results = results
-	}
-
-	log.Ln("CacheTime:", answer.CacheTime)
-
-	_, err = bot.AnswerInlineQuery(answer)
-	errCheck(err)
-}

update_message.go

@@ -1,22 +0,0 @@
-package main
-
-import (
-	log "github.com/kirillDanshin/dlog"
-	tg "github.com/toby3d/telegram"
-)
-
-func updateMessage(msg *tg.Message) {
-	if bot.IsMessageFromMe(msg) || bot.IsForwardFromMe(msg) {
-		log.Ln("Ignore message update")
-		return
-	}
-
-	switch {
-	case bot.IsCommandToMe(msg):
-		commands(msg)
-	case msg.Text != "":
-		messages(msg)
-	default:
-		actions(msg)
-	}
-}