Fix diaspy for diaspora 0.2 and simplify code