log middleware
This commit is contained in:
@@ -2,7 +2,7 @@ package plugins
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"kurumibot/database"
|
||||
"kurumibot/database/psql"
|
||||
"kurumibot/utils"
|
||||
"strconv"
|
||||
"strings"
|
||||
@@ -23,8 +23,8 @@ func RegisterWaifus(bot *laniakea.Bot) {
|
||||
bot.AddPlugins(waifus.Build())
|
||||
}
|
||||
|
||||
func myWaifu(ctx *laniakea.MsgContext) {
|
||||
user, err := database.GetUser(ctx.FromID)
|
||||
func myWaifu(ctx *laniakea.MsgContext, _ *laniakea.DatabaseContext) {
|
||||
user, err := psql.GetUser(ctx.FromID)
|
||||
if err != nil {
|
||||
ctx.Answer(err.Error())
|
||||
return
|
||||
@@ -35,7 +35,7 @@ func myWaifu(ctx *laniakea.MsgContext) {
|
||||
"Список твоих вайфу:",
|
||||
}
|
||||
|
||||
waifus, err := database.GetUserWaifus(user.ID)
|
||||
waifus, err := psql.GetUserWaifus(user.ID)
|
||||
if err != nil {
|
||||
ctx.Error(err)
|
||||
return
|
||||
@@ -48,17 +48,17 @@ func myWaifu(ctx *laniakea.MsgContext) {
|
||||
ctx.Answer(strings.Join(out, "\n"))
|
||||
}
|
||||
|
||||
func sellWaifu(ctx *laniakea.MsgContext) {
|
||||
func sellWaifu(ctx *laniakea.MsgContext, _ *laniakea.DatabaseContext) {
|
||||
|
||||
}
|
||||
|
||||
func waifuList(ctx *laniakea.MsgContext) {
|
||||
waifus, err := database.GetAllWaifus()
|
||||
func waifuList(ctx *laniakea.MsgContext, _ *laniakea.DatabaseContext) {
|
||||
waifus, err := psql.GetAllWaifus()
|
||||
if err != nil {
|
||||
ctx.Answer(err.Error())
|
||||
return
|
||||
}
|
||||
out := []string{}
|
||||
var out []string
|
||||
|
||||
for _, w := range waifus {
|
||||
var owner string
|
||||
@@ -74,7 +74,7 @@ func waifuList(ctx *laniakea.MsgContext) {
|
||||
ctx.Answer(strings.Join(out, "\n"))
|
||||
}
|
||||
|
||||
func waifuInfo(ctx *laniakea.MsgContext) {
|
||||
func waifuInfo(ctx *laniakea.MsgContext, _ *laniakea.DatabaseContext) {
|
||||
rawArgs := strings.TrimSpace(ctx.Text)
|
||||
args := strings.Split(rawArgs, " ")
|
||||
if len(args) != 1 {
|
||||
@@ -88,7 +88,7 @@ func waifuInfo(ctx *laniakea.MsgContext) {
|
||||
return
|
||||
}
|
||||
|
||||
waifu, err := database.GetWaifuById(waifuId)
|
||||
waifu, err := psql.GetWaifuById(waifuId)
|
||||
if err != nil {
|
||||
ctx.Error(err)
|
||||
return
|
||||
@@ -108,8 +108,8 @@ func waifuInfo(ctx *laniakea.MsgContext) {
|
||||
}
|
||||
}
|
||||
|
||||
func waifuSearch(ctx *laniakea.MsgContext) {
|
||||
user, err := database.GetOrCreateUser(ctx.FromID, ctx.Msg.From.FirstName)
|
||||
func waifuSearch(ctx *laniakea.MsgContext, _ *laniakea.DatabaseContext) {
|
||||
user, err := psql.GetOrCreateUser(ctx.FromID, ctx.Msg.From.FirstName)
|
||||
if err != nil {
|
||||
ctx.Error(err)
|
||||
return
|
||||
@@ -120,7 +120,7 @@ func waifuSearch(ctx *laniakea.MsgContext) {
|
||||
return
|
||||
}
|
||||
|
||||
count, err := database.GetFreeWaifusCount()
|
||||
count, err := psql.GetFreeWaifusCount()
|
||||
if err != nil {
|
||||
ctx.Error(err)
|
||||
return
|
||||
@@ -136,7 +136,7 @@ func waifuSearch(ctx *laniakea.MsgContext) {
|
||||
return
|
||||
}
|
||||
|
||||
var freeWaifus []*database.Waifu
|
||||
var freeWaifus []*psql.Waifu
|
||||
rarity := 3
|
||||
if rand == 0 {
|
||||
rarity = 5
|
||||
@@ -146,7 +146,7 @@ func waifuSearch(ctx *laniakea.MsgContext) {
|
||||
|
||||
fmt.Println(rarity)
|
||||
|
||||
freeWaifus, err = database.GetFreeWaifusWithRarity(rarity)
|
||||
freeWaifus, err = psql.GetFreeWaifusWithRarity(rarity)
|
||||
if err != nil {
|
||||
ctx.Error(err)
|
||||
return
|
||||
@@ -157,8 +157,8 @@ func waifuSearch(ctx *laniakea.MsgContext) {
|
||||
return
|
||||
}
|
||||
|
||||
findedWaifuIndex := utils.RandRange(0, len(freeWaifus))
|
||||
waifu := freeWaifus[findedWaifuIndex]
|
||||
foundWaifuIndex := utils.RandRange(0, len(freeWaifus))
|
||||
waifu := freeWaifus[foundWaifuIndex]
|
||||
out := []string{
|
||||
"Ты нашел новую вайфу!",
|
||||
fmt.Sprintf("*%s* из \"*%s*\"", waifu.Name, waifu.Fandom),
|
||||
|
||||
Reference in New Issue
Block a user