feat: add message history query command

Author: steipete

README.md

@@ -113,6 +113,24 @@ bin/discrawl search --channel billing --author steipete --limit 50 "invoice"
 bin/discrawl --json search "websocket closed"
 ```
 
+### `messages`
+
+Lists exact message slices by channel, author, and time range.
+
+```bash
+bin/discrawl messages --channel maintainers --days 7 --all
+bin/discrawl messages --channel "#maintainers" --since 2026-03-01T00:00:00Z
+bin/discrawl messages --channel 1456744319972282449 --author steipete --limit 50
+bin/discrawl --json messages --channel maintainers --days 3
+```
+
+Notes:
+
+- `--channel` accepts a channel id, exact name, `#name`, or partial name match
+- `--days` is shorthand for "since now minus N days"
+- `--all` removes the safety limit; default is `200`
+- at least one filter is required
+
 ### `sql`
 
 Runs read-only SQL against the local database.

internal/cli/cli.go

@@ -97,6 +97,8 @@ func Run(ctx context.Context, args []string, stdout, stderr io.Writer) error {
 		return runtime.withServices(true, func() error { return runtime.runTail(rest[1:]) })
 	case "search":
 		return runtime.withServices(false, func() error { return runtime.runSearch(rest[1:]) })
+	case "messages":
+		return runtime.withServices(false, func() error { return runtime.runMessages(rest[1:]) })
 	case "sql":
 		return runtime.withServices(false, func() error { return runtime.runSQL(rest[1:]) })
 	case "members":
@@ -127,6 +129,7 @@ type runtime struct {
 	openStore  func(context.Context, string) (*store.Store, error)
 	newDiscord func(config.Config) (discordClient, error)
 	newSyncer  func(syncer.Client, *store.Store, *slog.Logger) syncService
+	now        func() time.Time
 }
 
 type discordClient interface {
@@ -548,6 +551,11 @@ func (r *runtime) print(value any) error {
 				_, _ = fmt.Fprintf(r.stdout, "%s\t%s\t%s\t%s\n", row.GuildID, row.ID, row.Kind, row.Name)
 			}
 			return nil
+		case []store.MessageRow:
+			for _, row := range v {
+				_, _ = fmt.Fprintf(r.stdout, "%s\t%s\t%s\t%s\t%s\t%s\n", formatTime(row.CreatedAt), row.GuildID, row.ChannelID, row.AuthorID, row.MessageID, row.Content)
+			}
+			return nil
 		}
 	}
 	if err := printHuman(r.stdout, value); err == nil {
@@ -569,6 +577,7 @@ Commands:
   sync
   tail
   search
+  messages
   sql
   members
   channels
@@ -653,6 +662,13 @@ func printHuman(w io.Writer, value any) error {
 			_, _ = fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", row.GuildID, row.ID, row.Kind, row.Name)
 		}
 		return tw.Flush()
+	case []store.MessageRow:
+		for _, row := range v {
+			if _, err := fmt.Fprintf(w, "[%s/%s] %s %s\n%s\n\n", row.GuildID, row.ChannelName, row.AuthorName, formatTime(row.CreatedAt), row.Content); err != nil {
+				return err
+			}
+		}
+		return nil
 	case map[string]any:
 		keys := make([]string, 0, len(v))
 		for key := range v {

internal/cli/cli_test.go

@@ -67,6 +67,7 @@ func TestStatusSearchSQLAndListings(t *testing.T) {
 	tests := [][]string{
 		{"--config", cfgPath, "status"},
 		{"--config", cfgPath, "search", "panic"},
+		{"--config", cfgPath, "messages", "--channel", "general", "--days", "7", "--all"},
 		{"--config", cfgPath, "sql", "select count(*) as total from messages"},
 		{"--config", cfgPath, "members", "list"},
 		{"--config", cfgPath, "channels", "list"},
@@ -254,6 +255,8 @@ func TestRuntimeHelpersAndSubcommands(t *testing.T) {
 		require.NoError(t, rt.runMembers([]string{"show", "u1"}))
 		require.NoError(t, rt.runMembers([]string{"search", "pet"}))
 		require.NoError(t, rt.runMembers([]string{"list"}))
+		rt.now = func() time.Time { return time.Date(2026, 3, 8, 12, 0, 0, 0, time.UTC) }
+		require.NoError(t, rt.runMessages([]string{"--channel", "#general", "--days", "7", "--all"}))
 		require.NoError(t, rt.runChannels([]string{"show", "c1"}))
 		require.NoError(t, rt.runChannels([]string{"list"}))
 		require.NoError(t, rt.runStatus(nil))
@@ -284,6 +287,10 @@ func TestPrintJSONAndPlain(t *testing.T) {
 	require.NoError(t, rt.print([]store.SearchResult{{GuildID: "g1", ChannelID: "c1", AuthorID: "u1", Content: "hello"}}))
 	require.Contains(t, rt.stdout.(*bytes.Buffer).String(), "hello")
 
+	rt = &runtime{stdout: &bytes.Buffer{}, plain: true}
+	require.NoError(t, rt.print([]store.MessageRow{{GuildID: "g1", ChannelID: "c1", AuthorID: "u1", MessageID: "m1", Content: "hello", CreatedAt: time.Unix(1, 0).UTC()}}))
+	require.Contains(t, rt.stdout.(*bytes.Buffer).String(), "m1")
+
 	rt = &runtime{stdout: &bytes.Buffer{}}
 	require.NoError(t, rt.print(struct{ OK bool }{OK: true}))
 	require.Contains(t, rt.stdout.(*bytes.Buffer).String(), "\"OK\": true")
@@ -330,6 +337,9 @@ func TestCommandUsageErrors(t *testing.T) {
 	rt := &runtime{}
 	require.Equal(t, 2, ExitCode(rt.runMembers(nil)))
 	require.Equal(t, 2, ExitCode(rt.runMembers([]string{"nope"})))
+	require.Equal(t, 2, ExitCode(rt.runMessages(nil)))
+	require.Equal(t, 2, ExitCode(rt.runMessages([]string{"--days", "-1"})))
+	require.Equal(t, 2, ExitCode(rt.runMessages([]string{"--days", "1", "--since", "2026-03-01T00:00:00Z"})))
 	require.Equal(t, 2, ExitCode(rt.runChannels(nil)))
 	require.Equal(t, 2, ExitCode(rt.runStatus([]string{"extra"})))
 	require.NoError(t, (&runtime{stdout: &bytes.Buffer{}}).runDoctor(nil))

internal/cli/messages.go

@@ -0,0 +1,86 @@
+package cli
+
+import (
+	"flag"
+	"fmt"
+	"io"
+	"strings"
+	"time"
+
+	"github.com/steipete/discrawl/internal/store"
+)
+
+const defaultMessageLimit = 200
+
+func (r *runtime) runMessages(args []string) error {
+	fs := flag.NewFlagSet("messages", flag.ContinueOnError)
+	fs.SetOutput(io.Discard)
+	channel := fs.String("channel", "", "")
+	author := fs.String("author", "", "")
+	days := fs.Int("days", 0, "")
+	since := fs.String("since", "", "")
+	before := fs.String("before", "", "")
+	limit := fs.Int("limit", defaultMessageLimit, "")
+	all := fs.Bool("all", false, "")
+	guildsFlag := fs.String("guilds", "", "")
+	guildFlag := fs.String("guild", "", "")
+	if err := fs.Parse(args); err != nil {
+		return usageErr(err)
+	}
+	if fs.NArg() != 0 {
+		return usageErr(fmt.Errorf("messages takes flags only"))
+	}
+	if *days < 0 {
+		return usageErr(fmt.Errorf("--days must be >= 0"))
+	}
+	if *days > 0 && strings.TrimSpace(*since) != "" {
+		return usageErr(fmt.Errorf("use either --days or --since"))
+	}
+	if *limit < 0 {
+		return usageErr(fmt.Errorf("--limit must be >= 0"))
+	}
+
+	var sinceTime time.Time
+	var beforeTime time.Time
+	var err error
+	if *days > 0 {
+		now := time.Now().UTC()
+		if r.now != nil {
+			now = r.now().UTC()
+		}
+		sinceTime = now.Add(-time.Duration(*days) * 24 * time.Hour)
+	}
+	if strings.TrimSpace(*since) != "" {
+		sinceTime, err = time.Parse(time.RFC3339, *since)
+		if err != nil {
+			return usageErr(fmt.Errorf("invalid --since: %w", err))
+		}
+	}
+	if strings.TrimSpace(*before) != "" {
+		beforeTime, err = time.Parse(time.RFC3339, *before)
+		if err != nil {
+			return usageErr(fmt.Errorf("invalid --before: %w", err))
+		}
+	}
+
+	guildIDs := r.resolveSearchGuilds(*guildFlag, *guildsFlag)
+	if strings.TrimSpace(*channel) == "" && strings.TrimSpace(*author) == "" && sinceTime.IsZero() && beforeTime.IsZero() && len(guildIDs) == 0 {
+		return usageErr(fmt.Errorf("messages needs at least one filter"))
+	}
+	if *all {
+		*limit = 0
+	}
+
+	rows, err := r.store.ListMessages(r.ctx, store.MessageListOptions{
+		GuildIDs: guildIDs,
+		Channel:  *channel,
+		Author:   *author,
+		Since:    sinceTime,
+		Before:   beforeTime,
+		Limit:    *limit,
+	})
+	if err != nil {
+		return err
+	}
+	return r.print(rows)
+}

internal/store/messages.go

@@ -0,0 +1,127 @@
+package store
+
+import (
+	"context"
+	"strings"
+	"time"
+)
+
+type MessageListOptions struct {
+	GuildIDs []string
+	Channel  string
+	Author   string
+	Since    time.Time
+	Before   time.Time
+	Limit    int
+}
+
+type MessageRow struct {
+	MessageID      string    `json:"message_id"`
+	GuildID        string    `json:"guild_id"`
+	ChannelID      string    `json:"channel_id"`
+	ChannelName    string    `json:"channel_name"`
+	AuthorID       string    `json:"author_id"`
+	AuthorName     string    `json:"author_name"`
+	Content        string    `json:"content"`
+	CreatedAt      time.Time `json:"created_at"`
+	ReplyToMessage string    `json:"reply_to_message_id,omitempty"`
+	HasAttachments bool      `json:"has_attachments"`
+	Pinned         bool      `json:"pinned"`
+}
+
+func (s *Store) ListMessages(ctx context.Context, opts MessageListOptions) ([]MessageRow, error) {
+	args := []any{}
+	clauses := []string{"1=1"}
+	if len(opts.GuildIDs) > 0 {
+		clauses = append(clauses, "m.guild_id in ("+placeholders(len(opts.GuildIDs))+")")
+		for _, guildID := range opts.GuildIDs {
+			args = append(args, guildID)
+		}
+	}
+	if channel := normalizeChannelFilter(opts.Channel); channel != "" {
+		clauses = append(clauses, "(m.channel_id = ? or c.name = ? or c.name like ?)")
+		args = append(args, channel, channel, "%"+channel+"%")
+	}
+	if author := strings.TrimSpace(opts.Author); author != "" {
+		clauses = append(clauses, `(m.author_id = ? or coalesce(mem.username, '') = ? or coalesce(mem.display_name, '') = ? or coalesce(mem.username, '') like ? or coalesce(mem.display_name, '') like ? or json_extract(m.raw_json, '$.author.username') = ?)`)
+		args = append(args, author, author, author, "%"+author+"%", "%"+author+"%", author)
+	}
+	if !opts.Since.IsZero() {
+		clauses = append(clauses, "m.created_at >= ?")
+		args = append(args, opts.Since.UTC().Format(timeLayout))
+	}
+	if !opts.Before.IsZero() {
+		clauses = append(clauses, "m.created_at < ?")
+		args = append(args, opts.Before.UTC().Format(timeLayout))
+	}
+
+	query := `
+		select
+			m.id,
+			m.guild_id,
+			m.channel_id,
+			coalesce(c.name, ''),
+			coalesce(m.author_id, ''),
+			coalesce(
+				nullif(mem.display_name, ''),
+				nullif(mem.nick, ''),
+				nullif(mem.global_name, ''),
+				nullif(mem.username, ''),
+				nullif(json_extract(m.raw_json, '$.author.global_name'), ''),
+				nullif(json_extract(m.raw_json, '$.author.username'), ''),
+				''
+			),
+			m.content,
+			m.created_at,
+			coalesce(m.reply_to_message_id, ''),
+			m.has_attachments,
+			m.pinned
+		from messages m
+		left join channels c on c.id = m.channel_id
+		left join members mem on mem.guild_id = m.guild_id and mem.user_id = m.author_id
+		where ` + strings.Join(clauses, " and ") + `
+		order by m.created_at asc, m.id asc
+	`
+	if opts.Limit > 0 {
+		query += ` limit ?`
+		args = append(args, opts.Limit)
+	}
+
+	rows, err := s.db.QueryContext(ctx, query, args...)
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = rows.Close() }()
+
+	var out []MessageRow
+	for rows.Next() {
+		var row MessageRow
+		var created string
+		var hasAttachments int
+		var pinned int
+		if err := rows.Scan(
+			&row.MessageID,
+			&row.GuildID,
+			&row.ChannelID,
+			&row.ChannelName,
+			&row.AuthorID,
+			&row.AuthorName,
+			&row.Content,
+			&created,
+			&row.ReplyToMessage,
+			&hasAttachments,
+			&pinned,
+		); err != nil {
+			return nil, err
+		}
+		row.CreatedAt = parseTime(created)
+		row.HasAttachments = hasAttachments == 1
+		row.Pinned = pinned == 1
+		out = append(out, row)
+	}
+	return out, rows.Err()
+}
+
+func normalizeChannelFilter(raw string) string {
+	return strings.TrimSpace(strings.TrimPrefix(strings.TrimSpace(raw), "#"))
+}