From 1370ab2b91197980bfe77a45b6cdb7b6827d3ebc Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Tue, 13 Feb 2018 22:05:32 +0400 Subject: [PATCH] Yet another remote change Now: source.wtfteam.pro --- cmd/i2_bot/i2_bot.go | 32 ++++++++--------- lib/appcontext/appcontext.go | 34 +++++++++---------- lib/broadcaster/broadcaster.go | 2 +- .../broadcasterinterface.go | 2 +- lib/broadcaster/exported.go | 4 +-- lib/broadcaster/responders.go | 2 +- lib/broadcaster/sender.go | 2 +- .../chatterinterface/chatterinterface.go | 2 +- lib/chatter/exported.go | 4 +-- lib/chatter/getters.go | 2 +- lib/chatter/restricters.go | 2 +- lib/chatter/updaters.go | 2 +- lib/connections/connections.go | 2 +- .../datacacheinterface/datacacheinterface.go | 2 +- lib/datacache/elements.go | 2 +- lib/datacache/exported.go | 6 ++-- lib/datacache/leagues.go | 2 +- lib/datacache/locations.go | 2 +- lib/datacache/players.go | 2 +- lib/datacache/pokememes.go | 2 +- lib/datacache/profiles.go | 2 +- lib/datacache/weapons.go | 2 +- lib/forwarder/exported.go | 4 +-- lib/forwarder/forwarder.go | 2 +- .../forwarderinterface/forwarderinterface.go | 2 +- lib/migrations/exported.go | 4 +-- lib/orders/exported.go | 4 +-- lib/orders/getters.go | 2 +- lib/orders/orders.go | 2 +- lib/orders/ordersinterface/ordersinterface.go | 2 +- lib/pinner/exported.go | 4 +-- lib/pinner/pinner.go | 2 +- lib/pokedexer/exported.go | 4 +-- lib/pokedexer/getters.go | 2 +- lib/pokedexer/parsers.go | 2 +- lib/pokedexer/pokedexer.go | 2 +- .../pokedexerinterface/pokedexerinterface.go | 2 +- lib/pokedexer/responders.go | 2 +- lib/reminder/exported.go | 4 +-- lib/reminder/reminder.go | 2 +- .../reminderinterface/reminderinterface.go | 2 +- lib/reminder/responders.go | 2 +- lib/reminder/sender.go | 2 +- lib/reminder/updaters.go | 2 +- lib/router/exported.go | 2 +- lib/router/group_request.go | 2 +- lib/router/private_request.go | 2 +- lib/squader/exported.go | 4 +-- lib/squader/getters.go | 2 +- lib/squader/responders.go | 2 +- lib/squader/restricters.go | 2 +- lib/squader/squader.go | 2 +- .../squaderinterface/squaderinterface.go | 2 +- lib/statistics/exported.go | 4 +-- lib/statistics/squads.go | 2 +- .../statisticsinterface/statisticinterface.go | 2 +- lib/statistics/top.go | 2 +- lib/talkers/exported.go | 4 +-- lib/talkers/help.go | 4 +-- .../talkersinterface/talkersinterface.go | 2 +- lib/users/exported.go | 4 +-- lib/users/getters.go | 2 +- lib/users/parsers.go | 6 +++- lib/users/responders.go | 2 +- lib/users/users.go | 2 +- lib/users/usersinterface/usersinterface.go | 2 +- lib/welcomer/exported.go | 4 +-- lib/welcomer/responders.go | 2 +- .../welcomerinterface/welcomerinterface.go | 2 +- 69 files changed, 120 insertions(+), 116 deletions(-) diff --git a/cmd/i2_bot/i2_bot.go b/cmd/i2_bot/i2_bot.go index 19fb4e3..f4e8f4f 100644 --- a/cmd/i2_bot/i2_bot.go +++ b/cmd/i2_bot/i2_bot.go @@ -4,22 +4,22 @@ package main import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/broadcaster" - "git.wtfteam.pro/fat0troll/i2_bot/lib/chatter" - "git.wtfteam.pro/fat0troll/i2_bot/lib/datacache" - "git.wtfteam.pro/fat0troll/i2_bot/lib/forwarder" - "git.wtfteam.pro/fat0troll/i2_bot/lib/migrations" - "git.wtfteam.pro/fat0troll/i2_bot/lib/orders" - "git.wtfteam.pro/fat0troll/i2_bot/lib/pinner" - "git.wtfteam.pro/fat0troll/i2_bot/lib/pokedexer" - "git.wtfteam.pro/fat0troll/i2_bot/lib/reminder" - "git.wtfteam.pro/fat0troll/i2_bot/lib/router" - "git.wtfteam.pro/fat0troll/i2_bot/lib/squader" - "git.wtfteam.pro/fat0troll/i2_bot/lib/statistics" - "git.wtfteam.pro/fat0troll/i2_bot/lib/talkers" - "git.wtfteam.pro/fat0troll/i2_bot/lib/users" - "git.wtfteam.pro/fat0troll/i2_bot/lib/welcomer" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/broadcaster" + "source.wtfteam.pro/i2_bot/i2_bot/lib/chatter" + "source.wtfteam.pro/i2_bot/i2_bot/lib/datacache" + "source.wtfteam.pro/i2_bot/i2_bot/lib/forwarder" + "source.wtfteam.pro/i2_bot/i2_bot/lib/migrations" + "source.wtfteam.pro/i2_bot/i2_bot/lib/orders" + "source.wtfteam.pro/i2_bot/i2_bot/lib/pinner" + "source.wtfteam.pro/i2_bot/i2_bot/lib/pokedexer" + "source.wtfteam.pro/i2_bot/i2_bot/lib/reminder" + "source.wtfteam.pro/i2_bot/i2_bot/lib/router" + "source.wtfteam.pro/i2_bot/i2_bot/lib/squader" + "source.wtfteam.pro/i2_bot/i2_bot/lib/statistics" + "source.wtfteam.pro/i2_bot/i2_bot/lib/talkers" + "source.wtfteam.pro/i2_bot/i2_bot/lib/users" + "source.wtfteam.pro/i2_bot/i2_bot/lib/welcomer" ) var ( diff --git a/lib/appcontext/appcontext.go b/lib/appcontext/appcontext.go index d4b66c9..ebb0f2d 100644 --- a/lib/appcontext/appcontext.go +++ b/lib/appcontext/appcontext.go @@ -6,23 +6,23 @@ package appcontext import ( "bitbucket.org/pztrn/flagger" "bitbucket.org/pztrn/mogrus" - "git.wtfteam.pro/fat0troll/i2_bot/lib/broadcaster/broadcasterinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/chatter/chatterinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/config" - "git.wtfteam.pro/fat0troll/i2_bot/lib/connections" - "git.wtfteam.pro/fat0troll/i2_bot/lib/datacache/datacacheinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/forwarder/forwarderinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/migrations/migrationsinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/orders/ordersinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/pinner/pinnerinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/pokedexer/pokedexerinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/reminder/reminderinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/router/routerinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/squader/squaderinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/statistics/statisticsinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/talkers/talkersinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/users/usersinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/welcomer/welcomerinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/broadcaster/broadcasterinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/chatter/chatterinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/config" + "source.wtfteam.pro/i2_bot/i2_bot/lib/connections" + "source.wtfteam.pro/i2_bot/i2_bot/lib/datacache/datacacheinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/forwarder/forwarderinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/migrations/migrationsinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/orders/ordersinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/pinner/pinnerinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/pokedexer/pokedexerinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/reminder/reminderinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/router/routerinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/squader/squaderinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/statistics/statisticsinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/talkers/talkersinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/users/usersinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/welcomer/welcomerinterface" "github.com/go-telegram-bot-api/telegram-bot-api" "github.com/jmoiron/sqlx" "github.com/robfig/cron" diff --git a/lib/broadcaster/broadcaster.go b/lib/broadcaster/broadcaster.go index fd65c1f..f7e551b 100644 --- a/lib/broadcaster/broadcaster.go +++ b/lib/broadcaster/broadcaster.go @@ -4,7 +4,7 @@ package broadcaster import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "time" ) diff --git a/lib/broadcaster/broadcasterinterface/broadcasterinterface.go b/lib/broadcaster/broadcasterinterface/broadcasterinterface.go index f236796..fffdbc4 100644 --- a/lib/broadcaster/broadcasterinterface/broadcasterinterface.go +++ b/lib/broadcaster/broadcasterinterface/broadcasterinterface.go @@ -5,7 +5,7 @@ package broadcasterinterface import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" ) // BroadcasterInterface implements Broadcaster for importing via appcontex diff --git a/lib/broadcaster/exported.go b/lib/broadcaster/exported.go index 6b64e34..e7385d1 100644 --- a/lib/broadcaster/exported.go +++ b/lib/broadcaster/exported.go @@ -4,8 +4,8 @@ package broadcaster import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/broadcaster/broadcasterinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/broadcaster/broadcasterinterface" ) var ( diff --git a/lib/broadcaster/responders.go b/lib/broadcaster/responders.go index 623b94b..a27759d 100644 --- a/lib/broadcaster/responders.go +++ b/lib/broadcaster/responders.go @@ -5,7 +5,7 @@ package broadcaster import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" ) diff --git a/lib/broadcaster/sender.go b/lib/broadcaster/sender.go index 9bc3721..265b6ce 100644 --- a/lib/broadcaster/sender.go +++ b/lib/broadcaster/sender.go @@ -4,7 +4,7 @@ package broadcaster import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "strconv" ) diff --git a/lib/chatter/chatterinterface/chatterinterface.go b/lib/chatter/chatterinterface/chatterinterface.go index daa2bc0..80e4418 100644 --- a/lib/chatter/chatterinterface/chatterinterface.go +++ b/lib/chatter/chatterinterface/chatterinterface.go @@ -5,7 +5,7 @@ package chatterinterface import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" ) // ChatterInterface implements Chatter for importing via appcontext. diff --git a/lib/chatter/exported.go b/lib/chatter/exported.go index e1de1a3..e563e59 100644 --- a/lib/chatter/exported.go +++ b/lib/chatter/exported.go @@ -4,8 +4,8 @@ package chatter import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/chatter/chatterinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/chatter/chatterinterface" ) var ( diff --git a/lib/chatter/getters.go b/lib/chatter/getters.go index a3a38b7..10c0b2d 100644 --- a/lib/chatter/getters.go +++ b/lib/chatter/getters.go @@ -5,7 +5,7 @@ package chatter import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" "strings" "time" diff --git a/lib/chatter/restricters.go b/lib/chatter/restricters.go index 9f449b4..8c4740f 100644 --- a/lib/chatter/restricters.go +++ b/lib/chatter/restricters.go @@ -4,7 +4,7 @@ package chatter import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "strconv" "strings" diff --git a/lib/chatter/updaters.go b/lib/chatter/updaters.go index 940bc03..9620afc 100644 --- a/lib/chatter/updaters.go +++ b/lib/chatter/updaters.go @@ -5,7 +5,7 @@ package chatter import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" ) // UpdateChatTitle updates chat title in database diff --git a/lib/connections/connections.go b/lib/connections/connections.go index 421f708..9a32bbf 100644 --- a/lib/connections/connections.go +++ b/lib/connections/connections.go @@ -5,7 +5,7 @@ package connections import ( "bitbucket.org/pztrn/mogrus" - "git.wtfteam.pro/fat0troll/i2_bot/lib/config" + "source.wtfteam.pro/i2_bot/i2_bot/lib/config" _ "github.com/go-sql-driver/mysql" "github.com/go-telegram-bot-api/telegram-bot-api" "github.com/jmoiron/sqlx" diff --git a/lib/datacache/datacacheinterface/datacacheinterface.go b/lib/datacache/datacacheinterface/datacacheinterface.go index d107f79..0e49252 100644 --- a/lib/datacache/datacacheinterface/datacacheinterface.go +++ b/lib/datacache/datacacheinterface/datacacheinterface.go @@ -4,7 +4,7 @@ package datacacheinterface import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" ) // DataCacheInterface implements DataCache for importing via appcontext. diff --git a/lib/datacache/elements.go b/lib/datacache/elements.go index cc29d75..836218b 100644 --- a/lib/datacache/elements.go +++ b/lib/datacache/elements.go @@ -5,7 +5,7 @@ package datacache import ( "errors" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" ) diff --git a/lib/datacache/exported.go b/lib/datacache/exported.go index 499947e..2ed283f 100644 --- a/lib/datacache/exported.go +++ b/lib/datacache/exported.go @@ -4,9 +4,9 @@ package datacache import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/datacache/datacacheinterface" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/datacache/datacacheinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "sync" ) diff --git a/lib/datacache/leagues.go b/lib/datacache/leagues.go index 86e22f8..ab07a42 100644 --- a/lib/datacache/leagues.go +++ b/lib/datacache/leagues.go @@ -5,7 +5,7 @@ package datacache import ( "errors" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" ) diff --git a/lib/datacache/locations.go b/lib/datacache/locations.go index e6d52e3..83c759e 100644 --- a/lib/datacache/locations.go +++ b/lib/datacache/locations.go @@ -5,7 +5,7 @@ package datacache import ( "errors" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" ) diff --git a/lib/datacache/players.go b/lib/datacache/players.go index e155eb3..141511e 100644 --- a/lib/datacache/players.go +++ b/lib/datacache/players.go @@ -5,7 +5,7 @@ package datacache import ( "errors" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" "time" ) diff --git a/lib/datacache/pokememes.go b/lib/datacache/pokememes.go index afde9eb..a87d0a4 100644 --- a/lib/datacache/pokememes.go +++ b/lib/datacache/pokememes.go @@ -5,7 +5,7 @@ package datacache import ( "errors" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "sort" "strconv" "strings" diff --git a/lib/datacache/profiles.go b/lib/datacache/profiles.go index f20a735..c8b950d 100644 --- a/lib/datacache/profiles.go +++ b/lib/datacache/profiles.go @@ -5,7 +5,7 @@ package datacache import ( "errors" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" ) diff --git a/lib/datacache/weapons.go b/lib/datacache/weapons.go index 6ff0a5d..efdf82e 100644 --- a/lib/datacache/weapons.go +++ b/lib/datacache/weapons.go @@ -5,7 +5,7 @@ package datacache import ( "errors" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" "strings" ) diff --git a/lib/forwarder/exported.go b/lib/forwarder/exported.go index 713bbfa..084514d 100644 --- a/lib/forwarder/exported.go +++ b/lib/forwarder/exported.go @@ -4,8 +4,8 @@ package forwarder import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/forwarder/forwarderinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/forwarder/forwarderinterface" ) var ( diff --git a/lib/forwarder/forwarder.go b/lib/forwarder/forwarder.go index 2b5dd99..bbee2f7 100644 --- a/lib/forwarder/forwarder.go +++ b/lib/forwarder/forwarder.go @@ -4,7 +4,7 @@ package forwarder import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "regexp" ) diff --git a/lib/forwarder/forwarderinterface/forwarderinterface.go b/lib/forwarder/forwarderinterface/forwarderinterface.go index e8798ef..3966b5b 100644 --- a/lib/forwarder/forwarderinterface/forwarderinterface.go +++ b/lib/forwarder/forwarderinterface/forwarderinterface.go @@ -5,7 +5,7 @@ package forwarderinterface import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" ) // ForwarderInterface implements Getters for importing via appcontext. diff --git a/lib/migrations/exported.go b/lib/migrations/exported.go index b635a6c..bcb06ff 100644 --- a/lib/migrations/exported.go +++ b/lib/migrations/exported.go @@ -4,8 +4,8 @@ package migrations import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/migrations/migrationsinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/migrations/migrationsinterface" ) // Migrations handles all functions of migrations package diff --git a/lib/orders/exported.go b/lib/orders/exported.go index 77e2853..5bb4293 100644 --- a/lib/orders/exported.go +++ b/lib/orders/exported.go @@ -4,8 +4,8 @@ package orders import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/orders/ordersinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/orders/ordersinterface" ) var ( diff --git a/lib/orders/getters.go b/lib/orders/getters.go index 86d135d..5a993da 100644 --- a/lib/orders/getters.go +++ b/lib/orders/getters.go @@ -4,7 +4,7 @@ package orders import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" ) // GetAllOrders returns all orders in database diff --git a/lib/orders/orders.go b/lib/orders/orders.go index 03cce6c..52e2d71 100644 --- a/lib/orders/orders.go +++ b/lib/orders/orders.go @@ -5,7 +5,7 @@ package orders import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" "strings" ) diff --git a/lib/orders/ordersinterface/ordersinterface.go b/lib/orders/ordersinterface/ordersinterface.go index 1976db9..c18bee7 100644 --- a/lib/orders/ordersinterface/ordersinterface.go +++ b/lib/orders/ordersinterface/ordersinterface.go @@ -5,7 +5,7 @@ package ordersinterface import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" ) // OrdersInterface implements Orders for importing via appcontext. diff --git a/lib/pinner/exported.go b/lib/pinner/exported.go index 13efc02..fd150e2 100644 --- a/lib/pinner/exported.go +++ b/lib/pinner/exported.go @@ -4,8 +4,8 @@ package pinner import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/pinner/pinnerinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/pinner/pinnerinterface" ) var ( diff --git a/lib/pinner/pinner.go b/lib/pinner/pinner.go index 6ef9819..b883393 100644 --- a/lib/pinner/pinner.go +++ b/lib/pinner/pinner.go @@ -5,7 +5,7 @@ package pinner import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" "strings" ) diff --git a/lib/pokedexer/exported.go b/lib/pokedexer/exported.go index 8f3d929..0a07963 100644 --- a/lib/pokedexer/exported.go +++ b/lib/pokedexer/exported.go @@ -5,8 +5,8 @@ package pokedexer import ( // local - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/pokedexer/pokedexerinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/pokedexer/pokedexerinterface" ) var ( diff --git a/lib/pokedexer/getters.go b/lib/pokedexer/getters.go index a937809..17ee8aa 100644 --- a/lib/pokedexer/getters.go +++ b/lib/pokedexer/getters.go @@ -4,7 +4,7 @@ package pokedexer import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "sort" "strconv" "strings" diff --git a/lib/pokedexer/parsers.go b/lib/pokedexer/parsers.go index 10dda67..7cac67d 100644 --- a/lib/pokedexer/parsers.go +++ b/lib/pokedexer/parsers.go @@ -4,7 +4,7 @@ package pokedexer import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "regexp" "strconv" diff --git a/lib/pokedexer/pokedexer.go b/lib/pokedexer/pokedexer.go index 5ea880d..5f3aa96 100644 --- a/lib/pokedexer/pokedexer.go +++ b/lib/pokedexer/pokedexer.go @@ -4,7 +4,7 @@ package pokedexer import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "sort" "strconv" diff --git a/lib/pokedexer/pokedexerinterface/pokedexerinterface.go b/lib/pokedexer/pokedexerinterface/pokedexerinterface.go index 9a76e34..8a77619 100644 --- a/lib/pokedexer/pokedexerinterface/pokedexerinterface.go +++ b/lib/pokedexer/pokedexerinterface/pokedexerinterface.go @@ -4,7 +4,7 @@ package pokedexerinterface import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" ) diff --git a/lib/pokedexer/responders.go b/lib/pokedexer/responders.go index b6214f0..0af44f9 100644 --- a/lib/pokedexer/responders.go +++ b/lib/pokedexer/responders.go @@ -4,7 +4,7 @@ package pokedexer import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "strconv" "strings" diff --git a/lib/reminder/exported.go b/lib/reminder/exported.go index 76f1584..c4660d9 100644 --- a/lib/reminder/exported.go +++ b/lib/reminder/exported.go @@ -4,8 +4,8 @@ package reminder import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/reminder/reminderinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/reminder/reminderinterface" ) var ( diff --git a/lib/reminder/reminder.go b/lib/reminder/reminder.go index 6133754..2d54bfa 100644 --- a/lib/reminder/reminder.go +++ b/lib/reminder/reminder.go @@ -5,7 +5,7 @@ package reminder import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" ) diff --git a/lib/reminder/reminderinterface/reminderinterface.go b/lib/reminder/reminderinterface/reminderinterface.go index c843bda..7bd7585 100644 --- a/lib/reminder/reminderinterface/reminderinterface.go +++ b/lib/reminder/reminderinterface/reminderinterface.go @@ -5,7 +5,7 @@ package reminderinterface import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" ) // ReminderInterface implements Reminder for importing via appcontext diff --git a/lib/reminder/responders.go b/lib/reminder/responders.go index 2e2e80d..c1e8b3e 100644 --- a/lib/reminder/responders.go +++ b/lib/reminder/responders.go @@ -5,7 +5,7 @@ package reminder import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" ) // AlarmsList lists all alarms for user with buttons to enable/disable each of available alarms diff --git a/lib/reminder/sender.go b/lib/reminder/sender.go index 71631dc..e07a084 100644 --- a/lib/reminder/sender.go +++ b/lib/reminder/sender.go @@ -5,7 +5,7 @@ package reminder import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "time" ) diff --git a/lib/reminder/updaters.go b/lib/reminder/updaters.go index d96f858..c4335bc 100644 --- a/lib/reminder/updaters.go +++ b/lib/reminder/updaters.go @@ -5,7 +5,7 @@ package reminder import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" "strings" "time" diff --git a/lib/router/exported.go b/lib/router/exported.go index 580f8b3..9f60888 100644 --- a/lib/router/exported.go +++ b/lib/router/exported.go @@ -4,7 +4,7 @@ package router import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" ) var ( diff --git a/lib/router/group_request.go b/lib/router/group_request.go index cdab976..cd456b0 100644 --- a/lib/router/group_request.go +++ b/lib/router/group_request.go @@ -5,7 +5,7 @@ package router import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "math/rand" "regexp" ) diff --git a/lib/router/private_request.go b/lib/router/private_request.go index 44d2285..4d06a3a 100644 --- a/lib/router/private_request.go +++ b/lib/router/private_request.go @@ -4,7 +4,7 @@ package router import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "regexp" ) diff --git a/lib/squader/exported.go b/lib/squader/exported.go index 502c050..ccbdf07 100644 --- a/lib/squader/exported.go +++ b/lib/squader/exported.go @@ -4,8 +4,8 @@ package squader import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/squader/squaderinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/squader/squaderinterface" ) var ( diff --git a/lib/squader/getters.go b/lib/squader/getters.go index 47d58de..ceb1f99 100644 --- a/lib/squader/getters.go +++ b/lib/squader/getters.go @@ -4,7 +4,7 @@ package squader import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" "strings" ) diff --git a/lib/squader/responders.go b/lib/squader/responders.go index 22605f5..fdf73a9 100644 --- a/lib/squader/responders.go +++ b/lib/squader/responders.go @@ -5,7 +5,7 @@ package squader import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" "strings" ) diff --git a/lib/squader/restricters.go b/lib/squader/restricters.go index 55a1cb6..da2b466 100644 --- a/lib/squader/restricters.go +++ b/lib/squader/restricters.go @@ -4,7 +4,7 @@ package squader import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" ) diff --git a/lib/squader/squader.go b/lib/squader/squader.go index f7782ca..aa075ba 100644 --- a/lib/squader/squader.go +++ b/lib/squader/squader.go @@ -4,7 +4,7 @@ package squader import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "regexp" "strconv" diff --git a/lib/squader/squaderinterface/squaderinterface.go b/lib/squader/squaderinterface/squaderinterface.go index f4a119c..e9d316d 100644 --- a/lib/squader/squaderinterface/squaderinterface.go +++ b/lib/squader/squaderinterface/squaderinterface.go @@ -5,7 +5,7 @@ package squaderinterface import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" ) // SquaderInterface implements Squader for importing via appcontext. diff --git a/lib/statistics/exported.go b/lib/statistics/exported.go index 52905b7..0eb691a 100644 --- a/lib/statistics/exported.go +++ b/lib/statistics/exported.go @@ -4,8 +4,8 @@ package statistics import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/statistics/statisticsinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/statistics/statisticsinterface" ) var ( diff --git a/lib/statistics/squads.go b/lib/statistics/squads.go index ea0cf91..d8c67cf 100644 --- a/lib/statistics/squads.go +++ b/lib/statistics/squads.go @@ -4,7 +4,7 @@ package statistics import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "strconv" ) diff --git a/lib/statistics/statisticsinterface/statisticinterface.go b/lib/statistics/statisticsinterface/statisticinterface.go index 3c5e93b..f8b065b 100644 --- a/lib/statistics/statisticsinterface/statisticinterface.go +++ b/lib/statistics/statisticsinterface/statisticinterface.go @@ -4,7 +4,7 @@ package statisticsinterface import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" ) diff --git a/lib/statistics/top.go b/lib/statistics/top.go index eb8da74..0348696 100644 --- a/lib/statistics/top.go +++ b/lib/statistics/top.go @@ -4,7 +4,7 @@ package statistics import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "sort" "strconv" diff --git a/lib/talkers/exported.go b/lib/talkers/exported.go index 75d69f2..0e371b1 100644 --- a/lib/talkers/exported.go +++ b/lib/talkers/exported.go @@ -4,8 +4,8 @@ package talkers import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/talkers/talkersinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/talkers/talkersinterface" ) var ( diff --git a/lib/talkers/help.go b/lib/talkers/help.go index dde3aa6..d98dd3a 100644 --- a/lib/talkers/help.go +++ b/lib/talkers/help.go @@ -4,8 +4,8 @@ package talkers import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/config" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/config" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "time" ) diff --git a/lib/talkers/talkersinterface/talkersinterface.go b/lib/talkers/talkersinterface/talkersinterface.go index 99eae15..db21a99 100644 --- a/lib/talkers/talkersinterface/talkersinterface.go +++ b/lib/talkers/talkersinterface/talkersinterface.go @@ -4,7 +4,7 @@ package talkersinterface import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" ) diff --git a/lib/users/exported.go b/lib/users/exported.go index 9392889..fe1d423 100644 --- a/lib/users/exported.go +++ b/lib/users/exported.go @@ -4,8 +4,8 @@ package users import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/users/usersinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/users/usersinterface" ) var ( diff --git a/lib/users/getters.go b/lib/users/getters.go index 873e119..4d2fcd9 100644 --- a/lib/users/getters.go +++ b/lib/users/getters.go @@ -4,7 +4,7 @@ package users import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" ) diff --git a/lib/users/parsers.go b/lib/users/parsers.go index 3535c0f..886fa07 100644 --- a/lib/users/parsers.go +++ b/lib/users/parsers.go @@ -4,7 +4,7 @@ package users import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "regexp" "strconv" @@ -299,6 +299,10 @@ func (u *Users) ParseProfile(update *tgbotapi.Update, playerRaw *dbmapping.Playe rarity = "new year" meme = strings.Replace(meme, "❄", "", 1) } + if strings.HasPrefix(meme, "❤️") { + rarity = "valentine" + meme = strings.Replace(meme, "❤️", "", 1) + } u.fillProfilePokememe(newProfileID, meme, attack, rarity) } diff --git a/lib/users/responders.go b/lib/users/responders.go index fc9af60..248256e 100644 --- a/lib/users/responders.go +++ b/lib/users/responders.go @@ -4,7 +4,7 @@ package users import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "strconv" "strings" diff --git a/lib/users/users.go b/lib/users/users.go index 6efb65b..aff8921 100644 --- a/lib/users/users.go +++ b/lib/users/users.go @@ -4,7 +4,7 @@ package users import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "sort" "strconv" diff --git a/lib/users/usersinterface/usersinterface.go b/lib/users/usersinterface/usersinterface.go index 228641c..5c0b591 100644 --- a/lib/users/usersinterface/usersinterface.go +++ b/lib/users/usersinterface/usersinterface.go @@ -4,7 +4,7 @@ package usersinterface import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" ) diff --git a/lib/welcomer/exported.go b/lib/welcomer/exported.go index 4b1d686..275695d 100644 --- a/lib/welcomer/exported.go +++ b/lib/welcomer/exported.go @@ -4,8 +4,8 @@ package welcomer import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/appcontext" - "git.wtfteam.pro/fat0troll/i2_bot/lib/welcomer/welcomerinterface" + "source.wtfteam.pro/i2_bot/i2_bot/lib/appcontext" + "source.wtfteam.pro/i2_bot/i2_bot/lib/welcomer/welcomerinterface" ) var ( diff --git a/lib/welcomer/responders.go b/lib/welcomer/responders.go index 8f3815b..60b9cf6 100644 --- a/lib/welcomer/responders.go +++ b/lib/welcomer/responders.go @@ -4,7 +4,7 @@ package welcomer import ( - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" "github.com/go-telegram-bot-api/telegram-bot-api" "strconv" ) diff --git a/lib/welcomer/welcomerinterface/welcomerinterface.go b/lib/welcomer/welcomerinterface/welcomerinterface.go index 4ecf53a..bc233f6 100644 --- a/lib/welcomer/welcomerinterface/welcomerinterface.go +++ b/lib/welcomer/welcomerinterface/welcomerinterface.go @@ -5,7 +5,7 @@ package welcomerinterface import ( "github.com/go-telegram-bot-api/telegram-bot-api" - "git.wtfteam.pro/fat0troll/i2_bot/lib/dbmapping" + "source.wtfteam.pro/i2_bot/i2_bot/lib/dbmapping" ) // WelcomerInterface implements Welcomer for importing via appcontex