diff --git a/Chat.go b/Chat.go index ac249a4..14de748 100644 --- a/Chat.go +++ b/Chat.go @@ -241,7 +241,7 @@ func generateWelcomeChatHTML() string { } NextMessages = append(NextMessages, nextMsg) - botOut, err := botTmpl.Execute(pongo2.Context{"Messages": NextMessages, "ConversationAreaId": 0, "NotClickable": !true}) + botOut, err := botTmpl.Execute(pongo2.Context{"Messages": NextMessages, "ConversationAreaId": 0, "NotClickable": true}) if err != nil { panic(err) } @@ -268,7 +268,7 @@ func generateEnterKeyChatHTML() string { } NextMessages = append(NextMessages, nextMsg) - botOut, err := botTmpl.Execute(pongo2.Context{"Messages": NextMessages, "ConversationAreaId": 0, "NotClickable": !true}) + botOut, err := botTmpl.Execute(pongo2.Context{"Messages": NextMessages, "ConversationAreaId": 0, "NotClickable": true}) if err != nil { panic(err) } diff --git a/login.go b/login.go index fee2cb2..b27a15f 100644 --- a/login.go +++ b/login.go @@ -1,12 +1,14 @@ package main import ( + "context" "crypto/rand" "crypto/sha256" "encoding/base64" "encoding/json" "fmt" "io" + "log" "net/http" "github.com/edgedb/edgedb-go" @@ -158,6 +160,17 @@ func handleCallback(c *fiber.Ctx) error { func handleSignOut(c *fiber.Ctx) error { c.ClearCookie("jade-edgedb-auth-token") - edgeClient = edgeClient.WithGlobals(map[string]interface{}{"ext::auth::client_token": ""}) + edgeClient.Close() + + var ctx = context.Background() + client, err := edgedb.CreateClient(ctx, edgedb.Options{}) + if err != nil { + fmt.Println("Error in edgedb.CreateClient: in init") + log.Fatal(err) + } + + edgeCtx = ctx + edgeClient = client + return c.Redirect("/", fiber.StatusTemporaryRedirect) } diff --git a/utils.go b/utils.go index daac131..c7b64f3 100644 --- a/utils.go +++ b/utils.go @@ -81,7 +81,8 @@ func getExistingKeys() (bool, bool, bool) { ); `, &openaiExists) if err != nil { - fmt.Println("Error in edgedb.QuerySingle: in addOpenaiKey: ", err) + fmt.Println("Error in edgedb.QuerySingle checking for openai: ", err) + openaiExists = false } err = edgeClient.QuerySingle(edgeCtx, ` @@ -91,7 +92,8 @@ func getExistingKeys() (bool, bool, bool) { ); `, &anthropicExists) if err != nil { - fmt.Println("Error in edgedb.QuerySingle: in addOpenaiKey: ", err) + fmt.Println("Error in edgedb.QuerySingle checking for anthropic: ", err) + anthropicExists = false } err = edgeClient.QuerySingle(edgeCtx, ` @@ -101,7 +103,8 @@ func getExistingKeys() (bool, bool, bool) { ); `, &mistralExists) if err != nil { - fmt.Println("Error in edgedb.QuerySingle: in addOpenaiKey: ", err) + fmt.Println("Error in edgedb.QuerySingle checking for mistral: ", err) + mistralExists = false } return openaiExists, anthropicExists, mistralExists diff --git a/views/partials/message-bot.html b/views/partials/message-bot.html index fcf5c61..8fe6ccc 100644 --- a/views/partials/message-bot.html +++ b/views/partials/message-bot.html @@ -30,17 +30,13 @@