minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-10 09:18:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4' into 4.3

Browse Source
This commit is contained in:
Kwoth
2022-07-11 03:33:29 +02:00
parent 946b095d4b c9287dc166
commit ff779ad494
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/guides/windows-guide.md
View File

@@ -31,7 +31,8 @@
![Create a new bot](https://i.imgur.com/JxtRk9e.png "Create a new bot") ![Create a new bot](https://i.imgur.com/JxtRk9e.png "Create a new bot")
- Click on **`DOWNLOAD`** at the lower right - Click on **`DOWNLOAD`** at the lower right
![Bot Setup](https://i.imgur.com/HqAl36p.png "Bot Setup") ![Bot Setup](https://i.imgur.com/HqAl36p.png "Bot Setup")
- Click on **`Install`** next to **`Redis`**. - Click on **`Install`** next to **`Redis`**.
- **(Note: Redis is optional unless you are are using the bot on 2000+ servers)**
- Note: If Redis fails to install, install Redis manually here: [Redis Installer](https://github.com/MicrosoftArchive/redis/releases/tag/win-3.0.504) Download and run the **`.msi`** file. - Note: If Redis fails to install, install Redis manually here: [Redis Installer](https://github.com/MicrosoftArchive/redis/releases/tag/win-3.0.504) Download and run the **`.msi`** file.
- If you will use the music module, click on **`Install`** next to **`FFMPEG`** and **`Youtube-DL`**. - If you will use the music module, click on **`Install`** next to **`FFMPEG`** and **`Youtube-DL`**.
- If any dependencies fail to install, you can temporarily disable your Windows Defender/AV until you install them. If you don't want to, then read [the last section of this guide](#Manual-Prerequisite-Installation). - If any dependencies fail to install, you can temporarily disable your Windows Defender/AV until you install them. If you don't want to, then read [the last section of this guide](#Manual-Prerequisite-Installation).

7
src/NadekoBot/Modules/Xp/XpService.cs
View File

@@ -319,11 +319,14 @@ public class XpService : INService, IReadyExecutor, IExecNoCommand
long newLevel, long newLevel,
XpNotificationLocation notifyLoc) XpNotificationLocation notifyLoc)
{ {
var user = await _client.GetUserAsync(userId); if (notifyLoc == XpNotificationLocation.None)
return;
var guild = _client.GetGuild(guildId); var guild = _client.GetGuild(guildId);
var user = guild?.GetUser(userId);
var ch = guild?.GetTextChannel(channelId); var ch = guild?.GetTextChannel(channelId);
if (user is null || guild is null) if (guild is null || user is null)
return; return;
if (isServer) if (isServer)