diff options
| author | bodqhrohro <bodqhrohro@gmail.com> | 2019-12-10 21:49:42 +0300 |
|---|---|---|
| committer | bodqhrohro <bodqhrohro@gmail.com> | 2019-12-10 21:49:42 +0300 |
| commit | 9e785a56d29f617a29afb941476c73f43bcdb3cc (patch) | |
| tree | 5eb4443d4f0877ee978e273198ac8e674b97f731 | |
| parent | 416c70890950f76ce6f5ce902ea9a70165239f56 (diff) | |
lint
| -rw-r--r-- | telegram/commands.go | 8 | ||||
| -rw-r--r-- | telegram/utils.go | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/telegram/commands.go b/telegram/commands.go index c41da29..678570f 100644 --- a/telegram/commands.go +++ b/telegram/commands.go @@ -133,7 +133,7 @@ func (c *Client) sendMessagesReverse(chatID int64, messages []*client.Message) { } } -func (c *Client) usernameOrIdToId(username string) (int32, error) { +func (c *Client) usernameOrIDToID(username string) (int32, error) { userID, err := strconv.ParseInt(username, 10, 32) // couldn't parse the id, try to lookup as a username if err != nil { @@ -481,7 +481,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool) } if chatID < 0 { - userID, err := c.usernameOrIdToId(args[0]) + userID, err := c.usernameOrIDToID(args[0]) if err != nil { return err.Error(), true } @@ -501,7 +501,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool) } if chatID < 0 { - userID, err := c.usernameOrIdToId(args[0]) + userID, err := c.usernameOrIDToID(args[0]) if err != nil { return err.Error(), true } @@ -522,7 +522,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool) } if chatID < 0 { - userID, err := c.usernameOrIdToId(args[0]) + userID, err := c.usernameOrIDToID(args[0]) if err != nil { return err.Error(), true } diff --git a/telegram/utils.go b/telegram/utils.go index ded9d2c..8b8da57 100644 --- a/telegram/utils.go +++ b/telegram/utils.go @@ -79,11 +79,11 @@ func (c *Client) GetContactByID(id int64, chat *client.Chat) (*client.Chat, *cli }) if err != nil { // error is irrelevant if the user was found successfully - if user == nil { - return nil, nil, err - } else { + if user != nil { return nil, user, nil } + + return nil, nil, err } c.cache.chats[id] = cacheChat |