Merge pull request #436 from shindakioku/fix-invite-links

Fix CreateInviteLink, EditInviteLink, RevokeInviteLink functions
pull/437/head
demget 3 years ago committed by GitHub
commit 93c5ba7136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1703,12 +1703,14 @@ func (b *Bot) CreateInviteLink(chat *Chat, link *ChatInviteLink) (*ChatInviteLin
return nil, err
}
var resp ChatInviteLink
var resp struct {
Result ChatInviteLink `json:"result"`
}
if err := json.Unmarshal(data, &resp); err != nil {
return nil, wrapError(err)
}
return &resp, nil
return &resp.Result, nil
}
// EditInviteLink edits a non-primary invite link created by the bot.
@ -1727,19 +1729,21 @@ func (b *Bot) EditInviteLink(chat *Chat, link *ChatInviteLink) (*ChatInviteLink,
return nil, err
}
var resp ChatInviteLink
var resp struct {
Result ChatInviteLink `json:"result"`
}
if err := json.Unmarshal(data, &resp); err != nil {
return nil, wrapError(err)
}
return &resp, nil
return &resp.Result, nil
}
// RevokeInviteLink revokes an invite link created by the bot.
func (b *Bot) RevokeInviteLink(chat *Chat, link string) (*ChatInviteLink, error) {
params := map[string]string{
"chat_id": chat.Recipient(),
"link": link,
"invite_link": link,
}
data, err := b.Raw("revokeChatInviteLink", params)
@ -1747,10 +1751,12 @@ func (b *Bot) RevokeInviteLink(chat *Chat, link string) (*ChatInviteLink, error)
return nil, err
}
var resp ChatInviteLink
var resp struct {
Result ChatInviteLink `json:"result"`
}
if err := json.Unmarshal(data, &resp); err != nil {
return nil, wrapError(err)
}
return &resp, nil
return &resp.Result, nil
}

@ -480,4 +480,30 @@ func TestBot(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, orig, cmds)
})
t.Run("CreateInviteLink", func(t *testing.T) {
inviteLink, err := b.CreateInviteLink(&Chat{ID: chatID}, nil)
assert.Nil(t, err)
assert.True(t, len(inviteLink.InviteLink) > 0)
})
t.Run("EditInviteLink", func(t *testing.T) {
inviteLink, err := b.CreateInviteLink(&Chat{ID: chatID}, nil)
assert.Nil(t, err)
assert.True(t, len(inviteLink.InviteLink) > 0)
response, err := b.EditInviteLink(&Chat{ID: chatID}, &ChatInviteLink{InviteLink: inviteLink.InviteLink})
assert.Nil(t, err)
assert.True(t, len(response.InviteLink) > 0)
})
t.Run("RevokeInviteLink", func(t *testing.T) {
inviteLink, err := b.CreateInviteLink(&Chat{ID: chatID}, nil)
assert.Nil(t, err)
assert.True(t, len(inviteLink.InviteLink) > 0)
response, err := b.RevokeInviteLink(&Chat{ID: chatID}, inviteLink.InviteLink)
assert.Nil(t, err)
assert.True(t, len(response.InviteLink) > 0)
})
}

Loading…
Cancel
Save