From 6738a04715b55043fb470f2dbd578b81d728a181 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sat, 6 May 2023 20:18:13 +0300
Subject: [PATCH] Move zerolog.CallerMarshalFunc to mautrix-go

---
 go.mod  |  2 +-
 go.sum  |  4 ++--
 main.go | 15 ---------------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/go.mod b/go.mod
index b52e5ac..a5eaf51 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/stretchr/testify v1.8.2
 	github.com/yuin/goldmark v1.5.4
 	maunium.net/go/maulogger/v2 v2.4.1
-	maunium.net/go/mautrix v0.15.2-0.20230505115924-0f35052822c7
+	maunium.net/go/mautrix v0.15.2-0.20230506171416-973e67d55fe0
 )
 
 require (
diff --git a/go.sum b/go.sum
index 31ab41c..d7a7f84 100644
--- a/go.sum
+++ b/go.sum
@@ -72,5 +72,5 @@ maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
 maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
 maunium.net/go/maulogger/v2 v2.4.1 h1:N7zSdd0mZkB2m2JtFUsiGTQQAdP0YeFWT7YMc80yAL8=
 maunium.net/go/maulogger/v2 v2.4.1/go.mod h1:omPuYwYBILeVQobz8uO3XC8DIRuEb5rXYlQSuqrbCho=
-maunium.net/go/mautrix v0.15.2-0.20230505115924-0f35052822c7 h1:FKSv0JgTa3Ecx0BrPGIWDRoP6dLt94mHcZVhrHn8uVQ=
-maunium.net/go/mautrix v0.15.2-0.20230505115924-0f35052822c7/go.mod h1:XM6eY4GfAZy2MaVeQrw8K3HjjkEGmiGReG/yWmZIkbM=
+maunium.net/go/mautrix v0.15.2-0.20230506171416-973e67d55fe0 h1:NBszqQxZQNCFecJzR0EiFtauUmyt8GrGVQDH8aQaf5w=
+maunium.net/go/mautrix v0.15.2-0.20230506171416-973e67d55fe0/go.mod h1:XM6eY4GfAZy2MaVeQrw8K3HjjkEGmiGReG/yWmZIkbM=
diff --git a/main.go b/main.go
index 8e380ab..fda2bee 100644
--- a/main.go
+++ b/main.go
@@ -18,13 +18,8 @@ package main
 
 import (
 	_ "embed"
-	"fmt"
-	"runtime"
-	"strings"
 	"sync"
 
-	"github.com/rs/zerolog"
-
 	"maunium.net/go/mautrix/bridge"
 	"maunium.net/go/mautrix/bridge/commands"
 	"maunium.net/go/mautrix/id"
@@ -101,16 +96,6 @@ func (br *DiscordBridge) Init() {
 
 	br.DB = database.New(br.Bridge.DB, br.Log.Sub("Database"))
 	discordLog = br.ZLog.With().Str("component", "discordgo").Logger()
-
-	// TODO move this to mautrix-go?
-	zerolog.CallerMarshalFunc = func(pc uintptr, file string, line int) string {
-		files := strings.Split(file, "/")
-		file = files[len(files)-1]
-		name := runtime.FuncForPC(pc).Name()
-		fns := strings.Split(name, ".")
-		name = fns[len(fns)-1]
-		return fmt.Sprintf("%s:%d:%s()", file, line, name)
-	}
 }
 
 func (br *DiscordBridge) Start() {