Jesse/collab edit

Can we perform this check in on_join? Would avoid checking this on every message received.