From 8241500df17f36805aaf7f62d0d877235d59a110 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Wed, 22 Feb 2023 16:22:50 +0400 Subject: [PATCH 01/17] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20?= =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD?= =?UTF-8?q?=D0=B3=D0=B0=20=D0=BD=D0=B0=20=D0=93=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +- go.mod | 22 + go.sum | 609 ++++++++++++++++++++++++++++ main.go | 79 ++++ modules/database/database_struct.go | 12 + modules/database/mysql.go | 41 ++ 6 files changed, 767 insertions(+), 1 deletion(-) create mode 100644 go.mod create mode 100644 go.sum create mode 100644 main.go create mode 100644 modules/database/database_struct.go create mode 100644 modules/database/mysql.go diff --git a/.gitignore b/.gitignore index d20927e..394a91f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,7 @@ __pycache__ config.json logs *.wpr -*test.py \ No newline at end of file +*test.py +*.exe +*.env +.vscode \ No newline at end of file diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..8d08cd7 --- /dev/null +++ b/go.mod @@ -0,0 +1,22 @@ +module git.l9labs.ru/anufriev.g.a/l9_stud_bot + +go 1.20 + +require ( + github.com/go-sql-driver/mysql v1.7.0 + github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 + github.com/joho/godotenv v1.5.1 + xorm.io/xorm v1.3.2 +) + +require ( + github.com/goccy/go-json v0.8.1 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/lib/pq v1.10.7 // indirect + github.com/mattn/go-sqlite3 v1.14.16 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/syndtr/goleveldb v1.0.0 // indirect + xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..f7c85ee --- /dev/null +++ b/go.sum @@ -0,0 +1,609 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= +gitee.com/travelliu/dm v1.8.11192/go.mod h1:DHTzyhCrM843x9VdKVbZ+GKXGRbKM2sJ4LxihRxShkE= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= +github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 h1:wG8n/XJQ07TmjbITcGiUaOtXxdrINDz1b0J1w0SzqDc= +github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1/go.mod h1:A2S0CWkNylc2phvKXWBBdD3K0iGnDBGbzRpISP2zBl8= +github.com/goccy/go-json v0.8.1 h1:4/Wjm0JIJaTDm8K1KcGrLHJoa8EsJ13YWeX+6Kfq6uI= +github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= +github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= +github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= +github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= +github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= +github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= +github.com/jackc/pgconn v1.8.1/go.mod h1:JV6m6b6jhjdmzchES0drzCcYcAHS1OPD5xu3OZ/lE2g= +github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= +github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= +github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= +github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= +github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= +github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= +github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0= +github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= +github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= +github.com/jackc/pgtype v1.7.0/go.mod h1:ZnHF+rMePVqDKaOfJVI4Q8IVvAQMryDlDkZnKOI75BE= +github.com/jackc/pgtype v1.8.0/go.mod h1:PqDKcEBtllAtk/2p6z6SHdXW5UB+MhE75tUol2OKexE= +github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= +github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= +github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= +github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA= +github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= +github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= +github.com/jackc/pgx/v4 v4.11.0/go.mod h1:i62xJgdrtVDsnL3U8ekyrQXEwGNTRoG7/8r+CIdYfcc= +github.com/jackc/pgx/v4 v4.12.0/go.mod h1:fE547h6VulLPA3kySjfnSG/e2D861g/50JlVUa/ub60= +github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= +github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= +github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= +github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= +github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= +github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= +modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.34.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.4/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.5/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.7/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.8/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.10/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.15/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.16/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= +modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60= +modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw= +modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI= +modernc.org/ccgo/v3 v3.11.1/go.mod h1:lWHxfsn13L3f7hgGsGlU28D9eUOf6y3ZYHKoPaKU0ag= +modernc.org/ccgo/v3 v3.11.3/go.mod h1:0oHunRBMBiXOKdaglfMlRPBALQqsfrCKXgw9okQ3GEw= +modernc.org/ccgo/v3 v3.12.4/go.mod h1:Bk+m6m2tsooJchP/Yk5ji56cClmN6R1cqc9o/YtbgBQ= +modernc.org/ccgo/v3 v3.12.6/go.mod h1:0Ji3ruvpFPpz+yu+1m0wk68pdr/LENABhTrDkMDWH6c= +modernc.org/ccgo/v3 v3.12.8/go.mod h1:Hq9keM4ZfjCDuDXxaHptpv9N24JhgBZmUG5q60iLgUo= +modernc.org/ccgo/v3 v3.12.11/go.mod h1:0jVcmyDwDKDGWbcrzQ+xwJjbhZruHtouiBEvDfoIsdg= +modernc.org/ccgo/v3 v3.12.14/go.mod h1:GhTu1k0YCpJSuWwtRAEHAol5W7g1/RRfS4/9hc9vF5I= +modernc.org/ccgo/v3 v3.12.18/go.mod h1:jvg/xVdWWmZACSgOiAhpWpwHWylbJaSzayCqNOJKIhs= +modernc.org/ccgo/v3 v3.12.20/go.mod h1:aKEdssiu7gVgSy/jjMastnv/q6wWGRbszbheXgWRHc8= +modernc.org/ccgo/v3 v3.12.21/go.mod h1:ydgg2tEprnyMn159ZO/N4pLBqpL7NOkJ88GT5zNU2dE= +modernc.org/ccgo/v3 v3.12.22/go.mod h1:nyDVFMmMWhMsgQw+5JH6B6o4MnZ+UQNw1pp52XYFPRk= +modernc.org/ccgo/v3 v3.12.25/go.mod h1:UaLyWI26TwyIT4+ZFNjkyTbsPsY3plAEB6E7L/vZV3w= +modernc.org/ccgo/v3 v3.12.29/go.mod h1:FXVjG7YLf9FetsS2OOYcwNhcdOLGt8S9bQ48+OP75cE= +modernc.org/ccgo/v3 v3.12.36/go.mod h1:uP3/Fiezp/Ga8onfvMLpREq+KUjUmYMxXPO8tETHtA8= +modernc.org/ccgo/v3 v3.12.38/go.mod h1:93O0G7baRST1vNj4wnZ49b1kLxt0xCW5Hsa2qRaZPqc= +modernc.org/ccgo/v3 v3.12.43/go.mod h1:k+DqGXd3o7W+inNujK15S5ZYuPoWYLpF5PYougCmthU= +modernc.org/ccgo/v3 v3.12.46/go.mod h1:UZe6EvMSqOxaJ4sznY7b23/k13R8XNlyWsO5bAmSgOE= +modernc.org/ccgo/v3 v3.12.47/go.mod h1:m8d6p0zNps187fhBwzY/ii6gxfjob1VxWb919Nk1HUk= +modernc.org/ccgo/v3 v3.12.50/go.mod h1:bu9YIwtg+HXQxBhsRDE+cJjQRuINuT9PUK4orOco/JI= +modernc.org/ccgo/v3 v3.12.51/go.mod h1:gaIIlx4YpmGO2bLye04/yeblmvWEmE4BBBls4aJXFiE= +modernc.org/ccgo/v3 v3.12.53/go.mod h1:8xWGGTFkdFEWBEsUmi+DBjwu/WLy3SSOrqEmKUjMeEg= +modernc.org/ccgo/v3 v3.12.54/go.mod h1:yANKFTm9llTFVX1FqNKHE0aMcQb1fuPJx6p8AcUx+74= +modernc.org/ccgo/v3 v3.12.55/go.mod h1:rsXiIyJi9psOwiBkplOaHye5L4MOOaCjHg1Fxkj7IeU= +modernc.org/ccgo/v3 v3.12.56/go.mod h1:ljeFks3faDseCkr60JMpeDb2GSO3TKAmrzm7q9YOcMU= +modernc.org/ccgo/v3 v3.12.57/go.mod h1:hNSF4DNVgBl8wYHpMvPqQWDQx8luqxDnNGCMM4NFNMc= +modernc.org/ccgo/v3 v3.12.60/go.mod h1:k/Nn0zdO1xHVWjPYVshDeWKqbRWIfif5dtsIOCUVMqM= +modernc.org/ccgo/v3 v3.12.65/go.mod h1:D6hQtKxPNZiY6wDBtehSGKFKmyXn53F8nGTpH+POmS4= +modernc.org/ccgo/v3 v3.12.66/go.mod h1:jUuxlCFZTUZLMV08s7B1ekHX5+LIAurKTTaugUr/EhQ= +modernc.org/ccgo/v3 v3.12.67/go.mod h1:Bll3KwKvGROizP2Xj17GEGOTrlvB1XcVaBrC90ORO84= +modernc.org/ccgo/v3 v3.12.73/go.mod h1:hngkB+nUUqzOf3iqsM48Gf1FZhY599qzVg1iX+BT3cQ= +modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6rYY= +modernc.org/ccgo/v3 v3.12.82/go.mod h1:ApbflUfa5BKadjHynCficldU1ghjen84tuM5jRynB7w= +modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= +modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= +modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= +modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q= +modernc.org/libc v1.11.0/go.mod h1:2lOfPmj7cz+g1MrPNmX65QCzVxgNq2C5o0jdLY2gAYg= +modernc.org/libc v1.11.2/go.mod h1:ioIyrl3ETkugDO3SGZ+6EOKvlP3zSOycUETe4XM4n8M= +modernc.org/libc v1.11.5/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU= +modernc.org/libc v1.11.6/go.mod h1:ddqmzR6p5i4jIGK1d/EiSw97LBcE3dK24QEwCFvgNgE= +modernc.org/libc v1.11.11/go.mod h1:lXEp9QOOk4qAYOtL3BmMve99S5Owz7Qyowzvg6LiZso= +modernc.org/libc v1.11.13/go.mod h1:ZYawJWlXIzXy2Pzghaf7YfM8OKacP3eZQI81PDLFdY8= +modernc.org/libc v1.11.16/go.mod h1:+DJquzYi+DMRUtWI1YNxrlQO6TcA5+dRRiq8HWBWRC8= +modernc.org/libc v1.11.19/go.mod h1:e0dgEame6mkydy19KKaVPBeEnyJB4LGNb0bBH1EtQ3I= +modernc.org/libc v1.11.24/go.mod h1:FOSzE0UwookyT1TtCJrRkvsOrX2k38HoInhw+cSCUGk= +modernc.org/libc v1.11.26/go.mod h1:SFjnYi9OSd2W7f4ct622o/PAYqk7KHv6GS8NZULIjKY= +modernc.org/libc v1.11.27/go.mod h1:zmWm6kcFXt/jpzeCgfvUNswM0qke8qVwxqZrnddlDiE= +modernc.org/libc v1.11.28/go.mod h1:Ii4V0fTFcbq3qrv3CNn+OGHAvzqMBvC7dBNyC4vHZlg= +modernc.org/libc v1.11.31/go.mod h1:FpBncUkEAtopRNJj8aRo29qUiyx5AvAlAxzlx9GNaVM= +modernc.org/libc v1.11.34/go.mod h1:+Tzc4hnb1iaX/SKAutJmfzES6awxfU1BPvrrJO0pYLg= +modernc.org/libc v1.11.37/go.mod h1:dCQebOwoO1046yTrfUE5nX1f3YpGZQKNcITUYWlrAWo= +modernc.org/libc v1.11.39/go.mod h1:mV8lJMo2S5A31uD0k1cMu7vrJbSA3J3waQJxpV4iqx8= +modernc.org/libc v1.11.42/go.mod h1:yzrLDU+sSjLE+D4bIhS7q1L5UwXDOw99PLSX0BlZvSQ= +modernc.org/libc v1.11.44/go.mod h1:KFq33jsma7F5WXiYelU8quMJasCCTnHK0mkri4yPHgA= +modernc.org/libc v1.11.45/go.mod h1:Y192orvfVQQYFzCNsn+Xt0Hxt4DiO4USpLNXBlXg/tM= +modernc.org/libc v1.11.47/go.mod h1:tPkE4PzCTW27E6AIKIR5IwHAQKCAtudEIeAV1/SiyBg= +modernc.org/libc v1.11.49/go.mod h1:9JrJuK5WTtoTWIFQ7QjX2Mb/bagYdZdscI3xrvHbXjE= +modernc.org/libc v1.11.51/go.mod h1:R9I8u9TS+meaWLdbfQhq2kFknTW0O3aw3kEMqDDxMaM= +modernc.org/libc v1.11.53/go.mod h1:5ip5vWYPAoMulkQ5XlSJTy12Sz5U6blOQiYasilVPsU= +modernc.org/libc v1.11.54/go.mod h1:S/FVnskbzVUrjfBqlGFIPA5m7UwB3n9fojHhCNfSsnw= +modernc.org/libc v1.11.55/go.mod h1:j2A5YBRm6HjNkoSs/fzZrSxCuwWqcMYTDPLNx0URn3M= +modernc.org/libc v1.11.56/go.mod h1:pakHkg5JdMLt2OgRadpPOTnyRXm/uzu+Yyg/LSLdi18= +modernc.org/libc v1.11.58/go.mod h1:ns94Rxv0OWyoQrDqMFfWwka2BcaF6/61CqJRK9LP7S8= +modernc.org/libc v1.11.70/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw= +modernc.org/libc v1.11.71/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw= +modernc.org/libc v1.11.75/go.mod h1:dGRVugT6edz361wmD9gk6ax1AbDSe0x5vji0dGJiPT0= +modernc.org/libc v1.11.82/go.mod h1:NF+Ek1BOl2jeC7lw3a7Jj5PWyHPwWD4aq3wVKxqV1fI= +modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE= +modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY= +modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc= +modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM= +modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= +modernc.org/sqlite v1.14.2/go.mod h1:yqfn85u8wVOE6ub5UT8VI9JjhrwBUUCNyTACN0h6Sx8= +modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= +modernc.org/tcl v1.8.13/go.mod h1:V+q/Ef0IJaNUSECieLU4o+8IScapxnMyFV6i/7uQlAY= +modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= +modernc.org/z v1.2.19/go.mod h1:+ZpP0pc4zz97eukOzW3xagV/lS82IpPN9NGG5pNF9vY= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= +xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 h1:bvLlAPW1ZMTWA32LuZMBEGHAUOcATZjzHcotf3SWweM= +xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= +xorm.io/xorm v1.3.2 h1:uTRRKF2jYzbZ5nsofXVUx6ncMaek+SHjWYtCXyZo1oM= +xorm.io/xorm v1.3.2/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw= diff --git a/main.go b/main.go new file mode 100644 index 0000000..d365c71 --- /dev/null +++ b/main.go @@ -0,0 +1,79 @@ +package main + +import ( + "log" + "os" + + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "github.com/joho/godotenv" +) + +func main() { + if err := godotenv.Load(); err != nil { + log.Fatal("No .env file found") + } + + engine := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) + + bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_APITOKEN")) + if err != nil { + log.Fatal(err) + } + bot.Debug = true + + log.Printf("Authorized on account %s", bot.Self.UserName) + + u := tgbotapi.NewUpdate(0) + u.Timeout = 60 + + updates := bot.GetUpdatesChan(u) + + for update := range updates { + if update.Message != nil { + log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text) + + var users []database.TgUser + err := engine.Find(&users, &database.TgUser{TgId: update.Message.Chat.ID}) + if err != nil { + log.Fatal(err) + } + + var tg_user database.TgUser + if len(users) == 0 { + l9id := database.GenerateID(engine) + + user := database.User{ + L9Id: l9id, + } + + tg_user = database.TgUser{ + L9Id: l9id, + Name: update.Message.From.UserName, + TgId: update.Message.Chat.ID, + PosTag: "not_started", + } + _, err := engine.Insert(user, tg_user) + if err != nil { + log.Fatal(err) + } + } else { + tg_user = users[0] + } + + if tg_user.PosTag == "not_started" { + tg_user.PosTag = "started" + _, err := engine.Update(tg_user) + if err != nil { + log.Fatal(err) + } + msg := tgbotapi.NewMessage(update.Message.Chat.ID, "Hello!") + bot.Send(msg) + } else { + msg := tgbotapi.NewMessage(update.Message.Chat.ID, "Oops!") + bot.Send(msg) + } + + } + } +} diff --git a/modules/database/database_struct.go b/modules/database/database_struct.go new file mode 100644 index 0000000..b8c78fd --- /dev/null +++ b/modules/database/database_struct.go @@ -0,0 +1,12 @@ +package database + +type User struct { + L9Id int64 `xorm:"pk"` +} + +type TgUser struct { + L9Id int64 `xorm:"pk"` + TgId int64 + Name string + PosTag string +} diff --git a/modules/database/mysql.go b/modules/database/mysql.go new file mode 100644 index 0000000..e1d7cdf --- /dev/null +++ b/modules/database/mysql.go @@ -0,0 +1,41 @@ +package database + +import ( + "log" + "math/rand" + + _ "github.com/go-sql-driver/mysql" + "xorm.io/xorm" + "xorm.io/xorm/names" +) + +func Connect(user, pass, db string) *xorm.Engine { + engine, err := xorm.NewEngine("mysql", user+":"+pass+"@tcp(localhost:3306)/"+db+"?charset=utf8") + if err != nil { + log.Fatal(err) + } + + engine.ShowSQL(true) + engine.SetMapper(names.SameMapper{}) + + err = engine.Sync(&User{}, &TgUser{}) + if err != nil { + log.Fatal(err) + } + return engine +} + +func GenerateID(engine *xorm.Engine) int64 { + id := rand.Int63n(899999999) + 100000000 + + exists, err := engine.ID(id).Exist(&User{}) + if err != nil { + log.Fatal(err) + } + + if exists { + return GenerateID(engine) + } else { + return id + } +} From d9c869a854bd6430d634c60ca585473cd9bbf9ba Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Wed, 22 Feb 2023 17:23:38 +0400 Subject: [PATCH 02/17] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE:=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=B1=D1=8D=D0=BA=D0=B5=D0=BD=D0=B4=20Telegram?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 57 ++++++------------------------------------ modules/tg/bot.go | 36 ++++++++++++++++++++++++++ modules/tg/handlers.go | 56 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 49 deletions(-) create mode 100644 modules/tg/bot.go create mode 100644 modules/tg/handlers.go diff --git a/main.go b/main.go index d365c71..68e6659 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "os" "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" - tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/tg" "github.com/joho/godotenv" ) @@ -16,62 +16,21 @@ func main() { engine := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) - bot, err := tgbotapi.NewBotAPI(os.Getenv("TELEGRAM_APITOKEN")) - if err != nil { - log.Fatal(err) - } - bot.Debug = true + bot := new(tg.Bot) + bot.InitBot(os.Getenv("TELEGRAM_APITOKEN"), *engine) - log.Printf("Authorized on account %s", bot.Self.UserName) + updates := bot.GetUpdates() - u := tgbotapi.NewUpdate(0) - u.Timeout = 60 - - updates := bot.GetUpdatesChan(u) - - for update := range updates { + for update := range *updates { if update.Message != nil { log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text) - var users []database.TgUser - err := engine.Find(&users, &database.TgUser{TgId: update.Message.Chat.ID}) - if err != nil { - log.Fatal(err) - } - - var tg_user database.TgUser - if len(users) == 0 { - l9id := database.GenerateID(engine) - - user := database.User{ - L9Id: l9id, - } - - tg_user = database.TgUser{ - L9Id: l9id, - Name: update.Message.From.UserName, - TgId: update.Message.Chat.ID, - PosTag: "not_started", - } - _, err := engine.Insert(user, tg_user) - if err != nil { - log.Fatal(err) - } - } else { - tg_user = users[0] - } + tg_user := bot.InitUser(update.Message) if tg_user.PosTag == "not_started" { - tg_user.PosTag = "started" - _, err := engine.Update(tg_user) - if err != nil { - log.Fatal(err) - } - msg := tgbotapi.NewMessage(update.Message.Chat.ID, "Hello!") - bot.Send(msg) + bot.Start() } else { - msg := tgbotapi.NewMessage(update.Message.Chat.ID, "Oops!") - bot.Send(msg) + bot.Etc() } } diff --git a/modules/tg/bot.go b/modules/tg/bot.go new file mode 100644 index 0000000..9dd715d --- /dev/null +++ b/modules/tg/bot.go @@ -0,0 +1,36 @@ +package tg + +import ( + "log" + + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "xorm.io/xorm" +) + +type Bot struct { + TG *tgbotapi.BotAPI + DB xorm.Engine + TG_user database.TgUser +} + +func (bot *Bot) InitBot(token string, engine xorm.Engine) { + var err error + bot.TG, err = tgbotapi.NewBotAPI(token) + if err != nil { + log.Fatal(err) + } + bot.TG.Debug = true + + bot.DB = engine + + log.Printf("Authorized on account %s", bot.TG.Self.UserName) +} + +func (bot *Bot) GetUpdates() *tgbotapi.UpdatesChannel { + u := tgbotapi.NewUpdate(0) + u.Timeout = 60 + + updates := bot.TG.GetUpdatesChan(u) + return &updates +} diff --git a/modules/tg/handlers.go b/modules/tg/handlers.go new file mode 100644 index 0000000..915b04d --- /dev/null +++ b/modules/tg/handlers.go @@ -0,0 +1,56 @@ +package tg + +import ( + "log" + + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" +) + +func (bot *Bot) InitUser(msg *tgbotapi.Message) *database.TgUser { + db := &bot.DB + var users []database.TgUser + err := db.Find(&users, &database.TgUser{TgId: msg.Chat.ID}) + if err != nil { + log.Fatal(err) + } + + var tg_user database.TgUser + if len(users) == 0 { + l9id := database.GenerateID(db) + + user := database.User{ + L9Id: l9id, + } + + tg_user = database.TgUser{ + L9Id: l9id, + Name: msg.From.UserName, + TgId: msg.Chat.ID, + PosTag: "not_started", + } + _, err := db.Insert(user, tg_user) + if err != nil { + log.Fatal(err) + } + } else { + tg_user = users[0] + } + bot.TG_user = tg_user + return &tg_user +} + +func (bot *Bot) Start() { + bot.TG_user.PosTag = "started" + _, err := bot.DB.Update(bot.TG_user) + if err != nil { + log.Fatal(err) + } + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Hello!") + bot.TG.Send(msg) +} + +func (bot *Bot) Etc() { + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Oops!") + bot.TG.Send(msg) +} From 47d96fb1e4a7c265a1740967cdf99013018f5a13 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Thu, 23 Feb 2023 17:43:49 +0400 Subject: [PATCH 03/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=BF=D0=BF=D1=8B=20=D0=B2=20=D1=80=D0=B0=D1=81?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 6 ++ go.sum | 21 +++++++ modules/ssau_parser/parser.go | 83 +++++++++++++++++++++++++ modules/ssau_parser/ssau_parser_test.go | 11 ++++ 4 files changed, 121 insertions(+) create mode 100644 modules/ssau_parser/parser.go create mode 100644 modules/ssau_parser/ssau_parser_test.go diff --git a/go.mod b/go.mod index 8d08cd7..303cf99 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,12 @@ require ( ) require ( + github.com/andybalholm/cascadia v1.3.1 // indirect + golang.org/x/net v0.7.0 // indirect +) + +require ( + github.com/PuerkitoBio/goquery v1.8.1 github.com/goccy/go-json v0.8.1 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/go.sum b/go.sum index f7c85ee..42f317d 100644 --- a/go.sum +++ b/go.sum @@ -5,6 +5,8 @@ gitee.com/travelliu/dm v1.8.11192/go.mod h1:DHTzyhCrM843x9VdKVbZ+GKXGRbKM2sJ4Lxi github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM= +github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= @@ -13,6 +15,8 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= +github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -337,6 +341,7 @@ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -370,6 +375,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -379,6 +385,7 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -397,6 +404,10 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -406,6 +417,7 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -430,16 +442,24 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/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-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -459,6 +479,7 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/modules/ssau_parser/parser.go b/modules/ssau_parser/parser.go new file mode 100644 index 0000000..65ff0a3 --- /dev/null +++ b/modules/ssau_parser/parser.go @@ -0,0 +1,83 @@ +package ssau_parser + +import ( + "encoding/json" + "io" + "log" + "net/http" + "net/url" + "strings" + + "github.com/PuerkitoBio/goquery" +) + +type RaspList struct { + Items []RaspItems +} + +type RaspItems []struct { + Id int64 + Url string + Text string +} + +func FindInRasp(query string) RaspItems { + client := http.Client{} + + req, err := http.NewRequest("GET", "https://ssau.ru/rasp", nil) + if err != nil { + log.Fatal(err) + } + req.Header.Add("User-Agent", "Mozilla/5.0") + + resp, err := client.Do(req) + if err != nil { + log.Fatal(err) + } + + doc, err := goquery.NewDocumentFromReader(resp.Body) + if err != nil { + log.Fatal(err) + } + csrf, exists := doc.Find("meta[name='csrf-token']").Attr("content") + if !exists { + log.Fatal("Missed CSRF") + } + + parm := url.Values{} + parm.Add("text", query) + req, err = http.NewRequest("POST", "https://ssau.ru/rasp/search", strings.NewReader(parm.Encode())) + if err != nil { + log.Fatal(err) + } + + for _, cookie := range resp.Cookies() { + req.AddCookie(cookie) + } + req.Header.Add("Content-Type", "application/x-www-form-urlencoded") + req.Header.Add("User-Agent", "Mozilla/5.0") + req.Header.Add("Accept", "application/json") + req.Header.Add("X-CSRF-TOKEN", csrf) + + resp, err = client.Do(req) + if err != nil { + log.Fatal(err) + } + + var list RaspItems + if resp.StatusCode == 200 { + body, err := io.ReadAll(resp.Body) + if err != nil { + log.Fatal(err) + } + + if err := json.Unmarshal(body, &list); err != nil { + log.Fatal(err) + } + + } else { + log.Fatal("Responce: " + resp.Status) + } + + return list +} diff --git a/modules/ssau_parser/ssau_parser_test.go b/modules/ssau_parser/ssau_parser_test.go new file mode 100644 index 0000000..71ca03f --- /dev/null +++ b/modules/ssau_parser/ssau_parser_test.go @@ -0,0 +1,11 @@ +package ssau_parser + +import ( + "log" + "testing" +) + +func TestFindInRasp(t *testing.T) { + list := FindInRasp("2305") + log.Println(list) +} From 804b767dbb763e3d9c825d53d07a1e0dcf54fd29 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Fri, 24 Feb 2023 10:19:42 +0400 Subject: [PATCH 04/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=BF=D0=B0=D1=80=D1=81=D0=B8=D0=BD?= =?UTF-8?q?=D0=B3=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ssau_parser/parser.go | 130 ++++++++++++++++++++++-- modules/ssau_parser/ssau_parser_test.go | 30 +++++- 2 files changed, 149 insertions(+), 11 deletions(-) diff --git a/modules/ssau_parser/parser.go b/modules/ssau_parser/parser.go index 65ff0a3..c447ff5 100644 --- a/modules/ssau_parser/parser.go +++ b/modules/ssau_parser/parser.go @@ -2,11 +2,14 @@ package ssau_parser import ( "encoding/json" + "errors" + "fmt" "io" "log" "net/http" "net/url" "strings" + "time" "github.com/PuerkitoBio/goquery" ) @@ -21,34 +24,34 @@ type RaspItems []struct { Text string } -func FindInRasp(query string) RaspItems { +func FindInRasp(query string) (RaspItems, error) { client := http.Client{} req, err := http.NewRequest("GET", "https://ssau.ru/rasp", nil) if err != nil { - log.Fatal(err) + return nil, err } req.Header.Add("User-Agent", "Mozilla/5.0") resp, err := client.Do(req) if err != nil { - log.Fatal(err) + return nil, err } doc, err := goquery.NewDocumentFromReader(resp.Body) if err != nil { - log.Fatal(err) + return nil, err } csrf, exists := doc.Find("meta[name='csrf-token']").Attr("content") if !exists { - log.Fatal("Missed CSRF") + return nil, errors.New("missed csrf") } parm := url.Values{} parm.Add("text", query) req, err = http.NewRequest("POST", "https://ssau.ru/rasp/search", strings.NewReader(parm.Encode())) if err != nil { - log.Fatal(err) + return nil, err } for _, cookie := range resp.Cookies() { @@ -61,7 +64,7 @@ func FindInRasp(query string) RaspItems { resp, err = client.Do(req) if err != nil { - log.Fatal(err) + return nil, err } var list RaspItems @@ -72,12 +75,119 @@ func FindInRasp(query string) RaspItems { } if err := json.Unmarshal(body, &list); err != nil { - log.Fatal(err) + return nil, err } } else { - log.Fatal("Responce: " + resp.Status) + return nil, fmt.Errorf("Responce: %s", resp.Status) } - return list + return list, nil } + +type Times struct { + Begin time.Time + End time.Time +} + +func Connect(uri string, week int) (*goquery.Document, error) { + client := http.Client{} + + req, err := http.NewRequest("GET", fmt.Sprintf("https://ssau.ru%s&selectedWeek=%d", uri, week), nil) + if err != nil { + return nil, err + } + req.Header.Add("User-Agent", "Mozilla/5.0") + + resp, err := client.Do(req) + if err != nil { + return nil, err + } + + doc, err := goquery.NewDocumentFromReader(resp.Body) + if err != nil { + return nil, err + } + + return doc, nil +} + +type Lesson struct { + Begin time.Time + End time.Time + Name string +} + +type Shedule struct { + SpecName string + Week int + Lessons [][]Lesson +} + +func Parse(doc *goquery.Document) (*Shedule, error) { + spec := doc.Find(".info-block__description div").First().Text()[1:] + log.Println(spec) + + var raw_dates []string + doc.Find(".schedule__head-date").Each(func(i int, s *goquery.Selection) { + sh_date := s.Text() + raw_dates = append(raw_dates, sh_date) + }) + + var raw_times []string + doc.Find(".schedule__time-item").Each(func(i int, s *goquery.Selection) { + sh_time := s.Text() + "+04" + raw_times = append(raw_times, sh_time) + }) + + var lessons []string + doc.Find(".schedule__item:not(.schedule__head)").Each(func(i int, s *goquery.Selection) { + lesson := s.Text() + lessons = append(lessons, lesson) + }) + + var shedule [][]Lesson + + for t := 0; t < len(raw_times); t += 2 { + var time_line []Lesson + for d, date := range raw_dates { + begin_raw := date + raw_times[t] + begin, err := time.Parse(" 02.01.2006 15:04 -07", begin_raw) + if err != nil { + return nil, err + } + end_raw := date + raw_times[t+1] + end, err := time.Parse(" 02.01.2006 15:04 -07", end_raw) + if err != nil { + return nil, err + } + idx := (len(raw_times)-2)*t/2 + d + lesson := Lesson{ + Begin: begin, + End: end, + Name: lessons[idx], + } + time_line = append(time_line, lesson) + } + shedule = append(shedule, time_line) + } + return &Shedule{SpecName: spec, Lessons: shedule}, nil +} + +/* +type Lesson struct { + Type string + Name string + Place string + TeacherID int64 + Comment string +} + +func parseLesson(l *goquery.Selection) { + var lesson Lesson + d, _ := l.Find("div.schedule__discipline").Attr("class") + t := strings.Split(d, " ") + lesson.Type = t[len(t)-1] + lesson.Name = l.Find("div.schedule__discipline").First().Text() +} +*/ diff --git a/modules/ssau_parser/ssau_parser_test.go b/modules/ssau_parser/ssau_parser_test.go index 71ca03f..c08dc7e 100644 --- a/modules/ssau_parser/ssau_parser_test.go +++ b/modules/ssau_parser/ssau_parser_test.go @@ -6,6 +6,34 @@ import ( ) func TestFindInRasp(t *testing.T) { - list := FindInRasp("2305") + list, err := FindInRasp("2305") + if err != nil { + t.Error(err) + } log.Println(list) } + +func TestConnect(t *testing.T) { + list, err := FindInRasp("2305") + if err != nil { + t.Error(err) + } + uri := list[0].Url + _, err = Connect(uri, 3) + if err != nil { + t.Error(err) + } +} + +func TestParse(t *testing.T) { + list, err := FindInRasp("2405") + if err != nil { + t.Error(err) + } + uri := list[0].Url + doc, err := Connect(uri, 3) + if err != nil { + t.Error(err) + } + Parse(doc) +} From fef468f6957bea61023ea116f7930151c4475443 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Fri, 24 Feb 2023 12:47:47 +0400 Subject: [PATCH 05/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=BF=D0=BE=D0=BB=D0=BD=D1=8B=D0=B9=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=80=D1=81=D0=B8=D0=BD=D0=B3=20=D1=80=D0=B0=D1=81?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ssau_parser/parser.go | 88 +---------------- modules/ssau_parser/shedule.go | 125 ++++++++++++++++++++++++ modules/ssau_parser/ssau_parser_test.go | 7 +- 3 files changed, 131 insertions(+), 89 deletions(-) create mode 100644 modules/ssau_parser/shedule.go diff --git a/modules/ssau_parser/parser.go b/modules/ssau_parser/parser.go index c447ff5..39a41d4 100644 --- a/modules/ssau_parser/parser.go +++ b/modules/ssau_parser/parser.go @@ -9,7 +9,6 @@ import ( "net/http" "net/url" "strings" - "time" "github.com/PuerkitoBio/goquery" ) @@ -79,17 +78,12 @@ func FindInRasp(query string) (RaspItems, error) { } } else { - return nil, fmt.Errorf("Responce: %s", resp.Status) + return nil, fmt.Errorf("responce: %s", resp.Status) } return list, nil } -type Times struct { - Begin time.Time - End time.Time -} - func Connect(uri string, week int) (*goquery.Document, error) { client := http.Client{} @@ -111,83 +105,3 @@ func Connect(uri string, week int) (*goquery.Document, error) { return doc, nil } - -type Lesson struct { - Begin time.Time - End time.Time - Name string -} - -type Shedule struct { - SpecName string - Week int - Lessons [][]Lesson -} - -func Parse(doc *goquery.Document) (*Shedule, error) { - spec := doc.Find(".info-block__description div").First().Text()[1:] - log.Println(spec) - - var raw_dates []string - doc.Find(".schedule__head-date").Each(func(i int, s *goquery.Selection) { - sh_date := s.Text() - raw_dates = append(raw_dates, sh_date) - }) - - var raw_times []string - doc.Find(".schedule__time-item").Each(func(i int, s *goquery.Selection) { - sh_time := s.Text() + "+04" - raw_times = append(raw_times, sh_time) - }) - - var lessons []string - doc.Find(".schedule__item:not(.schedule__head)").Each(func(i int, s *goquery.Selection) { - lesson := s.Text() - lessons = append(lessons, lesson) - }) - - var shedule [][]Lesson - - for t := 0; t < len(raw_times); t += 2 { - var time_line []Lesson - for d, date := range raw_dates { - begin_raw := date + raw_times[t] - begin, err := time.Parse(" 02.01.2006 15:04 -07", begin_raw) - if err != nil { - return nil, err - } - end_raw := date + raw_times[t+1] - end, err := time.Parse(" 02.01.2006 15:04 -07", end_raw) - if err != nil { - return nil, err - } - idx := (len(raw_times)-2)*t/2 + d - lesson := Lesson{ - Begin: begin, - End: end, - Name: lessons[idx], - } - time_line = append(time_line, lesson) - } - shedule = append(shedule, time_line) - } - return &Shedule{SpecName: spec, Lessons: shedule}, nil -} - -/* -type Lesson struct { - Type string - Name string - Place string - TeacherID int64 - Comment string -} - -func parseLesson(l *goquery.Selection) { - var lesson Lesson - d, _ := l.Find("div.schedule__discipline").Attr("class") - t := strings.Split(d, " ") - lesson.Type = t[len(t)-1] - lesson.Name = l.Find("div.schedule__discipline").First().Text() -} -*/ diff --git a/modules/ssau_parser/shedule.go b/modules/ssau_parser/shedule.go new file mode 100644 index 0000000..35656c8 --- /dev/null +++ b/modules/ssau_parser/shedule.go @@ -0,0 +1,125 @@ +package ssau_parser + +import ( + "log" + "strconv" + "strings" + "time" + + "github.com/PuerkitoBio/goquery" +) + +type Lesson struct { + Begin time.Time + End time.Time + SubLessons []SubLesson +} + +type SubLesson struct { + Type string + Name string + Place string + TeacherID int64 + Comment string + SubGroup string +} + +type Shedule struct { + SpecName string + Week int + Lessons [][]Lesson +} + +func Parse(doc *goquery.Document) (*Shedule, error) { + spec := doc.Find(".info-block__description div").First().Text()[1:] + log.Println(spec) + + var raw_dates []string + doc.Find(".schedule__head-date").Each(func(i int, s *goquery.Selection) { + sh_date := s.Text() + raw_dates = append(raw_dates, sh_date) + }) + + var raw_times []string + doc.Find(".schedule__time-item").Each(func(i int, s *goquery.Selection) { + sh_time := s.Text() + "+04" + raw_times = append(raw_times, sh_time) + }) + + var lessons [][]SubLesson + doc.Find(".schedule__item:not(.schedule__head)").Each(func(i int, s *goquery.Selection) { + sl := ParseSubLesson(s) + lessons = append(lessons, sl) + }) + + var shedule [][]Lesson + + for t := 0; t < len(raw_times); t += 2 { + var time_line []Lesson + for d, date := range raw_dates { + begin_raw := date + raw_times[t] + begin, err := time.Parse(" 02.01.2006 15:04 -07", begin_raw) + if err != nil { + return nil, err + } + end_raw := date + raw_times[t+1] + end, err := time.Parse(" 02.01.2006 15:04 -07", end_raw) + if err != nil { + return nil, err + } + idx := (len(raw_times)-2)*t/2 + d + lesson := Lesson{ + Begin: begin, + End: end, + SubLessons: lessons[idx], + } + time_line = append(time_line, lesson) + } + shedule = append(shedule, time_line) + } + return &Shedule{SpecName: spec, Lessons: shedule}, nil +} + +var types = [4]string{"lect", "lab", "pract", "other"} + +func ParseSubLesson(s *goquery.Selection) []SubLesson { + var subs []SubLesson + s.Find(".schedule__lesson").Each(func(j int, l *goquery.Selection) { + var sublesson SubLesson + + name := l.Find("div.schedule__discipline").First() + sublesson.Name = name.Text()[1:] + l_type := name.AttrOr("class", "lesson-color-type-4") + t := strings.Split(l_type, " ") + l_type = t[len(t)-1] + type_idx, err := strconv.ParseInt(l_type[len(l_type)-1:], 0, 8) + if err != nil { + type_idx = 4 + } + sublesson.Type = types[type_idx-1] + + teacher := l.Find(".schedule__teacher a").AttrOr("href", "/rasp?staffId=") + teacherId, err := strconv.ParseInt(teacher[14:], 0, 64) + if err != nil { + teacherId = 0 + } + sublesson.TeacherID = teacherId + + subgroup := l.Find(".schedule__groups span").First().Text() + if subgroup == " " { + subgroup = "" + } + sublesson.SubGroup = subgroup + + place := l.Find("div.schedule__place").First().Text() + if len(place) > 2 { + place = place[1:] + } + sublesson.Place = place + sublesson.Comment = l.Find("div.schedule__comment").First().Text() + + subs = append(subs, sublesson) + }) + + return subs +} diff --git a/modules/ssau_parser/ssau_parser_test.go b/modules/ssau_parser/ssau_parser_test.go index c08dc7e..a89744e 100644 --- a/modules/ssau_parser/ssau_parser_test.go +++ b/modules/ssau_parser/ssau_parser_test.go @@ -26,7 +26,7 @@ func TestConnect(t *testing.T) { } func TestParse(t *testing.T) { - list, err := FindInRasp("2405") + list, err := FindInRasp("2207") if err != nil { t.Error(err) } @@ -35,5 +35,8 @@ func TestParse(t *testing.T) { if err != nil { t.Error(err) } - Parse(doc) + _, err = Parse(doc) + if err != nil { + t.Error(err) + } } From 160e08a52af870e61b8673518a80e3f5b58c83e2 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Tue, 7 Mar 2023 12:09:20 +0400 Subject: [PATCH 06/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=80=D0=B0=D1=81=D0=BF=D0=B0=D1=80=D1=81=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=91=D0=94=20=D0=98?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=87=D1=82=D0=B8=20=D0=B0=D0=B4=D0=B5=D0=BA=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D0=BF=D0=B0=D1=80=D1=81=D0=B8=D0=BD=D0=B3?= =?UTF-8?q?=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=B0=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/database/database_struct.go | 21 +++++++++++ modules/database/mysql.go | 2 +- modules/ssau_parser/database.go | 30 +++++++++++++++ modules/ssau_parser/parser.go | 23 +++++++++--- modules/ssau_parser/shedule.go | 49 ++++++++++++++++++------- modules/ssau_parser/ssau_parser_test.go | 17 +++++++-- 6 files changed, 120 insertions(+), 22 deletions(-) create mode 100644 modules/ssau_parser/database.go diff --git a/modules/database/database_struct.go b/modules/database/database_struct.go index b8c78fd..0345c10 100644 --- a/modules/database/database_struct.go +++ b/modules/database/database_struct.go @@ -1,5 +1,7 @@ package database +import "time" + type User struct { L9Id int64 `xorm:"pk"` } @@ -10,3 +12,22 @@ type TgUser struct { Name string PosTag string } + +type Group struct { + GroupId int64 `xorm:"pk"` + groupName string + specName string +} + +type Lesson struct { + LessonId int64 `xorm:"pk autoincr"` + Type string + Name string + GroupId int64 + Begin time.Time + End time.Time + TeacherId int64 + Place string + Comment string + SubGroup string +} diff --git a/modules/database/mysql.go b/modules/database/mysql.go index e1d7cdf..d58217b 100644 --- a/modules/database/mysql.go +++ b/modules/database/mysql.go @@ -18,7 +18,7 @@ func Connect(user, pass, db string) *xorm.Engine { engine.ShowSQL(true) engine.SetMapper(names.SameMapper{}) - err = engine.Sync(&User{}, &TgUser{}) + err = engine.Sync(&User{}, &TgUser{}, &Group{}, &Lesson{}) if err != nil { log.Fatal(err) } diff --git a/modules/ssau_parser/database.go b/modules/ssau_parser/database.go new file mode 100644 index 0000000..a6d0435 --- /dev/null +++ b/modules/ssau_parser/database.go @@ -0,0 +1,30 @@ +package ssau_parser + +import ( + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" + "xorm.io/xorm" +) + +func uploadShedule(db *xorm.Engine, sh Shedule) { + for _, line := range sh.Lessons { + for _, lesson := range line { + var pair database.Lesson + for _, subLesson := range lesson.SubLessons { + pair = database.Lesson{ + Begin: lesson.Begin, + End: lesson.End, + Type: subLesson.Type, + Name: subLesson.Name, + TeacherId: subLesson.TeacherId, + Place: subLesson.Place, + Comment: subLesson.Comment, + SubGroup: subLesson.SubGroup, + } + for _, groupId := range subLesson.GroupId { + pair.GroupId = groupId + db.InsertOne(pair) + } + } + } + } +} diff --git a/modules/ssau_parser/parser.go b/modules/ssau_parser/parser.go index 39a41d4..b976e8f 100644 --- a/modules/ssau_parser/parser.go +++ b/modules/ssau_parser/parser.go @@ -8,6 +8,7 @@ import ( "log" "net/http" "net/url" + "strconv" "strings" "github.com/PuerkitoBio/goquery" @@ -84,24 +85,36 @@ func FindInRasp(query string) (RaspItems, error) { return list, nil } -func Connect(uri string, week int) (*goquery.Document, error) { +// Connect to ssau.ru/rasp +// Returns goquery.Document, is shedule a group shedule and its ID +func Connect(uri string, week int) (*goquery.Document, bool, int64, error) { client := http.Client{} req, err := http.NewRequest("GET", fmt.Sprintf("https://ssau.ru%s&selectedWeek=%d", uri, week), nil) if err != nil { - return nil, err + return nil, false, 0, err } req.Header.Add("User-Agent", "Mozilla/5.0") resp, err := client.Do(req) if err != nil { - return nil, err + return nil, false, 0, err } doc, err := goquery.NewDocumentFromReader(resp.Body) if err != nil { - return nil, err + return nil, false, 0, err } - return doc, nil + var sheduleId int64 + var isGroup bool + + sheduleId, err = strconv.ParseInt(uri[14:], 0, 64) + if err != nil { + return nil, false, 0, err + } + + isGroup = strings.Contains(uri, "group") + + return doc, isGroup, sheduleId, nil } diff --git a/modules/ssau_parser/shedule.go b/modules/ssau_parser/shedule.go index 35656c8..ce5497d 100644 --- a/modules/ssau_parser/shedule.go +++ b/modules/ssau_parser/shedule.go @@ -19,18 +19,22 @@ type SubLesson struct { Type string Name string Place string - TeacherID int64 + TeacherId int64 + GroupId []int64 Comment string SubGroup string } type Shedule struct { - SpecName string - Week int - Lessons [][]Lesson + IsGroup bool + SheduleId int64 + SpecName string + Week int + Lessons [][]Lesson } -func Parse(doc *goquery.Document) (*Shedule, error) { +// Parse goquery shedule site +func Parse(doc *goquery.Document, isGroup bool, sheduleId int64) (*Shedule, error) { spec := doc.Find(".info-block__description div").First().Text()[1:] log.Println(spec) @@ -48,7 +52,7 @@ func Parse(doc *goquery.Document) (*Shedule, error) { var lessons [][]SubLesson doc.Find(".schedule__item:not(.schedule__head)").Each(func(i int, s *goquery.Selection) { - sl := ParseSubLesson(s) + sl := ParseSubLesson(s, isGroup, sheduleId) lessons = append(lessons, sl) }) @@ -82,7 +86,8 @@ func Parse(doc *goquery.Document) (*Shedule, error) { var types = [4]string{"lect", "lab", "pract", "other"} -func ParseSubLesson(s *goquery.Selection) []SubLesson { +// Parse shedule item +func ParseSubLesson(s *goquery.Selection, isGroup bool, sheduleId int64) []SubLesson { var subs []SubLesson s.Find(".schedule__lesson").Each(func(j int, l *goquery.Selection) { var sublesson SubLesson @@ -98,13 +103,31 @@ func ParseSubLesson(s *goquery.Selection) []SubLesson { } sublesson.Type = types[type_idx-1] - teacher := l.Find(".schedule__teacher a").AttrOr("href", "/rasp?staffId=") - teacherId, err := strconv.ParseInt(teacher[14:], 0, 64) - if err != nil { - teacherId = 0 - } - sublesson.TeacherID = teacherId + var teacherId int64 + var groupId []int64 + if isGroup { + teacher := l.Find(".schedule__teacher a").AttrOr("href", "/rasp?staffId=") + teacherId, err = strconv.ParseInt(teacher[14:], 0, 64) + if err != nil { + teacherId = 0 + } + groupId = append(groupId, sheduleId) + } else { + teacherId = sheduleId + l.Find("a.schedule__group").Each(func(k int, gr *goquery.Selection) { + id, err := strconv.ParseInt(gr.AttrOr("href", "/rasp?groupId=")[14:], 0, 64) + if err != nil { + teacherId = 0 + } + groupId = append(groupId, id) + }) + } + sublesson.TeacherId = teacherId + sublesson.GroupId = groupId + + // Я в рот ебал парсить это расписание, потому что у преподов решили номера подгрупп пихать + // в ссылки на группу, а не в предназначенный для этого элемент subgroup := l.Find(".schedule__groups span").First().Text() if subgroup == " " { subgroup = "" diff --git a/modules/ssau_parser/ssau_parser_test.go b/modules/ssau_parser/ssau_parser_test.go index a89744e..d8f5dfd 100644 --- a/modules/ssau_parser/ssau_parser_test.go +++ b/modules/ssau_parser/ssau_parser_test.go @@ -2,7 +2,11 @@ package ssau_parser import ( "log" + "os" "testing" + + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" + "github.com/joho/godotenv" ) func TestFindInRasp(t *testing.T) { @@ -19,7 +23,7 @@ func TestConnect(t *testing.T) { t.Error(err) } uri := list[0].Url - _, err = Connect(uri, 3) + _, _, _, err = Connect(uri, 3) if err != nil { t.Error(err) } @@ -31,12 +35,19 @@ func TestParse(t *testing.T) { t.Error(err) } uri := list[0].Url - doc, err := Connect(uri, 3) + doc, is, gr, err := Connect(uri, 5) if err != nil { t.Error(err) } - _, err = Parse(doc) + shedule, err := Parse(doc, is, gr) if err != nil { t.Error(err) } + + if err := godotenv.Load(); err != nil { + log.Fatal("No .env file found") + } + + engine := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) + uploadShedule(engine, *shedule) } From e9cad18cb31c10e1fb7b37396fa98e2e2827c4f0 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Tue, 7 Mar 2023 13:27:18 +0400 Subject: [PATCH 07/17] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE:=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BE=D0=B4=D0=BD=D0=B8=D0=BC=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=81=D0=BE=D0=BC=20=D0=B8=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=B4=D1=83=D0=BF=D0=BB=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ssau_parser/database.go | 23 ++++++++++++++++++----- modules/ssau_parser/ssau_parser_test.go | 5 ++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/modules/ssau_parser/database.go b/modules/ssau_parser/database.go index a6d0435..55ec338 100644 --- a/modules/ssau_parser/database.go +++ b/modules/ssau_parser/database.go @@ -5,7 +5,8 @@ import ( "xorm.io/xorm" ) -func uploadShedule(db *xorm.Engine, sh Shedule) { +func uploadShedule(db *xorm.Engine, sh Shedule) error { + var pairs []database.Lesson for _, line := range sh.Lessons { for _, lesson := range line { var pair database.Lesson @@ -16,15 +17,27 @@ func uploadShedule(db *xorm.Engine, sh Shedule) { Type: subLesson.Type, Name: subLesson.Name, TeacherId: subLesson.TeacherId, - Place: subLesson.Place, - Comment: subLesson.Comment, - SubGroup: subLesson.SubGroup, } for _, groupId := range subLesson.GroupId { pair.GroupId = groupId - db.InsertOne(pair) + var existsLessons []database.Lesson + err := db.Find(&existsLessons, pair) + if err != nil { + return err + } + if len(existsLessons) == 0 { + pair.Place = subLesson.Place + pair.Comment = subLesson.Comment + pair.SubGroup = subLesson.SubGroup + pairs = append(pairs, pair) + } } } } } + if len(pairs) > 0 { + _, err := db.Insert(pairs) + return err + } + return nil } diff --git a/modules/ssau_parser/ssau_parser_test.go b/modules/ssau_parser/ssau_parser_test.go index d8f5dfd..3038348 100644 --- a/modules/ssau_parser/ssau_parser_test.go +++ b/modules/ssau_parser/ssau_parser_test.go @@ -49,5 +49,8 @@ func TestParse(t *testing.T) { } engine := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) - uploadShedule(engine, *shedule) + err = uploadShedule(engine, *shedule) + if err != nil { + t.Error(err) + } } From 106e6b98e896fd2d91ef0ba3739a177041afb8b7 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Tue, 7 Mar 2023 13:38:50 +0400 Subject: [PATCH 08/17] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE:=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B9=20=D0=B2=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0?= =?UTF-8?q?=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 10 ++++++++-- modules/database/mysql.go | 15 +++++++-------- modules/ssau_parser/ssau_parser_test.go | 2 +- modules/tg/handlers.go | 15 +++++++++------ 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/main.go b/main.go index 68e6659..ebbee97 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,10 @@ func main() { log.Fatal("No .env file found") } - engine := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) + engine, err := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) + if err != nil { + log.Fatal(err) + } bot := new(tg.Bot) bot.InitBot(os.Getenv("TELEGRAM_APITOKEN"), *engine) @@ -25,7 +28,10 @@ func main() { if update.Message != nil { log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text) - tg_user := bot.InitUser(update.Message) + tg_user, err := bot.InitUser(update.Message) + if err != nil { + log.Fatal(err) + } if tg_user.PosTag == "not_started" { bot.Start() diff --git a/modules/database/mysql.go b/modules/database/mysql.go index d58217b..dd0611f 100644 --- a/modules/database/mysql.go +++ b/modules/database/mysql.go @@ -1,7 +1,6 @@ package database import ( - "log" "math/rand" _ "github.com/go-sql-driver/mysql" @@ -9,10 +8,10 @@ import ( "xorm.io/xorm/names" ) -func Connect(user, pass, db string) *xorm.Engine { +func Connect(user, pass, db string) (*xorm.Engine, error) { engine, err := xorm.NewEngine("mysql", user+":"+pass+"@tcp(localhost:3306)/"+db+"?charset=utf8") if err != nil { - log.Fatal(err) + return nil, err } engine.ShowSQL(true) @@ -20,22 +19,22 @@ func Connect(user, pass, db string) *xorm.Engine { err = engine.Sync(&User{}, &TgUser{}, &Group{}, &Lesson{}) if err != nil { - log.Fatal(err) + return nil, err } - return engine + return engine, nil } -func GenerateID(engine *xorm.Engine) int64 { +func GenerateID(engine *xorm.Engine) (int64, error) { id := rand.Int63n(899999999) + 100000000 exists, err := engine.ID(id).Exist(&User{}) if err != nil { - log.Fatal(err) + return 0, err } if exists { return GenerateID(engine) } else { - return id + return id, nil } } diff --git a/modules/ssau_parser/ssau_parser_test.go b/modules/ssau_parser/ssau_parser_test.go index 3038348..e6d5e79 100644 --- a/modules/ssau_parser/ssau_parser_test.go +++ b/modules/ssau_parser/ssau_parser_test.go @@ -48,7 +48,7 @@ func TestParse(t *testing.T) { log.Fatal("No .env file found") } - engine := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) + engine, err := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) err = uploadShedule(engine, *shedule) if err != nil { t.Error(err) diff --git a/modules/tg/handlers.go b/modules/tg/handlers.go index 915b04d..59bfb5e 100644 --- a/modules/tg/handlers.go +++ b/modules/tg/handlers.go @@ -7,7 +7,7 @@ import ( tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" ) -func (bot *Bot) InitUser(msg *tgbotapi.Message) *database.TgUser { +func (bot *Bot) InitUser(msg *tgbotapi.Message) (*database.TgUser, error) { db := &bot.DB var users []database.TgUser err := db.Find(&users, &database.TgUser{TgId: msg.Chat.ID}) @@ -17,7 +17,10 @@ func (bot *Bot) InitUser(msg *tgbotapi.Message) *database.TgUser { var tg_user database.TgUser if len(users) == 0 { - l9id := database.GenerateID(db) + l9id, err := database.GenerateID(db) + if err != nil { + return nil, err + } user := database.User{ L9Id: l9id, @@ -29,19 +32,19 @@ func (bot *Bot) InitUser(msg *tgbotapi.Message) *database.TgUser { TgId: msg.Chat.ID, PosTag: "not_started", } - _, err := db.Insert(user, tg_user) + _, err = db.Insert(user, tg_user) if err != nil { - log.Fatal(err) + return nil, err } } else { tg_user = users[0] } bot.TG_user = tg_user - return &tg_user + return &tg_user, nil } func (bot *Bot) Start() { - bot.TG_user.PosTag = "started" + bot.TG_user.PosTag = "add" _, err := bot.DB.Update(bot.TG_user) if err != nil { log.Fatal(err) From 7a16cc719a218415733146626b45e15d7fb47e21 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Tue, 7 Mar 2023 20:27:14 +0400 Subject: [PATCH 09/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D0=BF=D0=BE=D0=B4=D0=B0=D0=B2=D0=B0=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9=20=D0=B8=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/database/database_struct.go | 12 ++- modules/database/mysql.go | 2 +- modules/ssau_parser/database.go | 107 +++++++++++++++++++++++- modules/ssau_parser/shedule.go | 19 +++-- modules/ssau_parser/ssau_parser_test.go | 10 ++- 5 files changed, 138 insertions(+), 12 deletions(-) diff --git a/modules/database/database_struct.go b/modules/database/database_struct.go index 0345c10..9a5a2e5 100644 --- a/modules/database/database_struct.go +++ b/modules/database/database_struct.go @@ -15,8 +15,16 @@ type TgUser struct { type Group struct { GroupId int64 `xorm:"pk"` - groupName string - specName string + GroupName string + SpecName string +} + +type Teacher struct { + TeacherId int64 `xorm:"pk"` + LastName string + FirstName string + MidName string + SpecName string } type Lesson struct { diff --git a/modules/database/mysql.go b/modules/database/mysql.go index dd0611f..33e432e 100644 --- a/modules/database/mysql.go +++ b/modules/database/mysql.go @@ -17,7 +17,7 @@ func Connect(user, pass, db string) (*xorm.Engine, error) { engine.ShowSQL(true) engine.SetMapper(names.SameMapper{}) - err = engine.Sync(&User{}, &TgUser{}, &Group{}, &Lesson{}) + err = engine.Sync(&User{}, &TgUser{}, &Group{}, &Lesson{}, &Teacher{}) if err != nil { return nil, err } diff --git a/modules/ssau_parser/database.go b/modules/ssau_parser/database.go index 55ec338..b0be390 100644 --- a/modules/ssau_parser/database.go +++ b/modules/ssau_parser/database.go @@ -1,11 +1,20 @@ package ssau_parser import ( + "log" + "strconv" + "strings" + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" "xorm.io/xorm" ) func uploadShedule(db *xorm.Engine, sh Shedule) error { + err := addGroupOrTeacher(db, sh) + if err != nil { + return err + } + var pairs []database.Lesson for _, line := range sh.Lessons { for _, lesson := range line { @@ -18,10 +27,48 @@ func uploadShedule(db *xorm.Engine, sh Shedule) error { Name: subLesson.Name, TeacherId: subLesson.TeacherId, } + + exists, err := isTeacherExists(db, subLesson.TeacherId) + if err != nil { + return err + } + + if !exists && subLesson.TeacherId != 0 { + uri := "/rasp?staffId=" + strconv.FormatInt(subLesson.TeacherId, 10) + doc, _, _, err := Connect(uri, sh.Week) + if err != nil { + return err + } + var gr Shedule + gr.IsGroup = false + gr.SheduleId = subLesson.TeacherId + GetSheduleInfo(doc, &gr) + addGroupOrTeacher(db, gr) + } + for _, groupId := range subLesson.GroupId { pair.GroupId = groupId + + exists, err := isGroupExists(db, groupId) + if err != nil { + return err + } + + if !exists { + uri := "/rasp?groupId=" + strconv.FormatInt(groupId, 10) + doc, _, _, err := Connect(uri, sh.Week) + if err != nil { + return err + } + var gr Shedule + gr.IsGroup = true + gr.SheduleId = groupId + GetSheduleInfo(doc, &gr) + addGroupOrTeacher(db, gr) + } + var existsLessons []database.Lesson - err := db.Find(&existsLessons, pair) + err = db.Find(&existsLessons, pair) if err != nil { return err } @@ -41,3 +88,61 @@ func uploadShedule(db *xorm.Engine, sh Shedule) error { } return nil } + +func isGroupExists(db *xorm.Engine, groupId int64) (bool, error) { + var exists []database.Group + err := db.Find(&exists, database.Group{GroupId: groupId}) + if err != nil { + return false, err + } + + return len(exists) == 1, nil +} + +func isTeacherExists(db *xorm.Engine, teacherId int64) (bool, error) { + var exists []database.Teacher + err := db.Find(&exists, database.Teacher{TeacherId: teacherId}) + if err != nil { + return false, err + } + + return len(exists) == 1, nil +} + +func addGroupOrTeacher(db *xorm.Engine, sh Shedule) error { + if sh.IsGroup { + exists, err := isGroupExists(db, sh.SheduleId) + if err != nil { + return err + } + + if !exists { + group := database.Group{ + GroupId: sh.SheduleId, + GroupName: sh.GroupName, + SpecName: sh.SpecName, + } + db.InsertOne(group) + } + } else { + exists, err := isTeacherExists(db, sh.SheduleId) + if err != nil { + return err + } + + if !exists { + name := strings.Split(sh.GroupName, " ") + log.Println(name) + teacher := database.Teacher{ + TeacherId: sh.SheduleId, + LastName: name[0], + FirstName: name[1], + MidName: name[2], + SpecName: sh.SpecName, + } + db.InsertOne(teacher) + } + + } + return nil +} diff --git a/modules/ssau_parser/shedule.go b/modules/ssau_parser/shedule.go index ce5497d..9102b9b 100644 --- a/modules/ssau_parser/shedule.go +++ b/modules/ssau_parser/shedule.go @@ -1,7 +1,6 @@ package ssau_parser import ( - "log" "strconv" "strings" "time" @@ -28,15 +27,21 @@ type SubLesson struct { type Shedule struct { IsGroup bool SheduleId int64 + GroupName string SpecName string Week int Lessons [][]Lesson } +func GetSheduleInfo(doc *goquery.Document, sh *Shedule) { + sh.SpecName = doc.Find(".info-block__description div").First().Text()[1:] + sh.GroupName = doc.Find(".info-block__title").First().Text()[1:] +} + // Parse goquery shedule site -func Parse(doc *goquery.Document, isGroup bool, sheduleId int64) (*Shedule, error) { - spec := doc.Find(".info-block__description div").First().Text()[1:] - log.Println(spec) +func Parse(doc *goquery.Document, isGroup bool, sheduleId int64, week int) (*Shedule, error) { + var sh Shedule + GetSheduleInfo(doc, &sh) var raw_dates []string doc.Find(".schedule__head-date").Each(func(i int, s *goquery.Selection) { @@ -81,7 +86,11 @@ func Parse(doc *goquery.Document, isGroup bool, sheduleId int64) (*Shedule, erro } shedule = append(shedule, time_line) } - return &Shedule{SpecName: spec, Lessons: shedule}, nil + sh.IsGroup = isGroup + sh.SheduleId = sheduleId + sh.Week = week + sh.Lessons = shedule + return &sh, nil } var types = [4]string{"lect", "lab", "pract", "other"} diff --git a/modules/ssau_parser/ssau_parser_test.go b/modules/ssau_parser/ssau_parser_test.go index e6d5e79..627fd85 100644 --- a/modules/ssau_parser/ssau_parser_test.go +++ b/modules/ssau_parser/ssau_parser_test.go @@ -30,16 +30,17 @@ func TestConnect(t *testing.T) { } func TestParse(t *testing.T) { - list, err := FindInRasp("2207") + list, err := FindInRasp("2305") if err != nil { t.Error(err) } + week := 5 uri := list[0].Url - doc, is, gr, err := Connect(uri, 5) + doc, is, gr, err := Connect(uri, week) if err != nil { t.Error(err) } - shedule, err := Parse(doc, is, gr) + shedule, err := Parse(doc, is, gr, week) if err != nil { t.Error(err) } @@ -49,6 +50,9 @@ func TestParse(t *testing.T) { } engine, err := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) + if err != nil { + t.Error(err) + } err = uploadShedule(engine, *shedule) if err != nil { t.Error(err) From e9470f1bd21dab52c4483319edc998bdf529483a Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Wed, 8 Mar 2023 10:43:04 +0400 Subject: [PATCH 10/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=BA=D1=80=D1=83=D1=82=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF?= =?UTF-8?q?=20=D0=B8=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=B0=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 2 ++ modules/tg/handlers.go | 63 ++++++++++++++++++++++++++++++++++++++++++ modules/tg/utils.go | 43 ++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 modules/tg/utils.go diff --git a/main.go b/main.go index ebbee97..3da4c1a 100644 --- a/main.go +++ b/main.go @@ -35,6 +35,8 @@ func main() { if tg_user.PosTag == "not_started" { bot.Start() + } else if tg_user.PosTag == "add" { + bot.Find(update.Message.Text) } else { bot.Etc() } diff --git a/modules/tg/handlers.go b/modules/tg/handlers.go index 59bfb5e..fd8d585 100644 --- a/modules/tg/handlers.go +++ b/modules/tg/handlers.go @@ -2,9 +2,12 @@ package tg import ( "log" + "strings" "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/ssau_parser" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "xorm.io/builder" ) func (bot *Bot) InitUser(msg *tgbotapi.Message) (*database.TgUser, error) { @@ -53,6 +56,66 @@ func (bot *Bot) Start() { bot.TG.Send(msg) } +func (bot *Bot) Find(query string) { + var groups []database.Group + bot.DB.Where(builder.Like{"GroupName", query}).Find(&groups) + + var teachers []database.Teacher + bot.DB.Where(builder.Like{"LastName", query}).Find(&teachers) + + list, _ := ssau_parser.FindInRasp(query) + + allGroups := groups + allTeachers := teachers + + for _, elem := range list { + if strings.Contains(elem.Url, "group") { + exists := false + for _, group := range groups { + if elem.Id == group.GroupId { + exists = true + break + } + } + if !exists { + allGroups = append(allGroups, database.Group{GroupId: elem.Id, GroupName: elem.Text}) + } + } + if strings.Contains(elem.Url, "staff") { + exists := false + for _, teacher := range teachers { + if elem.Id == teacher.TeacherId { + exists = true + break + } + } + if !exists { + name := strings.Split(elem.Text, " ") + allTeachers = append(allTeachers, database.Teacher{ + TeacherId: elem.Id, + LastName: name[0], + FirstName: name[1], + MidName: name[2], + }) + } + } + } + + if len(allGroups) != 0 { + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Many groups in base. Please sekect one") + msg.ReplyMarkup = GenerateKeyboard(GenerateGroupsArray(allGroups), query) + bot.TG.Send(msg) + } else if len(allTeachers) != 0 { + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Many teachers in base. Please sekect one") + msg.ReplyMarkup = GenerateKeyboard(GenerateTeachersArray(allTeachers), query) + bot.TG.Send(msg) + } else { + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Nothing found ):") + bot.TG.Send(msg) + } + +} + func (bot *Bot) Etc() { msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Oops!") bot.TG.Send(msg) diff --git a/modules/tg/utils.go b/modules/tg/utils.go new file mode 100644 index 0000000..eb91834 --- /dev/null +++ b/modules/tg/utils.go @@ -0,0 +1,43 @@ +package tg + +import ( + "fmt" + "strconv" + + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" +) + +func GenerateGroupsArray(groups []database.Group) []tgbotapi.InlineKeyboardButton { + var grKeys []tgbotapi.InlineKeyboardButton + for _, gr := range groups { + grKeys = append(grKeys, tgbotapi.NewInlineKeyboardButtonData(gr.GroupName, strconv.FormatInt(gr.GroupId, 10))) + } + return grKeys +} + +func GenerateTeachersArray(groups []database.Teacher) []tgbotapi.InlineKeyboardButton { + var teacherKeys []tgbotapi.InlineKeyboardButton + for _, t := range groups { + name := fmt.Sprintf("%s %s.%s.", t.LastName, t.FirstName[0:2], t.MidName[0:2]) + teacherKeys = append(teacherKeys, tgbotapi.NewInlineKeyboardButtonData(name, strconv.FormatInt(t.TeacherId, 10))) + } + return teacherKeys +} + +func GenerateKeyboard(array []tgbotapi.InlineKeyboardButton, query string) tgbotapi.InlineKeyboardMarkup { + var keys []tgbotapi.InlineKeyboardButton + var markup [][]tgbotapi.InlineKeyboardButton + + for _, key := range array { + keys = append(keys, key) + if len(keys) >= 3 { + markup = append(markup, keys) + keys = []tgbotapi.InlineKeyboardButton{} + } + } + markup = append(markup, keys) + no_one := tgbotapi.NewInlineKeyboardButtonData("No one", "no_one_"+query) + markup = append(markup, []tgbotapi.InlineKeyboardButton{no_one}) + return tgbotapi.InlineKeyboardMarkup{InlineKeyboard: markup} +} From 7f268865ea086e583228bbdcd9e2bfc94e17c75b Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Wed, 8 Mar 2023 14:03:27 +0400 Subject: [PATCH 11/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=BF=D0=BE=D0=B4=D1=82=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=8B=D0=B1?= =?UTF-8?q?=D0=BE=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 27 +++++++++-- modules/database/database_struct.go | 7 +++ modules/database/mysql.go | 2 +- modules/tg/bot.go | 5 ++- modules/tg/handlers.go | 69 +++++++++++++++++++++++------ modules/tg/utils.go | 2 +- 6 files changed, 91 insertions(+), 21 deletions(-) diff --git a/main.go b/main.go index 3da4c1a..22ced70 100644 --- a/main.go +++ b/main.go @@ -3,6 +3,7 @@ package main import ( "log" "os" + "strings" "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/tg" @@ -20,15 +21,19 @@ func main() { } bot := new(tg.Bot) - bot.InitBot(os.Getenv("TELEGRAM_APITOKEN"), *engine) + err = bot.InitBot(os.Getenv("TELEGRAM_APITOKEN"), *engine) + if err != nil { + log.Fatal(err) + } updates := bot.GetUpdates() for update := range *updates { if update.Message != nil { - log.Printf("[%s] %s", update.Message.From.UserName, update.Message.Text) + msg := update.Message + log.Printf("Message [%s] %s", msg.From.UserName, msg.Text) - tg_user, err := bot.InitUser(update.Message) + tg_user, err := bot.InitUser(msg.From.ID, msg.From.UserName) if err != nil { log.Fatal(err) } @@ -36,11 +41,25 @@ func main() { if tg_user.PosTag == "not_started" { bot.Start() } else if tg_user.PosTag == "add" { - bot.Find(update.Message.Text) + bot.Find(msg.Text) } else { bot.Etc() } } + + if update.CallbackQuery != nil { + query := update.CallbackQuery + log.Printf("Callback [%s] %s", query.From.UserName, query.Data) + + tg_user, err := bot.InitUser(query.From.ID, query.From.UserName) + if err != nil { + log.Fatal(err) + } + + if strings.Contains(tg_user.PosTag, "confirm") { + bot.Confirm(query, tg_user, tg_user.PosTag == "confirm_group") + } + } } } diff --git a/modules/database/database_struct.go b/modules/database/database_struct.go index 9a5a2e5..393a87a 100644 --- a/modules/database/database_struct.go +++ b/modules/database/database_struct.go @@ -13,6 +13,13 @@ type TgUser struct { PosTag string } +type ShedulesInUser struct { + UID int64 `xorm:"pk"` + L9Id int64 + IsTeacher bool + SheduleId int64 +} + type Group struct { GroupId int64 `xorm:"pk"` GroupName string diff --git a/modules/database/mysql.go b/modules/database/mysql.go index 33e432e..1344a02 100644 --- a/modules/database/mysql.go +++ b/modules/database/mysql.go @@ -17,7 +17,7 @@ func Connect(user, pass, db string) (*xorm.Engine, error) { engine.ShowSQL(true) engine.SetMapper(names.SameMapper{}) - err = engine.Sync(&User{}, &TgUser{}, &Group{}, &Lesson{}, &Teacher{}) + err = engine.Sync(&User{}, &TgUser{}, &Group{}, &Lesson{}, &Teacher{}, &ShedulesInUser{}) if err != nil { return nil, err } diff --git a/modules/tg/bot.go b/modules/tg/bot.go index 9dd715d..0684eb9 100644 --- a/modules/tg/bot.go +++ b/modules/tg/bot.go @@ -14,17 +14,18 @@ type Bot struct { TG_user database.TgUser } -func (bot *Bot) InitBot(token string, engine xorm.Engine) { +func (bot *Bot) InitBot(token string, engine xorm.Engine) error { var err error bot.TG, err = tgbotapi.NewBotAPI(token) if err != nil { - log.Fatal(err) + return err } bot.TG.Debug = true bot.DB = engine log.Printf("Authorized on account %s", bot.TG.Self.UserName) + return nil } func (bot *Bot) GetUpdates() *tgbotapi.UpdatesChannel { diff --git a/modules/tg/handlers.go b/modules/tg/handlers.go index fd8d585..d04f9eb 100644 --- a/modules/tg/handlers.go +++ b/modules/tg/handlers.go @@ -2,6 +2,7 @@ package tg import ( "log" + "strconv" "strings" "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" @@ -10,10 +11,10 @@ import ( "xorm.io/builder" ) -func (bot *Bot) InitUser(msg *tgbotapi.Message) (*database.TgUser, error) { +func (bot *Bot) InitUser(id int64, name string) (*database.TgUser, error) { db := &bot.DB var users []database.TgUser - err := db.Find(&users, &database.TgUser{TgId: msg.Chat.ID}) + err := db.Find(&users, &database.TgUser{TgId: id}) if err != nil { log.Fatal(err) } @@ -31,8 +32,8 @@ func (bot *Bot) InitUser(msg *tgbotapi.Message) (*database.TgUser, error) { tg_user = database.TgUser{ L9Id: l9id, - Name: msg.From.UserName, - TgId: msg.Chat.ID, + Name: name, + TgId: id, PosTag: "not_started", } _, err = db.Insert(user, tg_user) @@ -46,17 +47,18 @@ func (bot *Bot) InitUser(msg *tgbotapi.Message) (*database.TgUser, error) { return &tg_user, nil } -func (bot *Bot) Start() { +func (bot *Bot) Start() error { bot.TG_user.PosTag = "add" _, err := bot.DB.Update(bot.TG_user) if err != nil { - log.Fatal(err) + return err } - msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Hello!") - bot.TG.Send(msg) + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Привет! Введи свой номер группы или фамилию преподавателя") + _, err = bot.TG.Send(msg) + return err } -func (bot *Bot) Find(query string) { +func (bot *Bot) Find(query string) error { var groups []database.Group bot.DB.Where(builder.Like{"GroupName", query}).Find(&groups) @@ -102,21 +104,62 @@ func (bot *Bot) Find(query string) { } if len(allGroups) != 0 { - msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Many groups in base. Please sekect one") + if bot.TG_user.PosTag == "add" { + bot.TG_user.PosTag = "confirm_group" + } + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Вот что я нашёл.\nВыбери свою группу") msg.ReplyMarkup = GenerateKeyboard(GenerateGroupsArray(allGroups), query) bot.TG.Send(msg) } else if len(allTeachers) != 0 { - msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Many teachers in base. Please sekect one") + if bot.TG_user.PosTag == "add" { + bot.TG_user.PosTag = "confirm_teacher" + } + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Вот что я нашёл.\nВыбери нужного преподавателя") msg.ReplyMarkup = GenerateKeyboard(GenerateTeachersArray(allTeachers), query) bot.TG.Send(msg) } else { - msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Nothing found ):") + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "К сожалению, я ничего не нашёл ):\nПроверь свой запрос") bot.TG.Send(msg) } + _, err := bot.DB.Update(bot.TG_user) + return err +} + +func (bot *Bot) Confirm(query *tgbotapi.CallbackQuery, tg_user *database.TgUser, isGroup bool) { + groupId, err := strconv.ParseInt(query.Data, 0, 64) + if err != nil { + log.Fatal(err) + } + var groups []database.ShedulesInUser + err = bot.DB.Find(&groups, &database.ShedulesInUser{ + SheduleId: groupId, + IsTeacher: !isGroup, + }) + if err != nil { + log.Fatal(err) + } + if len(groups) == 0 { + shInUser := database.ShedulesInUser{ + L9Id: tg_user.L9Id, + IsTeacher: !isGroup, + SheduleId: groupId, + } + bot.DB.InsertOne(shInUser) + delete := tgbotapi.NewDeleteMessage(query.From.ID, query.Message.MessageID) + bot.TG.Request(delete) + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Подключено!") + bot.TG.Send(msg) + + tg_user.PosTag = "ready" + bot.DB.Update(tg_user) + } else { + callback := tgbotapi.NewCallback(query.ID, "Эта группа уже подключена!") + bot.TG.Request(callback) + } } func (bot *Bot) Etc() { - msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Oops!") + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Oй!") bot.TG.Send(msg) } diff --git a/modules/tg/utils.go b/modules/tg/utils.go index eb91834..89d3dd5 100644 --- a/modules/tg/utils.go +++ b/modules/tg/utils.go @@ -37,7 +37,7 @@ func GenerateKeyboard(array []tgbotapi.InlineKeyboardButton, query string) tgbot } } markup = append(markup, keys) - no_one := tgbotapi.NewInlineKeyboardButtonData("No one", "no_one_"+query) + no_one := tgbotapi.NewInlineKeyboardButtonData("Отмена", "cancel") markup = append(markup, []tgbotapi.InlineKeyboardButton{no_one}) return tgbotapi.InlineKeyboardMarkup{InlineKeyboard: markup} } From 7601630b99b0fa6d535513ad681932b9d04cfe59 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Mon, 13 Mar 2023 10:51:48 +0400 Subject: [PATCH 12/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=BE=D1=82=D0=BC=D0=B5=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 6 ++++-- modules/tg/handlers.go | 46 ++++++++++++++++++++++++++++++++++-------- modules/tg/utils.go | 5 +++++ 3 files changed, 47 insertions(+), 10 deletions(-) diff --git a/main.go b/main.go index 22ced70..3de006e 100644 --- a/main.go +++ b/main.go @@ -57,8 +57,10 @@ func main() { log.Fatal(err) } - if strings.Contains(tg_user.PosTag, "confirm") { - bot.Confirm(query, tg_user, tg_user.PosTag == "confirm_group") + if query.Data == "cancel" { + bot.Cancel(query) + } else if strings.Contains(tg_user.PosTag, "confirm") { + bot.Confirm(query) } } } diff --git a/modules/tg/handlers.go b/modules/tg/handlers.go index d04f9eb..3913377 100644 --- a/modules/tg/handlers.go +++ b/modules/tg/handlers.go @@ -53,7 +53,8 @@ func (bot *Bot) Start() error { if err != nil { return err } - msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Привет! Введи свой номер группы или фамилию преподавателя") + msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Привет! Введи свой номер группы или фамилию преподавателя") + msg.ParseMode = tgbotapi.ModeHTML _, err = bot.TG.Send(msg) return err } @@ -126,13 +127,15 @@ func (bot *Bot) Find(query string) error { return err } -func (bot *Bot) Confirm(query *tgbotapi.CallbackQuery, tg_user *database.TgUser, isGroup bool) { +func (bot *Bot) Confirm(query *tgbotapi.CallbackQuery) { + isGroup := bot.TG_user.PosTag == "confirm_group" groupId, err := strconv.ParseInt(query.Data, 0, 64) if err != nil { log.Fatal(err) } var groups []database.ShedulesInUser err = bot.DB.Find(&groups, &database.ShedulesInUser{ + L9Id: bot.TG_user.L9Id, SheduleId: groupId, IsTeacher: !isGroup, }) @@ -141,24 +144,51 @@ func (bot *Bot) Confirm(query *tgbotapi.CallbackQuery, tg_user *database.TgUser, } if len(groups) == 0 { shInUser := database.ShedulesInUser{ - L9Id: tg_user.L9Id, + L9Id: bot.TG_user.L9Id, IsTeacher: !isGroup, SheduleId: groupId, } bot.DB.InsertOne(shInUser) - delete := tgbotapi.NewDeleteMessage(query.From.ID, query.Message.MessageID) - bot.TG.Request(delete) + bot.DeleteMsg(query) msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Подключено!") bot.TG.Send(msg) - tg_user.PosTag = "ready" - bot.DB.Update(tg_user) + bot.TG_user.PosTag = "ready" + bot.DB.Update(bot.TG_user) } else { - callback := tgbotapi.NewCallback(query.ID, "Эта группа уже подключена!") + var msg string + if isGroup { + msg = "Эта группа уже подключена!" + } else { + msg = "Этот преподаватель уже подключен!" + } + callback := tgbotapi.NewCallback(query.ID, msg) bot.TG.Request(callback) } } +func (bot *Bot) Cancel(query *tgbotapi.CallbackQuery) { + shedules, err := bot.DB.Count(&database.ShedulesInUser{ + L9Id: bot.TG_user.L9Id, + }) + if err != nil { + log.Fatal(err) + } + if shedules == 0 { + bot.TG_user.PosTag = "add" + bot.DB.Update(bot.TG_user) + bot.DeleteMsg(query) + msg := tgbotapi.NewMessage( + bot.TG_user.TgId, + "Ой, для работы с ботом нужно подключить хотя бы одно расписание группы или преподавателя!\nВведи свой номер группы или фамилию преподавателя", + ) + bot.TG.Send(msg) + } else { + bot.TG_user.PosTag = "ready" + bot.DeleteMsg(query) + } +} + func (bot *Bot) Etc() { msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Oй!") bot.TG.Send(msg) diff --git a/modules/tg/utils.go b/modules/tg/utils.go index 89d3dd5..b5fc910 100644 --- a/modules/tg/utils.go +++ b/modules/tg/utils.go @@ -41,3 +41,8 @@ func GenerateKeyboard(array []tgbotapi.InlineKeyboardButton, query string) tgbot markup = append(markup, []tgbotapi.InlineKeyboardButton{no_one}) return tgbotapi.InlineKeyboardMarkup{InlineKeyboard: markup} } + +func (bot *Bot) DeleteMsg(query *tgbotapi.CallbackQuery) { + delete := tgbotapi.NewDeleteMessage(query.From.ID, query.Message.MessageID) + bot.TG.Request(delete) +} From 3a3479b6e313b07e26f7477fb63b02243c3e6e90 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Mon, 13 Mar 2023 19:23:30 +0400 Subject: [PATCH 13/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D1=81=D0=B2=D0=BE=D0=B4=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BE=20=D0=BF=D0=B0=D1=80=D0=B0=D1=85=20(=D0=BC=D0=B5=D0=B3?= =?UTF-8?q?=D0=B0=20=D1=81=D1=8B=D1=80=D0=B0=D1=8F,=20=D0=BD=D0=BE=20?= =?UTF-8?q?=D1=81=D0=B0=D0=BC=D0=BE=D0=B5=20=D1=81=D0=BB=D0=BE=D0=B6=D0=BD?= =?UTF-8?q?=D0=BE=D0=B5=20=D0=BF=D0=BE=D0=B7=D0=B0=D0=B4=D0=B8)=20=D0=98?= =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE:=20?= =?UTF-8?q?=D0=B1=D0=B0=D0=B3=D0=B8=20=D1=81=20=D0=BE=D0=B1=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D1=82=D1=8D=D0=B3?= =?UTF-8?q?=D0=BE=D0=B2,=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?= =?UTF-8?q?=D0=BE=D0=B9=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B8=20=D1=82=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 2 + modules/database/database_struct.go | 2 +- modules/ssau_parser/shedule.go | 2 +- modules/tg/handlers.go | 26 ++++-- modules/tg/shedule.go | 129 ++++++++++++++++++++++++++++ modules/tg/tg_test.go | 34 ++++++++ modules/tg/utils.go | 5 ++ 7 files changed, 192 insertions(+), 8 deletions(-) create mode 100644 modules/tg/shedule.go create mode 100644 modules/tg/tg_test.go diff --git a/main.go b/main.go index 3de006e..5667b8f 100644 --- a/main.go +++ b/main.go @@ -42,6 +42,8 @@ func main() { bot.Start() } else if tg_user.PosTag == "add" { bot.Find(msg.Text) + } else if msg.Text == "Главное меню" { + bot.GetSummary() } else { bot.Etc() } diff --git a/modules/database/database_struct.go b/modules/database/database_struct.go index 393a87a..30773d8 100644 --- a/modules/database/database_struct.go +++ b/modules/database/database_struct.go @@ -14,7 +14,7 @@ type TgUser struct { } type ShedulesInUser struct { - UID int64 `xorm:"pk"` + UID int64 `xorm:"pk autoincr"` // Не забывать про автоинкремент!!! L9Id int64 IsTeacher bool SheduleId int64 diff --git a/modules/ssau_parser/shedule.go b/modules/ssau_parser/shedule.go index 9102b9b..f4b035d 100644 --- a/modules/ssau_parser/shedule.go +++ b/modules/ssau_parser/shedule.go @@ -76,7 +76,7 @@ func Parse(doc *goquery.Document, isGroup bool, sheduleId int64, week int) (*She if err != nil { return nil, err } - idx := (len(raw_times)-2)*t/2 + d + idx := (len(raw_times)/2+1)*t/2 + d lesson := Lesson{ Begin: begin, End: end, diff --git a/modules/tg/handlers.go b/modules/tg/handlers.go index 3913377..213024b 100644 --- a/modules/tg/handlers.go +++ b/modules/tg/handlers.go @@ -127,11 +127,11 @@ func (bot *Bot) Find(query string) error { return err } -func (bot *Bot) Confirm(query *tgbotapi.CallbackQuery) { +func (bot *Bot) Confirm(query *tgbotapi.CallbackQuery) error { isGroup := bot.TG_user.PosTag == "confirm_group" groupId, err := strconv.ParseInt(query.Data, 0, 64) if err != nil { - log.Fatal(err) + return err } var groups []database.ShedulesInUser err = bot.DB.Find(&groups, &database.ShedulesInUser{ @@ -140,7 +140,7 @@ func (bot *Bot) Confirm(query *tgbotapi.CallbackQuery) { IsTeacher: !isGroup, }) if err != nil { - log.Fatal(err) + return err } if len(groups) == 0 { shInUser := database.ShedulesInUser{ @@ -151,10 +151,15 @@ func (bot *Bot) Confirm(query *tgbotapi.CallbackQuery) { bot.DB.InsertOne(shInUser) bot.DeleteMsg(query) msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Подключено!") + keyboard := tgbotapi.NewReplyKeyboard([]tgbotapi.KeyboardButton{tgbotapi.NewKeyboardButton("Главное меню")}) + msg.ReplyMarkup = keyboard bot.TG.Send(msg) bot.TG_user.PosTag = "ready" - bot.DB.Update(bot.TG_user) + err = bot.UpdateUserDB() + if err != nil { + return err + } } else { var msg string if isGroup { @@ -165,9 +170,10 @@ func (bot *Bot) Confirm(query *tgbotapi.CallbackQuery) { callback := tgbotapi.NewCallback(query.ID, msg) bot.TG.Request(callback) } + return nil } -func (bot *Bot) Cancel(query *tgbotapi.CallbackQuery) { +func (bot *Bot) Cancel(query *tgbotapi.CallbackQuery) error { shedules, err := bot.DB.Count(&database.ShedulesInUser{ L9Id: bot.TG_user.L9Id, }) @@ -176,7 +182,10 @@ func (bot *Bot) Cancel(query *tgbotapi.CallbackQuery) { } if shedules == 0 { bot.TG_user.PosTag = "add" - bot.DB.Update(bot.TG_user) + err = bot.UpdateUserDB() + if err != nil { + return err + } bot.DeleteMsg(query) msg := tgbotapi.NewMessage( bot.TG_user.TgId, @@ -185,8 +194,13 @@ func (bot *Bot) Cancel(query *tgbotapi.CallbackQuery) { bot.TG.Send(msg) } else { bot.TG_user.PosTag = "ready" + err = bot.UpdateUserDB() + if err != nil { + return err + } bot.DeleteMsg(query) } + return nil } func (bot *Bot) Etc() { diff --git a/modules/tg/shedule.go b/modules/tg/shedule.go new file mode 100644 index 0000000..01723c7 --- /dev/null +++ b/modules/tg/shedule.go @@ -0,0 +1,129 @@ +package tg + +import ( + "fmt" + "log" + "strconv" + "strings" + "time" + + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "xorm.io/xorm" +) + +func (bot *Bot) GetSummary() { + now := time.Now() + log.Println(now.Format("01-02-2006 15:04:05 -07"), now.Format("01-02-2006 15:04:05")) + + var lessons []database.Lesson + var shedules []database.ShedulesInUser + bot.DB.ID(bot.TG_user.L9Id).Find(&shedules) + + var groups []string + var teachers []string + + for _, sh := range shedules { + if sh.IsTeacher { + teachers = append(teachers, strconv.FormatInt(sh.SheduleId, 10)) + } else { + groups = append(groups, strconv.FormatInt(sh.SheduleId, 10)) + } + } + + teachers_str := strings.Join(teachers, ",") + groups_str := strings.Join(groups, ",") + + bot.DB. + Where("begin > ?", now.Format("2006-01-02 15:04:05")). + And("groupId in (?) or teacherId in (?)", groups_str, teachers_str). + OrderBy("begin"). + Limit(6). + Find(&lessons) + + log.Println(lessons) + + if len(lessons) != 0 { + var firstPair, secondPair []database.Lesson + l_idx := 0 + day := lessons[0].Begin + // Я хз, надо ли упарываться для случаев с более чем двумя подпарами + for lessons[l_idx].Begin == day && l_idx < len(lessons) { + firstPair = append(firstPair, lessons[l_idx]) + l_idx++ + } + if l_idx < len(lessons) { + day = lessons[l_idx].Begin + for lessons[l_idx].Begin == day && l_idx < len(lessons) { + secondPair = append(secondPair, lessons[l_idx]) + l_idx++ + } + } + log.Println(firstPair, secondPair) + + var str string + if firstPair[0].Begin.Day() != time.Now().Day() { + str = "❗️Сегодня пар нет\nБлижайшие занятия " + if time.Until(firstPair[0].Begin).Hours() < 48 { + str += "завтра\n" + } else { + str += fmt.Sprintf("%s\n\n", firstPair[0].Begin.Format("02.01")) + } + } + + firstPairStr, _ := PairToStr(firstPair, &bot.DB) + str += firstPairStr + + if len(secondPair) != 0 && firstPair[0].Begin.Day() == secondPair[0].Begin.Day() { + secondPairStr, _ := PairToStr(secondPair, &bot.DB) + str += secondPairStr + } + msg := tgbotapi.NewMessage(bot.TG_user.TgId, str) + bot.TG.Send(msg) + } + +} + +func PairToStr(pair []database.Lesson, db *xorm.Engine) (string, error) { + var str string + beginStr := pair[0].Begin.Format("15:04") + endStr := pair[0].End.Format("15:04") + str = fmt.Sprintf("📆 %s - %s\n", beginStr, endStr) + + for _, sublesson := range pair { + var type_emoji string + switch sublesson.Type { + case "lect": + type_emoji = "📗" + case "pract": + type_emoji = "📕" + case "lab": + type_emoji = "📘" + case "other": + type_emoji = "📙" + default: + type_emoji = "📙" + } + str += fmt.Sprintf("%s%s\n", type_emoji, sublesson.Name) + if sublesson.Place != "" { + str += fmt.Sprintf("🧭%s\n", sublesson.Place) + } + if sublesson.TeacherId != 0 { + var t database.Teacher + _, err := db.ID(sublesson.TeacherId).Get(&t) + if err != nil { + return "", err + } + name := fmt.Sprintf("%s %s.%s.", t.LastName, t.FirstName[0:2], t.MidName[0:2]) + str += fmt.Sprintf("👤%s\n", name) + } + if sublesson.SubGroup != "" { + str += fmt.Sprintf("👥%s\n", sublesson.SubGroup) + } + if sublesson.Comment != "" { + str += fmt.Sprintf("💬%s\n", sublesson.Comment) + } + str += "--------------------------------\n" + } + return str, nil +} diff --git a/modules/tg/tg_test.go b/modules/tg/tg_test.go new file mode 100644 index 0000000..8d68434 --- /dev/null +++ b/modules/tg/tg_test.go @@ -0,0 +1,34 @@ +package tg + +import ( + "log" + "os" + "testing" + + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" + "github.com/joho/godotenv" +) + +func TestGetSummary(t *testing.T) { + if err := godotenv.Load(); err != nil { + log.Fatal("No .env file found") + } + + engine, err := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) + if err != nil { + log.Fatal(err) + } + + bot := new(Bot) + err = bot.InitBot(os.Getenv("TELEGRAM_APITOKEN"), *engine) + if err != nil { + log.Fatal(err) + } + + bot.TG_user = database.TgUser{ + L9Id: 316268749, + TgId: 1086707888, + } + + bot.GetSummary() +} diff --git a/modules/tg/utils.go b/modules/tg/utils.go index b5fc910..fa211a6 100644 --- a/modules/tg/utils.go +++ b/modules/tg/utils.go @@ -46,3 +46,8 @@ func (bot *Bot) DeleteMsg(query *tgbotapi.CallbackQuery) { delete := tgbotapi.NewDeleteMessage(query.From.ID, query.Message.MessageID) bot.TG.Request(delete) } + +func (bot *Bot) UpdateUserDB() error { + _, err := bot.DB.ID(bot.TG_user.L9Id).Update(bot.TG_user) + return err +} From 97c66c49bc554ec6260f1fe9e5956a73f602c712 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Tue, 14 Mar 2023 10:19:26 +0400 Subject: [PATCH 14/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=B3=D1=80=D0=B0=D0=BC=D0=BE=D1=82?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BF=D0=B0=D1=80=20=D0=B8=20=D0=B2?= =?UTF-8?q?=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0=20=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/tg/shedule.go | 86 ++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 25 deletions(-) diff --git a/modules/tg/shedule.go b/modules/tg/shedule.go index 01723c7..0b3a440 100644 --- a/modules/tg/shedule.go +++ b/modules/tg/shedule.go @@ -35,55 +35,87 @@ func (bot *Bot) GetSummary() { groups_str := strings.Join(groups, ",") bot.DB. - Where("begin > ?", now.Format("2006-01-02 15:04:05")). + Where("end > ?", now.Format("2006-01-02 15:04:05")). And("groupId in (?) or teacherId in (?)", groups_str, teachers_str). OrderBy("begin"). - Limit(6). + Limit(16). Find(&lessons) log.Println(lessons) if len(lessons) != 0 { var firstPair, secondPair []database.Lesson - l_idx := 0 - day := lessons[0].Begin - // Я хз, надо ли упарываться для случаев с более чем двумя подпарами - for lessons[l_idx].Begin == day && l_idx < len(lessons) { - firstPair = append(firstPair, lessons[l_idx]) - l_idx++ - } - if l_idx < len(lessons) { - day = lessons[l_idx].Begin - for lessons[l_idx].Begin == day && l_idx < len(lessons) { - secondPair = append(secondPair, lessons[l_idx]) - l_idx++ - } - } + pairs := GroupPairs(lessons) + firstPair = pairs[0] + secondPair = pairs[1] log.Println(firstPair, secondPair) var str string - if firstPair[0].Begin.Day() != time.Now().Day() { + if pairs[0][0].Begin.Day() != time.Now().Day() { str = "❗️Сегодня пар нет\nБлижайшие занятия " if time.Until(firstPair[0].Begin).Hours() < 48 { str += "завтра\n" } else { str += fmt.Sprintf("%s\n\n", firstPair[0].Begin.Format("02.01")) } + day, _ := bot.GetDayShedule(pairs) + str += day + } else { + str = "Сводка на сегодня\n\n" + day, _ := bot.GetDayShedule(pairs) + str += day + /* + firstPairStr, _ := PairToStr(firstPair, &bot.DB) + str += firstPairStr + + if len(secondPair) != 0 && firstPair[0].Begin.Day() == secondPair[0].Begin.Day() { + secondPairStr, _ := PairToStr(secondPair, &bot.DB) + str += "\n--\n" + secondPairStr + } + */ } - firstPairStr, _ := PairToStr(firstPair, &bot.DB) - str += firstPairStr - - if len(secondPair) != 0 && firstPair[0].Begin.Day() == secondPair[0].Begin.Day() { - secondPairStr, _ := PairToStr(secondPair, &bot.DB) - str += secondPairStr - } msg := tgbotapi.NewMessage(bot.TG_user.TgId, str) bot.TG.Send(msg) } } +func (bot *Bot) GetDayShedule(lessons [][]database.Lesson) (string, error) { + var str string + day := lessons[0][0].Begin.Day() + for _, pair := range lessons { + if pair[0].Begin.Day() == day { + line, err := PairToStr(pair, &bot.DB) + if err != nil { + return "", err + } + str += line + } else { + break + } + } + return str, nil +} + +func GroupPairs(lessons []database.Lesson) [][]database.Lesson { + var shedule [][]database.Lesson + var pair []database.Lesson + + l_idx := 0 + + for l_idx < len(lessons) { + day := lessons[l_idx].Begin + for l_idx < len(lessons) && lessons[l_idx].Begin == day { + pair = append(pair, lessons[l_idx]) + l_idx++ + } + shedule = append(shedule, pair) + pair = []database.Lesson{} + } + return shedule +} + func PairToStr(pair []database.Lesson, db *xorm.Engine) (string, error) { var str string beginStr := pair[0].Begin.Format("15:04") @@ -123,7 +155,11 @@ func PairToStr(pair []database.Lesson, db *xorm.Engine) (string, error) { if sublesson.Comment != "" { str += fmt.Sprintf("💬%s\n", sublesson.Comment) } - str += "--------------------------------\n" + if len(pair) > 1 { + str += "+\n" + } } + + str += "--------------------------------\n" return str, nil } From d2c0b57cb268a391e939ae65855759f08a0857e6 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Tue, 14 Mar 2023 11:43:06 +0400 Subject: [PATCH 15/17] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE:=20=D0=BE=D1=87=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D0=BD=D1=8B=D0=B5=20=D0=BA=D0=BE=D1=81=D1=8F=D0=BA=D0=B8?= =?UTF-8?q?=20=D1=81=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ssau_parser/shedule.go | 2 +- modules/tg/shedule.go | 37 ++++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/modules/ssau_parser/shedule.go b/modules/ssau_parser/shedule.go index f4b035d..fbdde4a 100644 --- a/modules/ssau_parser/shedule.go +++ b/modules/ssau_parser/shedule.go @@ -76,7 +76,7 @@ func Parse(doc *goquery.Document, isGroup bool, sheduleId int64, week int) (*She if err != nil { return nil, err } - idx := (len(raw_times)/2+1)*t/2 + d + idx := (len(raw_dates))*t/2 + d lesson := Lesson{ Begin: begin, End: end, diff --git a/modules/tg/shedule.go b/modules/tg/shedule.go index 0b3a440..a993878 100644 --- a/modules/tg/shedule.go +++ b/modules/tg/shedule.go @@ -13,13 +13,18 @@ import ( ) func (bot *Bot) GetSummary() { - now := time.Now() + now := time.Now().Add(time.Hour * time.Duration(5)) log.Println(now.Format("01-02-2006 15:04:05 -07"), now.Format("01-02-2006 15:04:05")) var lessons []database.Lesson var shedules []database.ShedulesInUser bot.DB.ID(bot.TG_user.L9Id).Find(&shedules) + if len(shedules) == 0 { + bot.Etc() + return + } + var groups []string var teachers []string @@ -31,12 +36,22 @@ func (bot *Bot) GetSummary() { } } - teachers_str := strings.Join(teachers, ",") - groups_str := strings.Join(groups, ",") + var condition, teachers_str, groups_str string + if len(groups) > 0 { + groups_str = strings.Join(groups, ",") + condition = "groupId in (" + groups_str + ") " + } + if len(teachers) > 0 { + if len(condition) > 0 { + condition += " or " + } + teachers_str += strings.Join(teachers, ",") + condition += "teacherId in (" + teachers_str + ") " + } bot.DB. Where("end > ?", now.Format("2006-01-02 15:04:05")). - And("groupId in (?) or teacherId in (?)", groups_str, teachers_str). + And(condition). OrderBy("begin"). Limit(16). Find(&lessons) @@ -122,7 +137,7 @@ func PairToStr(pair []database.Lesson, db *xorm.Engine) (string, error) { endStr := pair[0].End.Format("15:04") str = fmt.Sprintf("📆 %s - %s\n", beginStr, endStr) - for _, sublesson := range pair { + for i, sublesson := range pair { var type_emoji string switch sublesson.Type { case "lect": @@ -138,7 +153,7 @@ func PairToStr(pair []database.Lesson, db *xorm.Engine) (string, error) { } str += fmt.Sprintf("%s%s\n", type_emoji, sublesson.Name) if sublesson.Place != "" { - str += fmt.Sprintf("🧭%s\n", sublesson.Place) + str += fmt.Sprintf("🧭 %s\n", sublesson.Place) } if sublesson.TeacherId != 0 { var t database.Teacher @@ -147,19 +162,19 @@ func PairToStr(pair []database.Lesson, db *xorm.Engine) (string, error) { return "", err } name := fmt.Sprintf("%s %s.%s.", t.LastName, t.FirstName[0:2], t.MidName[0:2]) - str += fmt.Sprintf("👤%s\n", name) + str += fmt.Sprintf("👤 %s\n", name) } if sublesson.SubGroup != "" { - str += fmt.Sprintf("👥%s\n", sublesson.SubGroup) + str += fmt.Sprintf("👥 %s\n", sublesson.SubGroup) } if sublesson.Comment != "" { - str += fmt.Sprintf("💬%s\n", sublesson.Comment) + str += fmt.Sprintf("💬 %s\n", sublesson.Comment) } - if len(pair) > 1 { + if i != len(pair)-1 { str += "+\n" } } - str += "--------------------------------\n" + str += "------------------------------------------\n" return str, nil } From 231dacec86cc9fba34cd456bca1a2fe8b6b94c85 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Tue, 14 Mar 2023 21:10:17 +0400 Subject: [PATCH 16/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0=20=D1=80=D0=B0=D1=81=D0=BF?= =?UTF-8?q?=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 2 ++ modules/ssau_parser/database.go | 22 ++++++++++++++++------ modules/ssau_parser/parser.go | 6 ++++++ modules/ssau_parser/ssau_parser_test.go | 4 ++-- modules/tg/bot.go | 5 +++-- modules/tg/handlers.go | 2 +- modules/tg/shedule.go | 17 +++++++++++++++-- 7 files changed, 45 insertions(+), 13 deletions(-) diff --git a/main.go b/main.go index 5667b8f..b32bb6d 100644 --- a/main.go +++ b/main.go @@ -19,8 +19,10 @@ func main() { if err != nil { log.Fatal(err) } + defer engine.Close() bot := new(tg.Bot) + bot.Week = 5 err = bot.InitBot(os.Getenv("TELEGRAM_APITOKEN"), *engine) if err != nil { log.Fatal(err) diff --git a/modules/ssau_parser/database.go b/modules/ssau_parser/database.go index b0be390..04d1d05 100644 --- a/modules/ssau_parser/database.go +++ b/modules/ssau_parser/database.go @@ -1,15 +1,15 @@ package ssau_parser import ( + "fmt" "log" - "strconv" "strings" "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" "xorm.io/xorm" ) -func uploadShedule(db *xorm.Engine, sh Shedule) error { +func UploadShedule(db *xorm.Engine, sh Shedule) error { err := addGroupOrTeacher(db, sh) if err != nil { return err @@ -34,7 +34,7 @@ func uploadShedule(db *xorm.Engine, sh Shedule) error { } if !exists && subLesson.TeacherId != 0 { - uri := "/rasp?staffId=" + strconv.FormatInt(subLesson.TeacherId, 10) + uri := GenerateUri(subLesson.TeacherId, true) doc, _, _, err := Connect(uri, sh.Week) if err != nil { return err @@ -55,7 +55,7 @@ func uploadShedule(db *xorm.Engine, sh Shedule) error { } if !exists { - uri := "/rasp?groupId=" + strconv.FormatInt(groupId, 10) + uri := GenerateUri(subLesson.TeacherId, false) doc, _, _, err := Connect(uri, sh.Week) if err != nil { return err @@ -83,12 +83,22 @@ func uploadShedule(db *xorm.Engine, sh Shedule) error { } } if len(pairs) > 0 { - _, err := db.Insert(pairs) + _, err := db.Insert(&pairs) return err } return nil } +func GenerateUri(id int64, isTeacher bool) string { + var uri string + if isTeacher { + uri = fmt.Sprintf("/rasp?staffId=%d", id) + } else { + uri = fmt.Sprintf("/rasp?groupId=%d", id) + } + return uri +} + func isGroupExists(db *xorm.Engine, groupId int64) (bool, error) { var exists []database.Group err := db.Find(&exists, database.Group{GroupId: groupId}) @@ -137,7 +147,7 @@ func addGroupOrTeacher(db *xorm.Engine, sh Shedule) error { TeacherId: sh.SheduleId, LastName: name[0], FirstName: name[1], - MidName: name[2], + MidName: name[2], // Уебать Сасау и придумать что-то с хреново прописанныит преподами SpecName: sh.SpecName, } db.InsertOne(teacher) diff --git a/modules/ssau_parser/parser.go b/modules/ssau_parser/parser.go index b976e8f..f5ee16f 100644 --- a/modules/ssau_parser/parser.go +++ b/modules/ssau_parser/parser.go @@ -118,3 +118,9 @@ func Connect(uri string, week int) (*goquery.Document, bool, int64, error) { return doc, isGroup, sheduleId, nil } + +func ConnectById(id int64, isTeacher bool, week int) (*goquery.Document, error) { + uri := GenerateUri(id, isTeacher) + doc, _, _, err := Connect(uri, week) + return doc, err +} diff --git a/modules/ssau_parser/ssau_parser_test.go b/modules/ssau_parser/ssau_parser_test.go index 627fd85..0229abd 100644 --- a/modules/ssau_parser/ssau_parser_test.go +++ b/modules/ssau_parser/ssau_parser_test.go @@ -30,7 +30,7 @@ func TestConnect(t *testing.T) { } func TestParse(t *testing.T) { - list, err := FindInRasp("2305") + list, err := FindInRasp("2108") if err != nil { t.Error(err) } @@ -53,7 +53,7 @@ func TestParse(t *testing.T) { if err != nil { t.Error(err) } - err = uploadShedule(engine, *shedule) + err = UploadShedule(engine, *shedule) if err != nil { t.Error(err) } diff --git a/modules/tg/bot.go b/modules/tg/bot.go index 0684eb9..ce27cf9 100644 --- a/modules/tg/bot.go +++ b/modules/tg/bot.go @@ -10,8 +10,9 @@ import ( type Bot struct { TG *tgbotapi.BotAPI - DB xorm.Engine + DB *xorm.Engine TG_user database.TgUser + Week int } func (bot *Bot) InitBot(token string, engine xorm.Engine) error { @@ -22,7 +23,7 @@ func (bot *Bot) InitBot(token string, engine xorm.Engine) error { } bot.TG.Debug = true - bot.DB = engine + bot.DB = &engine log.Printf("Authorized on account %s", bot.TG.Self.UserName) return nil diff --git a/modules/tg/handlers.go b/modules/tg/handlers.go index 213024b..848238b 100644 --- a/modules/tg/handlers.go +++ b/modules/tg/handlers.go @@ -12,7 +12,7 @@ import ( ) func (bot *Bot) InitUser(id int64, name string) (*database.TgUser, error) { - db := &bot.DB + db := bot.DB var users []database.TgUser err := db.Find(&users, &database.TgUser{TgId: id}) if err != nil { diff --git a/modules/tg/shedule.go b/modules/tg/shedule.go index a993878..2b07b78 100644 --- a/modules/tg/shedule.go +++ b/modules/tg/shedule.go @@ -8,11 +8,12 @@ import ( "time" "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" + "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/ssau_parser" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" "xorm.io/xorm" ) -func (bot *Bot) GetSummary() { +func (bot *Bot) GetSummary(isRetry ...bool) { now := time.Now().Add(time.Hour * time.Duration(5)) log.Println(now.Format("01-02-2006 15:04:05 -07"), now.Format("01-02-2006 15:04:05")) @@ -92,6 +93,18 @@ func (bot *Bot) GetSummary() { msg := tgbotapi.NewMessage(bot.TG_user.TgId, str) bot.TG.Send(msg) + } else if len(isRetry) == 0 { + _, week := time.Now().ISOWeek() + week -= bot.Week + for _, sh := range shedules { + doc, err := ssau_parser.ConnectById(sh.SheduleId, sh.IsTeacher, week) + shedule, err := ssau_parser.Parse(doc, !sh.IsTeacher, sh.SheduleId, week) + err = ssau_parser.UploadShedule(bot.DB, *shedule) + if err != nil { + log.Fatal(err) + } + } + bot.GetSummary(true) } } @@ -101,7 +114,7 @@ func (bot *Bot) GetDayShedule(lessons [][]database.Lesson) (string, error) { day := lessons[0][0].Begin.Day() for _, pair := range lessons { if pair[0].Begin.Day() == day { - line, err := PairToStr(pair, &bot.DB) + line, err := PairToStr(pair, bot.DB) if err != nil { return "", err } From be6061daadc0d88292654d2156e3313827d99ec4 Mon Sep 17 00:00:00 2001 From: far-galaxy Date: Wed, 15 Mar 2023 16:26:52 +0400 Subject: [PATCH 17/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=B1=D1=8B=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B5=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BE:=20?= =?UTF-8?q?=D1=81=D1=82=D1=83=D1=80=D0=BA=D1=82=D1=83=D1=80=D0=B0=20=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=B0=D0=B2=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 11 +++++--- modules/ssau_parser/database.go | 3 +-- modules/ssau_parser/shedule.go | 7 ++++- modules/tg/handlers.go | 29 ++++++++++++++++++--- modules/tg/shedule.go | 46 +++++++++++++++++++-------------- modules/tg/tg_test.go | 34 ------------------------ modules/tg/utils.go | 16 +++++++++--- 7 files changed, 79 insertions(+), 67 deletions(-) delete mode 100644 modules/tg/tg_test.go diff --git a/main.go b/main.go index b32bb6d..3175d4e 100644 --- a/main.go +++ b/main.go @@ -42,10 +42,10 @@ func main() { if tg_user.PosTag == "not_started" { bot.Start() - } else if tg_user.PosTag == "add" { - bot.Find(msg.Text) } else if msg.Text == "Главное меню" { - bot.GetSummary() + bot.GetPersonalSummary() + } else if tg_user.PosTag == "add" || tg_user.PosTag == "ready" { + bot.Find(msg.Text) } else { bot.Etc() } @@ -63,8 +63,11 @@ func main() { if query.Data == "cancel" { bot.Cancel(query) - } else if strings.Contains(tg_user.PosTag, "confirm") { + } else if strings.Contains(tg_user.PosTag, "confirm_add") { bot.Confirm(query) + } else if strings.Contains(tg_user.PosTag, "confirm_see") { + bot.SeeShedule(query) + bot.DeleteMsg(query) } } } diff --git a/modules/ssau_parser/database.go b/modules/ssau_parser/database.go index 04d1d05..bdafb0d 100644 --- a/modules/ssau_parser/database.go +++ b/modules/ssau_parser/database.go @@ -146,8 +146,7 @@ func addGroupOrTeacher(db *xorm.Engine, sh Shedule) error { teacher := database.Teacher{ TeacherId: sh.SheduleId, LastName: name[0], - FirstName: name[1], - MidName: name[2], // Уебать Сасау и придумать что-то с хреново прописанныит преподами + FirstName: strings.Join(name[1:], " "), SpecName: sh.SpecName, } db.InsertOne(teacher) diff --git a/modules/ssau_parser/shedule.go b/modules/ssau_parser/shedule.go index fbdde4a..fc1011e 100644 --- a/modules/ssau_parser/shedule.go +++ b/modules/ssau_parser/shedule.go @@ -34,8 +34,13 @@ type Shedule struct { } func GetSheduleInfo(doc *goquery.Document, sh *Shedule) { - sh.SpecName = doc.Find(".info-block__description div").First().Text()[1:] + spec := doc.Find(".info-block__description div").First().Text() + if spec != "" { + spec = spec[1:] + } + sh.SpecName = spec sh.GroupName = doc.Find(".info-block__title").First().Text()[1:] + } // Parse goquery shedule site diff --git a/modules/tg/handlers.go b/modules/tg/handlers.go index 848238b..93f3c1c 100644 --- a/modules/tg/handlers.go +++ b/modules/tg/handlers.go @@ -106,14 +106,18 @@ func (bot *Bot) Find(query string) error { if len(allGroups) != 0 { if bot.TG_user.PosTag == "add" { - bot.TG_user.PosTag = "confirm_group" + bot.TG_user.PosTag = "confirm_add_group" + } else { + bot.TG_user.PosTag = "confirm_see_group" } msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Вот что я нашёл.\nВыбери свою группу") msg.ReplyMarkup = GenerateKeyboard(GenerateGroupsArray(allGroups), query) bot.TG.Send(msg) } else if len(allTeachers) != 0 { if bot.TG_user.PosTag == "add" { - bot.TG_user.PosTag = "confirm_teacher" + bot.TG_user.PosTag = "confirm_add_teacher" + } else { + bot.TG_user.PosTag = "confirm_see_teacher" } msg := tgbotapi.NewMessage(bot.TG_user.TgId, "Вот что я нашёл.\nВыбери нужного преподавателя") msg.ReplyMarkup = GenerateKeyboard(GenerateTeachersArray(allTeachers), query) @@ -127,8 +131,27 @@ func (bot *Bot) Find(query string) error { return err } +func (bot *Bot) SeeShedule(query *tgbotapi.CallbackQuery) error { + isGroup := bot.TG_user.PosTag == "confirm_see_group" + groupId, err := strconv.ParseInt(query.Data, 0, 64) + if err != nil { + return err + } + shedule := database.ShedulesInUser{ + IsTeacher: !isGroup, + SheduleId: groupId, + } + err = bot.GetSummary([]database.ShedulesInUser{shedule}) + if err != nil { + return err + } + bot.TG_user.PosTag = "ready" + err = bot.UpdateUserDB() + return err +} + func (bot *Bot) Confirm(query *tgbotapi.CallbackQuery) error { - isGroup := bot.TG_user.PosTag == "confirm_group" + isGroup := bot.TG_user.PosTag == "confirm_add_group" groupId, err := strconv.ParseInt(query.Data, 0, 64) if err != nil { return err diff --git a/modules/tg/shedule.go b/modules/tg/shedule.go index 2b07b78..23c3e31 100644 --- a/modules/tg/shedule.go +++ b/modules/tg/shedule.go @@ -13,18 +13,24 @@ import ( "xorm.io/xorm" ) -func (bot *Bot) GetSummary(isRetry ...bool) { - now := time.Now().Add(time.Hour * time.Duration(5)) - log.Println(now.Format("01-02-2006 15:04:05 -07"), now.Format("01-02-2006 15:04:05")) - - var lessons []database.Lesson +func (bot *Bot) GetPersonalSummary() { var shedules []database.ShedulesInUser bot.DB.ID(bot.TG_user.L9Id).Find(&shedules) if len(shedules) == 0 { bot.Etc() return + } else { + err := bot.GetSummary(shedules) + if err != nil { + log.Fatal(err) + } } +} + +func (bot *Bot) GetSummary(shedules []database.ShedulesInUser, isRetry ...bool) error { + now := time.Now().Add(time.Hour * time.Duration(5) * (-1)) + log.Println(now.Format("01-02-2006 15:04:05 -07"), now.Format("01-02-2006 15:04:05")) var groups []string var teachers []string @@ -50,14 +56,17 @@ func (bot *Bot) GetSummary(isRetry ...bool) { condition += "teacherId in (" + teachers_str + ") " } - bot.DB. + var lessons []database.Lesson + err := bot.DB. Where("end > ?", now.Format("2006-01-02 15:04:05")). And(condition). OrderBy("begin"). Limit(16). Find(&lessons) - log.Println(lessons) + if err != nil { + return err + } if len(lessons) != 0 { var firstPair, secondPair []database.Lesson @@ -80,15 +89,6 @@ func (bot *Bot) GetSummary(isRetry ...bool) { str = "Сводка на сегодня\n\n" day, _ := bot.GetDayShedule(pairs) str += day - /* - firstPairStr, _ := PairToStr(firstPair, &bot.DB) - str += firstPairStr - - if len(secondPair) != 0 && firstPair[0].Begin.Day() == secondPair[0].Begin.Day() { - secondPairStr, _ := PairToStr(secondPair, &bot.DB) - str += "\n--\n" + secondPairStr - } - */ } msg := tgbotapi.NewMessage(bot.TG_user.TgId, str) @@ -98,15 +98,21 @@ func (bot *Bot) GetSummary(isRetry ...bool) { week -= bot.Week for _, sh := range shedules { doc, err := ssau_parser.ConnectById(sh.SheduleId, sh.IsTeacher, week) + if err != nil { + return err + } shedule, err := ssau_parser.Parse(doc, !sh.IsTeacher, sh.SheduleId, week) + if err != nil { + return err + } err = ssau_parser.UploadShedule(bot.DB, *shedule) if err != nil { - log.Fatal(err) + return err } } - bot.GetSummary(true) + bot.GetSummary(shedules, true) } - + return nil } func (bot *Bot) GetDayShedule(lessons [][]database.Lesson) (string, error) { @@ -174,7 +180,7 @@ func PairToStr(pair []database.Lesson, db *xorm.Engine) (string, error) { if err != nil { return "", err } - name := fmt.Sprintf("%s %s.%s.", t.LastName, t.FirstName[0:2], t.MidName[0:2]) + name := GenerateName(t) str += fmt.Sprintf("👤 %s\n", name) } if sublesson.SubGroup != "" { diff --git a/modules/tg/tg_test.go b/modules/tg/tg_test.go deleted file mode 100644 index 8d68434..0000000 --- a/modules/tg/tg_test.go +++ /dev/null @@ -1,34 +0,0 @@ -package tg - -import ( - "log" - "os" - "testing" - - "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" - "github.com/joho/godotenv" -) - -func TestGetSummary(t *testing.T) { - if err := godotenv.Load(); err != nil { - log.Fatal("No .env file found") - } - - engine, err := database.Connect(os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASS"), os.Getenv("MYSQL_DB")) - if err != nil { - log.Fatal(err) - } - - bot := new(Bot) - err = bot.InitBot(os.Getenv("TELEGRAM_APITOKEN"), *engine) - if err != nil { - log.Fatal(err) - } - - bot.TG_user = database.TgUser{ - L9Id: 316268749, - TgId: 1086707888, - } - - bot.GetSummary() -} diff --git a/modules/tg/utils.go b/modules/tg/utils.go index fa211a6..c754dc2 100644 --- a/modules/tg/utils.go +++ b/modules/tg/utils.go @@ -3,6 +3,7 @@ package tg import ( "fmt" "strconv" + "strings" "git.l9labs.ru/anufriev.g.a/l9_stud_bot/modules/database" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" @@ -16,10 +17,19 @@ func GenerateGroupsArray(groups []database.Group) []tgbotapi.InlineKeyboardButto return grKeys } -func GenerateTeachersArray(groups []database.Teacher) []tgbotapi.InlineKeyboardButton { +func GenerateName(t database.Teacher) string { + var initials string + for _, n := range strings.Split(t.FirstName, " ") { + initials += fmt.Sprintf("%s.", n[:2]) + } + name := fmt.Sprintf("%s %s", t.LastName, initials) + return name +} + +func GenerateTeachersArray(teachers []database.Teacher) []tgbotapi.InlineKeyboardButton { var teacherKeys []tgbotapi.InlineKeyboardButton - for _, t := range groups { - name := fmt.Sprintf("%s %s.%s.", t.LastName, t.FirstName[0:2], t.MidName[0:2]) + for _, t := range teachers { + name := GenerateName(t) teacherKeys = append(teacherKeys, tgbotapi.NewInlineKeyboardButtonData(name, strconv.FormatInt(t.TeacherId, 10))) } return teacherKeys