From 7cd5b2ba71bd3c62c300bf7fda99f644260c6ec8 Mon Sep 17 00:00:00 2001
From: skeris <kotilion.95@gmail.com>
Date: Wed, 26 Mar 2025 22:25:23 +0300
Subject: [PATCH] fix ssh message encoding

---
 internal/controllers/tickets/tickets.go      | 13 +++++++++----
 internal/tools/tools.go                      |  1 -
 internal/utils/middleware/http_middleware.go |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/internal/controllers/tickets/tickets.go b/internal/controllers/tickets/tickets.go
index 78edfd5..57d35fb 100644
--- a/internal/controllers/tickets/tickets.go
+++ b/internal/controllers/tickets/tickets.go
@@ -13,6 +13,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"go.uber.org/zap"
 	"gopkg.in/telebot.v3"
+  "encoding/json"
 )
 
 type Deps struct {
@@ -555,7 +556,8 @@ func (t *TicketController) Subscribe(ctx context.Context) chan interface{} {
 			if err := t.dal.WatchMessages(ctx, ticketID,
 				func(message model.Message) error {
 					if !message.System {
-						output <- message
+            msg,_:=json.Marshal(message)
+						output <- msg
 					}
 
 					//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() {
 
 				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 {
 					//	fmt.Println("2", err)
@@ -593,7 +596,8 @@ func (t *TicketController) Subscribe(ctx context.Context) chan interface{} {
 
 				if err := t.dal.WatchMessages(ctx, ticketID,
 					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 {
 						//	fmt.Println("3", err)
@@ -637,7 +641,8 @@ func (t *TicketController) Subscribe(ctx context.Context) chan interface{} {
 				if err := t.dal.WatchMessages(ctx, ticketID,
 					func(message model.Message) error {
 						if !message.System {
-							output <- message
+            msg,_:=json.Marshal(message)
+							output <- msg
 						}
 
 						//if err := h.dal.SetShown(ctx, message.ID, sess.Session); err != nil {
diff --git a/internal/tools/tools.go b/internal/tools/tools.go
index 77c4670..00828bc 100644
--- a/internal/tools/tools.go
+++ b/internal/tools/tools.go
@@ -51,7 +51,6 @@ func SseWrapper(emitter DataEmitter) fiber.Handler {
 						return
 					}
 				case m := <-dE:
-					fmt.Println("datatatata", m)
 					if m == nil {
 						continue
 					}
diff --git a/internal/utils/middleware/http_middleware.go b/internal/utils/middleware/http_middleware.go
index aa78a15..f82f80c 100644
--- a/internal/utils/middleware/http_middleware.go
+++ b/internal/utils/middleware/http_middleware.go
@@ -54,7 +54,6 @@ func (mw *Middleware) MiddlewareOriginAccess(ctx *fiber.Ctx) error {
 			return ctx.SendStatus(fiber.StatusForbidden)
 		}
 	}
-	fmt.Println("MWLOGGER", ctx.Get("Origin"))
 	return ctx.Next()
 }
 
@@ -101,6 +100,8 @@ func (mw *Middleware) MiddlewareJwt(ctx *fiber.Ctx) error {
 		err         error
 	)
 
+  fmt.Println("MLOW", ctx.Get("Referer"))
+
 	switch ctx.Get("Referer") {
 	case "sadmin.pena":
 		role = "admin"