From 2338c69d402ad3779f4e2a2f38ac800ceca656b9 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Tue, 4 Jul 2017 01:34:02 +0200
Subject: Add UseInsecureURL option (telegram)

---
 bridge/config/config.go     | 1 +
 bridge/telegram/telegram.go | 8 ++++----
 matterbridge.toml.sample    | 6 ++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bridge/config/config.go b/bridge/config/config.go
index fc41fe02..69a13e43 100644
--- a/bridge/config/config.go
+++ b/bridge/config/config.go
@@ -77,6 +77,7 @@ type Protocol struct {
 	UseSASL                bool   // IRC
 	UseTLS                 bool   // IRC
 	UseFirstName           bool   // telegram
+	UseInsecureURL         bool   // telegram
 	WebhookBindAddress     string // mattermost, slack
 	WebhookURL             string // mattermost, slack
 	WebhookUse             string // mattermost, slack, discord
diff --git a/bridge/telegram/telegram.go b/bridge/telegram/telegram.go
index 48ad672a..ce43b344 100644
--- a/bridge/telegram/telegram.go
+++ b/bridge/telegram/telegram.go
@@ -114,18 +114,18 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
 		if username == "" {
 			username = "unknown"
 		}
-		if message.Sticker != nil {
+		if message.Sticker != nil && b.Config.UseInsecureURL {
 			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)
 		}
-		if message.Photo != nil {
+		if message.Photo != nil && b.Config.UseInsecureURL {
 			photos := *message.Photo
 			// last photo is the biggest
 			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)
 		}
 		if text != "" {
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index c725b141..dac68da8 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -503,6 +503,12 @@ MessageFormat=""
 #OPTIONAL (default 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
 #OPTIONAL (default false)
 EditDisable=false
-- 
cgit v1.2.3