Skip to content

Commit 4ce3a1e

Browse files
AkiyamovAkiyamov
committed
Update to 1.23 go, Update to v3 vksdk, refactor code
1 parent fe2897b commit 4ce3a1e

File tree

4 files changed

+80
-110
lines changed

4 files changed

+80
-110
lines changed

‎src/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21.0-alpine3.17 as builder
1+
FROM golang:1.23.0-alpine3.20 as builder
22
WORKDIR /build
33
COPY go.mod .
44
RUN go mod download

‎src/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ module gitlab.com/Akiyamov/telegramrepost
33
go 1.21.3
44

55
require (
6-
github.com/SevereCloud/vksdk/v2 v2.16.1
6+
github.com/SevereCloud/vksdk/v3 v3.0.0
77
github.com/joho/godotenv v1.5.1
88
)
99

1010
require (
11-
github.com/klauspost/compress v1.17.2 // indirect
11+
github.com/klauspost/compress v1.17.9 // indirect
1212
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
1313
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
14-
golang.org/x/text v0.13.0 // indirect
14+
golang.org/x/text v0.16.0 // indirect
1515
)

‎src/go.sum

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
1-
github.com/SevereCloud/vksdk/v2 v2.16.1 h1:UiazL3vTy7lMm33oIXRMxXg8S5I8bQuqEdLtbmOSpG4=
2-
github.com/SevereCloud/vksdk/v2 v2.16.1/go.mod h1:UfVcBt8qh5+gIflQO6L+CWwrXcpwhOl5hKvKf8sXUd8=
1+
github.com/SevereCloud/vksdk/v3 v3.0.0 h1:44kHQ+3Vev4veZBhC/V6fMPf7x7H1O7LlZtL8Kvr1vg=
2+
github.com/SevereCloud/vksdk/v3 v3.0.0/go.mod h1:rh4Ujg+4ISyVHwvfsjRTzGcZ1YteFpdjV/3gn0LL1r0=
33
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
6-
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
5+
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
6+
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
77
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
88
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
9-
github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
10-
github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
11-
github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
12-
github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
9+
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
10+
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
1311
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1412
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
15-
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
16-
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
17-
github.com/vmihailenco/msgpack/v5 v5.4.0 h1:hRM0digJwyR6vll33NNAwCFguy5JuBD6jxDmQP3l608=
18-
github.com/vmihailenco/msgpack/v5 v5.4.0/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
13+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
14+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1915
github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
2016
github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
2117
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
2218
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
23-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
24-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
19+
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
20+
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
2521
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
2622
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎src/main.go

Lines changed: 66 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import (
1717
"strings"
1818
"time"
1919

20-
"github.com/SevereCloud/vksdk/v2/api"
20+
"github.com/SevereCloud/vksdk/v3/api"
21+
"github.com/SevereCloud/vksdk/v3/object"
2122
"github.com/joho/godotenv"
2223
)
2324

@@ -27,7 +28,6 @@ var vk_access_token string
2728
var vk_api_version string
2829
var vk_owner_id string
2930
var vk_post_last int
30-
var vk_post_requested_ID int
3131

3232
var telegram_bot_token string
3333
var telegram_temp_chat_id string
@@ -67,16 +67,32 @@ type telegram_audio_params struct {
6767
Parse_mode string `json:"parse_mode"`
6868
}
6969

