sneak/chat
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve cyclop, funlen issues by extracting helper methods

Browse Source
This commit is contained in:
user
2026-02-20 03:29:18 -08:00
parent 037202280b
commit 2f6d1f284c
5 changed files with 263 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
cmd/chat-cli/main.go
View File

@@ -97,6 +97,24 @@ func (a *App) handleInput(text string) {
a.ui.AddLine(target, fmt.Sprintf("[gray]%s [green]<%s>[white] %s", ts, nick, text))
}
func (a *App) commandHandlers() map[string]func(string) {
return map[string]func(string){
"/connect": a.cmdConnect,
"/nick": a.cmdNick,
"/join": a.cmdJoin,
"/part": a.cmdPart,
"/msg": a.cmdMsg,
"/query": a.cmdQuery,
"/topic": a.cmdTopic,
"/names": func(_ string) { a.cmdNames() },
"/list": func(_ string) { a.cmdList() },
"/window": a.cmdWindow,
"/w": a.cmdWindow,
"/quit": func(_ string) { a.cmdQuit() },
"/help": func(_ string) { a.cmdHelp() },
}
}
func (a *App) handleCommand(text string) {
parts := strings.SplitN(text, " ", splitParts)
cmd := strings.ToLower(parts[0])
@@ -106,32 +124,9 @@ func (a *App) handleCommand(text string) {
args = parts[1]
}
switch cmd {
case "/connect":
a.cmdConnect(args)
case "/nick":
a.cmdNick(args)
case "/join":
a.cmdJoin(args)
case "/part":
a.cmdPart(args)
case "/msg":
a.cmdMsg(args)
case "/query":
a.cmdQuery(args)
case "/topic":
a.cmdTopic(args)
case "/names":
a.cmdNames()
case "/list":
a.cmdList()
case "/window", "/w":
a.cmdWindow(args)
case "/quit":
a.cmdQuit()
case "/help":
a.cmdHelp()
default:
if handler, ok := a.commandHandlers()[cmd]; ok {
handler(args)
} else {
a.ui.AddStatus("[red]Unknown command: " + cmd)
}
}
@@ -543,68 +538,90 @@ func (a *App) pollLoop() {
}
}
func (a *App) handleServerMessage(msg *api.Message) {
var ts string
func (a *App) messageTimestamp(msg *api.Message) string {
if msg.TS != "" {
t := msg.ParseTS()
ts = t.Local().Format("15:04") //nolint:gosmopolitan // CLI displays local time intentionally
} else {
ts = time.Now().Format("15:04")
return t.Local().Format("15:04") //nolint:gosmopolitan // CLI displays local time intentionally
}
return time.Now().Format("15:04")
}
func (a *App) handleServerMessage(msg *api.Message) {
ts := a.messageTimestamp(msg)
a.mu.Lock()
myNick := a.nick
a.mu.Unlock()
switch msg.Command {
case "PRIVMSG":
a.handleMsgPrivmsg(msg, ts, myNick)
case "JOIN":
a.handleMsgJoin(msg, ts)
case "PART":
a.handleMsgPart(msg, ts)
case "QUIT":
a.handleMsgQuit(msg, ts)
case "NICK":
a.handleMsgNick(msg, ts, myNick)
case "NOTICE":
a.handleMsgNotice(msg, ts)
case "TOPIC":
a.handleMsgTopic(msg, ts)
default:
a.handleMsgDefault(msg, ts)
}
}
func (a *App) handleMsgPrivmsg(msg *api.Message, ts, myNick string) {
lines := msg.BodyLines()
text := strings.Join(lines, " ")
if msg.From == myNick {
// Skip our own echoed messages (already displayed locally).
return
}
target := msg.To
if !strings.HasPrefix(target, "#") {
// DM — use sender's nick as buffer name.
target = msg.From
}
a.ui.AddLine(target, fmt.Sprintf("[gray]%s [green]<%s>[white] %s", ts, msg.From, text))
}
case "JOIN":
func (a *App) handleMsgJoin(msg *api.Message, ts string) {
if msg.To != "" {
a.ui.AddLine(msg.To, fmt.Sprintf("[gray]%s [yellow]*** %s has joined %s", ts, msg.From, msg.To))
}
}
func (a *App) handleMsgPart(msg *api.Message, ts string) {
target := msg.To
if target != "" {
a.ui.AddLine(target, fmt.Sprintf("[gray]%s [yellow]*** %s has joined %s", ts, msg.From, target))
reason := strings.Join(msg.BodyLines(), " ")
if target == "" {
return
}
case "PART":
target := msg.To
lines := msg.BodyLines()
reason := strings.Join(lines, " ")
if target != "" {
if reason != "" {
a.ui.AddLine(target, fmt.Sprintf("[gray]%s [yellow]*** %s has left %s (%s)", ts, msg.From, target, reason))
} else {
a.ui.AddLine(target, fmt.Sprintf("[gray]%s [yellow]*** %s has left %s", ts, msg.From, target))
}
}
}
case "QUIT":
lines := msg.BodyLines()
reason := strings.Join(lines, " ")
func (a *App) handleMsgQuit(msg *api.Message, ts string) {
reason := strings.Join(msg.BodyLines(), " ")
if reason != "" {
a.ui.AddStatus(fmt.Sprintf("[gray]%s [yellow]*** %s has quit (%s)", ts, msg.From, reason))
} else {
a.ui.AddStatus(fmt.Sprintf("[gray]%s [yellow]*** %s has quit", ts, msg.From))
}
}
case "NICK":
func (a *App) handleMsgNick(msg *api.Message, ts, myNick string) {
lines := msg.BodyLines()
newNick := ""
@@ -621,27 +638,23 @@ func (a *App) handleServerMessage(msg *api.Message) {
}
a.ui.AddStatus(fmt.Sprintf("[gray]%s [yellow]*** %s is now known as %s", ts, msg.From, newNick))
}
case "NOTICE":
lines := msg.BodyLines()
text := strings.Join(lines, " ")
func (a *App) handleMsgNotice(msg *api.Message, ts string) {
text := strings.Join(msg.BodyLines(), " ")
a.ui.AddStatus(fmt.Sprintf("[gray]%s [magenta]--%s-- %s", ts, msg.From, text))
}
case "TOPIC":
lines := msg.BodyLines()
text := strings.Join(lines, " ")
func (a *App) handleMsgTopic(msg *api.Message, ts string) {
text := strings.Join(msg.BodyLines(), " ")
if msg.To != "" {
a.ui.AddLine(msg.To, fmt.Sprintf("[gray]%s [cyan]*** %s set topic: %s", ts, msg.From, text))
}
}
default:
// Numeric replies and other messages → status window.
lines := msg.BodyLines()
text := strings.Join(lines, " ")
func (a *App) handleMsgDefault(msg *api.Message, ts string) {
text := strings.Join(msg.BodyLines(), " ")
if text != "" {
a.ui.AddStatus(fmt.Sprintf("[gray]%s [white][%s] %s", ts, msg.Command, text))
}
}
}

37
cmd/chat-cli/ui.go
View File

@@ -55,12 +55,30 @@ func NewUI() *UI {
ui.statusBar.SetBackgroundColor(tcell.ColorNavy)
ui.statusBar.SetTextColor(tcell.ColorWhite)
// Input field.
ui.setupInput()
ui.setupKeyCapture()
// Layout: messages on top, status bar, input at bottom.
ui.layout = tview.NewFlex().SetDirection(tview.FlexRow).
AddItem(ui.messages, 0, 1, false).
AddItem(ui.statusBar, 1, 0, false).
AddItem(ui.input, 1, 0, true)
ui.app.SetRoot(ui.layout, true)
ui.app.SetFocus(ui.input)
return ui
}
func (ui *UI) setupInput() {
ui.input = tview.NewInputField().
SetFieldBackgroundColor(tcell.ColorBlack).
SetFieldTextColor(tcell.ColorWhite)
ui.input.SetDoneFunc(func(key tcell.Key) {
if key == tcell.KeyEnter {
if key != tcell.KeyEnter {
return
}
text := ui.input.GetText()
if text == "" {
return
@@ -71,10 +89,10 @@ func NewUI() *UI {
if ui.onInput != nil {
ui.onInput(text)
}
}
})
}
// Capture Alt+N for window switching.
func (ui *UI) setupKeyCapture() {
ui.app.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
if event.Modifiers()&tcell.ModAlt != 0 {
r := event.Rune()
@@ -88,17 +106,6 @@ func NewUI() *UI {
return event
})
// Layout: messages on top, status bar, input at bottom.
ui.layout = tview.NewFlex().SetDirection(tview.FlexRow).
AddItem(ui.messages, 0, 1, false).
AddItem(ui.statusBar, 1, 0, false).
AddItem(ui.input, 1, 0, true)
ui.app.SetRoot(ui.layout, true)
ui.app.SetFocus(ui.input)
return ui
}
// Run starts the UI event loop (blocks).

43
internal/db/db.go
View File

@@ -662,6 +662,15 @@ func (s *Database) applyMigrations(
migrations []migration,
) error {
for _, m := range migrations {
if err := s.applyOneMigration(ctx, m); err != nil {
return err
}
}
return nil
}
func (s *Database) applyOneMigration(ctx context.Context, m migration) error {
var exists int
err := s.db.QueryRowContext(ctx,
@@ -669,35 +678,25 @@ func (s *Database) applyMigrations(
m.version,
).Scan(&exists)
if err != nil {
return fmt.Errorf(
"check migration %d: %w", m.version, err,
)
return fmt.Errorf("check migration %d: %w", m.version, err)
}
if exists > 0 {
continue
return nil
}
s.log.Info(
"applying migration",
"version", m.version, "name", m.name,
)
s.log.Info("applying migration", "version", m.version, "name", m.name)
tx, err := s.db.BeginTx(ctx, nil)
if err != nil {
return fmt.Errorf(
"begin tx for migration %d: %w", m.version, err,
)
return fmt.Errorf("begin tx for migration %d: %w", m.version, err)
}
_, err = tx.ExecContext(ctx, m.sql)
if err != nil {
_ = tx.Rollback()
return fmt.Errorf(
"apply migration %d (%s): %w",
m.version, m.name, err,
)
return fmt.Errorf("apply migration %d (%s): %w", m.version, m.name, err)
}
_, err = tx.ExecContext(ctx,
@@ -707,18 +706,8 @@ func (s *Database) applyMigrations(
if err != nil {
_ = tx.Rollback()
return fmt.Errorf(
"record migration %d: %w", m.version, err,
)
return fmt.Errorf("record migration %d: %w", m.version, err)
}
err = tx.Commit()
if err != nil {
return fmt.Errorf(
"commit migration %d: %w", m.version, err,
)
}
}
return nil
return tx.Commit()
}

40
internal/handlers/api.go
View File

@@ -239,10 +239,15 @@ func (s *Handlers) HandleSendCommand() http.HandlerFunc {
req.Command = strings.ToUpper(strings.TrimSpace(req.Command))
req.To = strings.TrimSpace(req.To)
lines := extractBodyLines(req.Body)
// Helper to extract body as string lines.
bodyLines := func() []string {
switch v := req.Body.(type) {
s.dispatchCommand(w, r, uid, nick, req.Command, req.To, lines)
}
}
// extractBodyLines converts the request body to string lines.
func extractBodyLines(body any) []string {
switch v := body.(type) {
case []any:
lines := make([]string, 0, len(v))
@@ -258,32 +263,29 @@ func (s *Handlers) HandleSendCommand() http.HandlerFunc {
default:
return nil
}
}
}
switch req.Command {
func (s *Handlers) dispatchCommand(
w http.ResponseWriter, r *http.Request,
uid, nick, command, to string, lines []string,
) {
switch command {
case "PRIVMSG", "NOTICE":
s.handlePrivmsg(w, r, uid, nick, req.To, bodyLines())
s.handlePrivmsg(w, r, uid, nick, to, lines)
case "JOIN":
s.handleJoin(w, r, uid, req.To)
s.handleJoin(w, r, uid, to)
case "PART":
s.handlePart(w, r, uid, req.To)
s.handlePart(w, r, uid, to)
case "NICK":
s.handleNick(w, r, uid, bodyLines())
s.handleNick(w, r, uid, lines)
case "TOPIC":
s.handleTopic(w, r, uid, req.To, bodyLines())
s.handleTopic(w, r, uid, to, lines)
case "PING":
s.respondJSON(w, r, map[string]string{"command": "PONG", "from": s.params.Config.ServerName}, http.StatusOK)
default:
_ = nick // suppress unused warning
_ = nick
s.respondJSON(w, r, map[string]string{"error": "unknown command: " + req.Command}, http.StatusBadRequest)
}
s.respondJSON(w, r, map[string]string{"error": "unknown command: " + command}, http.StatusBadRequest)
}
}

12
internal/server/routes.go
View File

@@ -65,11 +65,17 @@ func (s *Server) SetupRoutes() {
r.Get("/channels/{channel}/members", s.h.HandleChannelMembers())
})
// Serve embedded SPA
s.setupSPA()
}
func (s *Server) setupSPA() {
distFS, err := fs.Sub(web.Dist, "dist")
if err != nil {
s.log.Error("failed to get web dist filesystem", "error", err)
} else {
return
}
fileServer := http.FileServer(http.FS(distFS))
s.router.Get("/*", func(w http.ResponseWriter, r *http.Request) {
@@ -80,7 +86,6 @@ func (s *Server) SetupRoutes() {
return
}
// Try to serve the file; if not found, serve index.html for SPA routing
f, err := readFS.ReadFile(r.URL.Path[1:])
if err != nil || len(f) == 0 {
indexHTML, _ := readFS.ReadFile("index.html")
@@ -94,5 +99,4 @@ func (s *Server) SetupRoutes() {
fileServer.ServeHTTP(w, r)
})
}
}