From c853cfb592b9adc7e7f2b4e89a35073d360c0ffa Mon Sep 17 00:00:00 2001 From: B4D_US3R Date: Mon, 21 Apr 2025 23:13:46 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D1=80?= =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=BB=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B=20(?= =?UTF-8?q?=D0=BE=D0=BF=D1=8F=D1=82=D1=8C),=20=D0=B7=D0=B0=D0=BA=D0=B8?= =?UTF-8?q?=D0=BD=D1=83=D0=BB=20=D0=B2=D1=81=D1=91=20=D0=B2=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BA=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 16 +++++++++++++ {src/config => config}/config.go | 0 config/go.mod | 14 ++++++++++++ docker-compose.yml | 11 +++++++++ go.mod | 29 ------------------------ service/go.mod | 35 +++++++++++++++++++++++++++++ main.go => service/kiki.go | 20 +++++------------ stacker/go.mod | 10 +++++++++ {src/stacker => stacker}/stacker.go | 0 tooter/go.mod | 25 +++++++++++++++++++++ {src/tooter => tooter}/tooter.go | 29 +++++++++++++++--------- 11 files changed, 135 insertions(+), 54 deletions(-) create mode 100644 Dockerfile rename {src/config => config}/config.go (100%) create mode 100644 config/go.mod create mode 100644 docker-compose.yml delete mode 100644 go.mod create mode 100644 service/go.mod rename main.go => service/kiki.go (82%) create mode 100644 stacker/go.mod rename {src/stacker => stacker}/stacker.go (100%) create mode 100644 tooter/go.mod rename {src/tooter => tooter}/tooter.go (84%) diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a6020e3 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,16 @@ +FROM golang:1.24 + +WORKDIR /app/kiki + +RUN mkdir /app/kiki/config /app/kiki/service /app/kiki/stacker /app/kiki/tooter + +COPY config/* /app/kiki/config +COPY service/* /app/kiki/service +COPY stacker/* /app/kiki/stacker +COPY tooter/* /app/kiki/tooter + +RUN cd service && go mod tidy && cd ../ + +RUN go build -C ./service -o ../kiki + +CMD [ "/app/kiki/kiki", "run" ] \ No newline at end of file diff --git a/src/config/config.go b/config/config.go similarity index 100% rename from src/config/config.go rename to config/config.go diff --git a/config/go.mod b/config/go.mod new file mode 100644 index 0000000..390a727 --- /dev/null +++ b/config/go.mod @@ -0,0 +1,14 @@ +module kiki/config + +go 1.24.2 + +require ( + github.com/mattn/go-mastodon v0.0.9 + gopkg.in/yaml.v2 v2.4.0 +) + +require ( + github.com/gorilla/websocket v1.5.1 // indirect + github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect + golang.org/x/net v0.25.0 // indirect +) diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..8d17708 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,11 @@ +services: + kiki: + build: ./ + restart: always + volumes: + - ./config.yaml:/app/kiki/config.yaml + - ./secret.conf:/app/kiki/secret.conf + redis: + image: redis + restart: always + \ No newline at end of file diff --git a/go.mod b/go.mod deleted file mode 100644 index 094a8af..0000000 --- a/go.mod +++ /dev/null @@ -1,29 +0,0 @@ -module kiki - -go 1.23.0 - -toolchain go1.24.2 - -require ( - github.com/mattn/go-mastodon v0.0.9 - github.com/mmcdole/gofeed v1.3.0 - github.com/redis/go-redis/v9 v9.7.3 - github.com/urfave/cli/v3 v3.1.1 - golang.org/x/net v0.39.0 - gopkg.in/yaml.v2 v2.4.0 -) - -require ( - github.com/PuerkitoBio/goquery v1.10.2 // indirect - github.com/andybalholm/cascadia v1.3.3 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/gorilla/websocket v1.5.3 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/mmcdole/goxpp v1.1.1 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect - golang.org/x/text v0.24.0 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect -) diff --git a/service/go.mod b/service/go.mod new file mode 100644 index 0000000..7f97ff1 --- /dev/null +++ b/service/go.mod @@ -0,0 +1,35 @@ +module kiki/kiki + +go 1.24.2 + +replace kiki/config => ../config + +replace kiki/stacker => ../stacker + +replace kiki/tooter => ../tooter + +require ( + github.com/mattn/go-mastodon v0.0.9 + github.com/urfave/cli/v3 v3.2.0 + kiki/config v0.0.0-00010101000000-000000000000 + kiki/stacker v0.0.0-00010101000000-000000000000 + kiki/tooter v0.0.0-00010101000000-000000000000 +) + +require ( + github.com/PuerkitoBio/goquery v1.8.0 // indirect + github.com/andybalholm/cascadia v1.3.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/gorilla/websocket v1.5.1 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/mmcdole/gofeed v1.3.0 // indirect + github.com/mmcdole/goxpp v1.1.1-0.20240225020742-a0c311522b23 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/redis/go-redis/v9 v9.7.3 // indirect + github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect + golang.org/x/net v0.39.0 // indirect + golang.org/x/text v0.24.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect +) diff --git a/main.go b/service/kiki.go similarity index 82% rename from main.go rename to service/kiki.go index 49fee83..8698431 100644 --- a/main.go +++ b/service/kiki.go @@ -8,9 +8,9 @@ import ( "path/filepath" "time" - "kiki/src/config" - "kiki/src/stacker" - "kiki/src/tooter" + "kiki/config" + "kiki/stacker" + "kiki/tooter" "github.com/mattn/go-mastodon" "github.com/urfave/cli/v3" @@ -56,6 +56,7 @@ func main() { kikiConfig := config.GetKikiConfig(confFile) rdb := stacker.ConnectToRedis(kikiConfig.Redis.Address) + defer stacker.SaveRedis(rdb) ticker := time.NewTicker(1 * time.Minute) defer ticker.Stop() @@ -72,7 +73,7 @@ func main() { if !inStack { log.Println(post.Description) - toot, err := tooter.CreateToot(*mastoClient, post.Description) + toot, err := tooter.CreateToot(*mastoClient, post) if err != nil { log.Println(err) } @@ -82,17 +83,6 @@ func main() { stacker.SetToRedis(rdb, post.GUID, post.Description) } } - /*if news[0].GUID != lastGUID { - log.Println(news[0].Description) - - toot, err := tooter.CreateToot(*mastoClient, news[0].Description) - if err != nil { - log.Println(err) - } - - tooter.CreatePost(*mastoClient, toot) - lastGUID = news[0].GUID - }*/ } return nil }, diff --git a/stacker/go.mod b/stacker/go.mod new file mode 100644 index 0000000..4b1afb2 --- /dev/null +++ b/stacker/go.mod @@ -0,0 +1,10 @@ +module kiki/stacker + +go 1.24.2 + +require github.com/redis/go-redis/v9 v9.7.3 + +require ( + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect +) diff --git a/src/stacker/stacker.go b/stacker/stacker.go similarity index 100% rename from src/stacker/stacker.go rename to stacker/stacker.go diff --git a/tooter/go.mod b/tooter/go.mod new file mode 100644 index 0000000..27e1817 --- /dev/null +++ b/tooter/go.mod @@ -0,0 +1,25 @@ +module kiki/tooter + +go 1.24.2 + +require ( + github.com/mattn/go-mastodon v0.0.9 + github.com/mmcdole/gofeed v1.3.0 + golang.org/x/net v0.39.0 + gopkg.in/yaml.v2 v2.4.0 + kiki/config v0.0.0-00010101000000-000000000000 +) + +require ( + github.com/PuerkitoBio/goquery v1.8.0 // indirect + github.com/andybalholm/cascadia v1.3.1 // indirect + github.com/gorilla/websocket v1.5.1 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/mmcdole/goxpp v1.1.1-0.20240225020742-a0c311522b23 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect + golang.org/x/text v0.24.0 // indirect +) + +replace kiki/config => ../config diff --git a/src/tooter/tooter.go b/tooter/tooter.go similarity index 84% rename from src/tooter/tooter.go rename to tooter/tooter.go index 3f1d762..7dd91a8 100644 --- a/src/tooter/tooter.go +++ b/tooter/tooter.go @@ -4,13 +4,14 @@ import ( "context" "fmt" "io" - "kiki/src/config" "log" "net/http" "net/url" "os" "strings" + "kiki/config" + "github.com/mattn/go-mastodon" "github.com/mmcdole/gofeed" "golang.org/x/net/html" @@ -36,7 +37,8 @@ func ClientConfiguration(Instance string) { log.Println(err) } var userToken string - fmt.Println(u) + //fmt.Println(u) + fmt.Printf("Перейдите по ссылке\n%s\nИ введите user token ниже:\n", u) fmt.Scanln(&userToken) conf := &mastodon.Config{ @@ -126,17 +128,18 @@ func UploadPictures(mastoClient mastodon.Client, filesBytes [][]byte) []*mastodo return attachments } -func CreateToot(mastoClient mastodon.Client, newsDesc string) (mastodon.Toot, error) { - var tootText string +func CreateToot(mastoClient mastodon.Client, newsDesc *gofeed.Item) (mastodon.Toot, error) { var imgArray []string var attachments []*mastodon.Attachment + var tootText string = fmt.Sprintf("src: %s\n\n", newsDesc.Link) + toot := mastodon.Toot{ Visibility: "unlisted", Sensitive: true, } - uString := html.UnescapeString(newsDesc) + uString := html.UnescapeString(newsDesc.Description) pHtml, err := html.Parse(strings.NewReader(uString)) if err != nil { return mastodon.Toot{}, err @@ -144,14 +147,20 @@ func CreateToot(mastoClient mastodon.Client, newsDesc string) (mastodon.Toot, er for n := range pHtml.Descendants() { if n.Type != html.ElementNode { - tootText += (n.Data + "\n") + tootText += (n.Data) } - if n.Type == html.ElementNode && n.Data == "img" { - for _, attr := range n.Attr { - if attr.Key == "src" { - imgArray = append(imgArray, attr.Val) + if n.Type == html.ElementNode { + switch n.Data { + case "img": + for _, attr := range n.Attr { + if attr.Key == "src" { + imgArray = append(imgArray, attr.Val) + } } + + case "br": + tootText += "\n" } }