nquidox/telegram-to-discord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

format change

Browse source
This commit is contained in:
nquidox 2026-03-05 16:20:28 +03:00
parent fd7868128a
commit 5f72059bb6
2 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
discordBot/handler.go
View file

@ -65,7 +65,7 @@ func (d *DiscordBot) Start(fromTelegram <-chan dto.TelegramDTO) chan dto.Discord
files = append(files, file) files = append(files, file)
} }
m := discord.MessageCreate{Content: fmt.Sprintf("[%s]\n%s", msg.AuthorName, msg.Content)} m := discord.MessageCreate{Content: fmt.Sprintf("**[%s]**\n%s", msg.AuthorName, msg.Content)}
if len(files) > 0 { if len(files) > 0 {
m.Files = append(m.Files, files...) m.Files = append(m.Files, files...)

23
tgBot/handler.go
View file

@ -57,11 +57,13 @@ func (b *TgBot) Start(fromDiscord chan dto.DiscordDTO) chan dto.TelegramDTO {
go func() { go func() {
for msg := range fromDiscord { for msg := range fromDiscord {
log.WithField("content", msg).Debug("TG | Message from Discord") log.WithField("content", msg).Debug("TG | Message from Discord")
m := fmt.Sprintf("[%s]\n%s", msg.AuthorName, msg.Content)
m := fmt.Sprintf("*\\[ %s \\]*\n%s", msg.AuthorName, msg.Content)
b.bot.SendMessage(b.ctx, &bot.SendMessageParams{ b.bot.SendMessage(b.ctx, &bot.SendMessageParams{
ChatID: b.chatID, ChatID: b.chatID,
Text: m, Text: m,
ParseMode: "",
}) })
if msg.Images != nil { if msg.Images != nil {
@ -69,7 +71,7 @@ func (b *TgBot) Start(fromDiscord chan dto.DiscordDTO) chan dto.TelegramDTO {
for _, img := range *msg.Images { for _, img := range *msg.Images {
photo := &models.InputMediaPhoto{ photo := &models.InputMediaPhoto{
Media: fmt.Sprintf("attach://%s", img.Filename), Media: fmt.Sprintf("attach://%s", img.Filename),
Caption: "test caption", //Caption: "test caption",
MediaAttachment: bytes.NewReader(img.Data), MediaAttachment: bytes.NewReader(img.Data),
} }
mediaGroup = append(mediaGroup, photo) mediaGroup = append(mediaGroup, photo)
@ -146,7 +148,7 @@ func (b *TgBot) proccessSimple(update *models.Update, msgChan chan<- dto.Telegra
} }
msg := dto.TelegramDTO{ msg := dto.TelegramDTO{
AuthorName: update.Message.From.Username, AuthorName: b.getName(update),
Content: content, Content: content,
Images: &images, Images: &images,
} }
@ -185,7 +187,7 @@ func (b *TgBot) processMediaGroup(update *models.Update, mediaGroupID string, ms
delete(b.mediaGroupCache, mediaGroupID) delete(b.mediaGroupCache, mediaGroupID)
msg := dto.TelegramDTO{ msg := dto.TelegramDTO{
AuthorName: update.Message.From.Username, AuthorName: b.getName(update),
Content: content, Content: content,
Images: &images, Images: &images,
} }
@ -193,3 +195,16 @@ func (b *TgBot) processMediaGroup(update *models.Update, mediaGroupID string, ms
msgChan <- msg msgChan <- msg
}() }()
} }
func (b *TgBot) getName(update *models.Update) string {
switch {
case update.Message.From.Username != "":
return update.Message.From.Username
case update.Message.From.FirstName != "":
return update.Message.From.FirstName
case update.Message.From.LastName != "":
return update.Message.From.LastName
default:
return "No name"
}
}