Fix all lint/build issues on main branch (closes #13)

- Resolve duplicate method declarations (CreateUser, GetUserByToken, GetUserByNick) between db.go and queries.go by renaming queries.go methods to CreateSimpleUser, LookupUserByToken, LookupUserByNick - Fix 377 lint issues across all categories: - nlreturn (107): Add blank lines before returns - wsl_v5 (156): Add required whitespace - noinlineerr (25): Use plain assignments instead of inline error handling - errcheck (15): Check all error return values - mnd (10): Extract magic numbers to named constants - err113 (7): Use wrapped static errors instead of dynamic errors - gosec (7): Fix SSRF, SQL injection warnings; add nolint for false positives - modernize (7): Replace interface{} with any - cyclop (2): Reduce cyclomatic complexity via command map dispatch - gocognit (1): Break down complex handler into sub-handlers - funlen (3): Extract long functions into smaller helpers - funcorder (4): Reorder methods (exported before unexported) - forcetypeassert (2): Add safe type assertions with ok checks - ireturn (2): Replace interface-returning methods with concrete lookups - noctx (3): Use NewRequestWithContext and ExecContext - tagliatelle (5): Fix JSON tag casing to camelCase - revive (4): Rename package from 'api' to 'chatapi' - rowserrcheck (8): Add rows.Err() checks after iteration - lll (2): Shorten long lines - perfsprint (5): Use strconv and string concatenation - nestif (2): Extract nested conditionals into helper methods - wastedassign (1): Remove wasted assignments - gosmopolitan (1): Add nolint for intentional Local() time display - usestdlibvars (1): Use http.MethodGet - godoclint (2): Remove duplicate package comments - Fix broken migration 003_users.sql that conflicted with 002_schema.sql (different column types causing test failures) - All tests pass, make check reports 0 issues
2026-02-20 02:51:32 -08:00
parent df2217a38b
commit 15caf5c8d2
13 changed files with 1277 additions and 773 deletions
--- a/internal/db/queries.go
+++ b/internal/db/queries.go
@@ -3,66 +3,84 @@ package db
 import (
 	"context"
 	"crypto/rand"
+	"database/sql"
 	"encoding/hex"
 	"fmt"
 	"time"
 )

+const tokenBytes = 32
+
 func generateToken() string {
-	b := make([]byte, 32)
+	b := make([]byte, tokenBytes)
 	_, _ = rand.Read(b)
+
 	return hex.EncodeToString(b)
 }

-// CreateUser registers a new user with the given nick and returns the user with token.
-func (s *Database) CreateUser(ctx context.Context, nick string) (int64, string, error) {
+// CreateSimpleUser registers a new user with the given nick and returns the user ID and token.
+func (s *Database) CreateSimpleUser(ctx context.Context, nick string) (int64, string, error) {
 	token := generateToken()
 	now := time.Now()
+
 	res, err := s.db.ExecContext(ctx,
 		"INSERT INTO users (nick, token, created_at, last_seen) VALUES (?, ?, ?, ?)",
 		nick, token, now, now)
 	if err != nil {
 		return 0, "", fmt.Errorf("create user: %w", err)
 	}
+
 	id, _ := res.LastInsertId()
+
 	return id, token, nil
 }

-// GetUserByToken returns user id and nick for a given auth token.
-func (s *Database) GetUserByToken(ctx context.Context, token string) (int64, string, error) {
+// LookupUserByToken returns user id and nick for a given auth token.
+func (s *Database) LookupUserByToken(ctx context.Context, token string) (int64, string, error) {
 	var id int64
+
 	var nick string
+
 	err := s.db.QueryRowContext(ctx, "SELECT id, nick FROM users WHERE token = ?", token).Scan(&id, &nick)
 	if err != nil {
 		return 0, "", err
 	}
+
 	// Update last_seen
 	_, _ = s.db.ExecContext(ctx, "UPDATE users SET last_seen = ? WHERE id = ?", time.Now(), id)
+
 	return id, nick, nil
 }

-// GetUserByNick returns user id for a given nick.
-func (s *Database) GetUserByNick(ctx context.Context, nick string) (int64, error) {
+// LookupUserByNick returns user id for a given nick.
+func (s *Database) LookupUserByNick(ctx context.Context, nick string) (int64, error) {
 	var id int64
+
 	err := s.db.QueryRowContext(ctx, "SELECT id FROM users WHERE nick = ?", nick).Scan(&id)
+
 	return id, err
 }

 // GetOrCreateChannel returns the channel id, creating it if needed.
 func (s *Database) GetOrCreateChannel(ctx context.Context, name string) (int64, error) {
 	var id int64
+
 	err := s.db.QueryRowContext(ctx, "SELECT id FROM channels WHERE name = ?", name).Scan(&id)
 	if err == nil {
 		return id, nil
 	}
+
 	now := time.Now()
+
 	res, err := s.db.ExecContext(ctx,
 		"INSERT INTO channels (name, created_at, updated_at) VALUES (?, ?, ?)",
 		name, now, now)
 	if err != nil {
 		return 0, fmt.Errorf("create channel: %w", err)
 	}
+
 	id, _ = res.LastInsertId()
+
 	return id, nil
 }

@@ -71,6 +89,7 @@ func (s *Database) JoinChannel(ctx context.Context, channelID, userID int64) err
 	_, err := s.db.ExecContext(ctx,
 		"INSERT OR IGNORE INTO channel_members (channel_id, user_id, joined_at) VALUES (?, ?, ?)",
 		channelID, userID, time.Now())
+
 	return err
 }

@@ -79,9 +98,17 @@ func (s *Database) PartChannel(ctx context.Context, channelID, userID int64) err
 	_, err := s.db.ExecContext(ctx,
 		"DELETE FROM channel_members WHERE channel_id = ? AND user_id = ?",
 		channelID, userID)
+
 	return err
 }

+// ChannelInfo is a lightweight channel representation.
+type ChannelInfo struct {
+	ID    int64  `json:"id"`
+	Name  string `json:"name"`
+	Topic string `json:"topic"`
+}
+
 // ListChannels returns all channels the user has joined.
 func (s *Database) ListChannels(ctx context.Context, userID int64) ([]ChannelInfo, error) {
 	rows, err := s.db.QueryContext(ctx,
@@ -91,26 +118,15 @@ func (s *Database) ListChannels(ctx context.Context, userID int64) ([]ChannelInf
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
-	var channels []ChannelInfo
-	for rows.Next() {
-		var ch ChannelInfo
-		if err := rows.Scan(&ch.ID, &ch.Name, &ch.Topic); err != nil {
-			return nil, err
-		}
-		channels = append(channels, ch)
-	}
-	if channels == nil {
-		channels = []ChannelInfo{}
-	}
-	return channels, nil
+
+	return scanChannelInfoRows(rows)
 }

-// ChannelInfo is a lightweight channel representation.
-type ChannelInfo struct {
-	ID    int64  `json:"id"`
-	Name  string `json:"name"`
-	Topic string `json:"topic"`
+// MemberInfo represents a channel member.
+type MemberInfo struct {
+	ID       int64     `json:"id"`
+	Nick     string    `json:"nick"`
+	LastSeen time.Time `json:"lastSeen"`
 }

 // ChannelMembers returns all members of a channel.
@@ -122,26 +138,32 @@ func (s *Database) ChannelMembers(ctx context.Context, channelID int64) ([]Membe
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+
+	defer func() { _ = rows.Close() }()
+
 	var members []MemberInfo
+
 	for rows.Next() {
 		var m MemberInfo
-		if err := rows.Scan(&m.ID, &m.Nick, &m.LastSeen); err != nil {
-			return nil, err
+
+		scanErr := rows.Scan(&m.ID, &m.Nick, &m.LastSeen)
+		if scanErr != nil {
+			return nil, scanErr
 		}
+
 		members = append(members, m)
 	}
+
+	err = rows.Err()
+	if err != nil {
+		return nil, err
+	}
+
 	if members == nil {
 		members = []MemberInfo{}
 	}
-	return members, nil
-}

-// MemberInfo represents a channel member.
-type MemberInfo struct {
-	ID       int64     `json:"id"`
-	Nick     string    `json:"nick"`
-	LastSeen time.Time `json:"lastSeen"`
+	return members, nil
 }

 // MessageInfo represents a chat message.
@@ -155,11 +177,18 @@ type MessageInfo struct {
 	CreatedAt time.Time `json:"createdAt"`
 }

+const defaultMessageLimit = 50
+
+const defaultPollLimit = 100
+
 // GetMessages returns messages for a channel, optionally after a given ID.
-func (s *Database) GetMessages(ctx context.Context, channelID int64, afterID int64, limit int) ([]MessageInfo, error) {
+func (s *Database) GetMessages(
+	ctx context.Context, channelID int64, afterID int64, limit int,
+) ([]MessageInfo, error) {
 	if limit <= 0 {
-		limit = 50
+		limit = defaultMessageLimit
 	}
+
 	rows, err := s.db.QueryContext(ctx,
 		`SELECT m.id, c.name, u.nick, m.content, m.created_at
 		 FROM messages m
@@ -170,48 +199,46 @@ func (s *Database) GetMessages(ctx context.Context, channelID int64, afterID int
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
-	var msgs []MessageInfo
-	for rows.Next() {
-		var m MessageInfo
-		if err := rows.Scan(&m.ID, &m.Channel, &m.Nick, &m.Content, &m.CreatedAt); err != nil {
-			return nil, err
-		}
-		msgs = append(msgs, m)
-	}
-	if msgs == nil {
-		msgs = []MessageInfo{}
-	}
-	return msgs, nil
+
+	return scanChannelMessages(rows)
 }

 // SendMessage inserts a channel message.
-func (s *Database) SendMessage(ctx context.Context, channelID, userID int64, content string) (int64, error) {
+func (s *Database) SendMessage(
+	ctx context.Context, channelID, userID int64, content string,
+) (int64, error) {
 	res, err := s.db.ExecContext(ctx,
 		"INSERT INTO messages (channel_id, user_id, content, is_dm, created_at) VALUES (?, ?, ?, 0, ?)",
 		channelID, userID, content, time.Now())
 	if err != nil {
 		return 0, err
 	}
+
 	return res.LastInsertId()
 }

 // SendDM inserts a direct message.
-func (s *Database) SendDM(ctx context.Context, fromID, toID int64, content string) (int64, error) {
+func (s *Database) SendDM(
+	ctx context.Context, fromID, toID int64, content string,
+) (int64, error) {
 	res, err := s.db.ExecContext(ctx,
 		"INSERT INTO messages (user_id, content, is_dm, dm_target_id, created_at) VALUES (?, ?, 1, ?, ?)",
 		fromID, content, toID, time.Now())
 	if err != nil {
 		return 0, err
 	}
+
 	return res.LastInsertId()
 }

 // GetDMs returns direct messages between two users after a given ID.
-func (s *Database) GetDMs(ctx context.Context, userA, userB int64, afterID int64, limit int) ([]MessageInfo, error) {
+func (s *Database) GetDMs(
+	ctx context.Context, userA, userB int64, afterID int64, limit int,
+) ([]MessageInfo, error) {
 	if limit <= 0 {
-		limit = 50
+		limit = defaultMessageLimit
 	}
+
 	rows, err := s.db.QueryContext(ctx,
 		`SELECT m.id, u.nick, m.content, t.nick, m.created_at
 		 FROM messages m
@@ -223,152 +250,85 @@ func (s *Database) GetDMs(ctx context.Context, userA, userB int64, afterID int64
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
-	var msgs []MessageInfo
-	for rows.Next() {
-		var m MessageInfo
-		if err := rows.Scan(&m.ID, &m.Nick, &m.Content, &m.DMTarget, &m.CreatedAt); err != nil {
-			return nil, err
-		}
-		m.IsDM = true
-		msgs = append(msgs, m)
-	}
-	if msgs == nil {
-		msgs = []MessageInfo{}
-	}
-	return msgs, nil
+
+	return scanDMMessages(rows)
 }

 // PollMessages returns all new messages (channel + DM) for a user after a given ID.
-func (s *Database) PollMessages(ctx context.Context, userID int64, afterID int64, limit int) ([]MessageInfo, error) {
+func (s *Database) PollMessages(
+	ctx context.Context, userID int64, afterID int64, limit int,
+) ([]MessageInfo, error) {
 	if limit <= 0 {
-		limit = 100
+		limit = defaultPollLimit
 	}
+
 	rows, err := s.db.QueryContext(ctx,
-		`SELECT m.id, COALESCE(c.name, ''), u.nick, m.content, m.is_dm, COALESCE(t.nick, ''), m.created_at
+		`SELECT m.id, COALESCE(c.name, ''), u.nick, m.content, m.is_dm,
+		        COALESCE(t.nick, ''), m.created_at
 		 FROM messages m
 		 INNER JOIN users u ON u.id = m.user_id
 		 LEFT JOIN channels c ON c.id = m.channel_id
 		 LEFT JOIN users t ON t.id = m.dm_target_id
 		 WHERE m.id > ? AND (
-		   (m.is_dm = 0 AND m.channel_id IN (SELECT channel_id FROM channel_members WHERE user_id = ?))
+		   (m.is_dm = 0 AND m.channel_id IN
+		     (SELECT channel_id FROM channel_members WHERE user_id = ?))
 		   OR (m.is_dm = 1 AND (m.user_id = ? OR m.dm_target_id = ?))
 		 )
 		 ORDER BY m.id ASC LIMIT ?`, afterID, userID, userID, userID, limit)
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
-	var msgs []MessageInfo
-	for rows.Next() {
-		var m MessageInfo
-		var isDM int
-		if err := rows.Scan(&m.ID, &m.Channel, &m.Nick, &m.Content, &isDM, &m.DMTarget, &m.CreatedAt); err != nil {
-			return nil, err
-		}
-		m.IsDM = isDM == 1
-		msgs = append(msgs, m)
-	}
-	if msgs == nil {
-		msgs = []MessageInfo{}
-	}
-	return msgs, nil
+
+	return scanPollMessages(rows)
 }

 // GetMessagesBefore returns channel messages before a given ID (for history scrollback).
-func (s *Database) GetMessagesBefore(ctx context.Context, channelID int64, beforeID int64, limit int) ([]MessageInfo, error) {
+func (s *Database) GetMessagesBefore(
+	ctx context.Context, channelID int64, beforeID int64, limit int,
+) ([]MessageInfo, error) {
 	if limit <= 0 {
-		limit = 50
-	}
-	var query string
-	var args []any
-	if beforeID > 0 {
-		query = `SELECT m.id, c.name, u.nick, m.content, m.created_at
-			FROM messages m
-			INNER JOIN users u ON u.id = m.user_id
-			INNER JOIN channels c ON c.id = m.channel_id
-			WHERE m.channel_id = ? AND m.is_dm = 0 AND m.id < ?
-			ORDER BY m.id DESC LIMIT ?`
-		args = []any{channelID, beforeID, limit}
-	} else {
-		query = `SELECT m.id, c.name, u.nick, m.content, m.created_at
-			FROM messages m
-			INNER JOIN users u ON u.id = m.user_id
-			INNER JOIN channels c ON c.id = m.channel_id
-			WHERE m.channel_id = ? AND m.is_dm = 0
-			ORDER BY m.id DESC LIMIT ?`
-		args = []any{channelID, limit}
+		limit = defaultMessageLimit
 	}
+
+	query, args := buildChannelHistoryQuery(channelID, beforeID, limit)
+
 	rows, err := s.db.QueryContext(ctx, query, args...)
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
-	var msgs []MessageInfo
-	for rows.Next() {
-		var m MessageInfo
-		if err := rows.Scan(&m.ID, &m.Channel, &m.Nick, &m.Content, &m.CreatedAt); err != nil {
-			return nil, err
-		}
-		msgs = append(msgs, m)
-	}
-	if msgs == nil {
-		msgs = []MessageInfo{}
-	}
-	// Reverse to ascending order
-	for i, j := 0, len(msgs)-1; i < j; i, j = i+1, j-1 {
-		msgs[i], msgs[j] = msgs[j], msgs[i]
+
+	msgs, err := scanChannelMessages(rows)
+	if err != nil {
+		return nil, err
 	}
+
+	reverseMessages(msgs)
+
 	return msgs, nil
 }

 // GetDMsBefore returns DMs between two users before a given ID (for history scrollback).
-func (s *Database) GetDMsBefore(ctx context.Context, userA, userB int64, beforeID int64, limit int) ([]MessageInfo, error) {
+func (s *Database) GetDMsBefore(
+	ctx context.Context, userA, userB int64, beforeID int64, limit int,
+) ([]MessageInfo, error) {
 	if limit <= 0 {
-		limit = 50
-	}
-	var query string
-	var args []any
-	if beforeID > 0 {
-		query = `SELECT m.id, u.nick, m.content, t.nick, m.created_at
-			FROM messages m
-			INNER JOIN users u ON u.id = m.user_id
-			INNER JOIN users t ON t.id = m.dm_target_id
-			WHERE m.is_dm = 1 AND m.id < ?
-			AND ((m.user_id = ? AND m.dm_target_id = ?) OR (m.user_id = ? AND m.dm_target_id = ?))
-			ORDER BY m.id DESC LIMIT ?`
-		args = []any{beforeID, userA, userB, userB, userA, limit}
-	} else {
-		query = `SELECT m.id, u.nick, m.content, t.nick, m.created_at
-			FROM messages m
-			INNER JOIN users u ON u.id = m.user_id
-			INNER JOIN users t ON t.id = m.dm_target_id
-			WHERE m.is_dm = 1
-			AND ((m.user_id = ? AND m.dm_target_id = ?) OR (m.user_id = ? AND m.dm_target_id = ?))
-			ORDER BY m.id DESC LIMIT ?`
-		args = []any{userA, userB, userB, userA, limit}
+		limit = defaultMessageLimit
 	}
+
+	query, args := buildDMHistoryQuery(userA, userB, beforeID, limit)
+
 	rows, err := s.db.QueryContext(ctx, query, args...)
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
-	var msgs []MessageInfo
-	for rows.Next() {
-		var m MessageInfo
-		if err := rows.Scan(&m.ID, &m.Nick, &m.Content, &m.DMTarget, &m.CreatedAt); err != nil {
-			return nil, err
-		}
-		m.IsDM = true
-		msgs = append(msgs, m)
-	}
-	if msgs == nil {
-		msgs = []MessageInfo{}
-	}
-	// Reverse to ascending order
-	for i, j := 0, len(msgs)-1; i < j; i, j = i+1, j-1 {
-		msgs[i], msgs[j] = msgs[j], msgs[i]
+
+	msgs, err := scanDMMessages(rows)
+	if err != nil {
+		return nil, err
 	}
+
+	reverseMessages(msgs)
+
 	return msgs, nil
 }

@@ -376,6 +336,7 @@ func (s *Database) GetDMsBefore(ctx context.Context, userA, userB int64, beforeI
 func (s *Database) ChangeNick(ctx context.Context, userID int64, newNick string) error {
 	_, err := s.db.ExecContext(ctx,
 		"UPDATE users SET nick = ? WHERE id = ?", newNick, userID)
+
 	return err
 }

@@ -383,6 +344,7 @@ func (s *Database) ChangeNick(ctx context.Context, userID int64, newNick string)
 func (s *Database) SetTopic(ctx context.Context, channelName string, _ int64, topic string) error {
 	_, err := s.db.ExecContext(ctx,
 		"UPDATE channels SET topic = ? WHERE name = ?", topic, channelName)
+
 	return err
 }

@@ -398,17 +360,174 @@ func (s *Database) ListAllChannels(ctx context.Context) ([]ChannelInfo, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer rows.Close()
+
+	return scanChannelInfoRows(rows)
+}
+
+// --- Helper functions ---
+
+func scanChannelInfoRows(rows *sql.Rows) ([]ChannelInfo, error) {
+	defer func() { _ = rows.Close() }()
+
 	var channels []ChannelInfo
+
 	for rows.Next() {
 		var ch ChannelInfo
-		if err := rows.Scan(&ch.ID, &ch.Name, &ch.Topic); err != nil {
-			return nil, err
+
+		scanErr := rows.Scan(&ch.ID, &ch.Name, &ch.Topic)
+		if scanErr != nil {
+			return nil, scanErr
 		}
+
 		channels = append(channels, ch)
 	}
+
+	err := rows.Err()
+	if err != nil {
+		return nil, err
+	}
+
 	if channels == nil {
 		channels = []ChannelInfo{}
 	}
+
 	return channels, nil
 }
+
+func scanChannelMessages(rows *sql.Rows) ([]MessageInfo, error) {
+	defer func() { _ = rows.Close() }()
+
+	var msgs []MessageInfo
+
+	for rows.Next() {
+		var m MessageInfo
+
+		scanErr := rows.Scan(&m.ID, &m.Channel, &m.Nick, &m.Content, &m.CreatedAt)
+		if scanErr != nil {
+			return nil, scanErr
+		}
+
+		msgs = append(msgs, m)
+	}
+
+	err := rows.Err()
+	if err != nil {
+		return nil, err
+	}
+
+	if msgs == nil {
+		msgs = []MessageInfo{}
+	}
+
+	return msgs, nil
+}
+
+func scanDMMessages(rows *sql.Rows) ([]MessageInfo, error) {
+	defer func() { _ = rows.Close() }()
+
+	var msgs []MessageInfo
+
+	for rows.Next() {
+		var m MessageInfo
+
+		scanErr := rows.Scan(&m.ID, &m.Nick, &m.Content, &m.DMTarget, &m.CreatedAt)
+		if scanErr != nil {
+			return nil, scanErr
+		}
+
+		m.IsDM = true
+		msgs = append(msgs, m)
+	}
+
+	err := rows.Err()
+	if err != nil {
+		return nil, err
+	}
+
+	if msgs == nil {
+		msgs = []MessageInfo{}
+	}
+
+	return msgs, nil
+}
+
+func scanPollMessages(rows *sql.Rows) ([]MessageInfo, error) {
+	defer func() { _ = rows.Close() }()
+
+	var msgs []MessageInfo
+
+	for rows.Next() {
+		var m MessageInfo
+
+		var isDM int
+
+		scanErr := rows.Scan(
+			&m.ID, &m.Channel, &m.Nick, &m.Content, &isDM, &m.DMTarget, &m.CreatedAt,
+		)
+		if scanErr != nil {
+			return nil, scanErr
+		}
+
+		m.IsDM = isDM == 1
+		msgs = append(msgs, m)
+	}
+
+	err := rows.Err()
+	if err != nil {
+		return nil, err
+	}
+
+	if msgs == nil {
+		msgs = []MessageInfo{}
+	}
+
+	return msgs, nil
+}
+
+func buildChannelHistoryQuery(channelID, beforeID int64, limit int) (string, []any) {
+	if beforeID > 0 {
+		return `SELECT m.id, c.name, u.nick, m.content, m.created_at
+			FROM messages m
+			INNER JOIN users u ON u.id = m.user_id
+			INNER JOIN channels c ON c.id = m.channel_id
+			WHERE m.channel_id = ? AND m.is_dm = 0 AND m.id < ?
+			ORDER BY m.id DESC LIMIT ?`, []any{channelID, beforeID, limit}
+	}
+
+	return `SELECT m.id, c.name, u.nick, m.content, m.created_at
+		FROM messages m
+		INNER JOIN users u ON u.id = m.user_id
+		INNER JOIN channels c ON c.id = m.channel_id
+		WHERE m.channel_id = ? AND m.is_dm = 0
+		ORDER BY m.id DESC LIMIT ?`, []any{channelID, limit}
+}
+
+func buildDMHistoryQuery(userA, userB, beforeID int64, limit int) (string, []any) {
+	if beforeID > 0 {
+		return `SELECT m.id, u.nick, m.content, t.nick, m.created_at
+			FROM messages m
+			INNER JOIN users u ON u.id = m.user_id
+			INNER JOIN users t ON t.id = m.dm_target_id
+			WHERE m.is_dm = 1 AND m.id < ?
+			AND ((m.user_id = ? AND m.dm_target_id = ?)
+			  OR (m.user_id = ? AND m.dm_target_id = ?))
+			ORDER BY m.id DESC LIMIT ?`,
+			[]any{beforeID, userA, userB, userB, userA, limit}
+	}
+
+	return `SELECT m.id, u.nick, m.content, t.nick, m.created_at
+		FROM messages m
+		INNER JOIN users u ON u.id = m.user_id
+		INNER JOIN users t ON t.id = m.dm_target_id
+		WHERE m.is_dm = 1
+		AND ((m.user_id = ? AND m.dm_target_id = ?)
+		  OR (m.user_id = ? AND m.dm_target_id = ?))
+		ORDER BY m.id DESC LIMIT ?`,
+		[]any{userA, userB, userB, userA, limit}
+}
+
+func reverseMessages(msgs []MessageInfo) {
+	for i, j := 0, len(msgs)-1; i < j; i, j = i+1, j-1 {
+		msgs[i], msgs[j] = msgs[j], msgs[i]
+	}
+}