Merge pull request #139 from gotd/feat/schema-123

feat: update schema to 123

cmd/gotdchats/main.go

@@ -14,6 +14,7 @@ import (
 	"golang.org/x/net/proxy"
 	"golang.org/x/xerrors"
 
+	"github.com/gotd/td/mtproto"
 	"github.com/gotd/td/telegram"
 	"github.com/gotd/td/tg"
 	"github.com/gotd/td/transport"
@@ -67,7 +68,7 @@ func run(ctx context.Context) error {
 		for range time.NewTicker(time.Second * 5).C {
 			chats, err := c.MessagesGetAllChats(ctx, nil)
 
-			if d, ok := telegram.AsFloodWait(err); ok {
+			if d, ok := mtproto.AsFloodWait(err); ok {
 				// Server told us to wait N seconds before sending next message.
 				logger.Info("Sleeping", zap.Duration("duration", d))
 				time.Sleep(d)

telegram/error.go → mtproto/flood_wait.go

@@ -1,9 +1,7 @@
-package telegram
+package mtproto
 
 import (
 	"time"
-
-	"github.com/gotd/td/mtproto"
 )
 
 // ErrFloodWait is error type of "FLOOD_WAIT" error.
@@ -15,7 +13,7 @@ const ErrFloodWait = "FLOOD_WAIT"
 // Client should wait for that duration before issuing new requests with
 // same method.
 func AsFloodWait(err error) (d time.Duration, ok bool) {
-	if rpcErr, ok := mtproto.AsTypeErr(err, ErrFloodWait); ok {
+	if rpcErr, ok := AsTypeErr(err, ErrFloodWait); ok {
 		return time.Second * time.Duration(rpcErr.Argument), true
 	}
 	return 0, false

mtproto/flood_wait_test.go

@@ -0,0 +1,21 @@
+package mtproto
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"golang.org/x/xerrors"
+)
+
+func TestAsFloodWait(t *testing.T) {
+	err := func() error {
+		return xerrors.Errorf("failed to perform operation: %w",
+			NewError(400, "FLOOD_WAIT_10"),
+		)
+	}()
+
+	d, ok := AsFloodWait(err)
+	assert.True(t, ok)
+	assert.Equal(t, time.Second*10, d)
+}

telegram/conn.go

@@ -175,7 +175,7 @@ func (c *conn) init(ctx context.Context) error {
 		LangCode:       c.device.LangCode,
 		Query:          c.wrapRequest(&tg.HelpGetConfigRequest{}),
 	})
-	var req bin.Object = c.wrapRequest(&tg.InvokeWithLayerRequest{
+	req := c.wrapRequest(&tg.InvokeWithLayerRequest{
 		Layer: tg.Layer,
 		Query: q,
 	})

telegram/error_test.go

@@ -2,9 +2,7 @@ package telegram
 
 import (
 	"testing"
-	"time"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
 
@@ -23,15 +21,3 @@ func TestError(t *testing.T) {
 	}()
 	require.True(t, mtproto.IsErr(err, tg.ErrAccessTokenExpired))
 }
-
-func TestAsFloodWait(t *testing.T) {
-	err := func() error {
-		return xerrors.Errorf("failed to perform operation: %w",
-			mtproto.NewError(400, "FLOOD_WAIT_10"),
-		)
-	}()
-
-	d, ok := AsFloodWait(err)
-	assert.True(t, ok)
-	assert.Equal(t, time.Second*10, d)
-}

telegram/uploader/common.go → telegram/uploader/flood_wait.go

@@ -4,16 +4,15 @@ import (
 	"context"
 	"time"
 
-	"golang.org/x/xerrors"
-
 	"github.com/gotd/td/mtproto"
 )
 
+// floodWait sleeps required duration and true if err is FLOOD_WAIT
+// or false and context or original error otherwise.
 func floodWait(ctx context.Context, err error) (bool, error) {
-	var rpcErr *mtproto.Error
-	if xerrors.As(err, &rpcErr) && rpcErr.Type == "FLOOD_WAIT" {
+	if d, ok := mtproto.AsFloodWait(err); ok {
 		select {
-		case <-time.After(time.Duration(rpcErr.Argument) * time.Second):
+		case <-time.After(d):
 			return true, err
 		case <-ctx.Done():
 			return false, ctx.Err()