merge branch

[Fiszh]

Proposed changes

Describe the changes here.

Notes

If this PR depends on features that are not released yet (e.g. API endpoints),
please explain how it should be tested.

Checklist

Put an x in the boxes that apply. You can also fill them out later after creating the PR.

Do not remove any of the checkboxes.

• This PR depends on an unreleased API or backend change.
• This PR adds my bot to the custom bot list.
  If yes:
  • I have checked that my bot does not have the Twitch bot badge.
  • I have checked that my bot is not on the FFZ global bots list.
  • The bot is publicly accessible (not private or test-only)
  • This PR does not add any endpoints that send user data to external services (telemetry, analytics, etc.)
• Could this change be breaking? Has it been checked?
• This PR adds a new setting.