Make native uploads default for discord.

42wim · Feb 22, 2023 · e4e520e · e4e520e
1 parent e4a672c
commit e4e520e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/bridge/config/config.go b/bridge/config/config.go
@@ -166,7 +166,6 @@ type Protocol struct {
 	URL                    string     // mattermost, slack // DEPRECATED
 	UseAPI                 bool       // mattermost, slack
 	UseLocalAvatar         []string   // discord
-	UseNativeUpload        bool       // discord
 	UseSASL                bool       // IRC
 	UseTLS                 bool       // IRC
 	UseDiscriminator       bool       // discord

diff --git a/bridge/discord/handlers.go b/bridge/discord/handlers.go
@@ -142,14 +142,7 @@ func (b *Bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
 	}
 
 	if len(m.Attachments) > 0 {
-		if b.Config.GetBool("UseNativeUpload") {
-			b.handleDownloadFile(&rmsg, m)
-		} else {
-			// add the url of the attachments to content
-			for _, attach := range m.Attachments {
-				m.Content = m.Content + "\n" + attach.URL
-			}
-		}
+		b.handleDownloadFile(&rmsg, m)
 	}
 
 	hasAttachment := len(rmsg.Extra["file"]) > 0

diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
@@ -907,9 +907,6 @@ ShowEmbeds=false
 # Example: ["irc"]
 UseLocalAvatar=[]
 
-# UseNativeUpload will use a naitive upload when relaying from discord to other platforms rather than using public links
-UseNativeUpload=false
-
 # UseUserName shows the username instead of the server nickname
 UseUserName=false