From fd14228789452c326f376b37c3c8f0c4fa32fde2 Mon Sep 17 00:00:00 2001 From: zhaoYangguang <1163765691@qq.com> Date: Mon, 29 Nov 2021 19:51:24 +0800 Subject: [PATCH] Standardize some log printing --- matrix.go | 75 +++++++++++++++++++++---------------------------------- portal.go | 20 +++++++-------- puppet.go | 18 ++++--------- user.go | 18 ++++++------- 4 files changed, 52 insertions(+), 79 deletions(-) diff --git a/matrix.go b/matrix.go index 74a5396..3b3455b 100644 --- a/matrix.go +++ b/matrix.go @@ -155,7 +155,6 @@ func (mx *MatrixHandler) handlePrivatePortal(roomID id.RoomID, inviter *User, pu _, _ = intent.LeaveRoom(roomID) } - func (mx *MatrixHandler) createPrivatePortalFromInvite(roomID id.RoomID, inviter *User, puppet *Puppet, portal *Portal) { portal.MXID = roomID portal.Topic = "Skype private chat" @@ -169,21 +168,21 @@ func (mx *MatrixHandler) createPrivatePortalFromInvite(roomID id.RoomID, inviter } else { portal.Name = "" } - portal.log.Infoln("Created private chat portal in %s after invite from", roomID, inviter.MXID) + mx.log.Infoln("Created private chat portal in %s after invite from", roomID, inviter.MXID) intent := puppet.DefaultIntent() if mx.bridge.Config.Bridge.Encryption.Default { _, err := intent.InviteUser(roomID, &mautrix.ReqInviteUser{UserID: mx.bridge.Bot.UserID}) if err != nil { - portal.log.Warnln("Failed to invite bridge bot to enable e2be:", err) + mx.log.Warnln("Failed to invite bridge bot to enable e2be:", err) } err = mx.bridge.Bot.EnsureJoined(roomID) if err != nil { - portal.log.Warnln("Failed to join as bridge bot to enable e2be:", err) + mx.log.Warnln("Failed to join as bridge bot to enable e2be:", err) } _, err = intent.SendStateEvent(roomID, event.StateEncryption, "", &event.EncryptionEventContent{Algorithm: id.AlgorithmMegolmV1}) if err != nil { - portal.log.Warnln("Failed to enable e2be:", err) + mx.log.Warnln("Failed to enable e2be:", err) } mx.as.StateStore.SetMembership(roomID, inviter.MXID, event.MembershipJoin) mx.as.StateStore.SetMembership(roomID, puppet.MXID, event.MembershipJoin) @@ -196,7 +195,7 @@ func (mx *MatrixHandler) createPrivatePortalFromInvite(roomID id.RoomID, inviter err := portal.FillInitialHistory(inviter) if err != nil { - portal.log.Errorln("Failed to fill history:", err) + mx.log.Errorln("Failed to fill history:", err) } inviter.addPortalToCommunity(portal) @@ -211,14 +210,10 @@ func (mx *MatrixHandler) HandlePuppetInvite(evt *event.Event, inviter *User, pup } var hasBridgeBot, hasOtherUsers bool for mxid, _ := range members.Joined { - fmt.Println() - fmt.Println() - fmt.Println("HandlePuppetInvite mxid", mxid) - fmt.Println("HandlePuppetInvite intent.UserID", intent.UserID) - fmt.Println("HandlePuppetInvite patch.Parse(intent.UserID)", id.UserID(patch.Parse(string(intent.UserID)))) - fmt.Println("HandlePuppetInvite inviter.MXID", inviter.MXID) - fmt.Println() - fmt.Println() + mx.log.Debugfln("HandlePuppetInvite mxid", mxid) + mx.log.Debugfln("HandlePuppetInvite intent.UserID", intent.UserID) + mx.log.Debugfln("HandlePuppetInvite patch.Parse(intent.UserID)", id.UserID(patch.Parse(string(intent.UserID)))) + mx.log.Debugfln("HandlePuppetInvite inviter.MXID", inviter.MXID) if mxid == id.UserID(patch.Parse(string(intent.UserID))) || mxid == inviter.MXID { continue } else if mxid == mx.bridge.Bot.UserID { @@ -240,8 +235,8 @@ func (mx *MatrixHandler) HandlePuppetInvite(evt *event.Event, inviter *User, pup } func (mx *MatrixHandler) HandleMembership(evt *event.Event) { - fmt.Println("HandleMembership0 evt.Sender:", evt.Sender) - fmt.Println("HandleMembership0 evt.GetStateKey:", evt.GetStateKey()) + mx.log.Debugfln("HandleMembership evt.Sender:", evt.Sender) + mx.log.Debugfln("HandleMembership evt.GetStateKey:", evt.GetStateKey()) if _, isPuppet := mx.bridge.ParsePuppetMXID(evt.Sender); evt.Sender == mx.bridge.Bot.UserID || isPuppet { return } @@ -270,9 +265,9 @@ func (mx *MatrixHandler) HandleMembership(evt *event.Event) { return } isSelf := id.UserID(evt.GetStateKey()) == evt.Sender - fmt.Println("HandleMembership isSelf:", isSelf) - fmt.Println("HandleMembership id.UserID(evt.GetStateKey()):", id.UserID(evt.GetStateKey())) - fmt.Println("HandleMembership evt.Sender:", evt.Sender) + mx.log.Debugfln("HandleMembership isSelf:", isSelf) + mx.log.Debugfln("HandleMembership id.UserID(evt.GetStateKey()):", id.UserID(evt.GetStateKey())) + mx.log.Debugfln("HandleMembership evt.Sender:", evt.Sender) if content.Membership == event.MembershipLeave { if id.UserID(evt.GetStateKey()) == evt.Sender { if evt.Unsigned.PrevContent != nil { @@ -285,13 +280,10 @@ func (mx *MatrixHandler) HandleMembership(evt *event.Event) { } } } else { - fmt.Println() - fmt.Println() - fmt.Println("HandleMembership evt.RoomID", evt.RoomID) - fmt.Println("HandleMembership id.UserID(evt.GetStateKey())", id.UserID(evt.GetStateKey())) - fmt.Println("HandleMembership event.MembershipLeave", event.MembershipLeave) - fmt.Println("HandleMembership user.", event.MembershipLeave) - fmt.Println() + mx.log.Debugfln("HandleMembership evt.RoomID", evt.RoomID) + mx.log.Debugfln("HandleMembership id.UserID(evt.GetStateKey())", id.UserID(evt.GetStateKey())) + mx.log.Debugfln("HandleMembership event.MembershipLeave", event.MembershipLeave) + mx.log.Debugfln("HandleMembership user.", event.MembershipLeave) //mx.as.StateStore.SetMembership(evt.RoomID, id.UserID(evt.GetStateKey()), event.MembershipLeave) portal.HandleMatrixKick(user, evt) } @@ -327,13 +319,13 @@ func (mx *MatrixHandler) HandleRoomMetadata(evt *event.Event) { case *event.RoomAvatarEventContent: data, err := portal.MainIntent().DownloadBytes(content.URL) if err != nil { - portal.log.Errorfln("Failed to download media in %v", err) + mx.log.Errorfln("Failed to download media in %v", err) return } _, fileId, _, err := user.Conn.UploadFile(portal.Key.JID, &skype.SendMessage{ - Jid: portal.Key.JID, + Jid: portal.Key.JID, ClientMessageId: "", - Type: "avatar/group", + Type: "avatar/group", SendMediaMessage: &skype.SendMediaMessage{ FileName: "avatar", RawData: data, @@ -359,11 +351,8 @@ func (mx *MatrixHandler) HandleRoomMetadata(evt *event.Event) { func (mx *MatrixHandler) shouldIgnoreEvent(evt *event.Event) bool { if _, isPuppet := mx.bridge.ParsePuppetMXID(evt.Sender); evt.Sender == mx.bridge.Bot.UserID || isPuppet { - fmt.Println() - fmt.Printf("shouldIgnoreEvent: isPuppet%+v", isPuppet) - fmt.Println() - fmt.Printf("shouldIgnoreEvent: isPuppet%+v", evt.Sender) - fmt.Println() + mx.log.Debugfln("shouldIgnoreEvent: isPuppet%+v", isPuppet) + mx.log.Debugfln("shouldIgnoreEvent: isPuppet%+v", evt.Sender) return true } isCustomPuppet, ok := evt.Content.Raw["net.maunium.skype.puppet"].(bool) @@ -371,20 +360,18 @@ func (mx *MatrixHandler) shouldIgnoreEvent(evt *event.Event) bool { return true } user := mx.bridge.GetUserByMXID(evt.Sender) - fmt.Println() - fmt.Printf("shouldIgnoreEvent: user%+v", *user) - fmt.Println() + mx.log.Debugfln("shouldIgnoreEvent: user%+v", *user) if !user.RelaybotWhitelisted { - fmt.Println("user.RelaybotWhitelisted true", user.RelaybotWhitelisted) + mx.log.Debugfln("user.RelaybotWhitelisted true", user.RelaybotWhitelisted) return true } - fmt.Println("shouldIgnoreEvent: false") + mx.log.Debugfln("shouldIgnoreEvent: false") return false } func (mx *MatrixHandler) HandleEncrypted(evt *event.Event) { if mx.shouldIgnoreEvent(evt) || mx.bridge.Crypto == nil { - fmt.Println("HandleEncrypted return 1") + mx.log.Debugfln("HandleEncrypted return 1") return } @@ -414,13 +401,9 @@ func (mx *MatrixHandler) HandleMessage(evt *event.Event) { return } } - fmt.Println() - fmt.Printf("HandleMessage evt.RoomID1: %+v", evt.RoomID) - fmt.Println() + mx.log.Debugfln("HandleMessage evt.RoomID1: %+v", evt.RoomID) portal := mx.bridge.GetPortalByMXID(evt.RoomID) - fmt.Println() - fmt.Printf("HandleMessage portal: %+v", portal) - fmt.Println() + mx.log.Debugfln("HandleMessage portal: %+v", portal) if user.Conn != nil && portal != nil && (user.Whitelisted || portal.HasRelaybot()) { portal.HandleMatrixMessage(user, evt) } diff --git a/portal.go b/portal.go index b1fd51b..2b72be2 100644 --- a/portal.go +++ b/portal.go @@ -2194,7 +2194,7 @@ func (portal *Portal) HandleMatrixMessage(sender *User, evt *event.Event) { portal.log.Debugfln("Received event %s", evt.ID) info, sender, _ := portal.convertMatrixMessageSkype(sender, evt) if info == nil { - fmt.Println("portal HandleMatrixMessage info is nil: ") + portal.log.Debugfln("portal HandleMatrixMessage info is nil: ") return } @@ -2205,7 +2205,7 @@ func (portal *Portal) HandleMatrixMessage(sender *User, evt *event.Event) { content = info.SendTextMessage.Content } - fmt.Println("portal HandleMatrixMessage start markHandledSkype: ") + portal.log.Debugln("portal HandleMatrixMessage start markHandledSkype: ") portal.markHandledSkype(sender, &skype.Resource{ ClientMessageId: info.ClientMessageId, Jid: portal.Key.JID, //receiver id(conversation id) @@ -2216,7 +2216,7 @@ func (portal *Portal) HandleMatrixMessage(sender *User, evt *event.Event) { errChan := make(chan error, 1) //go sender.Conn.Conn.SendMsg(portal.Key.JID, info.Content, info.ClientMessageId, errChan) - go SendMsg(sender, portal.Key.JID, info, errChan) + go portal.SendMsg(sender, portal.Key.JID, info, errChan) var err error var errorEventID id.EventID select { @@ -2249,26 +2249,26 @@ func (portal *Portal) HandleMatrixMessage(sender *User, evt *event.Event) { } } -func SendMsg(sender *User, chatThreadId string, content *skype.SendMessage, output chan<- error) (err error) { - fmt.Println("message SendMsg type: ", content.Type) +func (portal *Portal) SendMsg(sender *User, chatThreadId string, content *skype.SendMessage, output chan<- error) (err error) { + portal.log.Debugln("message SendMsg type: ", content.Type) if sender.Conn.LoginInfo != nil && sender.Conn.LoggedIn != false { switch event.MessageType(content.Type) { case event.MsgText, event.MsgEmote, event.MsgNotice: err = sender.Conn.SendText(chatThreadId, content) case event.MsgImage: - fmt.Println("message SendMsg type m.image: ", content.Type) + portal.log.Debugln("message SendMsg type m.image: ", content.Type) err = sender.Conn.SendFile(chatThreadId, content) case event.MsgVideo: - fmt.Println("message SendMsg type m.video: ", content.Type) + portal.log.Debugln("message SendMsg type m.video: ", content.Type) err = sender.Conn.SendFile(chatThreadId, content) case event.MsgAudio: - fmt.Println("message SendMsg type m.audio: ", content.Type) + portal.log.Debugln("message SendMsg type m.audio: ", content.Type) err = sender.Conn.SendFile(chatThreadId, content) case event.MsgFile: - fmt.Println("message SendMsg type m.file: ", content.Type) + portal.log.Debugln("message SendMsg type m.file: ", content.Type) err = sender.Conn.SendFile(chatThreadId, content) case event.MsgLocation: - fmt.Println("message SendMsg type m.location: ", content.Type) + portal.log.Debugln("message SendMsg type m.location: ", content.Type) //err = c.SendFile(chatThreadId, content) default: err = errors.New("send to skype(unknown message type)") diff --git a/puppet.go b/puppet.go index 15bdfdc..995eadc 100644 --- a/puppet.go +++ b/puppet.go @@ -166,21 +166,15 @@ func (puppet *Puppet) PhoneNumber() string { } func (puppet *Puppet) IntentFor(portal *Portal) *appservice.IntentAPI { - fmt.Println() - fmt.Printf("puppent IntentFor: %+v", puppet) - fmt.Println() + puppet.log.Debugln("puppent IntentFor: %+v", puppet) if (!portal.IsPrivateChat() && puppet.customIntent == nil) || (portal.backfilling && portal.bridge.Config.Bridge.InviteOwnPuppetForBackfilling) || portal.Key.JID + skypeExt.NewUserSuffix == puppet.JID { - fmt.Println() - fmt.Println("puppent IntentFor0:", portal.Key.JID, puppet.JID) - fmt.Println("puppent IntentFor0:", portal.Key.JID, puppet.JID) - fmt.Println() + puppet.log.Debugln("puppent IntentFor0:", portal.Key.JID, puppet.JID) + puppet.log.Debugln("puppent IntentFor0:", portal.Key.JID, puppet.JID) return puppet.DefaultIntent() } - fmt.Println() - fmt.Printf("puppent IntentFor2: %+v", puppet.customIntent) - fmt.Println() + puppet.log.Debugln("puppent IntentFor2: %+v", puppet.customIntent) if portal.IsPrivateChat() && puppet.customIntent == nil{ return puppet.DefaultIntent() } @@ -192,9 +186,7 @@ func (puppet *Puppet) CustomIntent() *appservice.IntentAPI { } func (puppet *Puppet) DefaultIntent() *appservice.IntentAPI { - fmt.Println() - fmt.Println("DefaultIntent puppet.MXID: ", puppet.MXID) - fmt.Println() + puppet.log.Debugln("DefaultIntent puppet.MXID: ", puppet.MXID) return puppet.bridge.AS.Intent(puppet.MXID) } diff --git a/user.go b/user.go index 7dc6dc3..dbeb68c 100644 --- a/user.go +++ b/user.go @@ -5,10 +5,12 @@ import ( "encoding/xml" "errors" "fmt" + "sort" + skype "github.com/kelaresg/go-skypeapi" skypeExt "github.com/kelaresg/matrix-skype/skype-ext" "maunium.net/go/mautrix/patch" - "sort" + //"strconv" "strings" "sync" @@ -59,11 +61,9 @@ type User struct { func (bridge *Bridge) GetUserByMXID(userID id.UserID) *User { _, isPuppet := bridge.ParsePuppetMXID(userID) - fmt.Println("GetUserByMXID0", userID) - fmt.Println("GetUserByMXID1", bridge.Bot.UserID) + bridge.Log.Debugln("GetUserByMXID userID", userID) + bridge.Log.Debugln("GetUserByMXID bridge.Bot.UserID", bridge.Bot.UserID) if isPuppet || userID == bridge.Bot.UserID { - fmt.Println("GetUserByMXID2", userID) - fmt.Println("GetUserByMXID3", bridge.Bot.UserID) return nil } bridge.usersLock.Lock() @@ -86,6 +86,7 @@ func (bridge *Bridge) GetUserByJID(userID types.SkypeID) *User { } func (user *User) getSkypeIdByMixId() (skypeId string) { + // TODO check this mixIdArr := strings.Split(string(user.MXID), "&") idArr := strings.Split(mixIdArr[1], ":"+user.bridge.Config.Homeserver.Domain) skypeId = strings.Replace(idArr[0], "-", ":", 2) @@ -362,7 +363,7 @@ func (user *User) Login(ce *CommandEvent, name string, password string) (err err ce.Reply("Successfully logged in as @" + username + ", orgid is " + orgId) user.Conn.Subscribes() // subscribe basic event - err = user.Conn.Conn.ContactList(user.Conn.UserProfile.Username) + err = user.Conn.ContactList(user.Conn.UserProfile.Username) if err == nil { var userIds []string for _, contact := range user.Conn.Store.Contacts { @@ -620,11 +621,8 @@ func (user *User) syncPuppets(contacts map[string]skype.Contact) { PersonId: user.Conn.UserProfile.Username, } for personId, contact := range contacts { - fmt.Println("Syncing puppet info from contacts", personId) - user.log.Infoln("Syncing puppet info from contacts", strings.HasSuffix(personId, skypeExt.NewUserSuffix)) - fmt.Println("Syncing puppet info from contacts", skypeExt.NewUserSuffix) + user.log.Infoln("Syncing puppet info from contacts", personId, skypeExt.NewUserSuffix) if strings.HasSuffix(personId, skypeExt.NewUserSuffix) { - fmt.Println("Syncing puppet info from contacts i am coming") puppet := user.bridge.GetPuppetByJID(personId) puppet.Sync(user, contact) }