fix: SendRichMessageDraft must send the input action

messages.setTyping for a rich draft carries inputSendMessageRichMessageDraftAction
(InputRichMessageClass), not the resolved sendMessageRichMessageDraftAction
(tg.RichMessage) which is the broadcast/output form — confirmed against
telegram-bot-api 10.1 (DialogAction::get_input_send_message_action). Take a
tg.InputRichMessageClass, mirroring SendRichMessage, so callers build content with
the rich package (rich.New(...).Input(), rich.HTML, rich.Markdown). Drops the
redundant botapi.RichMessage type.

Author: ernado

send_draft.go

@@ -68,50 +68,18 @@ func (b *Bot) SendMessageDraft(ctx context.Context, chat ChatID, draftID int64,
 	return nil
 }
 
-// RichMessage is the structured content of a rich message, expressed as native
-// MTProto page blocks.
+// SendRichMessageDraft streams a partial rich message (Bot API 10.1) to a chat
+// while the message is being generated, so its members see an ephemeral preview.
+// draftID is a unique client-side identifier for the draft; reuse it across the
+// stream and finalize with SendRichMessage once generation completes.
 //
-// The HTTP Bot API accepts a rich message only as an HTML or Markdown string and
-// parses it into this structure server-side. botapi is MTProto-native, so it
-// takes the page-block tree directly: no content parser is needed and the full
-// block vocabulary (paragraphs, headers, lists, embedded media, …) is available.
-// Build blocks with the tg.PageBlock* types; Bot.Raw exposes the same client.
-type RichMessage struct {
-	// Blocks are the page blocks that make up the message body.
-	Blocks []tg.PageBlockClass
-	// Photos are photos referenced by the blocks.
-	Photos []tg.PhotoClass
-	// Documents are documents referenced by the blocks.
-	Documents []tg.DocumentClass
-	// RTL renders the message right-to-left.
-	RTL bool
-	// Part marks this as a partial segment of a longer streamed message.
-	Part bool
-}
-
-// toTg converts the rich message into its MTProto representation.
-func (r RichMessage) toTg() tg.RichMessage {
-	out := tg.RichMessage{
-		Blocks:    r.Blocks,
-		Photos:    r.Photos,
-		Documents: r.Documents,
-	}
-	if r.RTL {
-		out.SetRtl(true)
-	}
-
-	if r.Part {
-		out.SetPart(true)
-	}
-
-	return out
-}
-
-// SendRichMessageDraft streams a partial rich message to a chat while the message
-// is being generated, so its members see an ephemeral preview. draftID is a
-// unique client-side identifier for the draft. Once generation finishes, persist
-// the result with a regular send.
-func (b *Bot) SendRichMessageDraft(ctx context.Context, chat ChatID, draftID int64, message RichMessage, opts ...DraftOption) error {
+// Build msg the same way as for SendRichMessage — from native page blocks with
+// github.com/gotd/td/telegram/message/rich (rich.New(...).Input()), or from a
+// whole HTML/Markdown document (rich.HTML / rich.Markdown), which Telegram's
+// servers parse.
+func (b *Bot) SendRichMessageDraft(
+	ctx context.Context, chat ChatID, draftID int64, msg tg.InputRichMessageClass, opts ...DraftOption,
+) error {
 	var cfg draftConfig
 
 	for _, o := range opts {
@@ -125,9 +93,9 @@ func (b *Bot) SendRichMessageDraft(ctx context.Context, chat ChatID, draftID int
 
 	req := &tg.MessagesSetTypingRequest{
 		Peer: peer,
-		Action: &tg.SendMessageRichMessageDraftAction{
+		Action: &tg.InputSendMessageRichMessageDraftAction{
 			RandomID:    draftID,
-			RichMessage: message.toTg(),
+			RichMessage: msg,
 		},
 	}
 	if cfg.messageThreadID != 0 {

send_draft_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	"github.com/gotd/td/telegram/message/rich"
 	"github.com/gotd/td/tg"
 )
 
@@ -38,34 +39,26 @@ func TestSendRichMessageDraft(t *testing.T) {
 	inv := newMockInvoker()
 	inv.reply(tg.MessagesSetTypingRequestTypeID, &tg.BoolTrue{})
 
-	message := RichMessage{
-		Blocks: []tg.PageBlockClass{&tg.PageBlockParagraph{Text: &tg.TextPlain{Text: "partial"}}},
-		RTL:    true,
-		Part:   true,
-	}
+	msg := rich.New(&tg.PageBlockParagraph{Text: &tg.TextPlain{Text: "partial"}}).Input()
 
-	if err := newMockBot(inv).SendRichMessageDraft(context.Background(), userRef(10, 20), 1000, message); err != nil {
+	if err := newMockBot(inv).SendRichMessageDraft(context.Background(), userRef(10, 20), 1000, msg); err != nil {
 		t.Fatalf("SendRichMessageDraft: %v", err)
 	}
 
 	var req tg.MessagesSetTypingRequest
 
 	inv.decode(t, tg.MessagesSetTypingRequestTypeID, &req)
 
-	action, ok := req.Action.(*tg.SendMessageRichMessageDraftAction)
+	action, ok := req.Action.(*tg.InputSendMessageRichMessageDraftAction)
 	if !ok {
-		t.Fatalf("action = %#v, want rich draft", req.Action)
-	}
-
-	if action.RandomID != 1000 || len(action.RichMessage.Blocks) != 1 {
-		t.Fatalf("action = %#v", action)
+		t.Fatalf("action = %#v, want input rich draft", req.Action)
 	}
 
-	if !action.RichMessage.GetRtl() {
-		t.Fatal("rtl flag should be set")
+	if action.RandomID != 1000 {
+		t.Fatalf("random id = %d", action.RandomID)
 	}
 
-	if _, ok := action.RichMessage.Blocks[0].(*tg.PageBlockParagraph); !ok {
-		t.Fatalf("block 0 = %#v, want paragraph", action.RichMessage.Blocks[0])
+	if _, ok := action.RichMessage.(*tg.InputRichMessage); !ok {
+		t.Fatalf("rich message = %#v, want input rich message", action.RichMessage)
 	}
 }