From f8d359d6e2b4a560c981ff0437fdc0800712cca8 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Mon, 27 Feb 2023 03:19:44 -0500
Subject: [PATCH] fix bug

---
 bridge/api/api.go   | 6 ++++++
 gateway/handlers.go | 7 +------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bridge/api/api.go b/bridge/api/api.go
index 515007f0..f15372c3 100644
--- a/bridge/api/api.go
+++ b/bridge/api/api.go
@@ -13,6 +13,7 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	ring "github.com/zfjagann/golang-ring"
+	"github.com/mitchellh/mapstructure"
 )
 
 type API struct {
@@ -137,6 +138,11 @@ func (b *API) handlePostMessage(c echo.Context) error {
 	message.Account = b.Account
 	message.ID = ""
 	message.Timestamp = time.Now()
+	for i, f := range message.Extra["file"] {
+		fi := config.FileInfo{}
+		mapstructure.Decode(f.(map[string]interface{}), &fi)
+		message.Extra["file"][i] = fi
+	}
 	b.Log.Debugf("Sending message from %s on %s to gateway", message.Username, "api")
 	b.Remote <- message
 	return c.JSON(http.StatusOK, message)
diff --git a/gateway/handlers.go b/gateway/handlers.go
index f59a987e..44cefe45 100644
--- a/gateway/handlers.go
+++ b/gateway/handlers.go
@@ -15,7 +15,6 @@ import (
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/gateway/bridgemap"
-	"github.com/mitchellh/mapstructure"
 )
 
 // handleEventFailure handles failures and reconnects bridges.
@@ -85,11 +84,7 @@ func (gw *Gateway) handleFiles(msg *config.Message) {
 	}
 
 	for i, f := range msg.Extra["file"] {
-		fi, ok := f.(config.FileInfo)
-		if !ok {
-			fi = config.FileInfo{}
-			mapstructure.Decode(f.(map[string]interface{}), &fi)
-		}
+		fi := f.(config.FileInfo)
 		ext := filepath.Ext(fi.Name)
 		fi.Name = fi.Name[0 : len(fi.Name)-len(ext)]
 		fi.Name = reg.ReplaceAllString(fi.Name, "_")