Merge pull request #3 from chaindead/revert-2-main
Revert "use InputPeerUser by custom username to 'user[%d]'"
This commit is contained in:
commit
956f664f17
3 changed files with 3 additions and 11 deletions
|
|
@ -35,12 +35,12 @@ func (c *Client) SendDraft(args DraftArguments) (*mcp.ToolResponse, error) {
|
||||||
Message: args.Text,
|
Message: args.Text,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to send draft: %w", err)
|
return fmt.Errorf("failed to get history: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return nil, errors.Wrap(err, "failed to send draft")
|
return nil, errors.Wrap(err, "failed to get history")
|
||||||
}
|
}
|
||||||
|
|
||||||
jsonData, err := json.Marshal(DraftResponse{Success: ok})
|
jsonData, err := json.Marshal(DraftResponse{Success: ok})
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ func getUsername(source any) string {
|
||||||
var username string
|
var username string
|
||||||
switch u := source.(type) {
|
switch u := source.(type) {
|
||||||
case *tg.User:
|
case *tg.User:
|
||||||
username = fmt.Sprintf("user[%d]", u.ID)
|
username = u.Username
|
||||||
case *tg.Chat:
|
case *tg.Chat:
|
||||||
username = fmt.Sprintf("cht[%d]", u.ID)
|
username = fmt.Sprintf("cht[%d]", u.ID)
|
||||||
case *tg.Channel:
|
case *tg.Channel:
|
||||||
|
|
|
||||||
|
|
@ -89,14 +89,6 @@ func getInputPeerFromName(ctx context.Context, api *tg.Client, name string) (tg.
|
||||||
}
|
}
|
||||||
|
|
||||||
return &chatPeer, nil
|
return &chatPeer, nil
|
||||||
case strings.HasPrefix(name, "user") && isCustom:
|
|
||||||
var userPeer tg.InputPeerUser
|
|
||||||
_, err := fmt.Sscanf(name, "user[%d]", &userPeer.UserID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrapf(err, "scan user peer(%q)", name)
|
|
||||||
}
|
|
||||||
|
|
||||||
return &userPeer, nil
|
|
||||||
default:
|
default:
|
||||||
sender := message.NewSender(api)
|
sender := message.NewSender(api)
|
||||||
inputPeer, err := sender.Resolve(name).AsInputPeer(ctx)
|
inputPeer, err := sender.Resolve(name).AsInputPeer(ctx)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue