hdkv/i2_bot
Archived
1
Fork 0
Code Releases Activity

Add pokememes info, convert it to new format and drop unnecessary database tables

Browse Source 
This commit introduces pokememes information storage in source code (because they're rarely changed and I always update them manually).

All information about pokememes updated after nerf of 25 April. Also, added buttons to /pokedeks command for changing pages (there are 21 pages already!), and limited one page to 35 pokememes.
This commit is contained in:
Vladimir Hodakov
2018-05-02 00:47:55 +04:00
parent b1975a161c
commit a9f1d25c7b
46 changed files with 10391 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/router/callback_request.go
View File

@@ -23,12 +23,15 @@ func (r *Router) RouteCallback(update tgbotapi.Update) string {
var enableAlarmCallback = regexp.MustCompile("enable_reminder_(\\d+)\\z")
var disableAlarmCallback = regexp.MustCompile("disable_reminder_(\\d+)\\z")
var pokedeksPageCallback = regexp.MustCompile("pokedeks(\\d+)\\z")
switch {
case enableAlarmCallback.MatchString(update.CallbackQuery.Data):
return c.Reminder.CreateAlarmSetting(&update, playerRaw)
case disableAlarmCallback.MatchString(update.CallbackQuery.Data):
return c.Reminder.DestroyAlarmSetting(&update, playerRaw)
case pokedeksPageCallback.MatchString(update.CallbackQuery.Data):
return c.Pokedexer.PokememesListUpdater(&update)
}
return "ok"

23
lib/router/private_request.go
View File

@@ -4,10 +4,10 @@
package router
import (
"regexp"
"github.com/go-telegram-bot-api/telegram-bot-api"
"regexp"
"source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping"
"strconv"
)
func (r *Router) routePrivateRequest(update tgbotapi.Update, playerRaw *dbmapping.Player, chatRaw *dbmapping.Chat) string {
@@ -26,15 +26,23 @@ func (r *Router) routePrivateRequest(update tgbotapi.Update, playerRaw *dbmappin
}
if update.Message.ForwardFrom != nil {
if update.Message.ForwardFrom.ID != 360402625 {
c.Log.Info("Forward from another user or bot. Ignoring")
} else {
if update.Message.ForwardFrom.ID == 360402625 {
c.Log.Info("Forward from PokememBro bot! Processing...")
if playerRaw.ID != 0 {
c.Forwarder.ProcessForward(&update, playerRaw)
} else {
return c.Talkers.AnyMessageUnauthorized(&update)
}
} else if update.Message.ForwardFrom.ID == 392622454 {
// Pokememes test bot with actual pokedeks
c.Log.Info("Forward from PokememBro test bot! Processing...")
if playerRaw.ID != 0 {
c.Forwarder.ProcessForward(&update, playerRaw)
} else {
return c.Talkers.AnyMessageUnauthorized(&update)
}
} else {
c.Log.Info("Forward from another user or bot (" + strconv.Itoa(update.Message.ForwardFrom.ID) + "). Ignoring")
}
} else {
if update.Message.IsCommand() {
@@ -74,12 +82,7 @@ func (r *Router) routePrivateRequest(update tgbotapi.Update, playerRaw *dbmappin
case pokememeInfoMsg.MatchString(text):
c.Pokedexer.PokememeInfo(&update, playerRaw)
return "ok"
case update.Message.Command() == "delete_pokememe":
if c.Users.PlayerBetterThan(playerRaw, "owner") {
return c.Pokedexer.DeletePokememe(&update)
}
return c.Talkers.AnyMessageUnauthorized(&update)
case update.Message.Command() == "me":
if playerRaw.ID != 0 {
c.Users.ProfileMessage(&update, playerRaw)