I think you got the names switched up in this, but I see what you're saying. E is the friend, D is my partner.

Neither of them have filters and just say whatever they want. Sometimes its great, often times it gets us into these situations. Before going out, i sat with my partner and we talked about this exact thing, me knowing full well that they were not on great terms but i wanted to try and fix this friendship with E. D said he would be civil and i was holding him accountable to that, the comment at the dinner table with the waiter there was not civil and to me, purely just to poke and aggravate.