This commit is contained in:
taz
2025-08-13 14:25:58 +02:00
parent d80277c4f1
commit 41713066df
3 changed files with 43 additions and 42 deletions
+10 -11
View File
@@ -37,41 +37,40 @@ func main() {
case from == "telegram":
// В Discord и VK
if discordChannelID != "" {
_ = bridge.SendToDiscord(discordChannelID, "[TG] "+text)
_ = bridge.SendToDiscord(discordChannelID, "[TG] "+from+": "+text)
}
if vkPeerID != "" {
// конвертация vkPeerID в int
if id, err := strconv.Atoi(vkPeerID); err == nil {
_ = bridge.SendToVK(id, "[TG] "+text)
_ = bridge.SendToVK(id, "[TG] "+from+": "+text)
}
}
case from == "discord":
// В Telegram и VK
if telegramChatID != "" {
if id, err := strconv.ParseInt(telegramChatID, 10, 64); err == nil {
_ = bridge.SendToTelegram(id, "[DS] "+text)
_ = bridge.SendToTelegram(id, "[DS] "+from+": "+text)
}
}
if vkPeerID != "" {
if id, err := strconv.Atoi(vkPeerID); err == nil {
_ = bridge.SendToVK(id, "[DS] "+text)
_ = bridge.SendToVK(id, "[DS] "+from+": "+text)
}
}
case from == "vk":
// В Telegram и Discord
default:
// Считаем, что from — это VK ID
if telegramChatID != "" {
if id, err := strconv.ParseInt(telegramChatID, 10, 64); err == nil {
_ = bridge.SendToTelegram(id, "[VK] "+text)
_ = bridge.SendToTelegram(id, "[VK] VK ID "+from+": "+text)
}
}
if discordChannelID != "" {
_ = bridge.SendToDiscord(discordChannelID, "[VK] "+text)
_ = bridge.SendToDiscord(discordChannelID, "[VK] VK ID "+from+": "+text)
}
}
}
bridge.StartTelegramListener(func(text, _ string) { forward(text, "telegram") })
bridge.StartDiscordListener(func(text, _ string) { forward(text, "discord") })
bridge.StartTelegramListener(func(text, from string) { forward(text, from) })
bridge.StartDiscordListener(func(text, from string) { forward(text, from) })
bridge.StartVKListener(func(text, _ string) { forward(text, "vk") })
select {} // Блокируем main, чтобы слушатели работали
+1
View File
@@ -17,6 +17,7 @@ func (b *Bridge) StartTelegramListener(forward func(text string, from string)) {
continue
}
log.Printf("[Telegram] %s: %s", update.Message.From.UserName, update.Message.Text)
// Передаём имя отправителя
forward(update.Message.Text, update.Message.From.UserName)
}
}()
+2 -1
View File
@@ -29,7 +29,8 @@ func (b *Bridge) StartVKListener(forward func(text string, from string)) {
lp.MessageNew(func(_ context.Context, obj events.MessageNewObject) {
log.Printf("[VK] %d: %s", obj.Message.FromID, obj.Message.Text)
forward(obj.Message.Text, "vk:"+strconv.Itoa(obj.Message.FromID))
// Передаём текст и имя отправителя (ID)
forward(obj.Message.Text, strconv.Itoa(obj.Message.FromID))
})
go lp.Run()
}