[peertube] Improve generic support (closes #16733)