diff options
| author | 2025-12-31 14:37:47 +0300 | |
|---|---|---|
| committer | 2025-12-31 14:50:56 +0300 | |
| commit | ffa4397107c1ad6b37b7587cae3d6317f08a59df (patch) | |
| tree | 9a51b1d4a9c823485c6c0e0decc184bafeb3765a /internal/server | |
| parent | Сделал корректную работу с терминалом и и... (diff) | |
| download | qchat-ffa4397107c1ad6b37b7587cae3d6317f08a59df.tar.gz qchat-ffa4397107c1ad6b37b7587cae3d6317f08a59df.tar.bz2 qchat-ffa4397107c1ad6b37b7587cae3d6317f08a59df.tar.xz qchat-ffa4397107c1ad6b37b7587cae3d6317f08a59df.zip | |
Версия 0.0.1
Diffstat (limited to '')
| -rw-r--r-- | internal/server/client.go | 14 | ||||
| -rw-r--r-- | internal/server/conn.go | 2 | ||||
| -rw-r--r-- | internal/server/event.go | 6 | ||||
| -rw-r--r-- | internal/server/server.go | 2 |
4 files changed, 15 insertions, 9 deletions
diff --git a/internal/server/client.go b/internal/server/client.go index 8a23c8b..0c7ca94 100644 --- a/internal/server/client.go +++ b/internal/server/client.go @@ -43,7 +43,7 @@ func (s *Server) serveClient( slog.Error("failed read line", slog.Any("err", err)) } - conn.Close() + _ = conn.Close() return } @@ -61,16 +61,16 @@ func (s *Server) serveClient( case "pty-req": termLen := req.Payload[3] w, h := parseDims(req.Payload[termLen+4:]) - t.SetSize(w, h) - req.Reply(true, nil) + _ = t.SetSize(w, h) + _ = req.Reply(true, nil) case "window-change": w, h := parseDims(req.Payload) - t.SetSize(w, h) - req.Reply(true, nil) + _ = t.SetSize(w, h) + _ = req.Reply(true, nil) case "shell": - req.Reply(len(req.Payload) == 0, nil) + _ = req.Reply(len(req.Payload) == 0, nil) default: - req.Reply(false, nil) + _ = req.Reply(false, nil) } slog.Debug( "req", diff --git a/internal/server/conn.go b/internal/server/conn.go index 347b4eb..8f856fe 100644 --- a/internal/server/conn.go +++ b/internal/server/conn.go @@ -26,7 +26,7 @@ func (s *Server) serveConn(ctx context.Context, nConn net.Conn, config *ssh.Serv for newChannel := range chans { if newChannel.ChannelType() != "session" { - newChannel.Reject(ssh.UnknownChannelType, "unknown channel type") + _ = newChannel.Reject(ssh.UnknownChannelType, "unknown channel type") continue } channel, requests, err := newChannel.Accept() diff --git a/internal/server/event.go b/internal/server/event.go index d006d22..def3c43 100644 --- a/internal/server/event.go +++ b/internal/server/event.go @@ -58,6 +58,7 @@ func displayMessage(w io.Writer, message chat.Message, user *chat.User) { msg = r.From.ReplaceAllString(msg, r.To) } + //nolint:errcheck fmt.Fprintf(w, "%s%18s%s [%s]%s: %s\n", escapeCodes[Blue], message.User.NUsername(), @@ -69,6 +70,7 @@ func displayMessage(w io.Writer, message chat.Message, user *chat.User) { } func displaySystemMessage(w io.Writer, message chat.SystemMessage) { + //nolint:errcheck fmt.Fprintf(w, "%s* %s %s\n", escapeCodes[Green], message.Message, @@ -76,6 +78,7 @@ func displaySystemMessage(w io.Writer, message chat.SystemMessage) { ) } func displaySelfMessage(w io.Writer, message chat.SelfMessage) { + //nolint:errcheck fmt.Fprintf(w, "%s* %s %s%s\n", escapeCodes[Blue], message.User.NUsername(), @@ -85,6 +88,7 @@ func displaySelfMessage(w io.Writer, message chat.SelfMessage) { } func displayUserJoined(w io.Writer, presence chat.UserJoined) { + //nolint:errcheck fmt.Fprintf(w, "%s* %s joined to %s chan%s\n", escapeCodes[Green], presence.User.NUsername(), @@ -94,6 +98,7 @@ func displayUserJoined(w io.Writer, presence chat.UserJoined) { } func displayUserLeft(w io.Writer, presence chat.UserLeft) { + //nolint:errcheck fmt.Fprintf(w, "%s* %s left %s chan%s\n", escapeCodes[Red], presence.User.NUsername(), @@ -120,6 +125,7 @@ func displayUserLogs(w io.Writer, message chat.UserLogs) { return } + //nolint:errcheck fmt.Fprintf(w, "%s* Last channel messages:\n%s%s\n", escapeCodes[Blue], strings.Join(messages, "\n"), diff --git a/internal/server/server.go b/internal/server/server.go index 1c28cd5..725b882 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -47,7 +47,7 @@ func (s *Server) Run(ctx context.Context) error { } go func() { <-ctx.Done() - listener.Close() + _ = listener.Close() }() wg := sync.WaitGroup{} |
