all: remove unsafe direct store access

Author: tulir

cmd/mautrix-whatsapp/legacyprovision.go

@@ -40,7 +40,7 @@ func legacyProvContacts(w http.ResponseWriter, r *http.Request) {
 	if userLogin == nil {
 		return
 	}
-	if contacts, err := userLogin.Client.(*connector.WhatsAppClient).Device.Contacts.GetAllContacts(r.Context()); err != nil {
+	if contacts, err := userLogin.Client.(*connector.WhatsAppClient).GetStore().Contacts.GetAllContacts(r.Context()); err != nil {
 		hlog.FromRequest(r).Err(err).Msg("Failed to fetch all contacts")
 		exhttp.WriteJSONResponse(w, http.StatusInternalServerError, Error{
 			Error:   "Internal server error while fetching contact list",

pkg/connector/handlewhatsapp.go

@@ -264,7 +264,7 @@ func (wa *WhatsAppClient) rerouteWAMessage(ctx context.Context, info *types.Mess
 			Msg("Forced LID DM sender to phone number in own message sent from another device")
 		info.Chat = info.RecipientAlt.ToNonAD()
 	} else if info.Sender.Server == types.BotServer && info.Chat.Server == types.HiddenUserServer {
-		chatPN, err := wa.Device.LIDs.GetPNForLID(ctx, info.Chat)
+		chatPN, err := wa.GetStore().LIDs.GetPNForLID(ctx, info.Chat)
 		if err != nil {
 			wa.UserLogin.Log.Err(err).
 				Str("message_id", info.ID).
@@ -423,7 +423,7 @@ func (wa *WhatsAppClient) handleWAReceipt(ctx context.Context, evt *events.Recei
 	if !evt.MessageSender.IsEmpty() {
 		messageSender = evt.MessageSender
 	} else if evt.Chat.Server == types.GroupServer && evt.Sender.Server == types.HiddenUserServer {
-		lid := wa.Device.GetLID()
+		lid := wa.GetStore().GetLID()
 		if !lid.IsEmpty() {
 			messageSender = lid
 		}

pkg/connector/id.go

@@ -39,7 +39,7 @@ func (wa *WhatsAppClient) makeEventSender(ctx context.Context, id types.JID) bri
 	} else if id.Server == types.DefaultUserServer {
 		senderLoginJID = id
 	} else if id.Server == types.HiddenUserServer {
-		pn, err := wa.Device.LIDs.GetPNForLID(ctx, id)
+		pn, err := wa.GetStore().LIDs.GetPNForLID(ctx, id)
 		if err != nil {
 			zerolog.Ctx(ctx).Err(err).
 				Stringer("lid", id).

pkg/connector/startchat.go

@@ -109,7 +109,7 @@ func (wa *WhatsAppConnector) ValidateUserID(id networkid.UserID) bool {
 
 func (wa *WhatsAppClient) startChatLIDToPN(ctx context.Context, jid types.JID) (types.JID, error) {
 	if jid.Server == types.HiddenUserServer {
-		pn, err := wa.Device.LIDs.GetPNForLID(ctx, jid)
+		pn, err := wa.GetStore().LIDs.GetPNForLID(ctx, jid)
 		if err != nil {
 			return jid, fmt.Errorf("failed to get phone number for lid: %w", err)
 		} else if pn.IsEmpty() {

pkg/connector/userinfo.go

@@ -378,9 +378,9 @@ func (wa *WhatsAppClient) syncAltGhostWithInfo(ctx context.Context, jid types.JI
 	var altJID types.JID
 	var err error
 	if jid.Server == types.HiddenUserServer {
-		altJID, err = wa.Device.LIDs.GetPNForLID(ctx, jid)
+		altJID, err = wa.GetStore().LIDs.GetPNForLID(ctx, jid)
 	} else if jid.Server == types.DefaultUserServer {
-		altJID, err = wa.Device.LIDs.GetLIDForPN(ctx, jid)
+		altJID, err = wa.GetStore().LIDs.GetLIDForPN(ctx, jid)
 	}
 	if err != nil {
 		log.Warn().Err(err).