hot compress for ten minutes, then leave it for a while. I would avoid makeup at all costs incase it makes the infection worse. Have you been given eye drops or anything. If your eye is swollen then it could take a while to calm down by itself.
I had a puffy eye last week and went into the pharmacist as I had a very important event coming up I'd need my sight for. She said salt and water on the eye. You know, like a saline solution.