UI: Change the Discord invite to link to the rules channel

When next stable comes out the old one will be invalidated

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs

@@ -110,10 +110,24 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
             _broadcastAddress = config.ProxyIp | (~config.ProxySubnetMask);
         }
 
-        private async Task<ushort> NatPunchForDevice(NatDevice device)
+        public async Task<ushort> NatPunch()
         {
-            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Attempting to map port using {device.ToString()}");
+            NatDiscoverer discoverer = new();
+            CancellationTokenSource cts = new(5000);
+
+            NatDevice device;
+
+            try
+            {
+                device = await discoverer.DiscoverDeviceAsync(PortMapper.Upnp, cts);
+            }
+            catch (NatDeviceNotFoundException)
+            {
+                return 0;
+            }
+
             _publicPort = PublicPortBase;
+
             for (int i = 0; i < PublicPortRange; i++)
             {
                 try
@@ -124,14 +138,12 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
 
                     break;
                 }
-                catch (MappingException ex)
+                catch (MappingException)
                 {
-                    Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Failed to map port {_publicPort}: {ex.Message}");
                     _publicPort++;
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
-                    Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Failed to map port {_publicPort}: {ex.GetType().Name}: {ex.Message}");
                     return 0;
                 }
 
@@ -143,52 +155,17 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
 
             if (_publicPort != 0)
             {
-                _natDevice = device;
                 _ = Executor.ExecuteAfterDelayAsync(
-                    PortLeaseRenew.Seconds(),
+                    PortLeaseRenew.Seconds(), 
                     _disposedCancellation.Token,
                     RefreshLease);
             }
 
+            _natDevice = device;
+
             return _publicPort;
         }
 
-        public async Task<ushort> NatPunch()
-        {
-            NatDiscoverer discoverer = new();
-            CancellationTokenSource cts = new(500);
-
-            NatDevice[] devices;
-
-            try
-            {
-                devices = (await discoverer.DiscoverDevicesAsync(PortMapper.Upnp, cts)).ToArray();
-            }
-            catch (Exception ex)
-            {
-                Logger.Error?.PrintMsg(LogClass.ServiceLdn, $"Failed to discover UPnP devices: {ex.Message}");
-                return 0;
-            }
-
-            if (devices.Length == 0)
-            {
-                Logger.Error?.PrintMsg(LogClass.ServiceLdn, "No UPnP devices found.");
-                return 0;
-            }
-
-            foreach (var device in devices)
-            {
-                ushort port = await NatPunchForDevice(device);
-                if (port != 0)
-                {
-                    return port;
-                }
-            }
-            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Failed to map port using any device");
-            _publicPort = 0;
-            return 0;
-        }
-
         // Proxy handlers
 
         private void RouteMessage(P2pProxySession sender, ref ProxyInfo info, Action<P2pProxySession> action)

src/Ryujinx/AppHost.cs

@@ -1041,6 +1041,7 @@ namespace Ryujinx.Ava
                 if (_viewModel.StartGamesInFullscreen)
                 {
                     _viewModel.WindowState = WindowState.FullScreen;
+                    _viewModel.Window.TitleBar.ExtendsContentIntoTitleBar = true;
                 }
 
                 if (_viewModel.WindowState is WindowState.FullScreen || _viewModel.StartGamesWithoutUI)

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -107,7 +107,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         [ObservableProperty] private ApplicationContextMenu _gridAppContextMenu;
         [ObservableProperty] private bool _updateAvailable;
 
-        public static AsyncRelayCommand UpdateCommand => Commands.Create(async () =>
+        public static AsyncRelayCommand UpdateCommand { get; } = Commands.Create(async () =>
         {
             if (Updater.CanUpdate(true))
                 await Updater.BeginUpdateAsync(true);

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -51,12 +51,8 @@ namespace Ryujinx.Ava.UI.Views.Main
             XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
             AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
             CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityList.Show());
-            
-            UpdateMenuItem.Command = Commands.Create(async () =>
-            {
-                if (Updater.CanUpdate(true))
-                    await Updater.BeginUpdateAsync(true);
-            });
+
+            UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;
 
             FaqMenuItem.Command = 
                 SetupGuideMenuItem.Command = 

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml

@@ -291,9 +291,11 @@
                 </MultiBinding>
             </StackPanel.IsVisible>
             <Button Margin="0, 0, 5, 0"
-                    Command="{Binding UpdateCommand}">
+                    Command="{Binding UpdateCommand}"
+                    Background="{DynamicResource SystemAccentColor}">
                 <TextBlock
                     Margin="-5"
+                    Foreground="Black"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
                     Text="{ext:Locale UpdaterBackgroundStatusBarButtonText}" />

src/Ryujinx/UI/Windows/AboutWindow.axaml

@@ -125,7 +125,7 @@
                         Background="Transparent"
                         Click="Button_OnClick"
                         CornerRadius="15"
-                        Tag="https://discord.gg/dHPrkBkkyA"
+                        Tag="https://discord.gg/PEuzjrFXUA"
                         ToolTip.Tip="{ext:Locale AboutDiscordUrlTooltipMessage}">
                         <Image Source="{Binding DiscordLogo}" />
                     </Button>

src/Ryujinx/Utilities/AppletMetadata.cs

@@ -45,7 +45,7 @@ namespace Ryujinx.Ava.Utilities
             if (string.IsNullOrEmpty(contentPath)) 
                 goto BadData;
 
-            appData = new() { Name = Name, Id = ProgramId, Path = GetContentPath(contentManager) };
+            appData = new() { Name = Name, Id = ProgramId, Path = contentPath };
             appControl = StructHelpers.CreateCustomNacpData(Name, Version);
             return true;