Prompt for protected macOS channels

2026-09-16 22:16:18 +02:00
parent 52f7f51e59
commit 5a30018aeb
4 changed files with 55 additions and 14 deletions
@@ -23,6 +23,7 @@ internal sealed class MainWindowController : NSWindowController
    private uint currentChannel = 1;
    private uint microphoneStreamId;
    private bool joinedVoice;
+    private bool changingChannel;
    private IAudioCapture? microphone;
    private IAudioPlayback? playback;

@@ -61,7 +62,11 @@ internal sealed class MainWindowController : NSWindowController
    private void RefreshState()
    {
        channels.RemoveAllItems();
-        foreach (var channel in client.Channels.OrderBy(c => c.Order).ThenBy(c => c.Name)) { channels.AddItem(channel.Name); channels.LastItem!.RepresentedObject = new NSString(channel.Id.ToString()); }
+        foreach (var channel in client.Channels.OrderBy(c => c.Order).ThenBy(c => c.Name))
+        {
+            channels.AddItem(channel.Name + (channel.PasswordProtected ? " [password]" : ""));
+            channels.LastItem!.RepresentedObject = new NSString(channel.Id.ToString());
+        }
        currentChannel = client.Users.FirstOrDefault(u => u.Id == selfId)?.ChannelId ?? currentChannel;
        int selectedIndex = client.Channels.ToList().FindIndex(c => c.Id == currentChannel); if (selectedIndex >= 0) channels.SelectItem(selectedIndex);
        users.Value = string.Join("\n", client.Users.Where(u => u.ChannelId == currentChannel).OrderBy(u => u.Nickname).Select(u => (u.Id == selfId ? "You — " : "") + u.Nickname));
@@ -69,16 +74,49 @@ internal sealed class MainWindowController : NSWindowController
    }
    private async void ChangeChannel(object? sender, EventArgs args)
    {
-        if (!uint.TryParse(channels.SelectedItem?.RepresentedObject?.ToString(), out uint id) || id == currentChannel) return;
+        if (changingChannel || !uint.TryParse(channels.SelectedItem?.RepresentedObject?.ToString(), out uint id) || id == currentChannel) return;
+        var channel = client.Channels.FirstOrDefault(item => item.Id == id);
+        if (channel is null) { RefreshState(); return; }
+        string? password = channel.PasswordProtected ? PromptForChannelPassword(channel.Name) : "";
+        if (password is null) { RefreshState(); return; }
+        bool resumeVoice = joinedVoice;
        try
        {
-            bool resumeVoice = joinedVoice;
+            changingChannel = true; channels.Enabled = false;
            if (resumeVoice) await LeaveVoice();
-            var result = (await client.RequestAsync(new() { JoinChannel = new() { ChannelId = id } })).JoinChannelResult;
-            if (!result.Ok) status.StringValue = result.Error;
+            var result = (await client.RequestAsync(new() { JoinChannel = new() { ChannelId = id, Password = password } })).JoinChannelResult;
+            if (result.Ok) currentChannel = id;
            if (resumeVoice) await JoinVoice();
+            RefreshState();
+            status.StringValue = result.Ok ? $"Joined {channel.Name}" : result.Error;
        }
-        catch (Exception exception) { status.StringValue = exception.Message; }
+        catch (Exception exception)
+        {
+            string message = exception.Message;
+            if (resumeVoice && !joinedVoice)
+            {
+                try { await JoinVoice(); }
+                catch (Exception restoreException) { message += " Voice could not be restored: " + restoreException.Message; }
+            }
+            RefreshState(); status.StringValue = message;
+        }
+        finally { changingChannel = false; channels.Enabled = true; }
+    }
+
+    private string? PromptForChannelPassword(string channelName)
+    {
+        var field = new NSSecureTextField(new CGRect(0, 0, 320, 26)) { PlaceholderString = "Channel password" };
+        ((INSAccessibility)field).AccessibilityLabel = $"Password for {channelName}";
+        var alert = new NSAlert
+        {
+            MessageText = $"Join {channelName}",
+            InformativeText = "Enter the channel password.",
+            AlertStyle = NSAlertStyle.Informational,
+            AccessoryView = field
+        };
+        alert.AddButton("Join"); alert.AddButton("Cancel");
+        if (alert.RunModal() != 1000) { field.StringValue = ""; return null; }
+        string value = field.StringValue; field.StringValue = ""; return value;
    }
    private void Send(object? sender, EventArgs args)
    {