Updating the dev

internal/lnbits/types.go

@@ -183,3 +183,13 @@ func (u User) SignKeyAuth(domain string, k1hex string) (key string, sig string,
 
 	return key, sig, nil
 }
+
+type SavingsPot struct {
+	ID        string    `json:"id" gorm:"primaryKey"`
+	UserID    string    `json:"user_id" gorm:"index"`
+	Name      string    `json:"name"`
+	Balance   int64     `json:"balance" gorm:"default:0;check:balance >= 0" validate:"min=0"`
+	CreatedAt time.Time `json:"created_at" gorm:"autoCreateTime"`
+	UpdatedAt time.Time `json:"updated_at" gorm:"autoUpdateTime"`
+	User      *User     `gorm:"foreignKey:UserID;references:ID"`
+}

internal/telegram/balance.go

@@ -36,12 +36,8 @@ func (bot *TipBot) balanceHandler(ctx intercept.Context) (intercept.Context, err
 	}
 
 	usrStr := GetUserStr(ctx.Sender())
-	balance, err := bot.GetUserBalance(user)
-	if err != nil {
-		log.Errorf("[/balance] Error fetching %s's balance: %s", usrStr, err)
-		bot.trySendMessage(ctx.Sender(), Translate(ctx, "balanceErrorMessage"))
-		return ctx, err
-	}
+	// Use database balance (in msat) to reflect pot transfers
+	balance := user.Wallet.Balance / 1000
 
 	log.Infof("[/balance] %s's balance: %s\n", usrStr, utils.FormatSats(balance))
 
@@ -50,9 +46,37 @@ func (bot *TipBot) balanceHandler(ctx intercept.Context) (intercept.Context, err
 		log.Infof("[/balance] error fetching price from coingecko\n")
 	}
 
-	USDValue := USDPerSat * float64(balance)
-	LKRValue := LKRPerSat * float64(balance)
+	potBalance, err := bot.GetUserTotalPotBalance(user)
+	if err != nil {
+		log.Errorf("[/balance] Error fetching %s's pot balance: %s", usrStr, err)
+		potBalance = 0
+	}
+
+	totalBalance := balance + potBalance
+	mainUSDValue := USDPerSat * float64(balance)
+	mainLKRValue := LKRPerSat * float64(balance)
+	totalUSDValue := USDPerSat * float64(totalBalance)
+	totalLKRValue := LKRPerSat * float64(totalBalance)
+	potUSDValue := USDPerSat * float64(potBalance)
+	potLKRValue := LKRPerSat * float64(potBalance)
+
+	message := fmt.Sprintf(Translate(ctx, "balanceMessage"),
+		utils.FormatSats(balance),
+		utils.FormatFloatWithCommas(mainUSDValue),
+		utils.FormatFloatWithCommas(mainLKRValue))
+
+	if potBalance > 0 {
+		potInfo := fmt.Sprintf(Translate(ctx, "potBalanceInfo"),
+			utils.FormatSats(potBalance),
+			utils.FormatFloatWithCommas(potUSDValue),
+			utils.FormatFloatWithCommas(potLKRValue))
+		totalInfo := fmt.Sprintf(Translate(ctx, "totalBalanceInfo"),
+			utils.FormatSats(totalBalance),
+			utils.FormatFloatWithCommas(totalUSDValue),
+			utils.FormatFloatWithCommas(totalLKRValue))
+		message += "\n" + potInfo + "\n" + totalInfo
+	}
 
-	bot.trySendMessage(ctx.Sender(), fmt.Sprintf(Translate(ctx, "balanceMessage"), utils.FormatSats(balance), utils.FormatFloatWithCommas(USDValue), utils.FormatFloatWithCommas(LKRValue)))
+	bot.trySendMessage(ctx.Sender(), message)
 	return ctx, nil
 }

internal/telegram/database.go

@@ -117,6 +117,10 @@ func AutoMigration() *Databases {
 	if err != nil {
 		panic(err)
 	}
+	err = orm.AutoMigrate(&lnbits.SavingsPot{})
+	if err != nil {
+		panic(err)
+	}
 
 	txLogger, err := gorm.Open(sqlite.Open(internal.Configuration.Database.TransactionsPath), &gorm.Config{DisableForeignKeyConstraintWhenMigrating: true, FullSaveAssociations: true})
 	if err != nil {

internal/telegram/handler.go

@@ -292,6 +292,86 @@ func (bot TipBot) getHandler() []InterceptionWrapper {
 				},
 			},
 		},
+		{
+			Endpoints: []interface{}{"/createpot"},
+			Handler:   bot.createPotHandler,
+			Interceptor: &Interceptor{
+				Before: []intercept.Func{
+					bot.requirePrivateChatInterceptor,
+					bot.localizerInterceptor,
+					bot.logMessageInterceptor,
+					bot.requireUserInterceptor,
+					bot.lockInterceptor,
+				},
+				OnDefer: []intercept.Func{
+					bot.unlockInterceptor,
+				},
+			},
+		},
+		{
+			Endpoints: []interface{}{"/pots"},
+			Handler:   bot.listPotsHandler,
+			Interceptor: &Interceptor{
+				Before: []intercept.Func{
+					bot.requirePrivateChatInterceptor,
+					bot.localizerInterceptor,
+					bot.logMessageInterceptor,
+					bot.requireUserInterceptor,
+					bot.lockInterceptor,
+				},
+				OnDefer: []intercept.Func{
+					bot.unlockInterceptor,
+				},
+			},
+		},
+		{
+			Endpoints: []interface{}{"/addtopot"},
+			Handler:   bot.addToPotHandler,
+			Interceptor: &Interceptor{
+				Before: []intercept.Func{
+					bot.requirePrivateChatInterceptor,
+					bot.localizerInterceptor,
+					bot.logMessageInterceptor,
+					bot.requireUserInterceptor,
+					bot.lockInterceptor,
+				},
+				OnDefer: []intercept.Func{
+					bot.unlockInterceptor,
+				},
+			},
+		},
+		{
+			Endpoints: []interface{}{"/withdrawfrompot"},
+			Handler:   bot.withdrawFromPotHandler,
+			Interceptor: &Interceptor{
+				Before: []intercept.Func{
+					bot.requirePrivateChatInterceptor,
+					bot.localizerInterceptor,
+					bot.logMessageInterceptor,
+					bot.requireUserInterceptor,
+					bot.lockInterceptor,
+				},
+				OnDefer: []intercept.Func{
+					bot.unlockInterceptor,
+				},
+			},
+		},
+		{
+			Endpoints: []interface{}{"/deletepot"},
+			Handler:   bot.deletePotHandler,
+			Interceptor: &Interceptor{
+				Before: []intercept.Func{
+					bot.requirePrivateChatInterceptor,
+					bot.localizerInterceptor,
+					bot.logMessageInterceptor,
+					bot.requireUserInterceptor,
+					bot.lockInterceptor,
+				},
+				OnDefer: []intercept.Func{
+					bot.unlockInterceptor,
+				},
+			},
+		},
 		{
 			Endpoints: []interface{}{"/send", &btnSendMenuEnter},
 			Handler:   bot.sendHandler,