Merge pull request #1659 from zumoshi/main

telegram/message: exposed the DropAuthor flag for forwardMessage

Author: ernado

telegram/message/forward.go

@@ -14,6 +14,7 @@ type ForwardBuilder struct {
 	from        tg.InputPeerClass
 	ids         []int
 	withMyScore bool
+	dropAuthor  bool
 }
 
 // WithMyScore sets flag to include your score in the forwarded game.
@@ -22,6 +23,12 @@ func (b *ForwardBuilder) WithMyScore() *ForwardBuilder {
 	return b
 }
 
+// DropAuthor sets flag to forward messages without quoting the original author.
+func (b *ForwardBuilder) DropAuthor() *ForwardBuilder {
+	b.dropAuthor = true
+	return b
+}
+
 // Send sends forwarded messages.
 func (b *ForwardBuilder) Send(ctx context.Context) (tg.UpdatesClass, error) {
 	p, err := b.builder.peer(ctx)
@@ -37,6 +44,7 @@ func (b *ForwardBuilder) Send(ctx context.Context) (tg.UpdatesClass, error) {
 		ID:           b.ids,
 		ToPeer:       p,
 		ScheduleDate: b.builder.scheduleDate,
+		DropAuthor:   b.dropAuthor,
 	})
 	if err != nil {
 		return nil, errors.Wrap(err, "send inline bot result")

telegram/message/forward_test.go

@@ -22,6 +22,7 @@ func TestBuilder_ForwardIDs(t *testing.T) {
 		require.Len(t, req.ID, 1)
 		require.Equal(t, 10, req.ID[0])
 		require.True(t, req.WithMyScore)
+		require.False(t, req.DropAuthor)
 	}).ThenResult(&tg.Updates{})
 	_, err := sender.Self().ForwardIDs(&tg.InputPeerSelf{}, 10).WithMyScore().Send(ctx)
 	require.NoError(t, err)
@@ -34,7 +35,21 @@ func TestBuilder_ForwardIDs(t *testing.T) {
 		require.Len(t, req.ID, 1)
 		require.Equal(t, 10, req.ID[0])
 		require.True(t, req.WithMyScore)
+		require.False(t, req.DropAuthor)
 	}).ThenRPCErr(testRPCError())
 	_, err = sender.Self().ForwardIDs(&tg.InputPeerSelf{}, 10).WithMyScore().Send(ctx)
 	require.Error(t, err)
+
+	mock.ExpectFunc(func(b bin.Encoder) {
+		req, ok := b.(*tg.MessagesForwardMessagesRequest)
+		require.True(t, ok)
+		require.Equal(t, &tg.InputPeerSelf{}, req.ToPeer)
+		require.Equal(t, &tg.InputPeerSelf{}, req.FromPeer)
+		require.Len(t, req.ID, 1)
+		require.Equal(t, 10, req.ID[0])
+		require.False(t, req.WithMyScore)
+		require.True(t, req.DropAuthor)
+	}).ThenRPCErr(testRPCError())
+	_, err = sender.Self().ForwardIDs(&tg.InputPeerSelf{}, 10).DropAuthor().Send(ctx)
+	require.Error(t, err)
 }