diff --git a/bot b/bot deleted file mode 100644 index e9a4500..0000000 Binary files a/bot and /dev/null differ diff --git a/go.mod b/go.mod index dea662b..4232995 100644 --- a/go.mod +++ b/go.mod @@ -3,23 +3,8 @@ module bot go 1.23.0 require ( - github.com/glebarez/sqlite v1.11.0 - github.com/robfig/cron v1.2.0 + github.com/go-sql-driver/mysql v1.8.1 gopkg.in/telebot.v4 v4.0.0-beta.4 - gorm.io/gorm v1.25.7 ) -require ( - github.com/dustin/go-humanize v1.0.1 // indirect - github.com/glebarez/go-sqlite v1.21.2 // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/jinzhu/inflection v1.0.0 // indirect - github.com/jinzhu/now v1.1.5 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect - github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect - golang.org/x/sys v0.7.0 // indirect - modernc.org/libc v1.22.5 // indirect - modernc.org/mathutil v1.5.0 // indirect - modernc.org/memory v1.5.0 // indirect - modernc.org/sqlite v1.23.1 // indirect -) +require filippo.io/edwards25519 v1.1.0 // indirect diff --git a/go.sum b/go.sum index 01a6e6b..e151062 100644 --- a/go.sum +++ b/go.sum @@ -54,6 +54,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= @@ -98,8 +100,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= -github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -117,10 +117,6 @@ github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYF github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo= -github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k= -github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= -github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -134,6 +130,8 @@ github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvSc github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -207,12 +205,8 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= -github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -253,10 +247,6 @@ github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpT github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= -github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= -github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -293,8 +283,6 @@ github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcME github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= @@ -342,11 +330,6 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= -github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= -github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= @@ -599,9 +582,6 @@ golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -866,8 +846,6 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A= -gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -875,14 +853,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE= -modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= -modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= -modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= -modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= -modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= -modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/main.go b/main.go index b39d39b..bb4e6ca 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + "bot/src/controllers" "bot/src/handlers" "log" "time" @@ -9,9 +10,6 @@ import ( ) func main() { - dataHandler := handlers.Data{} - dataHandler.InitDB() - pref := tele.Settings{ Token: "7757765456:AAFpFXhbi9XCfgRt7P3OT3F_jrBBplubWZA", Poller: &tele.LongPoller{Timeout: 10 * time.Second}, @@ -23,9 +21,15 @@ func main() { return } + dc := controllers.NewDB() + dataHandler := handlers.NewHandlers(dc) + duelController := controllers.NewDuel(b, dc) + b.Handle("/dick", dataHandler.Dick) b.Handle("/top_dick", dataHandler.TopDick) - b.Handle("/clear_stats", dataHandler.ClearStatistics) + + b.Handle("/duel", duelController.StartMatch) + b.Handle("/accept", duelController.AcceptMatch) b.Start() } diff --git a/src/controllers/dataController.go b/src/controllers/dataController.go index e603250..a3d675e 100644 --- a/src/controllers/dataController.go +++ b/src/controllers/dataController.go @@ -2,25 +2,40 @@ package controllers import ( "bot/src/models" + "database/sql" + "fmt" + "log" "math/rand" "time" - "github.com/glebarez/sqlite" - "github.com/robfig/cron" - "gorm.io/gorm" + _ "github.com/go-sql-driver/mysql" ) -type DataController struct { - DB *gorm.DB +type DataConfig struct { + UserName string + Password string + HostName string + DbName string } +func (d *DataConfig) Get() string { + return fmt.Sprintf("%s:%s@tcp(%s)/%s", d.UserName, d.Password, d.HostName, d.DbName) +} + +type DataController struct{ DB *sql.DB } + func NewDB() *DataController { - db, err := gorm.Open(sqlite.Open("users.db"), &gorm.Config{}) + config := DataConfig{UserName: "root", Password: "12641264", HostName: "217.12.40.237", DbName: "test"} + + db, err := sql.Open("mysql", config.Get()) if err != nil { - panic("failed to connect database") + panic(err) } - db.AutoMigrate(models.User{}) + db.SetConnMaxLifetime(time.Minute * 3) + db.SetMaxOpenConns(10) + db.SetMaxIdleConns(10) + return &DataController{DB: db} } @@ -29,16 +44,70 @@ func RandRange() int { return rand.Intn(21) - 5 } +// UpdateUser updates user's dick size and checks if it's blocked func (d *DataController) ClearAllBlocked() { - d.DB.Model(&models.User{}).Where("is_blocked = ?", true).Update("is_blocked", false) + _, err := d.DB.Exec("UPDATE users SET blocked = false") + if err != nil { + log.Fatal(err) + } else { + log.Println("Clear block stats complete") + } } -func (d *DataController) CronRun() { - c := cron.New() - - c.AddFunc("0 20 * * *", func() { - d.ClearAllBlocked() - }) - - c.Start() +// CreateUser creates new user with random dick size and sets it to blocked +func (d *DataController) CreateUser(id int64, lname string, fname string) { + _, err := d.DB.Exec("INSERT INTO users (id, fname, lname, dick_size, admin, blocked, trick) VALUES (?,?,?,?,?,?,?)", id, fname, lname, 0, 0, 0, 1) + if err != nil { + log.Fatal(err) + } else { + log.Printf("User %d created", id) + } +} + +// GetUser gets user's data by id +func (d *DataController) GetUser(id int64) *models.User { + var user models.User + row, err := d.DB.Query("SELECT * FROM users WHERE id =?", id) + if err != nil { + log.Fatal(err) + } + + for row.Next() { + err := row.Scan(&user.ID, &user.FirstName, &user.LastName, &user.DickSize, &user.Admin, &user.Blocked, &user.Trick) + if err != nil { + log.Fatal(err) + } + } + + return &user +} + +// UpdateUser updates user's dick size and blocked status +func (d *DataController) UpdateDick(id int64, newDickSize int) { + _, err := d.DB.Exec("UPDATE users SET dick_size =?, blocked =?, trick =? WHERE id =?", newDickSize, 1, +1, id) + if err != nil { + log.Fatal(err) + } else { + log.Printf("User %d dick size updated", id) + } +} + +// GetTopUsers gets top 10 users by dick size +func (d *DataController) GetTopUsers() []models.User { + var users []models.User + rows, err := d.DB.Query("SELECT * FROM users ORDER BY dick_size DESC LIMIT 10") + if err != nil { + log.Fatal(err) + } + + for rows.Next() { + var user models.User + err := rows.Scan(&user.ID, &user.FirstName, &user.LastName, &user.DickSize, &user.Blocked, &user.Admin, &user.Trick) + if err != nil { + log.Fatal(err) + } + users = append(users, user) + } + + return users } diff --git a/src/controllers/duelController.go b/src/controllers/duelController.go new file mode 100644 index 0000000..400a1e2 --- /dev/null +++ b/src/controllers/duelController.go @@ -0,0 +1,170 @@ +package controllers + +import ( + "fmt" + "math/rand" + "strconv" + "strings" + "time" + + tele "gopkg.in/telebot.v4" +) + +type DuelController struct { + PlayerOne struct { + ID int64 + Counter int + FName string + } + + PlayerTwo struct { + ID int64 + Counter int + FName string + } + + Summ int + Inited bool + Bot *tele.Bot + DC *DataController +} + +// Controller Init +func NewDuel(bot *tele.Bot, dc *DataController) *DuelController { + return &DuelController{ + Inited: false, + Bot: bot, + DC: dc, + } +} + +// Start Match +func (s *DuelController) StartMatch(c tele.Context) error { + if s.Inited { + return c.Send(fmt.Sprintf("Дуэль уже началась!\nИгрок: %s\nСтавка: %d", s.PlayerOne.FName, s.Summ)) + } + + s.Inited = true + s.PlayerOne.ID = c.Sender().ID + s.PlayerOne.FName = c.Sender().FirstName + + user := s.DC.GetUser(s.PlayerOne.ID) + + if c.Text() == "/duel" { + return c.Send("Используйте /duel <сумма> для начала дуэли!") + } + + a := strings.Split(c.Text(), "/duel ")[1] + summ, err := strconv.Atoi(a) + if err != nil { + return c.Send("Некорректная команда, используйте /duel <сумма>") + } else { + s.Summ = summ + } + + if user.DickSize < summ { + return c.Send("У вас недостаточно длинный пенис для состязания!") + } + + if summ <= 0 { + return c.Send("Некорректная сумма, используйте положительное значение!") + } + + return c.Send(fmt.Sprintf("%s начал дуель, ставка: %d", s.PlayerOne.FName, summ)) +} + +// Accept Match +func (s *DuelController) AcceptMatch(c tele.Context) error { + if !s.Inited { + return c.Send("Дуэль еще не началась! Дождитесь старта матча или начните новую дуель с помощью /duel <сумма>") + } + + s.PlayerTwo.ID = c.Sender().ID + s.PlayerTwo.FName = c.Sender().FirstName + + user := s.DC.GetUser(s.PlayerTwo.ID) + + if user.DickSize < s.Summ { + return c.Send("У вас недостаточно длинный пенис для состязания!") + } + + if s.PlayerTwo.ID == s.PlayerOne.ID { + return c.Send("Вы не можете принять участие в своей же дуэли!") + } + + s.Summ *= 2 + go s.gameProccess(c.Chat()) + + return c.Send(fmt.Sprintf("%s принимает участие в дуэли.", s.PlayerTwo.FName)) +} + +// Start Game +func (s *DuelController) gameProccess(r tele.Recipient) { + time.Sleep(time.Second * 3) + s.Bot.Send(r, fmt.Sprintf("Дуэль началась!\nНа кону: %d", s.Summ)) + s.RoundOne(r) +} + +// Round One +func (s *DuelController) RoundOne(r tele.Recipient) { + time.Sleep(time.Second * 3) + s.PlayerOne.Counter += rand.Intn(11) + 1 + s.PlayerTwo.Counter += rand.Intn(11) + 1 + s.Bot.Send(r, + fmt.Sprintf("Результаты первого раунда\nИгрок %s: %d очков.\nИгрок %s: %d очков.", + s.PlayerOne.FName, s.PlayerOne.Counter, s.PlayerTwo.FName, s.PlayerTwo.Counter), + ) + s.RoundTwo(r) +} + +// Round Two +func (s *DuelController) RoundTwo(r tele.Recipient) { + time.Sleep(time.Second * 3) + s.PlayerOne.Counter += rand.Intn(11) + 1 + s.PlayerTwo.Counter += rand.Intn(11) + 1 + s.Bot.Send(r, + fmt.Sprintf("Результаты второго раунда\nИгрок %s: %d очков.\nИгрок %s: %d очков.", + s.PlayerOne.FName, s.PlayerOne.Counter, s.PlayerTwo.FName, s.PlayerTwo.Counter), + ) + s.RoundThree(r) +} + +// Round Three +func (s *DuelController) RoundThree(r tele.Recipient) { + time.Sleep(time.Second * 3) + s.PlayerOne.Counter += rand.Intn(11) + 1 + s.PlayerTwo.Counter += rand.Intn(11) + 1 + s.Bot.Send(r, + fmt.Sprintf("Результаты третьего раунда\nИгрок %s: %d очков.\nИгрок %s: %d очков.", + s.PlayerOne.FName, s.PlayerOne.Counter, s.PlayerTwo.FName, s.PlayerTwo.Counter), + ) + s.CheckWin(r) +} + +// Check Win +func (s *DuelController) CheckWin(r tele.Recipient) { + userOne := s.DC.GetUser(s.PlayerOne.ID) + userTwo := s.DC.GetUser(s.PlayerTwo.ID) + time.Sleep(time.Second * 3) + var winner int = 0 + if s.PlayerOne.Counter > s.PlayerTwo.Counter { + winner = 1 + } else { + winner = 2 + } + + if winner == 1 { + s.Inited = false + s.Bot.Send(r, fmt.Sprintf("Игрок %s победил!", s.PlayerOne.FName)) + s.DC.UpdateDick(userOne.ID, userOne.DickSize+(s.Summ/2)) + s.DC.UpdateDick(userTwo.ID, userTwo.DickSize-(s.Summ/2)) + } else if winner == 2 { + s.Inited = false + s.Bot.Send(r, fmt.Sprintf("Игрок %s победил!", s.PlayerTwo.FName)) + s.DC.UpdateDick(userOne.ID, userOne.DickSize-(s.Summ/2)) + s.DC.UpdateDick(userTwo.ID, userTwo.DickSize+(s.Summ/2)) + } else { + s.Inited = false + s.Bot.Send(r, "Ничья!") + } +} diff --git a/src/handlers/data.go b/src/handlers/logic.go similarity index 60% rename from src/handlers/data.go rename to src/handlers/logic.go index 4b8fb8b..c0db7fe 100644 --- a/src/handlers/data.go +++ b/src/handlers/logic.go @@ -2,42 +2,40 @@ package handlers import ( "bot/src/controllers" - "bot/src/models" "fmt" tele "gopkg.in/telebot.v4" ) -type Data struct { - Db *controllers.DataController +type Handlers struct { + DC *controllers.DataController } -func (d *Data) InitDB() { - d.Db = controllers.NewDB() - go d.Db.CronRun() +func NewHandlers(db *controllers.DataController) *Handlers { + return &Handlers{DC: db} } -func (d *Data) Dick(c tele.Context) error { - var user models.User +func (d *Handlers) Dick(c tele.Context) error { var retMessage string id := c.Sender().ID lName := c.Sender().LastName fName := c.Sender().FirstName - d.Db.DB.First(&user, id) + user := d.DC.GetUser(id) + + if user.ID == 0 { + d.DC.CreateUser(id, lName, fName) + user = d.DC.GetUser(id) + } newRange := controllers.RandRange() newSize := user.DickSize + newRange - if user.IsBlocked { + if user.Blocked { retMessage = fmt.Sprintf("%s %s, ты уже отращивал свой писюн, следющая попытка будет после 22:00 по МСК.", fName, lName) } else { - if user.ID != id { - d.Db.DB.Create(&models.User{ID: id, FirstName: fName, LastName: lName, DickSize: newSize, IsBlocked: false, IsAdmin: false}) - } else { - d.Db.DB.Model(&user).Update("dick_size", newSize) - } + d.DC.UpdateDick(id, newSize) if newRange == 0 { retMessage = fmt.Sprintf("%s %s, твой писюн сегодня не подрос. Не переживай, просто он, видимо, решил взять выходной — пусть лучше отдохнет перед завтрашними подвигами!", fName, lName) @@ -46,17 +44,14 @@ func (d *Data) Dick(c tele.Context) error { } else if newRange < 0 { retMessage = fmt.Sprintf("%s %s, твой писюн сегодня сократился на %d см. Сейчас он равен %d см.", fName, lName, -newRange, newSize) } - d.Db.DB.Model(&user).Update("is_blocked", true) } return c.Send(retMessage) } -func (d *Data) TopDick(c tele.Context) error { - var users []models.User +func (d *Handlers) TopDick(c tele.Context) error { var retMessage string - - d.Db.DB.Order("dick_size desc").Limit(10).Find(&users) + users := d.DC.GetTopUsers() for iter, user := range users { retMessage += fmt.Sprintf("%d. %s %s, %d см\n", iter+1, user.FirstName, user.LastName, user.DickSize) @@ -65,14 +60,14 @@ func (d *Data) TopDick(c tele.Context) error { return c.Send(retMessage) } -func (d *Data) ClearStatistics(c tele.Context) error { - var user models.User - d.Db.DB.First(&user, c.Sender().ID) +// func (d *Handlers) ClearStatistics(c tele.Context) error { +// var user models.User +// d.DC.DC.First(&user, c.Sender().ID) - if user.IsAdmin { - d.Db.DB.Model(&models.User{}).Update("dick_size", 0) - return c.Send("Статистика очищена!") - } +// if user.IsAdmin { +// d.DC.DB.Model(&models.User{}).Update("dick_size", 0) +// return c.Send("Статистика очищена!") +// } - return c.Send("Ты не админ!") -} +// return c.Send("Ты не админ!") +// } diff --git a/src/models/user.go b/src/models/user.go index 1feb4dd..cd294e8 100644 --- a/src/models/user.go +++ b/src/models/user.go @@ -1,10 +1,11 @@ package models type User struct { - ID int64 `json:"id"` - FirstName string `json:"first_name"` - LastName string `json:"last_name"` - DickSize int `json:"dick_size"` - IsBlocked bool `json:"is_blocked"` - IsAdmin bool `json:"is_admin"` + ID int64 `sql:"id"` + FirstName string `sql:"fname"` + LastName string `sql:"lname"` + DickSize int `sql:"dick_size"` + Blocked bool `sql:"blocked"` + Admin bool `sql:"admin"` + Trick int `sql:"trick"` } diff --git a/users.db b/users.db deleted file mode 100644 index 363e69d..0000000 Binary files a/users.db and /dev/null differ