Updatec changelog. Upped version to 4.3.21

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
 
+## [4.3.21]
+
+### Fixed
+- Possible fix for a duplicate in `.h bank`
+- Fixed `.stock` command
+- Fixed `.clubapply` and `.clubaccept`
+- Removed some redundant discriminators
+
+## [4.3.20] - 20.01.2024
+
+### Fixed
+- Fixed `.config searches followedStreams.maxCount` not working
 
 ## [4.3.19] - 20.01.2024
 
@@ -36,7 +48,6 @@ Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.
 ### Removed
 
 - `.revimg` and `.revav` as google removed reverse image search
-- 
 
 ## [4.3.17] - 06.09.2023
 

src/NadekoBot/Db/Models/DiscordUser.cs

@@ -28,5 +28,10 @@ public class DiscordUser : DbEntity
         => UserId.GetHashCode();
 
     public override string ToString()
-        => Username + "#" + Discriminator;
+    {
+        if (string.IsNullOrWhiteSpace(Discriminator) || Discriminator == "0000")
+            return Username;
+        
+        return Username + "#" + Discriminator;
+    }
 }

src/NadekoBot/Db/Models/Waifu.cs

@@ -19,25 +19,25 @@ public class WaifuInfo : DbEntity
 
     public override string ToString()
     {
-        var claimer = "no one";
         var status = string.Empty;
 
-        var waifuUsername = Waifu.Username.TrimTo(20);
-        var claimerUsername = Claimer?.Username.TrimTo(20);
+        var waifuUsername = Waifu.ToString().TrimTo(20);
+        var claimer = Claimer?.ToString().TrimTo(20)
+            ?? "no one";
+
+        var affinity = Affinity?.ToString().TrimTo(20);
 
-        if (ClaimerId is not null)
-            claimer = $"{claimerUsername}#{Claimer.Discriminator}";
         if (AffinityId is null)
             status = $"... but {waifuUsername}'s heart is empty";
         else if (AffinityId == ClaimerId)
-            status = $"... and {waifuUsername} likes {claimerUsername} too <3";
+            status = $"... and {waifuUsername} likes {claimer} too <3";
         else
         {
             status =
-                $"... but {waifuUsername}'s heart belongs to {Affinity.Username.TrimTo(20)}#{Affinity.Discriminator}";
+                $"... but {waifuUsername}'s heart belongs to {affinity}";
         }
 
-        return $"**{waifuUsername}#{Waifu.Discriminator}** - claimed by **{claimer}**\n\t{status}";
+        return $"**{waifuUsername}** - claimed by **{claimer}**\n\t{status}";
     }
 }
 

src/NadekoBot/Modules/Administration/ServerLog/ServerLogCommandService.cs

@@ -363,7 +363,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                 if (before.Username != after.Username)
                 {
                     embed.WithTitle("👥 " + GetText(g, strs.username_changed))
-                        .WithDescription($"{before.Username}#{before.Discriminator} | {before.Id}")
+                        .WithDescription($"{before.Username} | {before.Id}")
                         .AddField("Old Name", $"{before.Username}", true)
                         .AddField("New Name", $"{after.Username}", true)
                         .WithFooter(CurrentTime(g))
@@ -905,7 +905,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                     str = "🎙"
                           + Format.Code(PrettyCurrentTime(usr.Guild))
                           + GetText(logChannel.Guild,
-                              strs.user_vmoved("👤" + Format.Bold(usr.Username + "#" + usr.Discriminator),
+                              strs.user_vmoved("👤" + Format.Bold(usr.Username),
                                   Format.Bold(beforeVch?.Name ?? ""),
                                   Format.Bold(afterVch?.Name ?? "")));
                 }
@@ -914,7 +914,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                     str = "🎙"
                           + Format.Code(PrettyCurrentTime(usr.Guild))
                           + GetText(logChannel.Guild,
-                              strs.user_vjoined("👤" + Format.Bold(usr.Username + "#" + usr.Discriminator),
+                              strs.user_vjoined("👤" + Format.Bold(usr.Username),
                                   Format.Bold(afterVch?.Name ?? "")));
                 }
                 else if (afterVch is null)
@@ -922,7 +922,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
                     str = "🎙"
                           + Format.Code(PrettyCurrentTime(usr.Guild))
                           + GetText(logChannel.Guild,
-                              strs.user_vleft("👤" + Format.Bold(usr.Username + "#" + usr.Discriminator),
+                              strs.user_vleft("👤" + Format.Bold(usr.Username),
                                   Format.Bold(beforeVch.Name ?? "")));
                 }
 

src/NadekoBot/Modules/Gambling/Gambling.cs

@@ -239,7 +239,7 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         var usr = membersArray[new NadekoRandom().Next(0, membersArray.Length)];
         await SendConfirmAsync("🎟 " + GetText(strs.raffled_user),
-            $"**{usr.Username}#{usr.Discriminator}**",
+            $"**{usr.Username}**",
             footer: $"ID: {usr.Id}");
     }
 
