From 0e2522279e8671a345c1be6b8b07c0f1a505e23e Mon Sep 17 00:00:00 2001
From: David Hill <dhill@mindcry.org>
Date: Wed, 7 Nov 2018 14:36:50 -0500
Subject: Clean up various stuff (#508)

* various cleanups
---
 bridge/xmpp/xmpp.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'bridge/xmpp')

diff --git a/bridge/xmpp/xmpp.go b/bridge/xmpp/xmpp.go
index 4ace2abd..4d6cc3cf 100644
--- a/bridge/xmpp/xmpp.go
+++ b/bridge/xmpp/xmpp.go
@@ -75,8 +75,6 @@ func (b *Bxmpp) JoinChannel(channel config.ChannelInfo) error {
 }
 
 func (b *Bxmpp) Send(msg config.Message) (string, error) {
-	var msgid = ""
-	var msgreplaceid = ""
 	// ignore delete messages
 	if msg.Event == config.EVENT_MSG_DELETE {
 		return "", nil
@@ -93,7 +91,8 @@ func (b *Bxmpp) Send(msg config.Message) (string, error) {
 		}
 	}
 
-	msgid = xid.New().String()
+	var msgreplaceid string
+	msgid := xid.New().String()
 	if msg.ID != "" {
 		msgid = msg.ID
 		msgreplaceid = msg.ID
-- 
cgit v1.2.3