From df2a98628603246d35d73bf8fe7dbfc2bafa404a Mon Sep 17 00:00:00 2001 From: Eva Dengler Date: Wed, 21 Dec 2022 13:04:36 +0100 Subject: [PATCH] Update repository --- boddle.db | Bin 290816 -> 290816 bytes boddle.go | 15 ++++++++++++++- bot.go | 29 +++++++++++++++-------------- bot.py | 2 +- forraspidothis | 9 ++------- go.mod | 2 +- go.sum | 2 ++ 7 files changed, 35 insertions(+), 24 deletions(-) diff --git a/boddle.db b/boddle.db index 31db554b75c27876bd1399b556269784797688dc..c6dd3eac1594c9d0700b0c6e510f2480d15f3c88 100644 GIT binary patch delta 6695 zcmZp8AlUFgaDp`B_lYvjtlt^*q762t1n4ssPu{Ap#n?LefxbNBf+mAD1IBFzOl%9} zoEaDx7~J?j@;~Cg#D9o?6aOOqN&LS{8`33V`=1a`SnfEYnWM0NRn|T6r zE6-A%Sv>tbEj*PxxjczXkv!WanOJfdr{~48Y@cq!!eYtBCd0zYXT80eg=HrjD+4KDORpJ%pW##$F^Ool!&vl;DJbQUI@+{+-#nZ=A z&6CfQ$`i)p&Ev>p%%jO8&m+27Q6ZDNp1rAEy`tYDr9C5%}**W z;chBmW{@o@O3lkF%}Zx*%4cQ}%}Fdx;%LfaW)M$HEJ{k{Y0710kS{JNO3h5pNX=t! z%3)>@EiTE-;cUugW{@mS&PXk)5@^a|W>C-0FGwp+&d5zIs!Gk{Y|3P2kgQM6NX^Ym zDE9^NLfmOSqd-nHgk@lQS|?(^88#n^Kq= zB�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 diff --git a/boddle.go b/boddle.go index 50a6807..11c733a 100644 --- a/boddle.go +++ b/boddle.go @@ -5,10 +5,11 @@ import ( "fmt" "regexp" "database/sql" + "math/rand" _ "github.com/mattn/go-sqlite3" ) -var begin_char = []byte{'-', '<'} +var begin_char = []byte{'-'} var db *sql.DB var err error @@ -278,6 +279,18 @@ func parsemsg(msg *irc_msg, foo bot) bool { return false } if c.cmd == "help" { + (*msg).retmsg = "There is no help in this hell..." + return false + } + if c.cmd == "slap" { + who := []string{(*msg).author, "\x01ACTION"} + whom := []string{(*msg).author, foo.Conf.Name} + LOG_WARN.Printf("suffix: " + c.suffix) + if c.suffix != "" { + who = append(who, strings.Split(c.suffix, " ")...) + whom = append(whom, strings.Split(c.suffix, " ")...) + } + (*msg).retmsg = who[rand.Intn(len(who))] + " slaps " + whom[rand.Intn(len(whom))] + " around with a large trout." return false } // hard code 'groups' to add new groups to the groups-table diff --git a/bot.go b/bot.go index 3f68137..c2598df 100644 --- a/bot.go +++ b/bot.go @@ -18,23 +18,22 @@ func sendmsg (conn net.Conn, channel string, msg string) { conn.Write([]byte(mesg)) } -func scanline_privmsg (msg string) irc_msg { - var irc irc_msg +func scanline_privmsg (msg string, irc *irc_msg) { + LOG_ERR.Printf(msg) msg = msg[1:] t := strings.Split(msg, "!") - irc.author, irc.channel = t[0], t[1] - t = strings.Split(irc.channel, "PRIVMSG ") - irc.channel = t[1] - t = strings.Split(irc.channel, " :") - irc.channel, irc.msg = t[0], t[1] - t = strings.Split(irc.msg, "\r\n") - irc.msg = strings.TrimSpace(t[0]) - if ! strings.HasPrefix(irc.channel, "#") { - irc.channel = irc.author + (*irc).author, (*irc).channel = t[0], t[1] + t = strings.Split((*irc).channel, "PRIVMSG ") + (*irc).channel = t[1] + t = strings.Split((*irc).channel, " :") + (*irc).channel, (*irc).msg = t[0], t[1] + t = strings.Split((*irc).msg, "\r\n") + (*irc).msg = strings.TrimSpace(t[0]) + if ! strings.HasPrefix((*irc).channel, "#") { + (*irc).channel = (*irc).author } - irc.retmsg = "" - return irc + (*irc).retmsg = "" } func bot_connect(bot *bot) { @@ -113,7 +112,9 @@ func bot_listen(bot *bot) <-chan string { time.Sleep(10 * time.Second) bot_register(bot) } else if strings.Contains(line, "PRIVMSG") { - msg := scanline_privmsg(line) + var msg irc_msg + scanline_privmsg(line, &msg) + LOG_ERR.Printf(msg.author) parsemsg(&msg, (*bot)) if msg.retmsg != "" { sendmsg((*bot).conn, msg.channel, msg.retmsg) diff --git a/bot.py b/bot.py index d623236..21ecae9 100644 --- a/bot.py +++ b/bot.py @@ -12,7 +12,7 @@ import sqlite3 as sql updater = Updater(token='935673062:AAH4By1EMqAUaD9wgnV3lZQRRBX6e5Lve6g', use_context=True) # sqlite database -connection = sql.connect("/home/horscchtey/bots/boddle/src/v2/boddle.db", check_same_thread=False) +connection = sql.connect("/home/boddle/boddle/src/v2/boddle.db", check_same_thread=False) cursor = connection.cursor() dispatcher = updater.dispatcher diff --git a/forraspidothis b/forraspidothis index d295ea6..6239be8 100755 --- a/forraspidothis +++ b/forraspidothis @@ -1,15 +1,10 @@ #!/bin/bash -export GOPATH=/home/horscchtey/go -export CC=arm-linux-gnueabihf-gcc -export CXX=arm-linux-gnueabihf-g++ +export GOPATH=/home/boddle/go export CGO_ENABLED=1 -export GOOS=linux -export GOARCH=arm -export GOARM=7 declare -a src src+=(bot.go boddle.go logging.go helpers.go types.go) declare -i nproc="$(nproc)" -go build -p ${nproc} "${src[@]}" +go build -v -p ${nproc} "${src[@]}" diff --git a/go.mod b/go.mod index ef1cee4..72f9306 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/distributedio/configo v0.0.0-20200107073829-efd79b027816 - github.com/mattn/go-sqlite3 v1.14.12 + github.com/mattn/go-sqlite3 v1.14.16 ) require ( diff --git a/go.sum b/go.sum index eb5290c..cb9d486 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/distributedio/configo v0.0.0-20200107073829-efd79b027816 h1:V6TyTUY0v github.com/distributedio/configo v0.0.0-20200107073829-efd79b027816/go.mod h1:Jwz2omP6W/T/XlSfu+BMGW7NEJX3tf5/Qv5gwaiQ+uU= github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0= github.com/mattn/go-sqlite3 v1.14.12/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/naoina/go-stringutil v0.1.0 h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks= github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/naoina/toml v0.1.1 h1:PT/lllxVVN0gzzSqSlHEmP8MJB4MY2U7STGxiouV4X8=