fixes

samarets · Oct 12, 2022 · cbe74fe · cbe74fe
1 parent 6cd3d75
commit cbe74fe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/internal/bot/bot.go b/internal/bot/bot.go
@@ -87,7 +87,7 @@ func (b *bot) InitUpdates() {
  case getSupports:
  b.GetSupports(update)
  case event:
- b.Event(update)
+ b.Event(b.adminID)
  }
 
  continue

diff --git a/internal/bot/commands.go b/internal/bot/commands.go
@@ -413,8 +413,11 @@ func (b *bot) GetSupports(update tgbotapi.Update) {
  }
 }
 
-func (b *bot) Event(update tgbotapi.Update) {
+func (b *bot) Event(adminID int64) {
  groupID := b.db.groupDB().get()
+ if groupID == 0 {
+ groupID = adminID
+ }
 
  msg := tgbotapi.NewMessage(
  groupID,

diff --git a/internal/bot/db.go b/internal/bot/db.go
@@ -94,6 +94,9 @@ func (db *queueDB) getFirst() (*tgbotapi.User, error) {
  return nil, err
  }
  }
+ if fromQueue.ID == 0 {
+ return nil, nil
+ }
 
  return &fromQueue, nil
 }

diff --git a/internal/db/badger.go b/internal/db/badger.go
@@ -159,7 +159,10 @@ func (d *DB) GetFirstWherePrefix(prefix []byte, v interface{}) error {
  return err
  }
 
- return json.Unmarshal(data, v)
+ if data != nil {
+ return json.Unmarshal(data, v)
+ }
+ return nil
 }
 
 func (d *DB) Drop(prefix []byte) error {