Closes #1150 and #1071 and #1226
With pleroma!3843 (merged) , this should replace !1478 and resolve #1041