history: I was upset when I had to pick up mu drunk friend last weekend. He was being a pain
current: I was upset when I picked up my drunk friend. He was just being a pain
next: I am sorry to hear; drunk people can make a situation quite difficult to deal with. Have you been friends for long?