From 9126a120ddf1c9611dd4169701761e0894ba03a8 Mon Sep 17 00:00:00 2001 From: Thomas May Date: Fri, 22 Apr 2022 19:39:21 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8Fwe=F0=9F=91=8Flove=F0=9F=91=8Fmerge?= =?UTF-8?q?=F0=9F=91=8Fconflicts=F0=9F=91=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Libraries/DSharpPlus | 2 +- Libraries/WamWooWam.Core | 2 +- Libraries/unicode.net | 2 +- .../Package.ARM.Debug.appxmanifest | 2 +- .../Package.ARM.appxmanifest | 4 +- .../Package.Debug.appxmanifest | 4 +- .../Package.appxmanifest | 4 +- .../Unicord.Universal.Package.wapproj | 4 +- .../Controls/AttachmentViewer.xaml.cs | 1 - Unicord.Universal/Package.Debug.appxmanifest | 4 +- Unicord.Universal/Package.appxmanifest | 4 +- Unicord.Universal/Tools.cs | 20 +----- Unicord.Universal/Unicord.Universal.csproj | 31 ++++----- Unicord.sln | 64 +------------------ 14 files changed, 32 insertions(+), 116 deletions(-) diff --git a/Libraries/DSharpPlus b/Libraries/DSharpPlus index 6cc5aaba..c914bae0 160000 --- a/Libraries/DSharpPlus +++ b/Libraries/DSharpPlus @@ -1 +1 @@ -Subproject commit 6cc5aaba9331f5d27826077a1498c58b90514ff7 +Subproject commit c914bae04b2cd3448220652268508b5423bbfef1 diff --git a/Libraries/WamWooWam.Core b/Libraries/WamWooWam.Core index cf68b689..9a9db194 160000 --- a/Libraries/WamWooWam.Core +++ b/Libraries/WamWooWam.Core @@ -1 +1 @@ -Subproject commit cf68b6892c083626b488389aa228360ec98d89e5 +Subproject commit 9a9db1948220cd4b8258943934dfda286a78c3ee diff --git a/Libraries/unicode.net b/Libraries/unicode.net index 1dcfc5c0..a588fcb5 160000 --- a/Libraries/unicode.net +++ b/Libraries/unicode.net @@ -1 +1 @@ -Subproject commit 1dcfc5c0851132021bd34cb0dae4a613f3a4efa0 +Subproject commit a588fcb5cb6d38ab3c17046406c5546fe8d02cd6 diff --git a/Unicord.Universal.Package/Package.ARM.Debug.appxmanifest b/Unicord.Universal.Package/Package.ARM.Debug.appxmanifest index dec9a7df..8e35a534 100644 --- a/Unicord.Universal.Package/Package.ARM.Debug.appxmanifest +++ b/Unicord.Universal.Package/Package.ARM.Debug.appxmanifest @@ -18,7 +18,7 @@ Assets\Store\StoreLogo.png - + diff --git a/Unicord.Universal.Package/Package.ARM.appxmanifest b/Unicord.Universal.Package/Package.ARM.appxmanifest index fdd3a99b..01b3b040 100644 --- a/Unicord.Universal.Package/Package.ARM.appxmanifest +++ b/Unicord.Universal.Package/Package.ARM.appxmanifest @@ -9,7 +9,7 @@ xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 rescap"> - + ms-resource:AppDisplayName @@ -17,7 +17,7 @@ Assets\Store\StoreLogo.png - + diff --git a/Unicord.Universal.Package/Package.Debug.appxmanifest b/Unicord.Universal.Package/Package.Debug.appxmanifest index 3bf77341..8efb7567 100644 --- a/Unicord.Universal.Package/Package.Debug.appxmanifest +++ b/Unicord.Universal.Package/Package.Debug.appxmanifest @@ -10,7 +10,7 @@ xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 desktop desktop5 rescap"> - + ms-resource:AppDisplayName @@ -18,7 +18,7 @@ Assets\Store\StoreLogo.png - + diff --git a/Unicord.Universal.Package/Package.appxmanifest b/Unicord.Universal.Package/Package.appxmanifest index 685d8a6a..2a8bfc83 100644 --- a/Unicord.Universal.Package/Package.appxmanifest +++ b/Unicord.Universal.Package/Package.appxmanifest @@ -9,7 +9,7 @@ xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 rescap"> - + ms-resource:AppDisplayName @@ -17,7 +17,7 @@ Assets\Store\StoreLogo.png - + diff --git a/Unicord.Universal.Package/Unicord.Universal.Package.wapproj b/Unicord.Universal.Package/Unicord.Universal.Package.wapproj index 94973fc5..3b031dab 100644 --- a/Unicord.Universal.Package/Unicord.Universal.Package.wapproj +++ b/Unicord.Universal.Package/Unicord.Universal.Package.wapproj @@ -71,7 +71,7 @@ 8e0255b7-b38e-423e-91c7-5637a01c2e13 - 10.0.19041.0 + 10.0.22000.0 10.0.16299.0 en-US True @@ -82,7 +82,7 @@ False SHA256 False - False + True x86|x64|arm 0 Always diff --git a/Unicord.Universal/Controls/AttachmentViewer.xaml.cs b/Unicord.Universal/Controls/AttachmentViewer.xaml.cs index 827c9210..8d3c474c 100644 --- a/Unicord.Universal/Controls/AttachmentViewer.xaml.cs +++ b/Unicord.Universal/Controls/AttachmentViewer.xaml.cs @@ -3,7 +3,6 @@ using System.IO; using System.Linq; using DSharpPlus.Entities; -using Unicord.Universal.Native; using Unicord.Universal.Utilities; using WamWooWam.Core; using Windows.ApplicationModel.DataTransfer; diff --git a/Unicord.Universal/Package.Debug.appxmanifest b/Unicord.Universal/Package.Debug.appxmanifest index dbee7ebd..8e2e5e7b 100644 --- a/Unicord.Universal/Package.Debug.appxmanifest +++ b/Unicord.Universal/Package.Debug.appxmanifest @@ -10,7 +10,7 @@ xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 desktop desktop5 rescap"> - + ms-resource:AppDisplayName @@ -18,7 +18,7 @@ Assets\Store\StoreLogo.png - + diff --git a/Unicord.Universal/Package.appxmanifest b/Unicord.Universal/Package.appxmanifest index 5ef41fd8..ad0fd3b5 100644 --- a/Unicord.Universal/Package.appxmanifest +++ b/Unicord.Universal/Package.appxmanifest @@ -9,7 +9,7 @@ xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 rescap"> - + ms-resource:AppDisplayName @@ -17,7 +17,7 @@ Assets\Store\StoreLogo.png - + diff --git a/Unicord.Universal/Tools.cs b/Unicord.Universal/Tools.cs index eee7424b..510bcdd9 100644 --- a/Unicord.Universal/Tools.cs +++ b/Unicord.Universal/Tools.cs @@ -10,7 +10,6 @@ using DSharpPlus.Net.Serialization; using Newtonsoft.Json; using Unicord.Universal.Misc; -using Unicord.Universal.Native; using WamWooWam.Core; using Windows.ApplicationModel.Contacts; using Windows.ApplicationModel.DataTransfer; @@ -51,15 +50,7 @@ public static string ToFileSizeString(long size) public static string ToFileSizeString(ulong size) { - try - { - return Shlwapi.StrFormatByteSizeEx(size, SFBSFlags.TruncateUndisplayedDecimalDigits); - } - catch (Exception ex) - { - Logger.LogError(ex); return Files.SizeSuffix((long)size); - } } public static Task DownloadToFileAsync(Uri url, StorageFile file) @@ -217,15 +208,6 @@ public static async Task SendFilesWithProgressAsync(DiscordChannel channel, stri internal static string GetItemTypeFromExtension(string extension, string fallback = null) { - try - { - return Shlwapi.AssocQueryString(ASSOCF.NONE, ASSOCSTR.FRIENDLYAPPNAME, extension, ""); - } - catch (Exception ex) - { - Logger.LogError(ex); - } - return fallback; } @@ -339,7 +321,7 @@ public static async Task> GetGroupedEmojiAsync(string text, Dis .Select(g => new EmojiGroup(g.Key, g)) .ToList(); - var list = guildEmoji != null ? guildEmoji.Where(e => n ? cult.IndexOf(e.GetDiscordName(), text, CompareOptions.IgnoreCase) >= 0 : true) + var list = guildEmoji != null ? guildEmoji.Where(e => n ? cult.IndexOf(e.DiscordName, text, CompareOptions.IgnoreCase) >= 0 : true) .GroupBy(e => App.Discord.Guilds.Values.FirstOrDefault(g => g.Emojis.ContainsKey(e.Id))) .OrderBy(g => App.Discord.UserSettings.GuildPositions.IndexOf(g.Key.Id)) .Select(g => new EmojiGroup(g.Key, g)) diff --git a/Unicord.Universal/Unicord.Universal.csproj b/Unicord.Universal/Unicord.Universal.csproj index e1a8b7e3..79c9dbe3 100644 --- a/Unicord.Universal/Unicord.Universal.csproj +++ b/Unicord.Universal/Unicord.Universal.csproj @@ -13,7 +13,7 @@ 9 UAP 10.0.16299.0 - 10.0.18362.0 + 10.0.19041.0 false false @@ -23,7 +23,7 @@ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 6BD8C4FCFA3FDEFC732E95AC6319476735CC564B + CBB99112037FA88434855C973D1AB39B0D4B2F10 False Always x64|arm @@ -925,16 +925,16 @@ 2.8.11 - 0.24.0 + 0.30.1 - 4.2.0 + 4.5.0 - 4.2.0 + 4.5.0 - 4.2.0 + 4.5.0 3.4.3 @@ -943,7 +943,7 @@ 5.3.200605002 --> - 6.2.12 + 6.2.13 10.1901.28001 @@ -967,7 +967,10 @@ 1.0.0 - 5.0.2 + 6.0.0 + + + 1.0.1 @@ -991,14 +994,6 @@ {01A262AF-E652-4381-88C3-2DCD7FDD9D93} Unicode - - {2427b481-8e92-433f-8714-53a2cde1bf7f} - Unicord.Universal.Native - - - {e3bc526e-debd-4f76-a669-9adade1d4fc8} - Unicord.Universal.Voice - {9b4bb6a4-4aa7-4b7c-ac3e-12a52832a245} Unicord @@ -1008,10 +1003,10 @@ Visual C++ 2015 Runtime for Universal Windows Platform Apps - + Windows Desktop Extensions for the UWP - + Windows Mobile Extensions for the UWP diff --git a/Unicord.sln b/Unicord.sln index f97befc3..1bbaaf53 100644 --- a/Unicord.sln +++ b/Unicord.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30804.86 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32126.317 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{3B1EC4DB-5461-4F80-968F-C1599C4E2BC4}" EndProject @@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{29620F EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "Libraries\Native\libsodium\libsodium.vcxproj", "{A185B162-6CB6-4502-B03F-B56F7699A8D9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Unicord.Universal.Voice", "Unicord.Universal.Voice\Unicord.Universal.Voice.vcxproj", "{E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSharpPlus", "libraries\DSharpPlus\DSharpPlus\DSharpPlus.csproj", "{0A9DFE2D-7E59-4E58-A28C-E38028F2CFA0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unicord", "Unicord\Unicord.csproj", "{9B4BB6A4-4AA7-4B7C-AC3E-12A52832A245}" @@ -31,8 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSharpPlus.Rest", "Librarie EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Unicord.Universal.Shared", "Unicord.Universal.Shared\Unicord.Universal.Shared.shproj", "{118F9D67-9235-4FC6-BF23-9ABE0CD693DA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Unicord.Universal.Native", "Unicord.Universal.Native\Unicord.Universal.Native.vcxproj", "{2427B481-8E92-433F-8714-53A2CDE1BF7F}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Unicode", "Libraries\unicode.net\unicode\Unicode.csproj", "{01A262AF-E652-4381-88C3-2DCD7FDD9D93}" EndProject Global @@ -186,34 +182,6 @@ Global {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Store|x64.Build.0 = ReleaseDLL|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Store|x86.ActiveCfg = ReleaseDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Store|x86.Build.0 = ReleaseDLL|Win32 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Debug|ARM.ActiveCfg = Debug|ARM - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Debug|ARM.Build.0 = Debug|ARM - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Debug|ARM64.Build.0 = Debug|ARM64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Debug|x64.ActiveCfg = Debug|x64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Debug|x64.Build.0 = Debug|x64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Debug|x86.ActiveCfg = Debug|Win32 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Debug|x86.Build.0 = Debug|Win32 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Release|Any CPU.ActiveCfg = Release|Win32 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Release|ARM.ActiveCfg = Release|ARM - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Release|ARM.Build.0 = Release|ARM - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Release|ARM64.ActiveCfg = Release|ARM64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Release|ARM64.Build.0 = Release|ARM64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Release|x64.ActiveCfg = Release|x64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Release|x64.Build.0 = Release|x64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Release|x86.ActiveCfg = Release|Win32 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Release|x86.Build.0 = Release|Win32 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Store|Any CPU.ActiveCfg = Release|Win32 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Store|Any CPU.Build.0 = Release|Win32 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Store|ARM.ActiveCfg = Release|ARM - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Store|ARM.Build.0 = Release|ARM - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Store|ARM64.ActiveCfg = Release|ARM64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Store|ARM64.Build.0 = Release|ARM64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Store|x64.ActiveCfg = Release|x64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Store|x64.Build.0 = Release|x64 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Store|x86.ActiveCfg = Release|Win32 - {E3BC526E-DEBD-4F76-A669-9ADADE1D4FC8}.Store|x86.Build.0 = Release|Win32 {0A9DFE2D-7E59-4E58-A28C-E38028F2CFA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0A9DFE2D-7E59-4E58-A28C-E38028F2CFA0}.Debug|Any CPU.Build.0 = Debug|Any CPU {0A9DFE2D-7E59-4E58-A28C-E38028F2CFA0}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -407,34 +375,6 @@ Global {95B0D2A9-7675-46AE-91D9-ED57DFDF47C4}.Store|x64.Build.0 = Release|Any CPU {95B0D2A9-7675-46AE-91D9-ED57DFDF47C4}.Store|x86.ActiveCfg = Release|Any CPU {95B0D2A9-7675-46AE-91D9-ED57DFDF47C4}.Store|x86.Build.0 = Release|Any CPU - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Debug|ARM.ActiveCfg = Debug|ARM - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Debug|ARM.Build.0 = Debug|ARM - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Debug|ARM64.Build.0 = Debug|ARM64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Debug|x64.ActiveCfg = Debug|x64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Debug|x64.Build.0 = Debug|x64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Debug|x86.ActiveCfg = Debug|Win32 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Debug|x86.Build.0 = Debug|Win32 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Release|Any CPU.ActiveCfg = Release|Win32 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Release|ARM.ActiveCfg = Release|ARM - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Release|ARM.Build.0 = Release|ARM - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Release|ARM64.ActiveCfg = Release|ARM64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Release|ARM64.Build.0 = Release|ARM64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Release|x64.ActiveCfg = Release|x64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Release|x64.Build.0 = Release|x64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Release|x86.ActiveCfg = Release|Win32 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Release|x86.Build.0 = Release|Win32 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Store|Any CPU.ActiveCfg = Release|Win32 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Store|Any CPU.Build.0 = Release|Win32 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Store|ARM.ActiveCfg = Release|ARM - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Store|ARM.Build.0 = Release|ARM - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Store|ARM64.ActiveCfg = Release|ARM64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Store|ARM64.Build.0 = Release|ARM64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Store|x64.ActiveCfg = Release|x64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Store|x64.Build.0 = Release|x64 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Store|x86.ActiveCfg = Release|Win32 - {2427B481-8E92-433F-8714-53A2CDE1BF7F}.Store|x86.Build.0 = Release|Win32 {01A262AF-E652-4381-88C3-2DCD7FDD9D93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {01A262AF-E652-4381-88C3-2DCD7FDD9D93}.Debug|Any CPU.Build.0 = Debug|Any CPU {01A262AF-E652-4381-88C3-2DCD7FDD9D93}.Debug|ARM.ActiveCfg = Debug|Any CPU