fix: QR code URL generation and WebSocket robustness

app/eventyay/config/next_settings.py

@@ -13,7 +13,7 @@
 from django.utils.translation import gettext_lazy as _
 from kombu import Queue
 from pycountry import currencies
-from pydantic import Field, HttpUrl
+from pydantic import Field, HttpUrl, model_validator
 from pydantic_settings import BaseSettings as _BaseSettings
 from pydantic_settings import PydanticBaseSettingsSource, SettingsConfigDict, TomlConfigSettingsSource
 from redis.asyncio.retry import Retry
@@ -128,7 +128,7 @@ class BaseSettings(_BaseSettings):
     # Override it to match the domain the website is running on,
     # or you will get "DisallowedHost" error.
     site_url: HttpUrl = 'http://localhost:8000'
-    short_url: HttpUrl = 'http://localhost:8000'
+    short_url: HttpUrl | None = None
     talk_hostname: str = 'http://localhost:8000'
     sentry_dsn: str = ''
     instance_name: str = 'eventyay'
@@ -146,6 +146,12 @@ class BaseSettings(_BaseSettings):
     zoom_key: str = ''
     zoom_secret: str = ''
     control_secret: str = ''
+
+    @model_validator(mode='after')
+    def default_short_url(self) -> 'BaseSettings':
+        if self.short_url is None:
+            self.short_url = self.site_url
+        return self
     statsd_host: str = ''
     statsd_port: int = 8125
     statsd_prefix: str = 'eventyay'

app/eventyay/features/live/modules/bbb.py

@@ -1,3 +1,4 @@
+from django.db.utils import IntegrityError
 from eventyay.core.permissions import Permission
 from eventyay.base.services.bbb import BBBService
 from eventyay.features.live.decorators import command, room_action
@@ -20,15 +21,20 @@ async def room_url(self, body):
         service = BBBService(self.consumer.event)
         if not self.consumer.user.profile.get("display_name"):
             raise ConsumerException("bbb.join.missing_profile")
-        url = await service.get_join_url_for_room(
-            self.room,
-            self.consumer.user,
-            moderator=await self.consumer.event.has_permission_async(
-                user=self.consumer.user,
-                permission=Permission.ROOM_BBB_MODERATE,
-                room=self.room,
-            ),
-        )
+        try:
+            url = await service.get_join_url_for_room(
+                self.room,
+                self.consumer.user,
+                moderator=await self.consumer.event.has_permission_async(
+                    user=self.consumer.user,
+                    permission=Permission.ROOM_BBB_MODERATE,
+                    room=self.room,
+                ),
+            )
+        except IntegrityError:
+            # This happens in dev environment when no BBB server is configured
+            raise ConsumerException("bbb.failed")
+
         if not url:
             raise ConsumerException("bbb.failed")
         await self.consumer.send_success({"url": url})
@@ -38,10 +44,14 @@ async def call_url(self, body):
         service = BBBService(self.consumer.event)
         if not self.consumer.user.profile.get("display_name"):
             raise ConsumerException("bbb.join.missing_profile")
-        url = await service.get_join_url_for_call_id(
-            body.get("call"),
-            self.consumer.user,
-        )
+        try:
+            url = await service.get_join_url_for_call_id(
+                body.get("call"),
+                self.consumer.user,
+            )
+        except IntegrityError:
+            raise ConsumerException("bbb.failed")
+
         if not url:
             raise ConsumerException("bbb.failed")
         await self.consumer.send_success({"url": url})
@@ -53,7 +63,10 @@ async def call_url(self, body):
     )
     async def recordings(self, body):
         service = BBBService(self.consumer.event)
-        recordings = await service.get_recordings_for_room(
-            self.room,
-        )
+        try:
+            recordings = await service.get_recordings_for_room(
+                self.room,
+            )
+        except IntegrityError:
+             recordings = []
         await self.consumer.send_success({"results": recordings})