From 9ddcd6d89e38b2efedf5514fd2e75b7dae51f025 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 10 May 2024 15:36:12 +0000 Subject: [PATCH] docs: Updated changelog --- CHANGELOG.md | 2 +- docs/guides/windows-guide.md | 8 ++++++-- .../Replacements/Impl/ReplacementRegistrator.default.cs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 203e829e7..b5c59584d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o -## [5.0.3] - 10.05.2024 +## [5.0.4] - 10.05.2024 ### Added diff --git a/docs/guides/windows-guide.md b/docs/guides/windows-guide.md index 419787370..f2e273a40 100644 --- a/docs/guides/windows-guide.md +++ b/docs/guides/windows-guide.md @@ -93,8 +93,12 @@ Open PowerShell as described above and run the following commands: - ⚠️ Make sure you don't have your database, credentials or any other nadekobot folder open in some application, this might prevent some of the steps from executing succesfully 2. Navigate to your bot's folder, example: - `cd ~/Desktop/nadekobot` -3. Pull the new version - - `git pull` +3. Pull the new version, and make sure you're on the v5 branch + - *⚠️ the first 3 lines can be omitted if you're already on v5. If you're updating from v4, you must run them* + - `git remote set-branches origin '*'` + - `git fetch -v --depth=1` + - `git checkout v5` + - `git pull` - ⚠️ If this fails, you may want to stash or remove your code changes if you don't know how to resolve merge conflicts 4. **Backup** old output in case your data is overwritten - `cp -r -fo output/ output-old` diff --git a/src/NadekoBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs b/src/NadekoBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs index 306617901..52cd00ea9 100644 --- a/src/NadekoBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs +++ b/src/NadekoBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs @@ -40,7 +40,7 @@ public sealed partial class ReplacementPatternStore Register("%server.id%", static (IGuild g) => g.Id.ToString()); Register("%server.name%", static (IGuild g) => g.Name); Register("%server.icon%", static (IGuild g) => g.IconUrl); - Register("%server.members%", static (IGuild g) => g.ApproximateMemberCount?.ToString() ?? "?"); + Register("%server.members%", static async (IGuild g) => (g as SocketGuild)?.MemberCount.ToString() ?? "?"); Register("%server.boosters%", static (IGuild g) => g.PremiumSubscriptionCount.ToString()); Register("%server.boost_level%", static (IGuild g) => ((int)g.PremiumTier).ToString()); }