@@ -258,7 +258,7 @@ public partial class Gambling : GamblingModule<GamblingService>
 
         var usr = membersArray[new NadekoRandom().Next(0, membersArray.Length)];
         await SendConfirmAsync("🎟 " + GetText(strs.raffled_user),
-            $"**{usr.Username}#{usr.Discriminator}**",
+            $"**{usr.Username}**",
             footer: $"ID: {usr.Id}");
     }
 

src/NadekoBot/Modules/Help/Help.cs

@@ -292,7 +292,7 @@ public partial class Help : NadekoModule<HelpService>
                     .WithTitle(GetText(strs.cmd_group_commands(group.Name)))
                     .WithOkColor();
 
-        foreach (var cmd in group.Commands)
+        foreach (var cmd in group.Commands.DistinctBy(x => x.Aliases[0]))
         {
             eb.AddField(prefix + cmd.Aliases.First(), cmd.RealSummary(_strings, _medusae, Culture, prefix));
         }

src/NadekoBot/Modules/Searches/Crypto/CryptoCommands.cs

@@ -85,11 +85,11 @@ public partial class Searches
                         .WithUrl($"https://www.tradingview.com/chart/?symbol={stock.Symbol}")
                         .WithTitle(stock.Name)
                         .AddField(GetText(strs.price), $"{sign} **{price}**", true)
-                        .AddField(GetText(strs.market_cap), stock.MarketCap.ToString("C0", localCulture), true)
+                        .AddField(GetText(strs.market_cap), stock.MarketCap, true)
                         .AddField(GetText(strs.volume_24h), stock.DailyVolume.ToString("C0", localCulture), true)
                         .AddField("Change", $"{change} ({changePercent})", true)
-                        .AddField("Change 50d", $"{sign50}{change50}", true)
-                        .AddField("Change 200d", $"{sign200}{change200}", true)
+                        // .AddField("Change 50d", $"{sign50}{change50}", true)
+                        // .AddField("Change 200d", $"{sign200}{change200}", true)
                         .WithFooter(stock.Exchange);
             
             var message = await ctx.Channel.EmbedAsync(eb);

src/NadekoBot/Modules/Searches/Crypto/DefaultStockDataService.cs

@@ -1,5 +1,8 @@
-using CsvHelper;
+using AngleSharp;
+using AngleSharp.Html.Dom;
+using CsvHelper;
 using CsvHelper.Configuration;
+using CsvHelper.Configuration.Attributes;
 using Google.Protobuf.WellKnownTypes;
 using System.Globalization;
 using System.Net.Http.Json;
@@ -23,33 +26,61 @@ public sealed class DefaultStockDataService : IStockDataService, INService
                 return default;
 
             using var http = _httpClientFactory.CreateClient();
-            var data = await http.GetFromJsonAsync<YahooQueryModel>(
-                $"https://query1.finance.yahoo.com/v7/finance/quote?symbols={query}");
 
-            if (data is null)
-                return default; 
-            
-            var symbol = data.QuoteResponse.Result.FirstOrDefault();
 
-            if (symbol is null)
-                return default;
+
+            var quoteHtmlPage = $"https://finance.yahoo.com/quote/{query.ToUpperInvariant()}";
+
+            var config = Configuration.Default.WithDefaultLoader();
+            using var document = await BrowsingContext.New(config).OpenAsync(quoteHtmlPage);
+            var divElem =
+                document.QuerySelector(
+                    "#quote-header-info > div:nth-child(2) > div > div > h1");
+            var tickerName = (divElem)?.TextContent;
+
+            var marketcap = document
+                            .QuerySelectorAll("table")
+                            .Skip(1)
+                            .First()
+                            .QuerySelector("tbody > tr > td:nth-child(2)")
+                            ?.TextContent;
+
+
+            var volume = document.QuerySelector("td[data-test='AVERAGE_VOLUME_3MONTH-value']")
+                                 ?.TextContent;
             
+            var close= document.QuerySelector("td[data-test='PREV_CLOSE-value']")
+                                 ?.TextContent ?? "0";
+            
+            var price = document
+                        .QuerySelector("#quote-header-info")
+                        ?.QuerySelector("fin-streamer[data-field='regularMarketPrice']")
+                                 ?.TextContent ?? close;
+            
+            // var data = await http.GetFromJsonAsync<YahooQueryModel>(
+            //     $"https://query1.finance.yahoo.com/v7/finance/quote?symbols={query}");
+            //
+            // if (data is null)
+            //     return default;
+
+            // var symbol = data.QuoteResponse.Result.FirstOrDefault();
+
+            // if (symbol is null)
+            // return default;
+
             return new()
             {
-                Name = symbol.LongName,
-                Symbol = symbol.Symbol,
-                Price = symbol.RegularMarketPrice,
-                Close = symbol.RegularMarketPreviousClose,
-                MarketCap = symbol.MarketCap,
-                Change50d = symbol.FiftyDayAverageChangePercent,
-                Change200d = symbol.TwoHundredDayAverageChangePercent,
-                DailyVolume = symbol.AverageDailyVolume10Day,
-                Exchange = symbol.FullExchangeName
+                Name = tickerName,
+                Symbol = query,
+                Price = double.Parse(price, NumberStyles.Any, CultureInfo.InvariantCulture),
+                Close = double.Parse(close, NumberStyles.Any, CultureInfo.InvariantCulture),
+                MarketCap = marketcap,
+                DailyVolume = (long)double.Parse(volume ?? "0", NumberStyles.Any, CultureInfo.InvariantCulture),
             };
         }
