Skip to content

Add minimal additional SMS/room-creation tracing #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add minimal additional SMS/room-creation tracing #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions imessage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,13 @@ func (imh *iMessageHandler) rerouteGroupMMS(portal *Portal, msg *imessage.Messag
return portal
}
mergedChatGUID := imh.bridge.DB.MergedChat.Get(portal.GUID)
imh.bridge.ZLog.Trace().
Str("portal_guid", portal.GUID).
Str("merged_chat_guid", mergedChatGUID).
Str("portal_mxid", portal.MXID.String()).
Str("msg_guid", msg.GUID).
Str("msg_chatguid", msg.ChatGUID).
Msg("rerouteGroupMMS")
if mergedChatGUID != "" && mergedChatGUID != portal.GUID {
newPortal := imh.bridge.GetPortalByGUID(mergedChatGUID)
if newPortal.MXID != "" {
Expand Down Expand Up @@ -154,6 +161,10 @@ func (imh *iMessageHandler) updateChatGUIDByThreadID(portal *Portal, threadID st
if len(portal.MXID) > 0 || !portal.Identifier.IsGroup || threadID == "" || portal.bridge.Config.IMessage.Platform == "android" {
return portal
}
imh.bridge.ZLog.Trace().
Str("portal_guid", portal.GUID).
Str("thread_id", threadID).
Msg("updateChatGUIDByThreadID")
existingByThreadID := imh.bridge.FindPortalsByThreadID(threadID)
if len(existingByThreadID) > 1 {
imh.log.Warnfln("Found multiple portals with thread ID %s (message chat guid: %s)", threadID, portal.GUID)
Expand All @@ -175,9 +186,11 @@ func (imh *iMessageHandler) getPortalFromMessage(msg *imessage.Message) *Portal
}

func (imh *iMessageHandler) HandleMessage(msg *imessage.Message) {
imh.log.Debugfln("Received incoming message %s in %s (%s)", msg.GUID, msg.ChatGUID, msg.ThreadID)
// TODO trace log
//imh.log.Debugfln("Received incoming message: %+v", msg)
imh.bridge.ZLog.Debug().
Str("msg_guid", msg.GUID).
Str("msg_chatguid", msg.ChatGUID).
Str("msg_threadid", msg.ThreadID).
Msg("HandleMessage")
portal := imh.updateChatGUIDByThreadID(
imh.rerouteGroupMMS(
imh.bridge.GetPortalByGUID(msg.ChatGUID),
Expand Down
38 changes: 37 additions & 1 deletion portal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,21 +76,35 @@ func (br *IMBridge) GetPortalByGUIDIfExists(guid string) *Portal {
}

func (br *IMBridge) maybeGetPortalByGUID(txn dbutil.Execable, guid string, createIfNotExist bool) *Portal {
br.ZLog.Trace().
Str("guid", guid).
Bool("create_if", createIfNotExist).
Msg("maybeGetPortalByGUID")
orig_guid := guid
if br.Config.Bridge.DisableSMSPortals && strings.HasPrefix(guid, "SMS;-;") {
parsed := imessage.ParseIdentifier(guid)
if !parsed.IsGroup && parsed.Service == "SMS" {
parsed.Service = "iMessage"
br.Log.Infofln("disable_sms_portals: true; mapping '%s' -> '%s'", guid, parsed.String())
guid = parsed.String()
}
}
fallbackGUID := guid
if !createIfNotExist {
fallbackGUID = ""
}

orig_portal, orig_ok := br.portalsByGUID[orig_guid]
portal, ok := br.portalsByGUID[guid]
if !ok {
return br.loadDBPortal(txn, br.DB.Portal.GetByGUID(guid), fallbackGUID)
res := br.loadDBPortal(txn, br.DB.Portal.GetByGUID(guid), fallbackGUID)
br.Log.Infofln("maybeGetPortalByGuid(): portalsByGuid[%s]=nil, loaded portal %s", guid, res.GUID)
return res
}
if orig_ok && orig_portal.GUID != portal.GUID {
br.Log.Infofln("maybeGetPortalByGuid(): portalsByGUID[%s]: %s; portalsByGuid[%s]: %s", orig_guid, orig_portal.GUID, guid, portal.GUID)
}
br.Log.Infofln("maybeGetPortalByGuid(): portalsByGUID[%s]: %s", guid, portal.GUID)
return portal
}

Expand Down Expand Up @@ -187,17 +201,39 @@ func (br *IMBridge) loadDBPortal(txn dbutil.Execable, dbPortal *database.Portal,
} else if guid != dbPortal.GUID {
aliasedPortal, ok := br.portalsByGUID[dbPortal.GUID]
if ok {
aliasedPortal.zlog.Debug().
Str("original_guid", guid).
Msg("loadDBPortal: found aliased portal")

br.portalsByGUID[guid] = aliasedPortal
return aliasedPortal
}
}

portal := br.NewPortal(dbPortal)
portal.zlog.Trace().Msg("loadDBPortal")
br.portalsByGUID[portal.GUID] = portal
if portal.IsPrivateChat() {
portal.SecondaryGUIDs = br.DB.MergedChat.GetAllForTarget(portal.GUID)
for _, sourceGUID := range portal.SecondaryGUIDs {
br.portalsByGUID[sourceGUID] = portal
}
filtered := make([]string, 0, len(portal.SecondaryGUIDs))
for _, guid := range portal.SecondaryGUIDs {
if guid != portal.GUID {
filtered = append(filtered, guid)
}
}

if len(filtered) > 0 {
portal.zlog.Debug().
Strs("secondary_guids", filtered).
Msg("loadDBPortal: private chat")
} else {
portal.zlog.Trace().
Strs("secondary_guids", filtered).
Msg("loadDBPortal: private chat")
}
}
if len(portal.MXID) > 0 {
br.portalsByMXID[portal.MXID] = portal
Expand Down