Initial commit
This commit is contained in:
@@ -1,30 +1,12 @@
|
|||||||
|
version: "2"
|
||||||
run:
|
run:
|
||||||
tests: false
|
go: "1.24"
|
||||||
modules-download-mode: readonly
|
modules-download-mode: readonly
|
||||||
|
tests: false
|
||||||
allow-parallel-runners: true
|
allow-parallel-runners: true
|
||||||
go: '1.24'
|
|
||||||
output:
|
|
||||||
sort-results: true
|
|
||||||
linters-settings:
|
|
||||||
gosec:
|
|
||||||
excludes:
|
|
||||||
# Оно не используется для повышения безопасности или каких-то таких секъюрых вещей, оно используется для выборки
|
|
||||||
# произвольного элемента из массива, так что ИДИ НАХУЙ с этой проверкой и не еби мозги липовой безопасностью.
|
|
||||||
- G404 # Insecure random number source (rand)
|
|
||||||
issues:
|
|
||||||
exclude-dirs:
|
|
||||||
- data
|
|
||||||
- vendor
|
|
||||||
|
|
||||||
linters:
|
linters:
|
||||||
disable-all: true
|
default: none
|
||||||
enable:
|
enable:
|
||||||
- errcheck
|
|
||||||
- gosimple
|
|
||||||
- govet
|
|
||||||
- ineffassign
|
|
||||||
- staticcheck
|
|
||||||
- unused
|
|
||||||
- asasalint
|
- asasalint
|
||||||
- asciicheck
|
- asciicheck
|
||||||
- bodyclose
|
- bodyclose
|
||||||
@@ -34,6 +16,7 @@ linters:
|
|||||||
- decorder
|
- decorder
|
||||||
- durationcheck
|
- durationcheck
|
||||||
- err113
|
- err113
|
||||||
|
- errcheck
|
||||||
- errchkjson
|
- errchkjson
|
||||||
- errorlint
|
- errorlint
|
||||||
- exhaustive
|
- exhaustive
|
||||||
@@ -41,12 +24,12 @@ linters:
|
|||||||
- gocheckcompilerdirectives
|
- gocheckcompilerdirectives
|
||||||
- gocritic
|
- gocritic
|
||||||
- godot
|
- godot
|
||||||
- gofmt
|
|
||||||
- goimports
|
|
||||||
- gosec
|
- gosec
|
||||||
- gosmopolitan
|
- gosmopolitan
|
||||||
|
- govet
|
||||||
- grouper
|
- grouper
|
||||||
- importas
|
- importas
|
||||||
|
- ineffassign
|
||||||
- ireturn
|
- ireturn
|
||||||
- makezero
|
- makezero
|
||||||
- mirror
|
- mirror
|
||||||
@@ -62,10 +45,35 @@ linters:
|
|||||||
- reassign
|
- reassign
|
||||||
- revive
|
- revive
|
||||||
- rowserrcheck
|
- rowserrcheck
|
||||||
- stylecheck
|
- staticcheck
|
||||||
- unconvert
|
- unconvert
|
||||||
|
- unused
|
||||||
- wastedassign
|
- wastedassign
|
||||||
- whitespace
|
- whitespace
|
||||||
- wsl
|
- wsl
|
||||||
|
settings:
|
||||||
# vim: set ft=yaml et ai ts=2 sw=2 sts=2:
|
exclusions:
|
||||||
|
generated: lax
|
||||||
|
presets:
|
||||||
|
- comments
|
||||||
|
- common-false-positives
|
||||||
|
- legacy
|
||||||
|
- std-error-handling
|
||||||
|
paths:
|
||||||
|
- data
|
||||||
|
- vendor
|
||||||
|
- third_party$
|
||||||
|
- builtin$
|
||||||
|
- examples$
|
||||||
|
formatters:
|
||||||
|
enable:
|
||||||
|
- gofmt
|
||||||
|
- goimports
|
||||||
|
exclusions:
|
||||||
|
generated: lax
|
||||||
|
paths:
|
||||||
|
- data
|
||||||
|
- vendor
|
||||||
|
- third_party$
|
||||||
|
- builtin$
|
||||||
|
- examples$
|
||||||
|
|||||||
72
Makefile
72
Makefile
@@ -2,18 +2,82 @@
|
|||||||
|
|
||||||
GOOPTS=CGO_ENABLED=0
|
GOOPTS=CGO_ENABLED=0
|
||||||
BUILDOPTS=-ldflags="-s -w" -a -gcflags=all=-l -trimpath -buildvcs=false
|
BUILDOPTS=-ldflags="-s -w" -a -gcflags=all=-l -trimpath -buildvcs=false
|
||||||
|
MYNAME=bunny-bot
|
||||||
|
BINARY=$MYNAME
|
||||||
|
RMCMD=rm -rf
|
||||||
|
|
||||||
|
# На windows имя бинарника может зависеть не только от платформы, но и от выбранной цели, для linux-а суффикс .exe
|
||||||
|
# не нужен
|
||||||
|
ifeq ($(OS),Windows_NT)
|
||||||
|
ifdef GOOS
|
||||||
|
ifeq ($(GOOS),windows)
|
||||||
|
BINARY=${MYNAME}.exe
|
||||||
|
else # not ifeq ($(GOOS),windows)
|
||||||
|
BINARY=${MYNAME}
|
||||||
|
endif # ifeq ($(GOOS),windows)
|
||||||
|
else # not ifdef GOOS
|
||||||
|
BINARY=${MYNAME}.exe
|
||||||
|
endif # ifdef GOOS
|
||||||
|
ifeq ($(SHELL), sh.exe)
|
||||||
|
RMCMD=DEL /Q /F
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Явно определяем символ новой строки, чтобы избежать неоднозначности на windows
|
||||||
|
define IFS
|
||||||
|
|
||||||
|
endef
|
||||||
|
|
||||||
|
|
||||||
all: clean build
|
all: clean build
|
||||||
|
|
||||||
|
|
||||||
build:
|
build:
|
||||||
${GOOPTS} go build ${BUILDOPTS} -o bunny-bot ./cmd/bunny-bot
|
ifeq ($(OS),Windows_NT)
|
||||||
|
# Looks like on windows gnu make explicitly set SHELL to sh.exe, if it was not set.
|
||||||
|
ifeq ($(SHELL), sh.exe)
|
||||||
|
# # Vanilla cmd.exe / powershell.
|
||||||
|
SET "CGO_ENABLED=0"
|
||||||
|
go build ${BUILDOPTS} -o ${BINARY} ./cmd/${MYNAME}
|
||||||
|
else ifeq (,$(findstring(Git/usr/bin/sh.exe, $(SHELL))))
|
||||||
|
# # git-bash
|
||||||
|
CGO_ENABLED=0 go build ${BUILDOPTS} -o ${BINARY} ./cmd/${MYNAME}
|
||||||
|
else # not ifeq (,$(findstring(Git/usr/bin/sh.exe, $(SHELL))))
|
||||||
|
# # Some other shell.
|
||||||
|
# # TODO: handle it.
|
||||||
|
$(info "-- Dunno how to handle this ${SHELL}")
|
||||||
|
endif # ifeq (,$(findstring(Git/usr/bin/sh.exe, $(SHELL))))
|
||||||
|
else # not ($(OS),Windows_NT)
|
||||||
|
CGO_ENABLED=0 go build ${BUILDOPTS} -o ${BINARY} ./cmd/${MYNAME}
|
||||||
|
endif # ifeq ($(OS),Windows_NT)
|
||||||
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf bunny-bot
|
ifeq ($(OS),Windows_NT)
|
||||||
|
ifeq ($(SHELL),sh.exe)
|
||||||
|
# # Vanilla cmd.exe / powershell.
|
||||||
|
if exist ${BINARY} ${RMCMD} ${BINARY}
|
||||||
|
else # not ifeq ($(SHELL),sh.exe)
|
||||||
|
${RMCMD} ./${BINARY}
|
||||||
|
endif # ifeq ($(SHELL),sh.exe)
|
||||||
|
else # not ifeq ($(OS),Windows_NT)
|
||||||
|
${RMCMD} ./${BINARY}
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
upgrade:
|
upgrade:
|
||||||
rm -rf vendor
|
ifeq ($(OS),Windows_NT)
|
||||||
go get -u -t -tool ./...
|
ifeq ($(SHELL),sh.exe)
|
||||||
|
# # Vanilla cmd.exe / powershell.
|
||||||
|
if exist vendor DEL /F /S /Q vendor >nul
|
||||||
|
else # not ifeq ($(SHELL),sh.exe)
|
||||||
|
# # git-bash
|
||||||
|
$(RM) -r vendor
|
||||||
|
endif # ifeq ($(SHELL),sh.exe)
|
||||||
|
else # not ifeq ($(OS),Windows_NT)
|
||||||
|
$(RM) -r vendor
|
||||||
|
endif
|
||||||
|
go get -d -u ./...
|
||||||
go mod tidy
|
go mod tidy
|
||||||
go mod vendor
|
go mod vendor
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ import (
|
|||||||
"go.uber.org/zap/zapcore"
|
"go.uber.org/zap/zapcore"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// TODO: use https://dev.to/gholami1313/saving-log-messages-to-a-custom-log-file-in-golang-ce5 for
|
||||||
|
//
|
||||||
|
// chat messages.
|
||||||
func main() {
|
func main() {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
@@ -32,7 +35,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Config for Zap logger facility.
|
// Config for Zap logger facility.
|
||||||
var logCfg zap.Config = zap.NewDevelopmentConfig()
|
var logCfg = zap.NewDevelopmentConfig()
|
||||||
|
|
||||||
// Define loglevel.
|
// Define loglevel.
|
||||||
var l zapcore.Level
|
var l zapcore.Level
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
"name": "Bunny",
|
"name": "Bunny",
|
||||||
"token": "get_it_from_botfather",
|
"token": "get_it_from_botfather",
|
||||||
"loglevel": "debug",
|
"loglevel": "debug",
|
||||||
"logfile": "bunny-bot.log",
|
"logfile": "bunny-bot.log",
|
||||||
|
"logchats": false,
|
||||||
"csign": ".",
|
"csign": ".",
|
||||||
"datadir": "data"
|
"datadir": "data"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,27 @@
|
|||||||
package moon
|
package moon
|
||||||
|
|
||||||
import "github.com/NicoNex/echotron/v3"
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/NicoNex/echotron/v3"
|
||||||
|
)
|
||||||
|
|
||||||
func animation(msg *echotron.Update) {
|
func animation(msg *echotron.Update) {
|
||||||
Log.Infof(
|
if Cfg.LogChats {
|
||||||
"User %s %s (username = %s, id = %d) sent animation to chat %s %s (%d)",
|
ChatLog(
|
||||||
msg.Message.From.FirstName,
|
msg.Message.Chat.ID,
|
||||||
msg.Message.From.LastName,
|
fmt.Sprintf(
|
||||||
msg.Message.From.Username,
|
"User %s %s (username = %s, id = %d) sent animation to chat %s %s (%d)",
|
||||||
msg.Message.From.ID,
|
msg.Message.From.FirstName,
|
||||||
msg.Message.Chat.Type,
|
msg.Message.From.LastName,
|
||||||
msg.Message.Chat.Title,
|
msg.Message.From.Username,
|
||||||
msg.Message.Chat.ID,
|
msg.Message.From.ID,
|
||||||
)
|
msg.Message.Chat.Type,
|
||||||
|
msg.Message.Chat.Title,
|
||||||
|
msg.Message.Chat.ID,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
|
|||||||
@@ -93,3 +93,5 @@ func CasCheckID(id int64) (bool, error) {
|
|||||||
|
|
||||||
return result, fmt.Errorf("unable to parse response from api.cas.chat: %s", string(body)) //nolint: err113
|
return result, fmt.Errorf("unable to parse response from api.cas.chat: %s", string(body)) //nolint: err113
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/NicoNex/echotron/v3"
|
"github.com/NicoNex/echotron/v3"
|
||||||
"github.com/akyoto/cache"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// newChatMember parses one of types ChatMemberUpdated event.
|
// newChatMember parses one of types ChatMemberUpdated event.
|
||||||
@@ -25,28 +24,16 @@ func newChatMember(msg *echotron.Update) {
|
|||||||
msg.ChatMember.OldChatMember.Status,
|
msg.ChatMember.OldChatMember.Status,
|
||||||
)
|
)
|
||||||
|
|
||||||
// If there is no such chatid, means that no such cache too.
|
Log.Debugf(
|
||||||
if len(ChatList) == 0 || !slices.Contains(ChatList, msg.Message.Chat.ID) {
|
"Add %s %s (%d) to list of known chats",
|
||||||
Log.Debugf(
|
msg.ChatMember.Chat.Type,
|
||||||
"Creating caches for new %s %s (%d)",
|
msg.ChatMember.Chat.Title,
|
||||||
msg.ChatMember.Chat.Type,
|
msg.ChatMember.Chat.ID,
|
||||||
msg.ChatMember.Chat.Title,
|
)
|
||||||
msg.ChatMember.Chat.ID,
|
|
||||||
)
|
|
||||||
|
|
||||||
NewMembers[msg.Message.Chat.ID] = cache.New(1 * time.Minute)
|
ChatList = append(ChatList, msg.ChatMember.Chat.ID)
|
||||||
AppearedMembers[msg.Message.Chat.ID] = cache.New(1 * time.Minute)
|
slices.Sort(ChatList)
|
||||||
SquashedMembers[msg.Message.Chat.ID] = cache.New(60 * time.Minute)
|
ChatList = slices.Compact(ChatList)
|
||||||
|
|
||||||
Log.Debugf(
|
|
||||||
"Add %s %s (%d) to list of known chats",
|
|
||||||
msg.ChatMember.Chat.Type,
|
|
||||||
msg.ChatMember.Chat.Title,
|
|
||||||
msg.ChatMember.Chat.ID,
|
|
||||||
)
|
|
||||||
|
|
||||||
ChatList = append(ChatList, msg.Message.Chat.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check some other attributes.
|
// Check some other attributes.
|
||||||
if msg.ChatMember.OldChatMember.Status == "left" && msg.ChatMember.NewChatMember.Status == "member" {
|
if msg.ChatMember.OldChatMember.Status == "left" && msg.ChatMember.NewChatMember.Status == "member" {
|
||||||
@@ -150,7 +137,8 @@ func newChatMember(msg *echotron.Update) {
|
|||||||
msg.ChatMember.Chat.ID,
|
msg.ChatMember.Chat.ID,
|
||||||
)
|
)
|
||||||
|
|
||||||
AppearedMembers[msg.ChatMember.Chat.ID].Set(msg.ChatMember.NewChatMember.User.ID, time.Now().Unix(), 1*time.Minute)
|
key := fmt.Sprintf("%d+%d", msg.ChatMember.Chat.ID, msg.ChatMember.NewChatMember.User.ID)
|
||||||
|
AppearedMembers.Set(key, time.Now().Unix(), 1*time.Minute)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
56
internal/moon/chatlog.go
Normal file
56
internal/moon/chatlog.go
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
package moon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ChatLog logs message to separate file, placed in basedir(Cfg.LogFile).
|
||||||
|
func ChatLog(chatid int64, text string) {
|
||||||
|
file := os.DevNull
|
||||||
|
|
||||||
|
if Cfg.LogFile != "" {
|
||||||
|
file = fmt.Sprintf("%s/%s", filepath.Dir(Cfg.LogFile), strconv.FormatInt(chatid, 10))
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
isOpened = false
|
||||||
|
)
|
||||||
|
|
||||||
|
for _, l := range chatlogs {
|
||||||
|
if l.LogFilePath == file {
|
||||||
|
isOpened = true
|
||||||
|
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isOpened {
|
||||||
|
// open log file
|
||||||
|
logFile, err := os.OpenFile(file, os.O_APPEND|os.O_RDWR|os.O_CREATE, 0644)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Unable to open log file %s: %s", file, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
l := Chatlog{LogFilePath: file, File: logFile}
|
||||||
|
|
||||||
|
chatlogs = append(chatlogs, l)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, l := range chatlogs {
|
||||||
|
if l.LogFilePath == file {
|
||||||
|
log.SetOutput(l.File)
|
||||||
|
// optional: log date-time, filename, and line number
|
||||||
|
log.SetFlags(log.Lshortfile | log.LstdFlags)
|
||||||
|
log.Println(text)
|
||||||
|
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
45
internal/moon/editedMessage.go
Normal file
45
internal/moon/editedMessage.go
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
package moon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/NicoNex/echotron/v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
// editedMessage hadles editedMessage type of update.
|
||||||
|
func editedMessage(msg *echotron.Update) {
|
||||||
|
// Edited message can contain all kinds of edited attributes that telegram allows to change in message.
|
||||||
|
// Not sure is we should handle all of them.
|
||||||
|
if Cfg.LogChats {
|
||||||
|
if msg.EditedMessage.Text != "" {
|
||||||
|
ChatLog(
|
||||||
|
msg.EditedMessage.Chat.ID,
|
||||||
|
fmt.Sprintf(
|
||||||
|
"User %s %s (username = %s, id = %d) in %s %s (%d) edited message: %s",
|
||||||
|
msg.EditedMessage.From.FirstName,
|
||||||
|
msg.EditedMessage.From.LastName,
|
||||||
|
msg.EditedMessage.From.Username,
|
||||||
|
msg.EditedMessage.From.ID,
|
||||||
|
msg.EditedMessage.Chat.Type,
|
||||||
|
msg.EditedMessage.Chat.Title,
|
||||||
|
msg.EditedMessage.Chat.ID,
|
||||||
|
msg.EditedMessage.Text,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
ChatLog(
|
||||||
|
msg.EditedMessage.Chat.ID,
|
||||||
|
fmt.Sprintf(
|
||||||
|
"User %s %s (username = %s, id = %d) in %s %s (%d) edited message",
|
||||||
|
msg.EditedMessage.From.FirstName,
|
||||||
|
msg.EditedMessage.From.LastName,
|
||||||
|
msg.EditedMessage.From.Username,
|
||||||
|
msg.EditedMessage.From.ID,
|
||||||
|
msg.EditedMessage.Chat.Type,
|
||||||
|
msg.EditedMessage.Chat.Title,
|
||||||
|
msg.EditedMessage.Chat.ID,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ package moon
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/NicoNex/echotron/v3"
|
"github.com/NicoNex/echotron/v3"
|
||||||
"github.com/akyoto/cache"
|
"github.com/akyoto/cache"
|
||||||
@@ -19,15 +20,17 @@ var (
|
|||||||
DB = make(map[string]*pebble.DB)
|
DB = make(map[string]*pebble.DB)
|
||||||
|
|
||||||
// SquashedMembers struct with banned members.
|
// SquashedMembers struct with banned members.
|
||||||
SquashedMembers map[int64]*cache.Cache
|
SquashedMembers = cache.New(1 * time.Minute)
|
||||||
|
|
||||||
// NewMembers struct with new members appeared via message with new_chat_members field set.
|
// NewMembers struct with new members appeared via message with new_chat_members field set.
|
||||||
NewMembers map[int64]*cache.Cache
|
NewMembers = cache.New(1 * time.Minute)
|
||||||
|
|
||||||
// AppearedMembers struct with new members appeared via ChatMemberUpdated event.
|
// AppearedMembers struct with new members appeared via ChatMemberUpdated event.
|
||||||
AppearedMembers map[int64]*cache.Cache
|
AppearedMembers = cache.New(60 * time.Minute)
|
||||||
|
|
||||||
ChatList = make([]int64, 0)
|
ChatList = make([]int64, 0)
|
||||||
|
|
||||||
|
chatlogs []Chatlog
|
||||||
)
|
)
|
||||||
|
|
||||||
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ func leftChatMember(msg *echotron.Update) {
|
|||||||
msg.Message.Chat.ID,
|
msg.Message.Chat.ID,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Save people that left chat to pebbledb. To preserve their state.
|
||||||
|
// Left folks can eventually return and in chat_mamber_updated event their state will be left->member.
|
||||||
if err := Cfg.SaveKeyValue(
|
if err := Cfg.SaveKeyValue(
|
||||||
"LeftMembers",
|
"LeftMembers",
|
||||||
fmt.Sprintf("%d", msg.Message.Chat.ID),
|
fmt.Sprintf("%d", msg.Message.Chat.ID),
|
||||||
|
|||||||
@@ -1,15 +1,27 @@
|
|||||||
package moon
|
package moon
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"slices"
|
"slices"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/NicoNex/echotron/v3"
|
"github.com/NicoNex/echotron/v3"
|
||||||
cache "github.com/akyoto/cache"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// newChatMembers parses NewChatMember event.
|
// newChatMembers parses NewChatMember event.
|
||||||
func newChatMembers(msg *echotron.Update) {
|
func newChatMembers(msg *echotron.Update) {
|
||||||
|
// If there is no such chatid, means that no such cache too.
|
||||||
|
Log.Debugf(
|
||||||
|
"Add %s %s (%d) to list of known chats",
|
||||||
|
msg.Message.Chat.Type,
|
||||||
|
msg.Message.Chat.Title,
|
||||||
|
msg.Message.Chat.ID,
|
||||||
|
)
|
||||||
|
|
||||||
|
ChatList = append(ChatList, msg.Message.Chat.ID)
|
||||||
|
slices.Sort(ChatList)
|
||||||
|
ChatList = slices.Compact(ChatList)
|
||||||
|
|
||||||
for _, user := range msg.Message.NewChatMembers {
|
for _, user := range msg.Message.NewChatMembers {
|
||||||
Log.Infof(
|
Log.Infof(
|
||||||
"User %s %s (username = %s, id = %d) joined %s %s (%d)",
|
"User %s %s (username = %s, id = %d) joined %s %s (%d)",
|
||||||
@@ -22,29 +34,6 @@ func newChatMembers(msg *echotron.Update) {
|
|||||||
msg.Message.Chat.ID,
|
msg.Message.Chat.ID,
|
||||||
)
|
)
|
||||||
|
|
||||||
// If there is no such chatid, means that no such cache too.
|
|
||||||
if !slices.Contains(ChatList, msg.Message.Chat.ID) {
|
|
||||||
Log.Debugf(
|
|
||||||
"Creating caches for new %s %s (%d)",
|
|
||||||
msg.Message.Chat.Type,
|
|
||||||
msg.Message.Chat.Title,
|
|
||||||
msg.Message.Chat.ID,
|
|
||||||
)
|
|
||||||
|
|
||||||
NewMembers[msg.Message.Chat.ID] = cache.New(1 * time.Minute)
|
|
||||||
AppearedMembers[msg.Message.Chat.ID] = cache.New(1 * time.Minute)
|
|
||||||
SquashedMembers[msg.Message.Chat.ID] = cache.New(60 * time.Minute)
|
|
||||||
|
|
||||||
Log.Debugf(
|
|
||||||
"Add %s %s (%d) to list of known chats",
|
|
||||||
msg.Message.Chat.Type,
|
|
||||||
msg.Message.Chat.Title,
|
|
||||||
msg.Message.Chat.ID,
|
|
||||||
)
|
|
||||||
|
|
||||||
ChatList = append(ChatList, msg.Message.Chat.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
casBanned, err := CasCheckID(user.ID)
|
casBanned, err := CasCheckID(user.ID)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -99,7 +88,8 @@ func newChatMembers(msg *echotron.Update) {
|
|||||||
msg.Message.Chat.ID,
|
msg.Message.Chat.ID,
|
||||||
)
|
)
|
||||||
|
|
||||||
NewMembers[msg.Message.Chat.ID].Set(user.ID, time.Now().Unix(), 1*time.Minute)
|
key := fmt.Sprintf("%d+%d", msg.Message.Chat.ID, user.ID)
|
||||||
|
NewMembers.Set(key, time.Now().Unix(), 1*time.Minute)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
46
internal/moon/photo.go
Normal file
46
internal/moon/photo.go
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
package moon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/NicoNex/echotron/v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
func photo(msg *echotron.Update) {
|
||||||
|
if Cfg.LogChats {
|
||||||
|
if msg.Message.Text != "" {
|
||||||
|
ChatLog(
|
||||||
|
msg.Message.Chat.ID,
|
||||||
|
fmt.Sprintf(
|
||||||
|
"User %s %s (username = %s, id = %d) sent %d photos to %s %s (%d) with text: %s",
|
||||||
|
msg.Message.From.FirstName,
|
||||||
|
msg.Message.From.LastName,
|
||||||
|
msg.Message.From.Username,
|
||||||
|
msg.Message.From.ID,
|
||||||
|
len(msg.Message.Photo),
|
||||||
|
msg.Message.Chat.Type,
|
||||||
|
msg.Message.Chat.Title,
|
||||||
|
msg.Message.Chat.ID,
|
||||||
|
msg.Message.Text,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
ChatLog(
|
||||||
|
msg.Message.Chat.ID,
|
||||||
|
fmt.Sprintf(
|
||||||
|
"User %s %s (username = %s, id = %d) sent %d photos to %s %s (%d)",
|
||||||
|
msg.Message.From.FirstName,
|
||||||
|
msg.Message.From.LastName,
|
||||||
|
msg.Message.From.Username,
|
||||||
|
msg.Message.From.ID,
|
||||||
|
len(msg.Message.Photo),
|
||||||
|
msg.Message.Chat.Type,
|
||||||
|
msg.Message.Chat.Title,
|
||||||
|
msg.Message.Chat.ID,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
65
internal/moon/reaction.go
Normal file
65
internal/moon/reaction.go
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
package moon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/NicoNex/echotron/v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
func reaction(msg *echotron.Update) {
|
||||||
|
if Cfg.LogChats {
|
||||||
|
var reactionString string
|
||||||
|
|
||||||
|
for _, item := range msg.MessageReaction.NewReaction {
|
||||||
|
switch item.Type {
|
||||||
|
case "Emoji":
|
||||||
|
reactionString += item.Emoji
|
||||||
|
case "CustomEmoji":
|
||||||
|
reactionString += item.CustomEmoji
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if reactionString != "" {
|
||||||
|
ChatLog(
|
||||||
|
msg.MessageReaction.Chat.ID,
|
||||||
|
fmt.Sprintf(
|
||||||
|
"User %s %s (username = %s, id = %d) set reaction %s to chat %s %s (%d)",
|
||||||
|
msg.MessageReaction.User.FirstName,
|
||||||
|
msg.MessageReaction.User.LastName,
|
||||||
|
msg.MessageReaction.User.Username,
|
||||||
|
msg.MessageReaction.User.ID,
|
||||||
|
reactionString,
|
||||||
|
msg.MessageReaction.Chat.Type,
|
||||||
|
msg.MessageReaction.Chat.Title,
|
||||||
|
msg.MessageReaction.Chat.ID,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
for _, item := range msg.MessageReaction.OldReaction {
|
||||||
|
switch item.Type {
|
||||||
|
case "Emoji":
|
||||||
|
reactionString += item.Emoji
|
||||||
|
case "CustomEmoji":
|
||||||
|
reactionString += item.CustomEmoji
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ChatLog(
|
||||||
|
msg.MessageReaction.Chat.ID,
|
||||||
|
fmt.Sprintf(
|
||||||
|
"User %s %s (username = %s, id = %d) removed reaction %s to chat %s %s (%d)",
|
||||||
|
msg.MessageReaction.User.FirstName,
|
||||||
|
msg.MessageReaction.User.LastName,
|
||||||
|
msg.MessageReaction.User.Username,
|
||||||
|
msg.MessageReaction.User.ID,
|
||||||
|
reactionString,
|
||||||
|
msg.MessageReaction.Chat.Type,
|
||||||
|
msg.MessageReaction.Chat.Title,
|
||||||
|
msg.MessageReaction.Chat.ID,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
23
internal/moon/reactionCount.go
Normal file
23
internal/moon/reactionCount.go
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
package moon
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/NicoNex/echotron/v3"
|
||||||
|
"github.com/davecgh/go-spew/spew"
|
||||||
|
)
|
||||||
|
|
||||||
|
func reactionCount(msg *echotron.Update) {
|
||||||
|
ChatLog(
|
||||||
|
msg.MessageReaction.Chat.ID,
|
||||||
|
fmt.Sprintf(
|
||||||
|
"Reaction count event in %s %s (%d): %s",
|
||||||
|
msg.MessageReaction.Chat.Type,
|
||||||
|
msg.MessageReaction.Chat.Title,
|
||||||
|
msg.MessageReaction.Chat.ID,
|
||||||
|
spew.Sdump(msg),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
@@ -1,163 +1,156 @@
|
|||||||
package moon
|
package moon
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"slices"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func RunAndBan() {
|
func RunAndBan() {
|
||||||
for {
|
for {
|
||||||
// If user have both events, he is not spammer. So wipe him from unchecked events list, just for sure.
|
var ListAppearedMembers, ListNewMembers []string
|
||||||
for _, chatid := range ChatList {
|
|
||||||
Log.Infof("RunAndBan by chatid: %d", chatid)
|
|
||||||
|
|
||||||
var ListAppearedMembers, ListNewMembers []int64
|
AppearedMembers.Range(
|
||||||
|
func(k, _ any) bool {
|
||||||
|
ListAppearedMembers = append(ListAppearedMembers, k.(string))
|
||||||
|
|
||||||
AppearedMembers[chatid].Range(
|
return true
|
||||||
func(k, _ any) bool {
|
},
|
||||||
ListAppearedMembers = append(ListAppearedMembers, k.(int64))
|
)
|
||||||
|
|
||||||
return true
|
NewMembers.Range(
|
||||||
},
|
func(k, _ any) bool {
|
||||||
)
|
ListNewMembers = append(ListNewMembers, k.(string))
|
||||||
|
|
||||||
NewMembers[chatid].Range(
|
return true
|
||||||
func(k, _ any) bool {
|
},
|
||||||
ListNewMembers = append(ListNewMembers, k.(int64))
|
)
|
||||||
|
|
||||||
return true
|
for _, AppearedMember := range ListAppearedMembers {
|
||||||
},
|
for _, NewMember := range ListNewMembers {
|
||||||
)
|
if AppearedMember == NewMember {
|
||||||
|
AppearedMembers.Delete(AppearedMember)
|
||||||
for _, AppearedMember := range ListAppearedMembers {
|
NewMembers.Delete(NewMember)
|
||||||
for _, NewMember := range ListNewMembers {
|
|
||||||
if AppearedMember == NewMember {
|
|
||||||
// TODO: Store also additional attributes in temporary database.
|
|
||||||
Log.Infof(
|
|
||||||
"Skip banning user %s %s (username = %s, id = %d) in %s %s (%d), because it has both events newMember and updateMember",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
NewMember,
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
chatid,
|
|
||||||
)
|
|
||||||
|
|
||||||
Log.Infof(
|
|
||||||
"Deleting user %s %s (username = %s, id = %d) in %s %s (%d), from AppearedMember DB",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
NewMember,
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
chatid,
|
|
||||||
)
|
|
||||||
|
|
||||||
AppearedMembers[chatid].Delete(AppearedMember)
|
|
||||||
|
|
||||||
Log.Infof(
|
|
||||||
"Deleting user %s %s (username = %s, id = %d) in %s %s (%d), from NewMember DB",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
NewMember,
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
chatid,
|
|
||||||
)
|
|
||||||
|
|
||||||
NewMembers[chatid].Delete(NewMember)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
currentTime := time.Now().Unix()
|
currentTime := time.Now().Unix()
|
||||||
|
|
||||||
// We would like to process only events that definitely older than 10 seconds!
|
ListAppearedMembers = ListAppearedMembers[:0]
|
||||||
for _, chatid := range ChatList {
|
ListNewMembers = ListNewMembers[:0]
|
||||||
var (
|
ListAppearedMembers = slices.Clip(ListAppearedMembers)
|
||||||
ListAppearedMembers, ListNewMembers []int64
|
ListNewMembers = slices.Clip(ListNewMembers)
|
||||||
)
|
|
||||||
|
|
||||||
AppearedMembers[chatid].Range(
|
AppearedMembers.Range(
|
||||||
func(k, v interface{}) bool {
|
func(k, _ any) bool {
|
||||||
ListAppearedMembers = append(ListAppearedMembers, k.(int64))
|
ListAppearedMembers = append(ListAppearedMembers, k.(string))
|
||||||
|
|
||||||
return true
|
return true
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
NewMembers[chatid].Range(
|
NewMembers.Range(
|
||||||
func(k, v interface{}) bool {
|
func(k, _ any) bool {
|
||||||
ListNewMembers = append(ListNewMembers, k.(int64))
|
ListNewMembers = append(ListNewMembers, k.(string))
|
||||||
|
|
||||||
return true
|
return true
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
for _, AppearedMember := range ListAppearedMembers {
|
for _, AppearedMember := range ListAppearedMembers {
|
||||||
eventTimestamp, found := AppearedMembers[chatid].Get(AppearedMember)
|
eventTimestamp, found := AppearedMembers.Get(AppearedMember)
|
||||||
|
|
||||||
if !found {
|
if !found {
|
||||||
continue
|
continue
|
||||||
}
|
|
||||||
|
|
||||||
eventTimeDelta := currentTime - eventTimestamp.(int64)
|
|
||||||
|
|
||||||
// Looks like it is spammer!
|
|
||||||
if eventTimeDelta > 10 {
|
|
||||||
// TODO: Store also additional attributes in temporary database.
|
|
||||||
Log.Infof(
|
|
||||||
"Ban user %s %s (username = %s, id = %d) in chat %s %s (%d) that have no newChatMember message since chatMemberUpdated for more than 10 seconds",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
AppearedMember,
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
chatid,
|
|
||||||
)
|
|
||||||
|
|
||||||
squash(
|
|
||||||
chatid,
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
AppearedMember,
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
)
|
|
||||||
|
|
||||||
AppearedMembers[chatid].Delete(AppearedMember)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, NewMember := range ListNewMembers {
|
eventTimeDelta := currentTime - eventTimestamp.(int64)
|
||||||
eventTimestamp, found := NewMembers[chatid].Get(NewMember)
|
|
||||||
|
// Spammer?
|
||||||
|
if eventTimeDelta > 10 {
|
||||||
|
item := strings.Split(AppearedMember, "+")
|
||||||
|
chatid, err := strconv.ParseInt(item[0], 10, 64)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
Log.Errorf("Got broken key in AppearedMembers cache: %s", AppearedMember)
|
||||||
|
|
||||||
if !found {
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
eventTimeDelta := currentTime - eventTimestamp.(int64)
|
userid, err := strconv.ParseInt(item[1], 10, 64)
|
||||||
|
|
||||||
// Totally new members should not have chatMemberUpdated events.
|
if err != nil {
|
||||||
if eventTimeDelta > 15 {
|
Log.Errorf("Got broken key in AppearedMembers cache: %s", AppearedMember)
|
||||||
// TODO: Store also additional attributes in temporary database.
|
|
||||||
Log.Debugf("Clean newChatMember event record older than 10 seconds for user user %s %s (username = %s, id = %d) in chat %s %s (%d)",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
NewMember,
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
chatid,
|
|
||||||
)
|
|
||||||
|
|
||||||
NewMembers[chatid].Delete(NewMember)
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Log.Infof(
|
||||||
|
"Ban user %s %s (username = %s, id = %d) in chat %s %s (%d) that have no newChatMember message since chatMemberUpdated for more than 10 seconds",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
userid,
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
chatid,
|
||||||
|
)
|
||||||
|
|
||||||
|
squash(
|
||||||
|
chatid,
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
userid,
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
)
|
||||||
|
|
||||||
|
AppearedMembers.Delete(AppearedMember)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, NewMember := range ListNewMembers {
|
||||||
|
eventTimestamp, found := NewMembers.Get(NewMember)
|
||||||
|
|
||||||
|
if !found {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
eventTimeDelta := currentTime - eventTimestamp.(int64)
|
||||||
|
|
||||||
|
// Spammer?
|
||||||
|
if eventTimeDelta > 10 {
|
||||||
|
item := strings.Split(NewMember, "+")
|
||||||
|
chatid, err := strconv.ParseInt(item[0], 10, 64)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
Log.Errorf("Got broken key in AppearedMembers cache: %s", NewMember)
|
||||||
|
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
userid, err := strconv.ParseInt(item[1], 10, 64)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
Log.Errorf("Got broken key in AppearedMembers cache: %s", NewMember)
|
||||||
|
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.Debugf("Clean newChatMember event record older than 10 seconds for user user %s %s (username = %s, id = %d) in chat %s %s (%d)",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
userid,
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
chatid,
|
||||||
|
)
|
||||||
|
|
||||||
|
NewMembers.Delete(NewMember)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package moon
|
package moon
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"slices"
|
"slices"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/NicoNex/echotron/v3"
|
"github.com/NicoNex/echotron/v3"
|
||||||
"github.com/akyoto/cache"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// TODO: refactor to return bool, error
|
// TODO: refactor to return bool, error
|
||||||
@@ -16,18 +16,12 @@ func squash(chatid int64, chattype, chattitle string, userid int64, firstname, l
|
|||||||
|
|
||||||
// If there is no such chatid, means that no such cache too.
|
// If there is no such chatid, means that no such cache too.
|
||||||
if len(ChatList) == 0 || !slices.Contains(ChatList, chatid) {
|
if len(ChatList) == 0 || !slices.Contains(ChatList, chatid) {
|
||||||
Log.Debugf("Creating caches for new %s %s (%d)", chattype, chattitle, chatid)
|
|
||||||
|
|
||||||
NewMembers[chatid] = cache.New(1 * time.Minute)
|
|
||||||
AppearedMembers[chatid] = cache.New(1 * time.Minute)
|
|
||||||
SquashedMembers[chatid] = cache.New(5 * time.Minute)
|
|
||||||
|
|
||||||
Log.Debugf("Add %s %s (%d) to list of known chats", chattype, chattitle, chatid)
|
Log.Debugf("Add %s %s (%d) to list of known chats", chattype, chattitle, chatid)
|
||||||
|
|
||||||
ChatList = append(ChatList, chatid)
|
ChatList = append(ChatList, chatid)
|
||||||
}
|
}
|
||||||
|
|
||||||
if found, exist := SquashedMembers[chatid].Get(userid); exist && found.(bool) {
|
if _, exist := SquashedMembers.Get(userid); exist {
|
||||||
Log.Infof(
|
Log.Infof(
|
||||||
"Skip banning user %s %s (username = %s, id = %d) in %s %s (%d), already banned",
|
"Skip banning user %s %s (username = %s, id = %d) in %s %s (%d), already banned",
|
||||||
firstname,
|
firstname,
|
||||||
@@ -85,9 +79,12 @@ func squash(chatid int64, chattype, chattitle string, userid int64, firstname, l
|
|||||||
chatid,
|
chatid,
|
||||||
)
|
)
|
||||||
|
|
||||||
SquashedMembers[chatid].Set(userid, true, 30*time.Second)
|
key := fmt.Sprintf("%d+%d", chatid, userid)
|
||||||
NewMembers[chatid].Delete(userid)
|
SquashedMembers.Set(key, true, 30*time.Second)
|
||||||
AppearedMembers[chatid].Delete(userid)
|
NewMembers.Delete(key)
|
||||||
|
AppearedMembers.Delete(key)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
|
|||||||
@@ -43,6 +43,12 @@ func telegramMsgParser(msg *echotron.Update) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if msg.EditedMessage != nil && msg.EditedMessage.Text != "" {
|
||||||
|
editedMessage(msg)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// ChatMember updated event. It goes to chatMemberUpdated.go.
|
// ChatMember updated event. It goes to chatMemberUpdated.go.
|
||||||
if msg.ChatMember != nil {
|
if msg.ChatMember != nil {
|
||||||
if msg.ChatMember.NewChatMember.User != nil {
|
if msg.ChatMember.NewChatMember.User != nil {
|
||||||
@@ -72,6 +78,24 @@ func telegramMsgParser(msg *echotron.Update) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if msg.MessageReaction != nil {
|
||||||
|
reaction(msg)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if msg.MessageReactionCount != nil {
|
||||||
|
reactionCount(msg)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if msg.Message != nil && msg.Message.Photo != nil {
|
||||||
|
photo(msg)
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
Log.Debug(spew.Sdump(msg))
|
Log.Debug(spew.Sdump(msg))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,61 +2,53 @@ package moon
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/NicoNex/echotron/v3"
|
"github.com/NicoNex/echotron/v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// textMessage handles text message events.
|
||||||
func textMessage(msg *echotron.Update) {
|
func textMessage(msg *echotron.Update) {
|
||||||
if msg.Message.ReplyToMessage == nil {
|
// Not sure if we must handle all kinds of these events.
|
||||||
|
if Cfg.LogChats {
|
||||||
|
switch {
|
||||||
// Just log it, it seems later here should be ban/mute command set.
|
// Just log it, it seems later here should be ban/mute command set.
|
||||||
Log.Infof(
|
case msg.Message != nil && msg.Message.ReplyToMessage == nil:
|
||||||
"User %s %s (username = %s, id = %d) in %s %s (%d) says: %s",
|
ChatLog(
|
||||||
msg.Message.From.FirstName,
|
msg.Message.Chat.ID,
|
||||||
msg.Message.From.LastName,
|
fmt.Sprintf(
|
||||||
msg.Message.From.Username,
|
"User %s %s (username = %s, id = %d) in %s %s (%d) says: %s",
|
||||||
msg.Message.From.ID,
|
msg.Message.From.FirstName,
|
||||||
msg.Message.Chat.Type,
|
msg.Message.From.LastName,
|
||||||
msg.Message.Chat.Title,
|
msg.Message.From.Username,
|
||||||
msg.Message.Chat.ID,
|
msg.Message.From.ID,
|
||||||
msg.Message.Text,
|
msg.Message.Chat.Type,
|
||||||
)
|
msg.Message.Chat.Title,
|
||||||
} else {
|
msg.Message.Chat.ID,
|
||||||
// Just log it.
|
msg.Message.Text,
|
||||||
Log.Infof(
|
),
|
||||||
"User %s %s (username = %s, id = %d) in %s %s (%d) replies to message %d by %s %s (username = %s, id = %d): %s",
|
)
|
||||||
msg.Message.From.FirstName,
|
|
||||||
msg.Message.From.LastName,
|
case msg.Message != nil && msg.Message.ReplyToMessage != nil:
|
||||||
msg.Message.From.Username,
|
ChatLog(
|
||||||
msg.Message.From.ID,
|
msg.Message.Chat.ID,
|
||||||
msg.Message.Chat.Type,
|
fmt.Sprintf(
|
||||||
msg.Message.Chat.Title,
|
"User %s %s (username = %s, id = %d) in %s %s (%d) replies to message %d by %s %s (username = %s, id = %d): %s",
|
||||||
msg.Message.Chat.ID,
|
msg.Message.From.FirstName,
|
||||||
msg.Message.ReplyToMessage.ID,
|
msg.Message.From.LastName,
|
||||||
msg.Message.ReplyToMessage.From.FirstName,
|
msg.Message.From.Username,
|
||||||
msg.Message.ReplyToMessage.From.LastName,
|
msg.Message.From.ID,
|
||||||
msg.Message.ReplyToMessage.From.Username,
|
msg.Message.Chat.Type,
|
||||||
msg.Message.ReplyToMessage.From.ID,
|
msg.Message.Chat.Title,
|
||||||
msg.Message.Text,
|
msg.Message.Chat.ID,
|
||||||
)
|
msg.Message.ReplyToMessage.ID,
|
||||||
}
|
msg.Message.ReplyToMessage.From.FirstName,
|
||||||
|
msg.Message.ReplyToMessage.From.LastName,
|
||||||
|
msg.Message.ReplyToMessage.From.Username,
|
||||||
|
msg.Message.ReplyToMessage.From.ID,
|
||||||
|
msg.Message.Text,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
// Update database of new members :)
|
|
||||||
// Try to get timestamp when this member joined to chat
|
|
||||||
if joinTimestampString := Cfg.GetValue(
|
|
||||||
"NewMembers",
|
|
||||||
fmt.Sprintf("%d", msg.Message.Chat.ID),
|
|
||||||
fmt.Sprintf("%d", msg.Message.From.ID),
|
|
||||||
); joinTimestampString == "" {
|
|
||||||
if err := Cfg.SaveKeyValue(
|
|
||||||
"NewMembers",
|
|
||||||
fmt.Sprintf("%d", msg.Message.Chat.ID),
|
|
||||||
fmt.Sprintf("%d", msg.Message.From.ID),
|
|
||||||
fmt.Sprintf("%d", time.Now().Unix()),
|
|
||||||
); err != nil {
|
|
||||||
Log.Error(err)
|
|
||||||
} else {
|
|
||||||
Log.Infof("Info about new userid %d saved to new users db", msg.Message.From.ID)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package moon
|
package moon
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"os"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -10,6 +11,7 @@ type MyConfig struct {
|
|||||||
Token string `json:"token,omitempty"`
|
Token string `json:"token,omitempty"`
|
||||||
LogLevel string `json:"loglevel,omitempty"`
|
LogLevel string `json:"loglevel,omitempty"`
|
||||||
LogFile string `json:"logfile,omitempty"`
|
LogFile string `json:"logfile,omitempty"`
|
||||||
|
LogChats bool `json:"logchats,omitempty"`
|
||||||
CSign string `json:"csign,omitempty"`
|
CSign string `json:"csign,omitempty"`
|
||||||
DataDir string `json:"datadir,omitempty"`
|
DataDir string `json:"datadir,omitempty"`
|
||||||
}
|
}
|
||||||
@@ -30,4 +32,9 @@ type CasTrue struct {
|
|||||||
} `json:"result"`
|
} `json:"result"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Chatlog struct {
|
||||||
|
LogFilePath string
|
||||||
|
File *os.File
|
||||||
|
}
|
||||||
|
|
||||||
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
|
|||||||
Reference in New Issue
Block a user