PenaSide/heruvym
3
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix ssh message encoding
All checks were successful
Deploy / CreateImage (push) Successful in 1m40s
Details
Deploy / DeployService (push) Successful in 32s
Details

Browse Source
This commit is contained in:
skeris 2025-03-26 22:25:23 +03:00
parent 464c571cfa
commit 7cd5b2ba71
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/controllers/tickets/tickets.go
View File

@ -13,6 +13,7 @@ import (
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
"go.uber.org/zap" "go.uber.org/zap"
"gopkg.in/telebot.v3" "gopkg.in/telebot.v3"
"encoding/json"
) )
type Deps struct { type Deps struct {
@ -555,7 +556,8 @@ func (t *TicketController) Subscribe(ctx context.Context) chan interface{} {
if err := t.dal.WatchMessages(ctx, ticketID, if err := t.dal.WatchMessages(ctx, ticketID,
func(message model.Message) error { func(message model.Message) error {
if !message.System { if !message.System {
output <- message msg,_:=json.Marshal(message)
output <- msg
} }
//if err := h.dal.SetShown(ctx, message.ID, sess.Session); err != nil { //if err := h.dal.SetShown(ctx, message.ID, sess.Session); err != nil {
@ -577,7 +579,8 @@ func (t *TicketController) Subscribe(ctx context.Context) chan interface{} {
go func() { go func() {
if err := t.dal.YieldMessages(ctx, ticketID, func(message model.Message) error { if err := t.dal.YieldMessages(ctx, ticketID, func(message model.Message) error {
output <- message msg,_:=json.Marshal(message)
output <- msg
//if err := h.dal.SetShown(ctx, message.ID, sess.User); err != nil { //if err := h.dal.SetShown(ctx, message.ID, sess.User); err != nil {
// fmt.Println("2", err) // fmt.Println("2", err)
@ -593,7 +596,8 @@ func (t *TicketController) Subscribe(ctx context.Context) chan interface{} {
if err := t.dal.WatchMessages(ctx, ticketID, if err := t.dal.WatchMessages(ctx, ticketID,
func(message model.Message) error { func(message model.Message) error {
output <- message msg,_:=json.Marshal(message)
output <- msg
//if err := h.dal.SetShown(ctx, message.ID, sess.Session); err != nil { //if err := h.dal.SetShown(ctx, message.ID, sess.Session); err != nil {
// fmt.Println("3", err) // fmt.Println("3", err)
@ -637,7 +641,8 @@ func (t *TicketController) Subscribe(ctx context.Context) chan interface{} {
if err := t.dal.WatchMessages(ctx, ticketID, if err := t.dal.WatchMessages(ctx, ticketID,
func(message model.Message) error { func(message model.Message) error {
if !message.System { if !message.System {
output <- message msg,_:=json.Marshal(message)
output <- msg
} }
//if err := h.dal.SetShown(ctx, message.ID, sess.Session); err != nil { //if err := h.dal.SetShown(ctx, message.ID, sess.Session); err != nil {

1
internal/tools/tools.go
View File

@ -51,7 +51,6 @@ func SseWrapper(emitter DataEmitter) fiber.Handler {
return return
} }
case m := <-dE: case m := <-dE:
fmt.Println("datatatata", m)
if m == nil { if m == nil {
continue continue
} }

3
internal/utils/middleware/http_middleware.go
View File

@ -54,7 +54,6 @@ func (mw *Middleware) MiddlewareOriginAccess(ctx *fiber.Ctx) error {
return ctx.SendStatus(fiber.StatusForbidden) return ctx.SendStatus(fiber.StatusForbidden)
} }
} }
fmt.Println("MWLOGGER", ctx.Get("Origin"))
return ctx.Next() return ctx.Next()
} }
@ -101,6 +100,8 @@ func (mw *Middleware) MiddlewareJwt(ctx *fiber.Ctx) error {
err error err error
) )
fmt.Println("MLOW", ctx.Get("Referer"))
switch ctx.Get("Referer") { switch ctx.Get("Referer") {
case "sadmin.pena": case "sadmin.pena":
role = "admin" role = "admin"