Fix all integrations

core/views/signal.py

@@ -5,6 +5,7 @@ import requests
 from django.conf import settings
 from django.contrib import messages
 from django.db.models import Q
+from django.http import HttpResponse
 from django.shortcuts import render
 from django.urls import reverse
 from django.views import View
@@ -141,7 +142,12 @@ class SignalAccountUnlink(SuperUserRequiredMixin, View):
             else:
                 messages.error(
                     request,
-                    "Signal relink failed to clear current device state. Try relink again.",
+                    (
+                        "Signal relink could not verify that the current device state was "
+                        "cleared. The account may still be linked in signal-cli-rest-api. "
+                        "Try relink again, and if it still fails, restart the Signal service "
+                        "before requesting a new QR code."
+                    ),
                 )
         else:
             messages.warning(request, "No Signal account selected to relink.")
@@ -324,15 +330,16 @@ class SignalChatsList(SuperUserRequiredMixin, ObjectList):
             group_id = str(link.chat_identifier or "").strip()
             if not group_id:
                 continue
+            query = urlencode({"service": "signal", "identifier": group_id})
             rows.append(
                 {
                     "chat": None,
-                    "compose_page_url": "",
-                    "compose_widget_url": "",
+                    "compose_page_url": f"{reverse('compose_page')}?{query}",
+                    "compose_widget_url": f"{reverse('compose_widget')}?{query}",
                     "ai_url": reverse("ai_workspace"),
                     "person_name": "",
                     "manual_icon_class": "fa-solid fa-users",
-                    "can_compose": False,
+                    "can_compose": True,
                     "match_url": "",
                     "is_group": True,
                     "name": link.chat_name or group_id,
@@ -412,7 +419,21 @@ class SignalAccountAdd(SuperUserRequiredMixin, CustomObjectRead):
     def get_object(self, **kwargs):
         form_args = self.request.POST.dict()
         device_name = form_args["device"]
-        image_bytes = transport.get_link_qr(self.service, device_name)
+        try:
+            image_bytes = transport.get_link_qr(self.service, device_name)
+        except Exception as exc:
+            return render(
+                self.request,
+                "mixins/wm/modal.html",
+                {
+                    "window_content": "mixins/partials/notify.html",
+                    "message": (
+                        "Signal QR link is unavailable right now. "
+                        f"signal-cli-rest-api did not return a QR in time: {exc}"
+                    ),
+                    "class": "danger",
+                },
+            )
         base64_image = transport.image_bytes_to_base64(image_bytes)
 
         return base64_image