-        catch (Exception)
+        catch (Exception ex)
         {
-            // Log.Warning(ex, "Error getting stock data: {ErrorMessage}", ex.Message);
+            Log.Warning(ex, "Error getting stock data: {ErrorMessage}", ex.ToString());
             return default;
         }
     }
@@ -60,9 +91,9 @@ public sealed class DefaultStockDataService : IStockDataService, INService
             throw new ArgumentNullException(nameof(query));
 
         query = Uri.EscapeDataString(query);
-        
+
         using var http = _httpClientFactory.CreateClient();
-        
+
         var res = await http.GetStringAsync(
             "https://finance.yahoo.com/_finance_doubledown/api/resource/searchassist"
             + $";searchTerm={query}"
@@ -72,11 +103,11 @@ public sealed class DefaultStockDataService : IStockDataService, INService
 
         if (data is null or { Items: null })
             return Array.Empty<SymbolData>();
-        
+
         return data.Items
-                  .Where(x => x.Type == "S")
-                  .Select(x => new SymbolData(x.Symbol, x.Name))
-                  .ToList();
+                   .Where(x => x.Type == "S")
+                   .Select(x => new SymbolData(x.Symbol, x.Name))
+                   .ToList();
     }
 
     private static CsvConfiguration _csvConfig = new(CultureInfo.InvariantCulture)

src/NadekoBot/Modules/Searches/Crypto/_Common/StockData.cs

@@ -6,7 +6,7 @@ public class StockData
     public string Name { get; set; }
     public string Symbol { get; set; }
     public double Price { get; set; }
-    public long MarketCap { get; set; }
+    public string MarketCap { get; set; }
     public double Close { get; set; }
     public double Change50d { get; set; }
     public double Change200d { get; set; }

src/NadekoBot/Modules/Searches/_Common/Config/SearchesConfigService.cs

@@ -30,7 +30,7 @@ public class SearchesConfigService : ConfigServiceBase<SearchesConfig>
 
         AddParsedProp("followedStreams.maxCount",
             sc => sc.FollowedStreams.MaxCount,
-            ConfigParsers.InsensitiveEnum,
+            int.TryParse,
             ConfigPrinters.ToString);
 
         Migrate();

src/NadekoBot/Modules/Xp/Club/Club.cs

@@ -259,8 +259,8 @@ public partial class Xp
                 await ReplyConfirmLocalizedAsync(strs.club_applied(Format.Bold(club.ToString())));
             else if (result == ClubApplyResult.Banned)
                 await ReplyErrorLocalizedAsync(strs.club_join_banned);
-            else if (result == ClubApplyResult.InsufficientLevel)
-                await ReplyErrorLocalizedAsync(strs.club_insuff_lvl);
+            else if (result == ClubApplyResult.AlreadyApplied)
+                await ReplyErrorLocalizedAsync(strs.club_already_applied);
             else if (result == ClubApplyResult.AlreadyInAClub)
                 await ReplyErrorLocalizedAsync(strs.club_already_in);
         }

src/NadekoBot/Modules/Xp/Club/ClubService.cs

@@ -146,7 +146,7 @@ public class ClubService : INService, IClubService
             return ClubApplyResult.Banned;
         
         if (club.Applicants.Any(x => x.UserId == du.Id))
-            return ClubApplyResult.InsufficientLevel;
+            return ClubApplyResult.AlreadyApplied;
 
         var app = new ClubApplicants
         {

src/NadekoBot/Modules/Xp/Club/IClubService.cs

@@ -27,8 +27,7 @@ public interface IClubService
 public enum ClubApplyResult
 {
     Success,
-
     AlreadyInAClub,
     Banned,
-    InsufficientLevel
+    AlreadyApplied
 }

src/NadekoBot/Services/Impl/StatsService.cs

@@ -7,7 +7,7 @@ namespace NadekoBot.Services;
 
 public sealed class StatsService : IStatsService, IReadyExecutor, INService
 {
-    public const string BOT_VERSION = "4.3.19";
+    public const string BOT_VERSION = "4.3.21";
 
     public string Author
         => "Kwoth#2452";

src/NadekoBot/data/strings/responses/responses.en-US.json

@@ -838,7 +838,7 @@
   "server_leaderboard": "Server XP Leaderboard",
   "global_leaderboard": "Global XP Leaderboard",
   "modified": "Modified server XP of the user {0} by {1}",
-  "club_insuff_lvl": "You're insufficient level to join that club.",
+  "club_already_applied": "You've already applied to that club.",
   "club_join_banned": "You're banned from that club.",
   "club_already_in": "You are already a member of a club.",
   "club_create_error_name": "Failed creating the club. A club with that name already exists.",