🎨 Small fixes and format of the code
This commit is contained in:
parent
79d45575a0
commit
638dd0f6b6
3
Makefile
3
Makefile
|
@ -15,6 +15,9 @@ debug:
|
|||
fmt:
|
||||
go fmt
|
||||
|
||||
check:
|
||||
gometalinter --fast
|
||||
|
||||
# Build localization files with separated untranslated strings
|
||||
translation:
|
||||
goi18n merge -format yaml \
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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(
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue