What is the greek god of fun?

If I recall correctly, there was no specific god/dess of fun as such, but there was Dionysus, the god of wine, revelry, and patron deity of the theatre. Among the muses there was also Thalia, muse of comedy.