eleksir/buny-jabber-bot
0
Fork 0
Code Pull Requests Activity

Fully implement ban of vilians when bot entered infested room, fix a bit MUC ping

Browse Source
This commit is contained in:
eleksir
2023-09-02 14:16:06 +03:00
parent 59b92f450d
commit 7f609ffb97
6 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
buny.go
View File

@@ -58,6 +58,7 @@ func buny(v xmpp.Presence) error { //nolint:gocognit,gocyclo
evilJid := strings.SplitN(v.JID, "/", 2)[0]
evilNick := ""
evilNicks := strings.SplitN(v.From, "/", 2)
// Давайте-ка похэндлим нонсенс - когда у нас в строке нету разделителя
if len(evilNicks) > 1 {
evilNick = evilNicks[1]
@@ -77,11 +78,13 @@ func buny(v xmpp.Presence) error { //nolint:gocognit,gocyclo
re, err := regexp.Compile(jidRegexp)
if err != nil {
log.Errorf("Incorrect regexp in blacklist: %s, skipping", jidRegexp)
log.Errorf("Incorrect regexp in global blacklist: %s, skipping", jidRegexp)
continue
}
log.Debugf("Checking jid %s vs global blacklist regex %s", evilJid, jidRegexp)
if re.MatchString(evilJid) {
if id, err := squash(room, evilJid, bEntry.ReasonEnable, v.Type); err != nil {
err := fmt.Errorf(
@@ -107,11 +110,13 @@ func buny(v xmpp.Presence) error { //nolint:gocognit,gocyclo
re, err := regexp.Compile(nickRegexp)
if err != nil {
log.Errorf("Incorrect regexp in blacklist: %s, skipping", nickRegexp)
log.Errorf("Incorrect regexp in global blacklist: %s, skipping", nickRegexp)
continue
}
log.Debugf("Checking nick %s vs global blacklist regex %s", evilNick, nickRegexp)
if re.MatchString(evilNick) {
// Баним именно jid
if id, err := squash(room, evilJid, bEntry.ReasonEnable, v.Type); err != nil {
@@ -143,11 +148,13 @@ func buny(v xmpp.Presence) error { //nolint:gocognit,gocyclo
re, err := regexp.Compile(jidRegexp)
if err != nil {
log.Errorf("Incorrect regexp in blacklist: %s, skipping", jidRegexp)
log.Errorf("Incorrect regexp in room %s blacklist: %s, skipping", room, jidRegexp)
continue
}
log.Debugf("Checking jid %s vs room %s blacklist regex %s", evilJid, room, jidRegexp)
if re.MatchString(evilJid) {
if id, err := squash(room, evilJid, bEntry.ReasonEnable, v.Type); err != nil {
err := fmt.Errorf(
@@ -174,11 +181,12 @@ func buny(v xmpp.Presence) error { //nolint:gocognit,gocyclo
re, err := regexp.Compile(nickRegexp)
if err != nil {
log.Errorf("Incorrect regexp in blacklist: %s, skipping", nickRegexp)
log.Errorf("Incorrect regexp in room %s blacklist: %s, skipping", room, nickRegexp)
continue
}
log.Debugf("Checking nick %s vs room %s blacklist regex %s", evilJid, room, nickRegexp)
if re.MatchString(evilNick) {
// Баним именно jid
if id, err := squash(room, evilJid, bEntry.ReasonEnable, v.Type); err != nil {