🎨 Small fixes and format of the code

This commit is contained in:
Maxim Lebedev 2018-03-31 01:20:00 +05:00
parent 79d45575a0
commit 638dd0f6b6
No known key found for this signature in database
GPG Key ID: F8978F46FF0FFA4F
7 changed files with 11 additions and 12 deletions

View File

@ -15,6 +15,9 @@ debug:
fmt:
go fmt
check:
gometalinter --fast
# Build localization files with separated untranslated strings
translation:
goi18n merge -format yaml \

View File

@ -16,23 +16,23 @@ func DeletePack(userID int, setName string) (bool, error) {
setName = models.SetUploaded
}
var fileIDs []string
var ids []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])
ids = append(ids, keys[5])
return true
},
)
})
if len(fileIDs) == 0 {
if len(ids) == 0 {
return true, nil
}
for _, fileID := range fileIDs {
for _, fileID := range ids {
var notExist bool
notExist, err = DeleteSticker(userID, setName, fileID)
if err != nil {

View File

@ -21,7 +21,6 @@ func DeleteSticker(userID int, setName, fileID string) (bool, error) {
)
return err
})
if err == buntdb.ErrNotFound {
log.Ln(userID, "not found, create new one")
return true, nil

View File

@ -8,8 +8,8 @@ import (
"github.com/tidwall/buntdb"
)
// Users return array of all available UserID in database
func Users() ([]int, error) {
// GetUsers return array of all available UserID in database
func GetUsers() ([]int, error) {
var users []int
err := DB.View(func(tx *buntdb.Tx) error {
return tx.AscendKeys(

View File

@ -17,9 +17,7 @@ func UserState(userID int) (string, error) {
state, err = tx.Get(fmt.Sprint("user:", userID, ":state"))
return err
})
switch err {
case buntdb.ErrNotFound:
if err == buntdb.ErrNotFound {
log.Ln(userID, "not found, create new one")
if err = ChangeUserState(userID, models.StateNone); err != nil {
return state, err

View File

@ -43,7 +43,7 @@ func InlineQuery(inlineQuery *tg.InlineQuery) {
errors.Check(err)
offset++
stickers, packSize, err := db.UserStickers(
stickers, err := db.GetUserStickers(
inlineQuery.From.ID, offset, inlineQuery.Query,
)
errors.Check(err)

View File

@ -16,7 +16,6 @@ var flagWebhook = flag.Bool(
// main function is a general function for work of this bot
func main() {
flag.Parse() // Parse flagWebhook
for update := range updates.Channel(*flagWebhook) {
log.D(update)
switch {