I did everything wrong

Hi, so long story short a friend introduced me to a guy that she thought I’d hit it off with but it seemed like my friend who introduced us liked him as well. He asked her if she was trying to set us up and she said no and that she would never set up someone like him with someone like me. The more i talked to my friend the more i started to feel like he was interested in her. Fast forward, we end up hanging out again as a group but this time he stays to hang out with me alone. I end up making a move and it was reciprocated. He was going away for a bit but said he wanted to see me as soon as he was back. He didnt contact me while he was away which was for over a month and when he got back he said we should hang out in a group again. I already was unsure about how he felt but my friend again made me feel like he liked her and it made me upset to think something happened with us while he liked her so i told her how i felt. She flipped out and called him and asked her if he liked her and if he had any issues with me. A few days later I called him to clear the air and I asked if he wanted to continue seeing me but he said that we should just be friends for now. I cut my losses and tried being friends but now i realize to any other person it looked like a despo. Anyways a friend of his mentioned me to him and for the first time since all of this happened he texted me about it and invited me over to hang out with them. I didn’t think anything of it, I just thought it was him trying to be friends. When i got there things with him were great, not awkward at all but his friend hit on me within minutes. I got really uncomfortable and I feel like he did too. I ended up leaving early & as i left he hugged me and said it was about time we hung out again. Now I feel weird. Was he trying to be my friend and invite me over as an olive branch or was I invited over to be set up?