Reviewed-on: fediversity/fediversity#586
Reviewed-on: fediversity/fediversity#582
precursor to #116. Reviewed-on: fediversity/fediversity#510
