diff --git a/internal/db_data/bot_data.go b/internal/db_data/bot_data.go index 9254170..19a017e 100644 --- a/internal/db_data/bot_data.go +++ b/internal/db_data/bot_data.go @@ -64,6 +64,13 @@ func SetUserFirstLastName(userID int64, firstLastName string) error { // return fmt.Errorf("the firstLastName is NULL") return nil } + if firstLastName == "NULL" { + return AddKeyValueWithExpiration( + fmt.Sprintf("%s%d", USER_FirstLastName_prefix, userID), + firstLastName, + time.Hour*24, + ) + } return AddKeyValue( fmt.Sprintf("%s%d", USER_FirstLastName_prefix, userID), diff --git a/internal/service/bot_service.go b/internal/service/bot_service.go index a84e62f..3c71b42 100644 --- a/internal/service/bot_service.go +++ b/internal/service/bot_service.go @@ -81,7 +81,7 @@ func GetUserFirstLastName(userID int64) string { if len(firstLastName) == 0 { if firstName, lastName, err := api.GetUserFirstLastName(userID); err != nil { // firstLastName = "NULL" - log.Errorf("GetUserFirstLastName(%d): %v", userID, err) + log.Errorf("api.GetUserFirstLastName(%d): %v", userID, err) } else { firstLastName = firstName + " " + lastName } @@ -89,6 +89,10 @@ func GetUserFirstLastName(userID int64) string { log.Errorf("SetUserFirstLastName(%d,%s): %v", userID, firstLastName, err) } } + + if firstLastName == "NULL" { + return "" + } return firstLastName } @@ -106,5 +110,8 @@ func GetChatTitle(chatID int64) string { log.Errorf("SetUserFirstLastName(%d,%s): %v", chatID, chatTitle, err) } } + if chatTitle == "NULL" { + return "" + } return chatTitle }