From 089d00b47e46af8ef4cb6ee7f54393351b22682b Mon Sep 17 00:00:00 2001 From: Alexander PapaTutuWawa Date: Wed, 15 Apr 2020 23:28:13 +0200 Subject: [PATCH] Move the RegExp compilation into the package --- bridge/xmpp/helpers.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bridge/xmpp/helpers.go b/bridge/xmpp/helpers.go index 97edf763..eb6a5366 100644 --- a/bridge/xmpp/helpers.go +++ b/bridge/xmpp/helpers.go @@ -6,12 +6,13 @@ import ( "github.com/42wim/matterbridge/bridge/config" ) +var pathRegex = regexp.MustCompile("[^a-zA-Z0-9]+") + // GetAvatar constructs a URL for a given user-avatar if it is available in the cache. func getAvatar(av map[string]string, userid string, general *config.Protocol) string { if hash, ok := av[userid]; ok { // NOTE: This does not happen in bridge/helper/helper.go but messes up XMPP - reg := regexp.MustCompile("[^a-zA-Z0-9]+") - id := reg.ReplaceAllString(userid, "_") + id := pathRegex.ReplaceAllString(userid, "_") return general.MediaServerDownload + "/" + hash + "/" + id + ".png" } return ""