I make a distinction between humor, which is more about making fun of oneself or making fun of a situation, and satire, which is usually making fun of other people. Although there are considerable overlap – in English, you use the same word, funny, to describe those – I think the kind of militant funnyless like irony, sarcasm, and so on.