Change inspired by 691107263c

Fix a regression introduced by 612b00d1bb

Port ed50c2393a to glitch-soc

Port 89c6d2bd6b to glitch-soc

Port 955d5d36e8 to the glitch-soc flavour

Port f6910fba02 to glitch-soc

Port d0d23b8f0a to glitch-soc

Port f2d9a3c239 to glitch-soc

This prepares for a third option that would restrict privacy to
privacyPreference(replyPrivacy, sideArmBasePrivacy)

Port front-end part of 20fefdb714 to glitch-soc

Port 30e1da7668 to glitch-soc

Port 1ca4e51eb3 to glitch-soc

Port 404c7702ec to glitch-soc

Port cfeb3beb4e to glitch-soc

Port cdb101340a to glitch-soc,
but without dropping support for regexp filters yet.

Port 64d7a63f18 to glitch-soc

Port c75493755f to glitch-soc

Port bd0791d800 to glitch-soc

Port e0354aba7c to glitch-soc

Fixes #541.

See also the following commits:

- 0c3ce41031
- 268d90e810