dkforest

commit 8be8abdf59cf72c8d6c1dbc225dc2ecc5aac0bf9
parent 705e1f48c487a3ba211dd8692215f5395cabe831
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 12 Jun 2023 20:12:59 -0700

useless code

Diffstat:
M
pkg/web/handlers/api/v1/handlers.go
 | 
29
-----------------------------
M
pkg/web/web.go
 | 
1
-

2 files changed, 0 insertions(+), 30 deletions(-)
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -13,13 +13,11 @@ import (
 	"dkforest/pkg/web/handlers/interceptors"
 	"dkforest/pkg/web/handlers/interceptors/command"
 	hutils "dkforest/pkg/web/handlers/utils"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/labstack/echo"
 	"github.com/sirupsen/logrus"
 	qt "github.com/valyala/quicktemplate"
-	"golang.org/x/net/websocket"
 	"io"
 	"net/http"
 	"strings"
@@ -177,33 +175,6 @@ func ChatMessagesHandler(c echo.Context) error {
 	//return c.Render(http.StatusOK, "chat-messages", data)
 }
 
-func ChatMessagesWSHandler(c echo.Context) error {
-	websocket.Handler(func(ws *websocket.Conn) {
-		defer ws.Close()
-		for {
-			status, data := chatMessages(c)
-			if status != http.StatusOK {
-				logrus.Error(status)
-				return
-			}
-
-			//buf := bytes.Buffer{}
-			//_ = c.Echo().Renderer.Render(&buf, "chat-messages", data, c)
-			//out := string(buf.Bytes())
-			by, _ := json.Marshal(data)
-			out := string(by)
-			out = strings.Replace(out, `http-equiv="refresh" content=`, `placeholder=`, 1)
-			if err := websocket.Message.Send(ws, out); err != nil {
-				logrus.Error(err)
-				return
-			}
-
-			time.Sleep(5 * time.Second)
-		}
-	}).ServeHTTP(c.Response(), c.Request())
-	return nil
-}
-
 func RoomNotifierHandler(c echo.Context) error {
 	authUser := c.Get("authUser").(*database.User)
 	db := c.Get("database").(*database.DkfDB)
diff --git a/pkg/web/web.go b/pkg/web/web.go
@@ -68,7 +68,6 @@ func getMainServer(db *database.DkfDB, i18nBundle *i18n.Bundle, renderer *tmp.Te
 	e.POST("/bhc", handlers.BHCHandler, middlewares.CircuitRateLimitMiddleware(5*time.Second, 4, true))
 	e.GET("/public/css/:signupToken/signup.css", handlers.SignupCss, middlewares.CircuitRateLimitMiddleware(15*time.Second, 4, false))
 	e.GET("/public/img/:signupToken/:signal/:data", handlers.SignalCss, middlewares.CircuitRateLimitMiddleware(15*time.Second, 4, false))
-	e.GET("/ws/:roomName", v1.ChatMessagesWSHandler)
 	noAuthGroup := e.Group("", middlewares.NoAuthMiddleware)
 	noAuthGroup.GET("/login", handlers.LoginHandler, middlewares.CircuitRateLimitMiddleware(1*time.Second, 4, false))
 	noAuthGroup.POST("/login", handlers.LoginHandler, middlewares.CircuitRateLimitMiddleware(1*time.Second, 4, false))