V2 draft

2fa.go

@@ -0,0 +1,9 @@
+package tdproto
+
+// RecoveryStatus:
+const (
+	Unknown2fa     = "unknown"
+	Unconfirmed2fa = "unconfirmed"
+	Confirmed2fa   = "confirmed"
+	Declined2fa    = "declined"
+)

CHANGELOG

@@ -1,3 +1,9 @@
+v.2.0.0
+ - websocket events moved to tdevents package
+ - PaginatedXXX structs moved to tdapi
+ - IconData now always not nullable
+ - server.roster event removed
+
 v.1.46.3
  - more docs added
 

codegen/api_paths/task.go

@@ -1,36 +1,37 @@
 package api_paths
 
 import (
-	"github.com/tada-team/tdproto/tdapi"
+	"github.com/tada-team/tdproto/tdforms"
+	"github.com/tada-team/tdproto/tdquery"
 )
 
 var TaskPaths = []PathSpec{
 	{
 		Path: "/api/v4/teams/{team_id}/tasks",
 		Post: &OperationSpec{
-			Request:     tdapi.Task{},
-			Response:    tdapi.Task{},
+			Request:     tdforms.Task{},
+			Response:    tdforms.Task{},
 			Description: "Create new task",
 		},
 		Get: &OperationSpec{
-			QueryStruct: tdapi.TaskFilter{},
-			Response:    []tdapi.Task{},
+			QueryStruct: tdquery.Tasks{},
+			Response:    []tdforms.Task{},
 			Description: "Get the list of tasks",
 		},
 	},
 	{
 		Path: "/api/v4/teams/{team_id}/tasks/{task_id}",
 		Get: &OperationSpec{
-			Response:    tdapi.Task{},
+			Response:    tdforms.Task{},
 			Description: "Get task",
 		},
 		Post: &OperationSpec{
-			Request:     tdapi.Task{},
-			Response:    tdapi.Task{},
+			Request:     tdforms.Task{},
+			Response:    tdforms.Task{},
 			Description: "Update task",
 		},
 		Delete: &OperationSpec{
-			Response:    tdapi.Task{},
+			Response:    tdforms.Task{},
 			Description: "Delete task",
 		},
 	},

codegen/dart/main.go

@@ -12,9 +12,11 @@ import (
 	"github.com/tada-team/tdproto/codegen"
 )
 
-const libPathPrefix = "./lib/"
-const enumsPathPrefix = "./src/enums"
-const modelsPathPrefix = "./src/models"
+const (
+	libPathPrefix    = "./lib/"
+	enumsPathPrefix  = "./src/enums"
+	modelsPathPrefix = "./src/models"
+)
 
 var dartTypeMap = map[string]string{
 	"string":            "String",
@@ -127,12 +129,8 @@ func lowercaseFirstOrAll(input string) string {
 	return strings.ToLower(input)
 }
 
-func writeFileFromTemplate(fileName string, template *template.Template, data interface{}, useExclusive bool) error {
-
-	fileFlags := os.O_WRONLY | os.O_CREATE
-	if useExclusive {
-		fileFlags |= os.O_EXCL
-	}
+func renderToFile(fileName string, template *template.Template, data interface{}) error {
+	fileFlags := os.O_WRONLY | os.O_CREATE | os.O_EXCL
 
 	file, err := os.OpenFile(fileName, fileFlags, 0o640)
 	if err != nil {
@@ -160,7 +158,7 @@ func generateDart(tdprotoInfo *codegen.TdPackage, baseLibPath string) error {
 		enumFilePath := path.Join(enumsPathPrefix, fmt.Sprintf("%s.dart", enumFileName))
 		libInfo.GeneratedEnums = append(libInfo.GeneratedEnums, enumFilePath)
 
-		err := writeFileFromTemplate(path.Join(baseLibPath, enumFilePath), dartEnumTemplate, tdEnum, true)
+		err := renderToFile(path.Join(baseLibPath, enumFilePath), dartEnumTemplate, tdEnum)
 		if err != nil {
 			return err
 		}
@@ -179,13 +177,13 @@ func generateDart(tdprotoInfo *codegen.TdPackage, baseLibPath string) error {
 			return nil
 		}
 
-		err = writeFileFromTemplate(path.Join(baseLibPath, dartClassFilePath), dartClassTemplate, dartClass, true)
+		err = renderToFile(path.Join(baseLibPath, dartClassFilePath), dartClassTemplate, dartClass)
 		if err != nil {
 			return err
 		}
 	}
 
-	err := writeFileFromTemplate(path.Join(baseLibPath, "./tdproto_dart.dart"), dartLibTemplate, libInfo, true)
+	err := renderToFile(path.Join(baseLibPath, "./tdproto_dart.dart"), dartLibTemplate, libInfo)
 	if err != nil {
 		return err
 	}
@@ -298,7 +296,7 @@ func main() {
 	flag.Parse()
 
 	var dartLibPath string
-	switch len_args := len(flag.Args()); len_args {
+	switch lenArgs := len(flag.Args()); lenArgs {
 	case 0:
 		newTempDir, err := os.MkdirTemp("", "tdproto_dart")
 		if err != nil {
@@ -309,7 +307,7 @@ func main() {
 	case 1:
 		dartLibPath = flag.Arg(0)
 	default:
-		panic(fmt.Errorf("expected zero or one argument got %d", len_args))
+		panic(fmt.Errorf("expected zero or one argument got %d", lenArgs))
 	}
 
 	err = createDirectoryStructure(dartLibPath)