I'd say that I'm a mixture of both; I want people to be happy, and I do enjoy making people happy, but not at the expense of my true self. There are some people whom I can make happy just by being my goofy strange self, and those are the people I like to have around me!
I've known for years that if I fake it (i.e. hide my true self and be more outgoing and talkative and stuff) then I can attract more people, but I was always so tired and unhappy at the end of the day, and used to wonder why. It was terrible to be angry and upset all of the time, I had no more energy to do my work properly, resulting in my falling behind in schoolwork. "Mysteriously," once I stopped faking it, my attitude improved considerably and I became more productive at work!
All those goodtime friends also just left me once I showed my true self, but I don't care... f*** them.
_________________
Won't you help a poor little puppy?