hdkv/i2_bot
Archived
1
Fork 0
Code Releases Activity

Bot welcome message fix for self-welcomes

Browse Source
This commit is contained in:
Vladimir Hodakov 2017-11-26 15:45:55 +04:00
parent 53a99b0ff3
commit 0025493636
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/welcomer/responders.go
View File

@ -47,13 +47,13 @@ func (w *Welcomer) PrivateWelcomeMessageSpecial(update *tgbotapi.Update, playerR
func (w *Welcomer) GroupWelcomeMessage(update *tgbotapi.Update) string { func (w *Welcomer) GroupWelcomeMessage(update *tgbotapi.Update) string {
newUsers := *update.Message.NewChatMembers newUsers := *update.Message.NewChatMembers
for i := range newUsers { for i := range newUsers {
if (newUsers[i].UserName == "i2_bot") || (newUsers[i].UserName == "i2_dev_bot") {
w.groupStartMessage(update)
}
newUser := newUsers[i] newUser := newUsers[i]
if (newUser.UserName == "i2_bot") || (newUser.UserName == "i2_dev_bot") {
w.groupStartMessage(update)
} else {
w.groupWelcomeUser(update, &newUser) w.groupWelcomeUser(update, &newUser)
} }
}
return "ok" return "ok"
} }

2
lib/welcomer/welcomer.go
View File

@ -17,7 +17,7 @@ func (w *Welcomer) groupWelcomeUser(update *tgbotapi.Update, newUser *tgbotapi.U
profileRaw, profileExist := c.Users.GetProfile(playerRaw.ID) profileRaw, profileExist := c.Users.GetProfile(playerRaw.ID)
message := "*Бот Инстинкта приветствует тебя, *@" message := "*Бот Инстинкта приветствует тебя, *@"
message += newUser.UserName message += c.Users.FormatUsername(newUser.UserName)
message += "*!*\n\n" message += "*!*\n\n"
if profileExist { if profileExist {