Conflicts: - `app/services/process_mentions_service.rb`: glitch-soc local-only handling, ported upstream changes