uwaru/matterbridge
1
0
Fork 0
forked from jshiffer/matterbridge
Code Pull Requests Activity

Add UseInsecureURL option (telegram)

Browse Source
This commit is contained in:
Wim 2017-07-04 01:34:02 +02:00
parent c714501a0e
commit 2338c69d40
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bridge/config/config.go
View File

@ -77,6 +77,7 @@ type Protocol struct {
UseSASL bool // IRC UseSASL bool // IRC
UseTLS bool // IRC UseTLS bool // IRC
UseFirstName bool // telegram UseFirstName bool // telegram
UseInsecureURL bool // telegram
WebhookBindAddress string // mattermost, slack WebhookBindAddress string // mattermost, slack
WebhookURL string // mattermost, slack WebhookURL string // mattermost, slack
WebhookUse string // mattermost, slack, discord WebhookUse string // mattermost, slack, discord

8
bridge/telegram/telegram.go
View File

@ -114,18 +114,18 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
if username == "" { if username == "" {
username = "unknown" username = "unknown"
} }
if message.Sticker != nil { if message.Sticker != nil && b.Config.UseInsecureURL {
text = text + " " + b.getFileDirectURL(message.Sticker.FileID) text = text + " " + b.getFileDirectURL(message.Sticker.FileID)
} }
if message.Video != nil { if message.Video != nil && b.Config.UseInsecureURL {
text = text + " " + b.getFileDirectURL(message.Video.FileID) text = text + " " + b.getFileDirectURL(message.Video.FileID)
} }
if message.Photo != nil { if message.Photo != nil && b.Config.UseInsecureURL {
photos := *message.Photo photos := *message.Photo
// last photo is the biggest // last photo is the biggest
text = text + " " + b.getFileDirectURL(photos[len(photos)-1].FileID) text = text + " " + b.getFileDirectURL(photos[len(photos)-1].FileID)
} }
if message.Document != nil { if message.Document != nil && b.Config.UseInsecureURL {
text = text + " " + message.Document.FileName + " : " + b.getFileDirectURL(message.Document.FileID) text = text + " " + message.Document.FileName + " : " + b.getFileDirectURL(message.Document.FileID)
} }
if text != "" { if text != "" {

6
matterbridge.toml.sample
View File

@ -503,6 +503,12 @@ MessageFormat=""
#OPTIONAL (default false) #OPTIONAL (default false)
UseFirstName=false UseFirstName=false
#WARNING! If enabled this will relay GIF/stickers/documents and other attachments as URLs
#Those URLs will contain your bot-token. This may not be what you want.
#For now there is no secure way to relay GIF/stickers/documents without seeing your token.
#OPTIONAL (default false)
UseInsecureURL=false
#Disable sending of edits to other bridges #Disable sending of edits to other bridges
#OPTIONAL (default false) #OPTIONAL (default false)
EditDisable=false EditDisable=false