Updates for Bot API 4.4 and 4.5.

Author: Syfaro

configs.go

@@ -34,8 +34,9 @@ const (
 
 // Constant values for ParseMode in MessageConfig
 const (
-	ModeMarkdown = "Markdown"
-	ModeHTML     = "HTML"
+	ModeMarkdown   = "Markdown"
+	ModeMarkdownV2 = "MarkdownV2"
+	ModeHTML       = "HTML"
 )
 
 // Library errors
@@ -939,11 +940,8 @@ func (config KickChatMemberConfig) params() (Params, error) {
 // RestrictChatMemberConfig contains fields to restrict members of chat
 type RestrictChatMemberConfig struct {
 	ChatMemberConfig
-	UntilDate             int64
-	CanSendMessages       *bool
-	CanSendMediaMessages  *bool
-	CanSendOtherMessages  *bool
-	CanAddWebPagePreviews *bool
+	UntilDate   int64
+	Permissions *ChatPermissions
 }
 
 func (config RestrictChatMemberConfig) method() string {
@@ -956,10 +954,9 @@ func (config RestrictChatMemberConfig) params() (Params, error) {
 	params.AddFirstValid("chat_id", config.ChatID, config.SuperGroupUsername, config.ChannelUsername)
 	params.AddNonZero("user_id", config.UserID)
 
-	params.AddNonNilBool("can_send_messages", config.CanSendMessages)
-	params.AddNonNilBool("can_send_media_messages", config.CanSendMediaMessages)
-	params.AddNonNilBool("can_send_other_messages", config.CanSendOtherMessages)
-	params.AddNonNilBool("can_add_web_page_previews", config.CanAddWebPagePreviews)
+	if err := params.AddInterface("permissions", config.Permissions); err != nil {
+		return params, err
+	}
 	params.AddNonZero64("until_date", config.UntilDate)
 
 	return params, nil
@@ -968,14 +965,14 @@ func (config RestrictChatMemberConfig) params() (Params, error) {
 // PromoteChatMemberConfig contains fields to promote members of chat
 type PromoteChatMemberConfig struct {
 	ChatMemberConfig
-	CanChangeInfo      *bool
-	CanPostMessages    *bool
-	CanEditMessages    *bool
-	CanDeleteMessages  *bool
-	CanInviteUsers     *bool
-	CanRestrictMembers *bool
-	CanPinMessages     *bool
-	CanPromoteMembers  *bool
+	CanChangeInfo      bool
+	CanPostMessages    bool
+	CanEditMessages    bool
+	CanDeleteMessages  bool
+	CanInviteUsers     bool
+	CanRestrictMembers bool
+	CanPinMessages     bool
+	CanPromoteMembers  bool
 }
 
 func (config PromoteChatMemberConfig) method() string {
@@ -988,14 +985,35 @@ func (config PromoteChatMemberConfig) params() (Params, error) {
 	params.AddFirstValid("chat_id", config.ChatID, config.SuperGroupUsername, config.ChannelUsername)
 	params.AddNonZero("user_id", config.UserID)
 
-	params.AddNonNilBool("can_change_info", config.CanChangeInfo)
-	params.AddNonNilBool("can_post_messages", config.CanPostMessages)
-	params.AddNonNilBool("can_edit_messages", config.CanEditMessages)
-	params.AddNonNilBool("can_delete_messages", config.CanDeleteMessages)
-	params.AddNonNilBool("can_invite_users", config.CanInviteUsers)
-	params.AddNonNilBool("can_restrict_members", config.CanRestrictMembers)
-	params.AddNonNilBool("can_pin_messages", config.CanPinMessages)
-	params.AddNonNilBool("can_promote_members", config.CanPromoteMembers)
+	params.AddBool("can_change_info", config.CanChangeInfo)
+	params.AddBool("can_post_messages", config.CanPostMessages)
+	params.AddBool("can_edit_messages", config.CanEditMessages)
+	params.AddBool("can_delete_messages", config.CanDeleteMessages)
+	params.AddBool("can_invite_users", config.CanInviteUsers)
+	params.AddBool("can_restrict_members", config.CanRestrictMembers)
+	params.AddBool("can_pin_messages", config.CanPinMessages)
+	params.AddBool("can_promote_members", config.CanPromoteMembers)
+
+	return params, nil
+}
+
+// SetChatAdministratorCustomTitle sets the title of an administrative user
+// promoted by the bot for a chat.
+type SetChatAdministratorCustomTitle struct {
+	ChatMemberConfig
+	CustomTitle string
+}
+
+func (SetChatAdministratorCustomTitle) method() string {
+	return "setChatAdministratorCustomTitle"
+}
+
+func (config SetChatAdministratorCustomTitle) params() (Params, error) {
+	params := make(Params)
+
+	params.AddFirstValid("chat_id", config.ChatID, config.SuperGroupUsername, config.ChannelUsername)
+	params.AddNonZero("user_id", config.UserID)
+	params.AddNonEmpty("custom_title", config.CustomTitle)
 
 	return params, nil
 }
@@ -1041,6 +1059,27 @@ func (ChatAdministratorsConfig) method() string {
 	return "getChatAdministrators"
 }
 
+// SetChatPermissionsConfig allows you to set default permissions for the
+// members in a group. The bot must be an administrator and have rights to
+// restrict members.
+type SetChatPermissionsConfig struct {
+	ChatConfig
+	Permissions *ChatPermissions
+}
+
+func (SetChatPermissionsConfig) method() string {
+	return "setChatPermissions"
+}
+
+func (config SetChatPermissionsConfig) params() (Params, error) {
+	params := make(Params)
+
+	params.AddFirstValid("chat_id", config.ChatID, config.SuperGroupUsername)
+	params.AddInterface("permissions", config.Permissions)
+
+	return params, nil
+}
+
 // ChatInviteLinkConfig contains information about getting a chat link.
 //
 // Note that generating a new link will revoke any previous links.

params.go

@@ -37,13 +37,6 @@ func (p Params) AddBool(key string, value bool) {
 	}
 }
 
-// AddNonNilBool adds the value of a bool pointer if not nil.
-func (p Params) AddNonNilBool(key string, value *bool) {
-	if value != nil {
-		p[key] = strconv.FormatBool(*value)
-	}
-}
-
 // AddNonZeroFloat adds a floating point value that is not zero.
 func (p Params) AddNonZeroFloat(key string, value float64) {
 	if value != 0 {
@@ -76,14 +69,17 @@ func (p Params) AddFirstValid(key string, args ...interface{}) error {
 		case int:
 			if v != 0 {
 				p[key] = strconv.Itoa(v)
+				return nil
 			}
 		case int64:
 			if v != 0 {
 				p[key] = strconv.FormatInt(v, 10)
+				return nil
 			}
 		case string:
 			if v != "" {
 				p[key] = v
+				return nil
 			}
 		case nil:
 		default:
@@ -93,6 +89,7 @@ func (p Params) AddFirstValid(key string, args ...interface{}) error {
 			}
 
 			p[key] = string(b)
+			return nil
 		}
 	}
 

params_test.go

@@ -0,0 +1,93 @@
+package tgbotapi
+
+import (
+	"testing"
+)
+
+func assertLen(t *testing.T, params Params, l int) {
+	actual := len(params)
+	if actual != l {
+		t.Fatalf("Incorrect number of params, expected %d but found %d\n", l, actual)
+	}
+}
+
+func assertEq(t *testing.T, a interface{}, b interface{}) {
+	if a != b {
+		t.Fatalf("Values did not match, a: %v, b: %v\n", a, b)
+	}
+}
+
+func TestAddNonEmpty(t *testing.T) {
+	params := make(Params)
+	params.AddNonEmpty("value", "value")
+	assertLen(t, params, 1)
+	assertEq(t, params["value"], "value")
+	params.AddNonEmpty("test", "")
+	assertLen(t, params, 1)
+	assertEq(t, params["test"], "")
+}
+
+func TestAddNonZero(t *testing.T) {
+	params := make(Params)
+	params.AddNonZero("value", 1)
+	assertLen(t, params, 1)
+	assertEq(t, params["value"], "1")
+	params.AddNonZero("test", 0)
+	assertLen(t, params, 1)
+	assertEq(t, params["test"], "")
+}
+
+func TestAddNonZero64(t *testing.T) {
+	params := make(Params)
+	params.AddNonZero64("value", 1)
+	assertLen(t, params, 1)
+	assertEq(t, params["value"], "1")
+	params.AddNonZero64("test", 0)
+	assertLen(t, params, 1)
+	assertEq(t, params["test"], "")
+}
+
+func TestAddBool(t *testing.T) {
+	params := make(Params)
+	params.AddBool("value", true)
+	assertLen(t, params, 1)
+	assertEq(t, params["value"], "true")
+	params.AddBool("test", false)
+	assertLen(t, params, 1)
+	assertEq(t, params["test"], "")
+}
+
+func TestAddNonZeroFloat(t *testing.T) {
+	params := make(Params)
+	params.AddNonZeroFloat("value", 1)
+	assertLen(t, params, 1)
+	assertEq(t, params["value"], "1.000000")
+	params.AddNonZeroFloat("test", 0)
+	assertLen(t, params, 1)
+	assertEq(t, params["test"], "")
+}
+
+func TestAddInterface(t *testing.T) {
+	params := make(Params)
+	data := struct {
+		Name string `json:"name"`
+	}{
+		Name: "test",
+	}
+	params.AddInterface("value", data)
+	assertLen(t, params, 1)
+	assertEq(t, params["value"], `{"name":"test"}`)
+	params.AddInterface("test", nil)
+	assertLen(t, params, 1)
+	assertEq(t, params["test"], "")
+}
+
+func TestAddFirstValid(t *testing.T) {
+	params := make(Params)
+	params.AddFirstValid("value", 0, "", "test")
+	assertLen(t, params, 1)
+	assertEq(t, params["value"], "test")
+	params.AddFirstValid("value2", 3, "test")
+	assertLen(t, params, 2)
+	assertEq(t, params["value2"], "3")
+}

passport.go

@@ -61,6 +61,8 @@ type (
 		// Unique identifier for this file
 		FileID string `json:"file_id"`
 
+		FileUniqueID string `json:"file_unique_id"`
+
 		// File size
 		FileSize int `json:"file_size"`