A humorist is an intellectual who uses irony or wit in writing and speaking. A raconteur is one who tells anecdotes in a skillful and amusing way.
Henri Bergson writes that a humorist's work grows from viewing the morals of society.
The term comedian is generally applied to one who is performing to an audience for laughter.