narayana/telegabber
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

lint

Browse source
This commit is contained in:
bodqhrohro 2019-12-10 20:49:42 +02:00
parent 416c708909
commit 9e785a56d2
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
telegram/commands.go
View file

@ -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) userID, err := strconv.ParseInt(username, 10, 32)
// couldn't parse the id, try to lookup as a username // couldn't parse the id, try to lookup as a username
if err != nil { if err != nil {
@ -481,7 +481,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool)
} }
if chatID < 0 { if chatID < 0 {
userID, err := c.usernameOrIdToId(args[0]) userID, err := c.usernameOrIDToID(args[0])
if err != nil { if err != nil {
return err.Error(), true return err.Error(), true
} }
@ -501,7 +501,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool)
} }
if chatID < 0 { if chatID < 0 {
userID, err := c.usernameOrIdToId(args[0]) userID, err := c.usernameOrIDToID(args[0])
if err != nil { if err != nil {
return err.Error(), true return err.Error(), true
} }
@ -522,7 +522,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool)
} }
if chatID < 0 { if chatID < 0 {
userID, err := c.usernameOrIdToId(args[0]) userID, err := c.usernameOrIDToID(args[0])
if err != nil { if err != nil {
return err.Error(), true return err.Error(), true
} }

6
telegram/utils.go
View file

@ -79,11 +79,11 @@ func (c *Client) GetContactByID(id int64, chat *client.Chat) (*client.Chat, *cli
}) })
if err != nil { if err != nil {
// error is irrelevant if the user was found successfully // error is irrelevant if the user was found successfully
if user == nil { if user != nil {
return nil, nil, err
} else {
return nil, user, nil return nil, user, nil
} }
return nil, nil, err
} }
c.cache.chats[id] = cacheChat c.cache.chats[id] = cacheChat