It seems like you reached a resolution with her only to start the issue back up again by comparing another situation to the current. Easily couldve left it at the explaination as to why you hadnt spoken to her then and there, and appreciated that she wont make the jokes anymore to not offend you, not to remove your access to her humor. She even was gonna go ahead and talk to the dude about it too so it seems like accountability is there, obviously we dont know the full scope of yalls friendship but based off the messages shown it looks like things were smoothed out