70-
func Request() {
70+
func VK_to_TG(post object.WallWallpost) {
71+
vk_post_requested_ID := post.ID
72+
vk_post_requested := post
73+
74+
if vk_post_last == 1 {
75+
vk_post_last = vk_post_requested_ID
76+
log.Print("[INFO] First request.\n")
77+
} else if vk_post_last != vk_post_requested_ID {
78+
vk_post_last = vk_post_requested_ID
79+
log.Printf("[INFO] New post vk.com/wall%v_%v\n", vk_post_requested.OwnerID, vk_post_requested.ID)
80+
PostMessage(vk_post_requested)
81+
if vk_post_requested.CopyHistory != nil {
82+
PostMessage(vk_post_requested.CopyHistory[0])
83+
}
84+
}
85+
}
86+
87+
func Request_VK() {
7188
var vk_response api.WallGetResponse
72-
var vk_response_repost api.WallGetResponse
7389

7490
vk := api.NewVK(vk_access_token)
7591

7692
params := api.Params{
7793
"access_token": vk_access_token,
7894
"owner_id": vk_owner_id,
79-
"count": 1,
95+
"count": 2,
8096
"offset": 0,
8197
"filter": "all",
8298
"v": vk_api_version,
@@ -89,51 +105,9 @@ func Request() {
89105

90106
vk_is_pinned_check := vk_response.Items[0].IsPinned
91107
if vk_is_pinned_check {
92-
params := api.Params{
93-
"access_token": vk_access_token,
94-
"owner_id": vk_owner_id,
95-
"count": 1,
96-
"offset": 1,
97-
"filter": "all",
98-
"v": vk_api_version,
99-
}
100-
101-
err := vk.RequestUnmarshal("wall.get", &vk_response, params)
102-
if err != nil {
103-
log.Fatalf("[ERROR] %v", err)
104-
}
105-
106-
vk_post_requested_ID = vk_response.Items[0].ID
107-
vk_post_requested := vk_response.Items[0]
108-
109-
if vk_post_last == 1 {
110-
vk_post_last = vk_post_requested_ID
111-
log.Print("[INFO] First request.\n")
112-
} else if vk_post_last != vk_post_requested_ID {
113-
vk_post_last = vk_post_requested_ID
114-
log.Printf("[INFO] New post vk.com/wall%v_%v\n", vk_post_requested.OwnerID, vk_post_requested.ID)
115-
PostMessage(vk_response)
116-
if vk_post_requested.CopyHistory != nil {
117-
vk_response_repost.Items = vk_post_requested.CopyHistory
118-
PostMessage(vk_response_repost)
119-
}
120-
}
121-
}
122-
123-
vk_post_requested_ID = vk_response.Items[0].ID
124-
vk_post_requested := vk_response.Items[0]
125-
126-
if vk_post_last == 1 {
127-
vk_post_last = vk_post_requested_ID
128-
log.Print("[INFO] First request.\n")
129-
} else if vk_post_last != vk_post_requested_ID {
130-
vk_post_last = vk_post_requested_ID
131-
log.Printf("[INFO] New post vk.com/wall%v_%v\n", vk_post_requested.OwnerID, vk_post_requested.ID)
132-
PostMessage(vk_response)
133-
if vk_post_requested.CopyHistory != nil {
134-
vk_response_repost.Items = vk_post_requested.CopyHistory
135-
PostMessage(vk_response_repost)
136-
}
108+
VK_to_TG(vk_response.Items[1])
109+
} else {
110+
VK_to_TG(vk_response.Items[0])
137111
}
138112
}
139113

@@ -277,38 +251,38 @@ func GetVideoURL(owner_id int, vid int) string {
277251
_, err = io.Copy(out, res.Body)
278252
_, err = os.Open(fmt.Sprintf("/video/%d_%d.mp4", oid, id))
279253
if err != nil {
280-
log.Fatalf("[ERROR %v]", err)
254+
log.Fatalf("[ERROR] %v", err)
281255
}
282256
form := new(bytes.Buffer)
283257
writer := multipart.NewWriter(form)
284258
fw, err := writer.CreateFormFile("video", fmt.Sprintf("%d_%d.mp4", oid, id))
285259
if err != nil {
286-
log.Fatalf("[ERROR %v]", err)
260+
log.Fatalf("[ERROR] %v", err)
287261
}
288262
fd, err := os.Open(fmt.Sprintf("/video/%d_%d.mp4", oid, id))
289263
if err != nil {
290-
log.Fatalf("[ERROR %v]", err)
264+
log.Fatalf("[ERROR] %v", err)
291265
}
292266
defer fd.Close()
293267
_, err = io.Copy(fw, fd)
294268
if err != nil {
295-
log.Fatalf("[ERROR %v]", err)
269+
log.Fatalf("[ERROR] %v", err)
296270
}
297271
formField, err := writer.CreateFormField("chat_id")
298272
if err != nil {
299-
log.Fatalf("[ERROR %v]", err)
273+
log.Fatalf("[ERROR] %v", err)
300274
}
301275
_, err = formField.Write([]byte(telegram_temp_chat_id))
302276
writer.Close()
303277
client = http.Client{}
304278
req, err = http.NewRequest("POST", telegram_api_send_video, form)
305279
if err != nil {
306-
log.Fatalf("[ERROR %v]", err)
280+
log.Fatalf("[ERROR] %v", err)
307281
}
308282
req.Header.Set("Content-Type", writer.FormDataContentType())
309283
resp, err := client.Do(req)
310284
if err != nil {
311-
log.Fatalf("[ERROR %v]", err)
285+
log.Fatalf("[ERROR] %v", err)
312286
}
313287
defer resp.Body.Close()
314288
data_vid := make(map[string]interface{})
@@ -329,7 +303,7 @@ func NoAttachPrepare(text string, tg_src string) {
329303
telegram_api_text.Chat_id = telegram_chat_id
330304
tmp_json, err := json.Marshal(telegram_api_text)
331305
if err != nil {
332-
log.Fatalf("[ERROR %v]", err)
306+
log.Fatalf("[ERROR] %v", err)
333307
}
334308
SendToTelegramNoAttach(tmp_json)
335309
}
@@ -340,7 +314,7 @@ func SendToTelegramNoAttach(post_data []byte) {
340314
client := &http.Client{}
341315
resp, err := client.Do(req)
342316
if err != nil {
343-
log.Fatalf("[ERROR %v]", err)
317+
log.Fatalf("[ERROR] %v", err)
344318
}
345319
defer resp.Body.Close()
346320
if resp.StatusCode != http.StatusOK {
@@ -356,7 +330,7 @@ func SendToTelegram(post_data []byte) {
356330
client := &http.Client{}
357331
resp, err := client.Do(req)
358332
if err != nil {
359-
log.Fatalf("[ERROR %v]", err)
333+
log.Fatalf("[ERROR] %v", err)
360334
}
361335
defer resp.Body.Close()
362336
if resp.StatusCode != http.StatusOK {
@@ -386,31 +360,31 @@ func DeleteEmptyMedia(s []telegram_photo_params) []telegram_photo_params {
386360
return r
387361
}
388362

389-
func PostMessage(post_response api.WallGetResponse) {
390-
if len(post_response.Items[0].Attachments) > 0 {
391-
telegram_api_photos := make([]telegram_photo_params, len(post_response.Items[0].Attachments))
392-
telegram_api_audio_params := make([]telegram_audio_params, len(post_response.Items[0].Attachments))
393-
for i := range post_response.Items[0].Attachments {
394-
if post_response.Items[0].Attachments[i].Type == "photo" {
363+
func PostMessage(post_vk object.WallWallpost) {
364+
if len(post_vk.Attachments) != 0 {
365+
telegram_api_photos := make([]telegram_photo_params, len(post_vk.Attachments))
366+
telegram_api_audio_params := make([]telegram_audio_params, len(post_vk.Attachments))
367+
for i := range post_vk.Attachments {
368+
if post_vk.Attachments[i].Type == "photo" {
395369
telegram_api_photos[i].Type_photo = "photo"
396-
telegram_api_photos[i].Media = post_response.Items[0].Attachments[i].Photo.MaxSize().URL
397-
} else if post_response.Items[0].Attachments[i].Type == "doc" && post_response.Items[0].Attachments[i].Doc.Ext == "gif" {
370+
telegram_api_photos[i].Media = post_vk.Attachments[i].Photo.MaxSize().URL
371+
} else if post_vk.Attachments[i].Type == "doc" && post_vk.Attachments[i].Doc.Ext == "gif" {
398372
telegram_api_photos[i].Type_photo = "video"
399-
telegram_api_photos[i].Media = fmt.Sprintf("%v", GetGifURL(post_response.Items[0].Attachments[i].Doc.Preview.Video.Src))
400-
} else if post_response.Items[0].Attachments[i].Type == "video" {
373+
telegram_api_photos[i].Media = fmt.Sprintf("%v", GetGifURL(post_vk.Attachments[i].Doc.Preview.Video.Src))
374+
} else if post_vk.Attachments[i].Type == "video" {
401375
telegram_api_photos[i].Type_photo = "video"
402-
telegram_api_photos[i].Media = fmt.Sprintf("%v", GetVideoURL(post_response.Items[0].Attachments[i].Video.OwnerID, post_response.Items[0].Attachments[i].Video.ID))
403-
} else if post_response.Items[0].Attachments[i].Type == "audio" {
376+
telegram_api_photos[i].Media = fmt.Sprintf("%v", GetVideoURL(post_vk.Attachments[i].Video.OwnerID, post_vk.Attachments[i].Video.ID))
377+
} else if post_vk.Attachments[i].Type == "audio" {
404378
telegram_api_audio_params[i].Type_audio = "audio"
405-
telegram_api_audio_params[i].Media = GetAudioURL(fmt.Sprintf("%v", post_response.Items[0].Attachments[i].Audio.OwnerID), fmt.Sprintf("%v", post_response.Items[0].Attachments[i].Audio.ID))
379+
telegram_api_audio_params[i].Media = GetAudioURL(fmt.Sprintf("%v", post_vk.Attachments[i].Audio.OwnerID), fmt.Sprintf("%v", post_vk.Attachments[i].Audio.ID))
406380
}
407381
}
408382
var telegram_source_link string
409383
if telegram_source_required == "true" {
410-
if post_response.Items[0].Copyright.Link != "" {
411-
telegram_source_link = fmt.Sprintf("\n\n<a href=\"https://vk.com/wall%d_%d\"><b>Ссылка на пост</b></a><b> | </b><a href=\"%s\"><b>Ссылка на источник</b></a>", post_response.Items[0].OwnerID, post_response.Items[0].ID, post_response.Items[0].Copyright.Link)
384+
if post_vk.Copyright.Link != "" {
385+
telegram_source_link = fmt.Sprintf("\n\n<a href=\"https://vk.com/wall%d_%d\"><b>Ссылка на пост</b></a><b> | </b><a href=\"%s\"><b>Ссылка на источник</b></a>", post_vk.OwnerID, post_vk.ID, post_vk.Copyright.Link)
412386
} else {
413-
telegram_source_link = fmt.Sprintf("\n\n<a href=\"https://vk.com/wall%d_%d\"><b>Ссылка на пост</b></a>", post_response.Items[0].OwnerID, post_response.Items[0].ID)
387+
telegram_source_link = fmt.Sprintf("\n\n<a href=\"https://vk.com/wall%d_%d\"><b>Ссылка на пост</b></a>", post_vk.OwnerID, post_vk.ID)
414388
}
415389
}
416390
telegram_api_media := telegram_api_params{}
@@ -421,66 +395,66 @@ func PostMessage(post_response api.WallGetResponse) {
421395
telegram_api_audio_params = DeleteEmptyAudio(telegram_api_audio_params)
422396
if len(telegram_api_photos) == 0 && len(telegram_api_audio_params) == 0 {
423397
log.Print("Poll or something else in post, maybe add them?")
424-
NoAttachPrepare(post_response.Items[0].Text, telegram_source_link)
398+
NoAttachPrepare(post_vk.Text, telegram_source_link)
425399
} else if len(telegram_api_photos) != 0 && len(telegram_api_audio_params) == 0 {
426400
telegram_api_photos[0].Parse_mode = "html"
427-
if post_response.Items[0].Attachments[0].Type == "video" && post_response.Items[0].Attachments[0].Video.Type == "short_video" {
428-
telegram_api_photos[0].Caption = fmt.Sprintf("%s%s", post_response.Items[0].Attachments[0].Video.Description, telegram_source_link)
401+
if post_vk.Attachments[0].Type == "video" && post_vk.Attachments[0].Video.Type == "short_video" {
402+
telegram_api_photos[0].Caption = fmt.Sprintf("%s%s", post_vk.Attachments[0].Video.Description, telegram_source_link)
429403
} else {
430-
telegram_api_photos[0].Caption = fmt.Sprintf("%s%s", post_response.Items[0].Text, telegram_source_link)
404+
telegram_api_photos[0].Caption = fmt.Sprintf("%s%s", post_vk.Text, telegram_source_link)
431405
}
432406
telegram_api_media.Media = telegram_api_photos
433407
tmp_json, err := json.Marshal(telegram_api_media)
434408
if err != nil {
435-
log.Fatalf("[ERROR %v]", err)
409+
log.Fatalf("[ERROR] %v", err)
436410
}
437411
SendToTelegram(tmp_json)
438412
} else if len(telegram_api_photos) == 0 && len(telegram_api_audio_params) != 0 {
439413
telegram_api_audio_params[0].Parse_mode = "html"
440-
telegram_api_photos[0].Caption = fmt.Sprintf("%s%s", post_response.Items[0].Text, telegram_source_link)
414+
telegram_api_photos[0].Caption = fmt.Sprintf("%s%s", post_vk.Text, telegram_source_link)
441415
telegram_api_audio.Media = telegram_api_audio_params
442416
tmp_json, err := json.Marshal(telegram_api_audio)
443417
if err != nil {
444-
log.Fatalf("[ERROR %v]", err)
418+
log.Fatalf("[ERROR] %v", err)
445419
}
446420
SendToTelegram(tmp_json)
447421
} else if len(telegram_api_photos) != 0 && len(telegram_api_audio_params) != 0 {
448422
telegram_api_photos[0].Parse_mode = "html"
449-
telegram_api_photos[0].Caption = fmt.Sprintf("%s%s", post_response.Items[0].Text, telegram_source_link)
423+
telegram_api_photos[0].Caption = fmt.Sprintf("%s%s", post_vk.Text, telegram_source_link)
450424
telegram_api_media.Media = telegram_api_photos
451425
tmp_json, err := json.Marshal(telegram_api_media)
452426
if err != nil {
453-
log.Fatalf("[ERROR %v]", err)
427+
log.Fatalf("[ERROR] %v", err)
454428
}
455429
SendToTelegram(tmp_json)
456430
telegram_api_audio_params[0].Parse_mode = "html"
457-
telegram_api_audio_params[0].Caption = fmt.Sprintf("<b>Пидорасня не дает сделать в одном посте, поэтому отдельно</b>")
431+
telegram_api_audio_params[0].Caption = fmt.Sprintf("")
458432
telegram_api_audio.Media = telegram_api_audio_params
459433
tmp_json_aud, err := json.Marshal(telegram_api_audio)
460434
if err != nil {
461-
log.Fatalf("[ERROR %v]", err)
435+
log.Fatalf("[ERROR] %v", err)
462436
}
463437
SendToTelegram(tmp_json_aud)
464438
}
465439
} else {
466440
var telegram_source_link string
467441
if telegram_source_required == "true" {
468-
if post_response.Items[0].Copyright.Link != "" {
469-
telegram_source_link = fmt.Sprintf("\n\n<a href=\"https://vk.com/wall%d_%d\"><b>Ссылка на пост</b></a><b> | </b><a href=\"%s\"><b>Ссылка на источник</b></a>", post_response.Items[0].OwnerID, post_response.Items[0].ID, post_response.Items[0].Copyright.Link)
442+
if post_vk.Copyright.Link != "" {
443+
telegram_source_link = fmt.Sprintf("\n\n<a href=\"https://vk.com/wall%d_%d\"><b>Ссылка на пост</b></a><b> | </b><a href=\"%s\"><b>Ссылка на источник</b></a>", post_vk.OwnerID, post_vk.ID, post_vk.Copyright.Link)
470444
} else {
471-
telegram_source_link = fmt.Sprintf("\n\n<a href=\"https://vk.com/wall%d_%d\"><b>Ссылка на пост</b></a>", post_response.Items[0].OwnerID, post_response.Items[0].ID)
445+
telegram_source_link = fmt.Sprintf("\n\n<a href=\"https://vk.com/wall%d_%d\"><b>Ссылка на пост</b></a>", post_vk.OwnerID, post_vk.ID)
472446
}
473447
}
474448
log.Print("Post has no media, post caption only\n")
475-
NoAttachPrepare(post_response.Items[0].Text, telegram_source_link)
449+
NoAttachPrepare(post_vk.Text, telegram_source_link)
476450
}
477451
}
478452

479453
func Poll() {
480454
r := rand.New(rand.NewSource(99))
481455
c := time.Tick(10 * time.Second)
482456
for range c {
483-
Request()
457+
Request_VK()
484458
jitter := time.Duration(r.Int31n(5000)) * time.Millisecond
485459
time.Sleep(jitter)
486460
}

0 commit comments

Comments
 (0)