mirror of
https://gitlab.com/Kwoth/nadekobot.git
synced 2025-09-11 17:58:26 -04:00
Compare commits
38 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
3f5443dd54 | ||
|
93df4f3bf3 | ||
|
073b832065 | ||
|
a01e580e03 | ||
|
6124e2fab5 | ||
|
4dd31d6a0b | ||
|
e8706d4006 | ||
|
140cc43c98 | ||
|
26b7149435 | ||
|
b354ee7269 | ||
|
b829ca0109 | ||
|
37acdb81e8 | ||
|
a9aea65134 | ||
|
5c03c5ba16 | ||
|
42f00c08fa | ||
|
598d3b8967 | ||
|
8df41c749b | ||
|
0eaa8be2d2 | ||
|
bdbe76f9f8 | ||
|
08b609a4b4 | ||
|
42d13b32b2 | ||
|
096ada367f | ||
|
0fed33ebda | ||
|
cb9e918681 | ||
|
bbf167df4d | ||
|
595a2b401c | ||
|
5713e8414e | ||
|
a551caf0da | ||
|
b13f05c4c0 | ||
|
6d6a3a811f | ||
|
fb4aac9f0d | ||
|
a98981de86 | ||
|
9ef3646711 | ||
|
9c174b8b6f | ||
|
657c1e461c | ||
|
f5a4a698bd | ||
|
8112337aaf | ||
|
73f7394e31 |
36
CHANGELOG.md
36
CHANGELOG.md
@@ -2,7 +2,41 @@
|
|||||||
|
|
||||||
Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
|
Experimental changelog. Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
|
||||||
|
|
||||||
## [4.3.12] - 11.02.2023
|
## [4.3.16] - 24.05.2023
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed missing events from `.logevents`
|
||||||
|
- Fixed `.log` thread deleted and thread created events not working properly
|
||||||
|
|
||||||
|
## [4.3.15] - 21.05.2023
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed -w 0 in trivia
|
||||||
|
- Fixed `.rps` amount field in the response
|
||||||
|
- Fixed `.showembed` output
|
||||||
|
- Fixed bank award's incorrect output message
|
||||||
|
|
||||||
|
## [4.3.14] - 02.04.2023
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed voice hearbeat issue
|
||||||
|
- `.banktake` had ok/error responses flipped. No functional change
|
||||||
|
- PermRole should deny messages in threads todo
|
||||||
|
- Fixed chucknorris jokes
|
||||||
|
- `.logserver` will now
|
||||||
|
|
||||||
|
## [4.3.13] - 20.02.2023
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed `.log userpresence`
|
||||||
|
- `.q` will now use `yt-dlp` if anything other than `ytProvider: Ytdl` is set in `data/searches.yml`
|
||||||
|
- Fixed Title links on some embeds
|
||||||
|
|
||||||
|
## [4.3.12] - 12.02.2023
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
@@ -24,6 +24,10 @@ The list below is not complete. Use commands above to see up-to-date list for yo
|
|||||||
|
|
||||||
`trivia.min_win_req` - Restricts a user's ability to make a trivia game with a win requirement less than the set value.
|
`trivia.min_win_req` - Restricts a user's ability to make a trivia game with a win requirement less than the set value.
|
||||||
`trivia.currency_reward` - Sets the amount of currency a user will win if they place first in a completed trivia game.
|
`trivia.currency_reward` - Sets the amount of currency a user will win if they place first in a completed trivia game.
|
||||||
|
`hangman.currency_reward` - Sets the amount of currency a user will win if they win a game of hangman.
|
||||||
|
`chatbot` - Sets which chatbot API the bot should use, values: `gpt3`, `cleverbot`.
|
||||||
|
`gpt.model` - Sets which GPT-3 model the bot should use, values: `ada001`, `babbage001`, `curie001`, `davinci003`.
|
||||||
|
`gpt.max_tokens` - Sets the limit of tokens GPT-3 can use per call. Find out more about tokens [here](https://help.openai.com/en/articles/4936856-what-are-tokens-and-how-to-count-them).
|
||||||
|
|
||||||
*more settings may be available in `data/games.yml` file*
|
*more settings may be available in `data/games.yml` file*
|
||||||
|
|
||||||
|
@@ -20,7 +20,7 @@ It is recommended that you use **Ubuntu 20.04**, as there have been nearly no pr
|
|||||||
|
|
||||||
##### Compatible operating systems:
|
##### Compatible operating systems:
|
||||||
|
|
||||||
- Ubuntu: 16.04, 18.04, 20.04, 21.04, 21.10
|
- Ubuntu: 16.04, 18.04, 20.04
|
||||||
- Mint: 19, 20
|
- Mint: 19, 20
|
||||||
- Debian: 10, 11
|
- Debian: 10, 11
|
||||||
- CentOS: 7
|
- CentOS: 7
|
||||||
|
@@ -123,7 +123,7 @@ In order to use music commands, you need ffmpeg and youtube-dl installed.
|
|||||||
- [ffmpeg-32bit] | [ffmpeg-64bit] - Download the **appropriate version** for your system (32 bit if you're running a 32 bit OS, or 64 if you're running a 64bit OS). Unzip it, and move `ffmpeg.exe` to a path that's in your PATH environment variable. If you don't know what that is, just move the `ffmpeg.exe` file to `NadekoBot/output`.
|
- [ffmpeg-32bit] | [ffmpeg-64bit] - Download the **appropriate version** for your system (32 bit if you're running a 32 bit OS, or 64 if you're running a 64bit OS). Unzip it, and move `ffmpeg.exe` to a path that's in your PATH environment variable. If you don't know what that is, just move the `ffmpeg.exe` file to `NadekoBot/output`.
|
||||||
- [youtube-dl] - Click to download the file, then move `youtube-dl.exe` to a path that's in your PATH environment variable. If you don't know what that is, just move the `youtube-dl.exe` file to `NadekoBot/system`.
|
- [youtube-dl] - Click to download the file, then move `youtube-dl.exe` to a path that's in your PATH environment variable. If you don't know what that is, just move the `youtube-dl.exe` file to `NadekoBot/system`.
|
||||||
|
|
||||||
[Updater]: https://dl.nadeko.bot/
|
[Updater]: https://dl.nadeko.bot/v3/
|
||||||
[Notepad++]: https://notepad-plus-plus.org/
|
[Notepad++]: https://notepad-plus-plus.org/
|
||||||
[.net]: https://dotnet.microsoft.com/download/dotnet/5.0
|
[.net]: https://dotnet.microsoft.com/download/dotnet/5.0
|
||||||
[Redis]: https://github.com/MicrosoftArchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.msi
|
[Redis]: https://github.com/MicrosoftArchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.msi
|
||||||
|
@@ -89,6 +89,5 @@ Some features have their own specific placeholders which are noted in that featu
|
|||||||
|
|
||||||
- `%rngX-Y%` - Returns a random number between X and Y
|
- `%rngX-Y%` - Returns a random number between X and Y
|
||||||
- `%target%` - Returns anything the user has written after the trigger (only works on Expressions)
|
- `%target%` - Returns anything the user has written after the trigger (only works on Expressions)
|
||||||
- `%img:stuff%` - Returns an `imgur.com` search for "stuff" (only works on Expressions)
|
|
||||||
|
|
||||||

|

|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
#nullable disable warnings
|
#nullable disable warnings
|
||||||
using SixLabors.ImageSharp.PixelFormats;
|
using SixLabors.ImageSharp.PixelFormats;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace NadekoBot;
|
namespace NadekoBot;
|
||||||
|
|
||||||
@@ -7,14 +8,14 @@ public sealed record SmartEmbedArrayElementText : SmartEmbedTextBase
|
|||||||
{
|
{
|
||||||
public string Color { get; init; } = string.Empty;
|
public string Color { get; init; } = string.Empty;
|
||||||
|
|
||||||
public SmartEmbedArrayElementText() : base()
|
public SmartEmbedArrayElementText()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public SmartEmbedArrayElementText(IEmbed eb) : base(eb)
|
public SmartEmbedArrayElementText(IEmbed eb) : base(eb)
|
||||||
{
|
{
|
||||||
|
Color = eb.Color is { } c ? new Rgba32(c.R, c.G, c.B).ToHex() : string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override EmbedBuilder GetEmbedInternal()
|
protected override EmbedBuilder GetEmbedInternal()
|
||||||
@@ -63,6 +64,7 @@ public abstract record SmartEmbedTextBase : SmartText
|
|||||||
public SmartTextEmbedFooter Footer { get; init; }
|
public SmartTextEmbedFooter Footer { get; init; }
|
||||||
public SmartTextEmbedField[] Fields { get; init; }
|
public SmartTextEmbedField[] Fields { get; init; }
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
public bool IsValid
|
public bool IsValid
|
||||||
=> !string.IsNullOrWhiteSpace(Title)
|
=> !string.IsNullOrWhiteSpace(Title)
|
||||||
|| !string.IsNullOrWhiteSpace(Description)
|
|| !string.IsNullOrWhiteSpace(Description)
|
||||||
|
@@ -1,4 +1,6 @@
|
|||||||
#nullable disable
|
#nullable disable
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace NadekoBot;
|
namespace NadekoBot;
|
||||||
|
|
||||||
public sealed record SmartEmbedTextArray : SmartText
|
public sealed record SmartEmbedTextArray : SmartText
|
||||||
@@ -6,6 +8,7 @@ public sealed record SmartEmbedTextArray : SmartText
|
|||||||
public string Content { get; set; }
|
public string Content { get; set; }
|
||||||
public SmartEmbedArrayElementText[] Embeds { get; set; }
|
public SmartEmbedArrayElementText[] Embeds { get; set; }
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
public bool IsValid
|
public bool IsValid
|
||||||
=> Embeds?.All(x => x.IsValid) ?? false;
|
=> Embeds?.All(x => x.IsValid) ?? false;
|
||||||
|
|
||||||
|
@@ -1,16 +1,20 @@
|
|||||||
#nullable disable
|
#nullable disable
|
||||||
using Newtonsoft.Json.Linq;
|
using Newtonsoft.Json.Linq;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace NadekoBot;
|
namespace NadekoBot;
|
||||||
|
|
||||||
public abstract record SmartText
|
public abstract record SmartText
|
||||||
{
|
{
|
||||||
|
[JsonIgnore]
|
||||||
public bool IsEmbed
|
public bool IsEmbed
|
||||||
=> this is SmartEmbedText;
|
=> this is SmartEmbedText;
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
public bool IsPlainText
|
public bool IsPlainText
|
||||||
=> this is SmartPlainText;
|
=> this is SmartPlainText;
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
public bool IsEmbedArray
|
public bool IsEmbedArray
|
||||||
=> this is SmartEmbedTextArray;
|
=> this is SmartEmbedTextArray;
|
||||||
|
|
||||||
|
@@ -46,9 +46,7 @@ public sealed class CommandOrExprTypeReader : NadekoTypeReader<CommandOrExprInfo
|
|||||||
|
|
||||||
public override async ValueTask<TypeReaderResult<CommandOrExprInfo>> ReadAsync(ICommandContext ctx, string input)
|
public override async ValueTask<TypeReaderResult<CommandOrExprInfo>> ReadAsync(ICommandContext ctx, string input)
|
||||||
{
|
{
|
||||||
input = input.ToUpperInvariant();
|
if (_exprs.ExpressionExists(ctx.Guild?.Id, input))
|
||||||
|
|
||||||
if (_exprs.ExpressionExists(ctx.Guild?.Id, input) || _exprs.ExpressionExists(null, input))
|
|
||||||
return TypeReaderResult.FromSuccess(new CommandOrExprInfo(input, CommandOrExprInfo.Type.Custom));
|
return TypeReaderResult.FromSuccess(new CommandOrExprInfo(input, CommandOrExprInfo.Type.Custom));
|
||||||
|
|
||||||
var cmd = await new CommandTypeReader(_commandHandler, _cmds).ReadAsync(ctx, input);
|
var cmd = await new CommandTypeReader(_commandHandler, _cmds).ReadAsync(ctx, input);
|
||||||
|
@@ -12,10 +12,4 @@ public static class NadekoExpressionExtensions
|
|||||||
|
|
||||||
public static IEnumerable<NadekoExpression> ForId(this DbSet<NadekoExpression> exprs, ulong id)
|
public static IEnumerable<NadekoExpression> ForId(this DbSet<NadekoExpression> exprs, ulong id)
|
||||||
=> exprs.AsNoTracking().AsQueryable().Where(x => x.GuildId == id).ToList();
|
=> exprs.AsNoTracking().AsQueryable().Where(x => x.GuildId == id).ToList();
|
||||||
|
|
||||||
public static NadekoExpression GetByGuildIdAndInput(
|
|
||||||
this DbSet<NadekoExpression> exprs,
|
|
||||||
ulong? guildId,
|
|
||||||
string input)
|
|
||||||
=> exprs.FirstOrDefault(x => x.GuildId == guildId && x.Trigger.ToUpper() == input);
|
|
||||||
}
|
}
|
@@ -19,6 +19,7 @@ public class MuteService : INService
|
|||||||
|
|
||||||
private static readonly OverwritePermissions _denyOverwrite = new(addReactions: PermValue.Deny,
|
private static readonly OverwritePermissions _denyOverwrite = new(addReactions: PermValue.Deny,
|
||||||
sendMessages: PermValue.Deny,
|
sendMessages: PermValue.Deny,
|
||||||
|
sendMessagesInThreads: PermValue.Deny,
|
||||||
attachFiles: PermValue.Deny);
|
attachFiles: PermValue.Deny);
|
||||||
|
|
||||||
public event Action<IGuildUser, IUser, MuteType, string> UserMuted = delegate { };
|
public event Action<IGuildUser, IUser, MuteType, string> UserMuted = delegate { };
|
||||||
|
@@ -73,6 +73,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
|
|||||||
_client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated;
|
_client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated;
|
||||||
_client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated_TTS;
|
_client.UserVoiceStateUpdated += _client_UserVoiceStateUpdated_TTS;
|
||||||
_client.GuildMemberUpdated += _client_GuildUserUpdated;
|
_client.GuildMemberUpdated += _client_GuildUserUpdated;
|
||||||
|
_client.PresenceUpdated += _client_PresenceUpdated;
|
||||||
_client.UserUpdated += _client_UserUpdated;
|
_client.UserUpdated += _client_UserUpdated;
|
||||||
_client.ChannelCreated += _client_ChannelCreated;
|
_client.ChannelCreated += _client_ChannelCreated;
|
||||||
_client.ChannelDestroyed += _client_ChannelDestroyed;
|
_client.ChannelDestroyed += _client_ChannelDestroyed;
|
||||||
@@ -90,15 +91,70 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
|
|||||||
_punishService.OnUserWarned += PunishServiceOnOnUserWarned;
|
_punishService.OnUserWarned += PunishServiceOnOnUserWarned;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task _client_PresenceUpdated(SocketUser user, SocketPresence? before, SocketPresence? after)
|
||||||
|
{
|
||||||
|
if (user is not SocketGuildUser gu)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!GuildLogSettings.TryGetValue(gu.Guild.Id, out var logSetting)
|
||||||
|
|| before is null
|
||||||
|
|| after is null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
ITextChannel? logChannel;
|
||||||
|
|
||||||
|
if (!user.IsBot
|
||||||
|
&& logSetting.LogUserPresenceId is not null
|
||||||
|
&& (logChannel =
|
||||||
|
await TryGetLogChannel(gu.Guild, logSetting, LogType.UserPresence)) is not null)
|
||||||
|
{
|
||||||
|
if (before.Status != after.Status)
|
||||||
|
{
|
||||||
|
var str = "🎭"
|
||||||
|
+ Format.Code(PrettyCurrentTime(gu.Guild))
|
||||||
|
+ GetText(logChannel.Guild,
|
||||||
|
strs.user_status_change("👤" + Format.Bold(gu.Username),
|
||||||
|
Format.Bold(after.Status.ToString())));
|
||||||
|
PresenceUpdates.AddOrUpdate(logChannel,
|
||||||
|
new List<string>
|
||||||
|
{
|
||||||
|
str
|
||||||
|
},
|
||||||
|
(_, list) =>
|
||||||
|
{
|
||||||
|
list.Add(str);
|
||||||
|
return list;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else if (before.Activities.FirstOrDefault()?.Name != after.Activities.FirstOrDefault()?.Name)
|
||||||
|
{
|
||||||
|
var str =
|
||||||
|
$"👾`{PrettyCurrentTime(gu.Guild)}`👤__**{gu.Username}**__ is now playing **{after.Activities.FirstOrDefault()?.Name ?? "-"}**.";
|
||||||
|
PresenceUpdates.AddOrUpdate(logChannel,
|
||||||
|
new List<string>
|
||||||
|
{
|
||||||
|
str
|
||||||
|
},
|
||||||
|
(_, list) =>
|
||||||
|
{
|
||||||
|
list.Add(str);
|
||||||
|
return list;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private Task _client_ThreadDeleted(Cacheable<SocketThreadChannel, ulong> sch)
|
private Task _client_ThreadDeleted(Cacheable<SocketThreadChannel, ulong> sch)
|
||||||
{
|
{
|
||||||
_ = Task.Run(async () =>
|
_ = Task.Run(async () =>
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (sch.HasValue || sch.Value is not IGuildChannel ch)
|
if (!sch.HasValue)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
var ch = sch.Value;
|
||||||
|
|
||||||
if (!GuildLogSettings.TryGetValue(ch.Guild.Id, out var logSetting)
|
if (!GuildLogSettings.TryGetValue(ch.Guild.Id, out var logSetting)
|
||||||
|| logSetting.ThreadDeletedId is null)
|
|| logSetting.ThreadDeletedId is null)
|
||||||
return;
|
return;
|
||||||
@@ -111,7 +167,7 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
|
|||||||
|
|
||||||
await logChannel.EmbedAsync(_eb.Create()
|
await logChannel.EmbedAsync(_eb.Create()
|
||||||
.WithOkColor()
|
.WithOkColor()
|
||||||
.WithTitle("🆕 " + title)
|
.WithTitle("🗑 " + title)
|
||||||
.WithDescription($"{ch.Name} | {ch.Id}")
|
.WithDescription($"{ch.Name} | {ch.Id}")
|
||||||
.WithFooter(CurrentTime(ch.Guild)));
|
.WithFooter(CurrentTime(ch.Guild)));
|
||||||
}
|
}
|
||||||
@@ -123,15 +179,12 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
|
|||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Task _client_ThreadCreated(SocketThreadChannel sch)
|
private Task _client_ThreadCreated(SocketThreadChannel ch)
|
||||||
{
|
{
|
||||||
_ = Task.Run(async () =>
|
_ = Task.Run(async () =>
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (sch.Guild is not IGuildChannel ch)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!GuildLogSettings.TryGetValue(ch.Guild.Id, out var logSetting)
|
if (!GuildLogSettings.TryGetValue(ch.Guild.Id, out var logSetting)
|
||||||
|| logSetting.ThreadCreatedId is null)
|
|| logSetting.ThreadCreatedId is null)
|
||||||
return;
|
return;
|
||||||
@@ -192,7 +245,9 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
|
|||||||
})
|
})
|
||||||
.WhenAll();
|
.WhenAll();
|
||||||
}
|
}
|
||||||
catch { }
|
catch
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -255,13 +310,13 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
|
|||||||
logSetting.UserLeftId = logSetting.UserBannedId = logSetting.UserUnbannedId = logSetting.UserUpdatedId =
|
logSetting.UserLeftId = logSetting.UserBannedId = logSetting.UserUnbannedId = logSetting.UserUpdatedId =
|
||||||
logSetting.ChannelCreatedId = logSetting.ChannelDestroyedId = logSetting.ChannelUpdatedId =
|
logSetting.ChannelCreatedId = logSetting.ChannelDestroyedId = logSetting.ChannelUpdatedId =
|
||||||
logSetting.LogUserPresenceId = logSetting.LogVoicePresenceId = logSetting.UserMutedId =
|
logSetting.LogUserPresenceId = logSetting.LogVoicePresenceId = logSetting.UserMutedId =
|
||||||
logSetting.LogVoicePresenceTTSId = value ? channelId : null;
|
logSetting.LogVoicePresenceTTSId = logSetting.ThreadCreatedId = logSetting.ThreadDeletedId
|
||||||
|
= logSetting.LogWarnsId = value ? channelId : null;
|
||||||
await uow.SaveChangesAsync();
|
await uow.SaveChangesAsync();
|
||||||
GuildLogSettings.AddOrUpdate(guildId, _ => logSetting, (_, _) => logSetting);
|
GuildLogSettings.AddOrUpdate(guildId, _ => logSetting, (_, _) => logSetting);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private async Task PunishServiceOnOnUserWarned(Warning arg)
|
private async Task PunishServiceOnOnUserWarned(Warning arg)
|
||||||
{
|
{
|
||||||
if (!GuildLogSettings.TryGetValue(arg.GuildId, out var logSetting) || logSetting.LogWarnsId is null)
|
if (!GuildLogSettings.TryGetValue(arg.GuildId, out var logSetting) || logSetting.LogWarnsId is null)
|
||||||
@@ -400,6 +455,12 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
|
|||||||
case LogType.UserWarned:
|
case LogType.UserWarned:
|
||||||
channelId = logSetting.LogWarnsId = logSetting.LogWarnsId is null ? cid : default;
|
channelId = logSetting.LogWarnsId = logSetting.LogWarnsId is null ? cid : default;
|
||||||
break;
|
break;
|
||||||
|
case LogType.ThreadDeleted:
|
||||||
|
channelId = logSetting.ThreadDeletedId = logSetting.ThreadDeletedId is null ? cid : default;
|
||||||
|
break;
|
||||||
|
case LogType.ThreadCreated:
|
||||||
|
channelId = logSetting.ThreadCreatedId = logSetting.ThreadCreatedId is null ? cid : default;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
uow.SaveChanges();
|
uow.SaveChanges();
|
||||||
@@ -676,46 +737,6 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!before.IsBot
|
|
||||||
&& logSetting.LogUserPresenceId is not null
|
|
||||||
&& (logChannel =
|
|
||||||
await TryGetLogChannel(before.Guild, logSetting, LogType.UserPresence)) is not null)
|
|
||||||
{
|
|
||||||
if (before.Status != after.Status)
|
|
||||||
{
|
|
||||||
var str = "🎭"
|
|
||||||
+ Format.Code(PrettyCurrentTime(after.Guild))
|
|
||||||
+ GetText(logChannel.Guild,
|
|
||||||
strs.user_status_change("👤" + Format.Bold(after.Username),
|
|
||||||
Format.Bold(after.Status.ToString())));
|
|
||||||
PresenceUpdates.AddOrUpdate(logChannel,
|
|
||||||
new List<string>
|
|
||||||
{
|
|
||||||
str
|
|
||||||
},
|
|
||||||
(_, list) =>
|
|
||||||
{
|
|
||||||
list.Add(str);
|
|
||||||
return list;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
else if (before.Activities.FirstOrDefault()?.Name != after.Activities.FirstOrDefault()?.Name)
|
|
||||||
{
|
|
||||||
var str =
|
|
||||||
$"👾`{PrettyCurrentTime(after.Guild)}`👤__**{after.Username}**__ is now playing **{after.Activities.FirstOrDefault()?.Name ?? "-"}**.";
|
|
||||||
PresenceUpdates.AddOrUpdate(logChannel,
|
|
||||||
new List<string>
|
|
||||||
{
|
|
||||||
str
|
|
||||||
},
|
|
||||||
(_, list) =>
|
|
||||||
{
|
|
||||||
list.Add(str);
|
|
||||||
return list;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -1060,7 +1081,6 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
|
|||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var embed = _eb.Create()
|
var embed = _eb.Create()
|
||||||
@@ -1252,6 +1272,12 @@ public sealed class LogCommandService : ILogCommandService, IReadyExecutor
|
|||||||
case LogType.UserWarned:
|
case LogType.UserWarned:
|
||||||
id = logSetting.LogWarnsId;
|
id = logSetting.LogWarnsId;
|
||||||
break;
|
break;
|
||||||
|
case LogType.ThreadCreated:
|
||||||
|
id = logSetting.ThreadCreatedId;
|
||||||
|
break;
|
||||||
|
case LogType.ThreadDeleted:
|
||||||
|
id = logSetting.ThreadDeletedId;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (id is null or 0)
|
if (id is null or 0)
|
||||||
|
@@ -143,6 +143,12 @@ public partial class Administration
|
|||||||
return l.LogVoicePresenceTTSId;
|
return l.LogVoicePresenceTTSId;
|
||||||
case LogType.UserMuted:
|
case LogType.UserMuted:
|
||||||
return l.UserMutedId;
|
return l.UserMutedId;
|
||||||
|
case LogType.UserWarned:
|
||||||
|
return l.LogWarnsId;
|
||||||
|
case LogType.ThreadDeleted:
|
||||||
|
return l.ThreadDeletedId;
|
||||||
|
case LogType.ThreadCreated:
|
||||||
|
return l.ThreadCreatedId;
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@@ -57,8 +57,8 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor
|
|||||||
// 1. expressions are almost never added (compared to how many times they are being looped through)
|
// 1. expressions are almost never added (compared to how many times they are being looped through)
|
||||||
// 2. only need write locks for this as we'll rebuild+replace the array on every edit
|
// 2. only need write locks for this as we'll rebuild+replace the array on every edit
|
||||||
// 3. there's never many of them (at most a thousand, usually < 100)
|
// 3. there's never many of them (at most a thousand, usually < 100)
|
||||||
private NadekoExpression[] globalExpressions;
|
private NadekoExpression[] globalExpressions = Array.Empty<NadekoExpression>();
|
||||||
private ConcurrentDictionary<ulong, NadekoExpression[]> newguildExpressions;
|
private ConcurrentDictionary<ulong, NadekoExpression[]> newguildExpressions = new();
|
||||||
|
|
||||||
private readonly DbService _db;
|
private readonly DbService _db;
|
||||||
private readonly DiscordSocketClient _client;
|
private readonly DiscordSocketClient _client;
|
||||||
@@ -509,9 +509,25 @@ public sealed class NadekoExpressionsService : IExecOnMessage, IReadyExecutor
|
|||||||
|
|
||||||
public bool ExpressionExists(ulong? guildId, string input)
|
public bool ExpressionExists(ulong? guildId, string input)
|
||||||
{
|
{
|
||||||
using var uow = _db.GetDbContext();
|
input = input.ToLowerInvariant();
|
||||||
var expr = uow.Expressions.GetByGuildIdAndInput(guildId, input);
|
|
||||||
return expr is not null;
|
var gexprs = globalExpressions;
|
||||||
|
foreach (var t in gexprs)
|
||||||
|
{
|
||||||
|
if (t.Trigger == input)
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (guildId is ulong gid && newguildExpressions.TryGetValue(gid, out var guildExprs))
|
||||||
|
{
|
||||||
|
foreach (var t in guildExprs)
|
||||||
|
{
|
||||||
|
if (t.Trigger == input)
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string ExportExpressions(ulong? guildId)
|
public string ExportExpressions(ulong? guildId)
|
||||||
|
@@ -77,28 +77,24 @@ public partial class Gambling
|
|||||||
{
|
{
|
||||||
if (await _bank.TakeAsync(userId, amount))
|
if (await _bank.TakeAsync(userId, amount))
|
||||||
{
|
{
|
||||||
|
await ctx.OkAsync();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
await ReplyErrorLocalizedAsync(strs.take_fail(N(amount),
|
await ReplyErrorLocalizedAsync(strs.take_fail(N(amount),
|
||||||
_client.GetUser(userId)?.ToString()
|
_client.GetUser(userId)?.ToString()
|
||||||
?? userId.ToString(),
|
?? userId.ToString(),
|
||||||
CurrencySign));
|
CurrencySign));
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await ctx.OkAsync();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task BankAwardInternalAsync(long amount, ulong userId)
|
private async Task BankAwardInternalAsync(long amount, ulong userId)
|
||||||
{
|
{
|
||||||
if (await _bank.AwardAsync(userId, amount))
|
if (await _bank.AwardAsync(userId, amount))
|
||||||
{
|
{
|
||||||
await ReplyErrorLocalizedAsync(strs.take_fail(N(amount),
|
await ctx.OkAsync();
|
||||||
_client.GetUser(userId)?.ToString()
|
|
||||||
?? userId.ToString(),
|
|
||||||
CurrencySign));
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await ctx.OkAsync();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[Cmd]
|
[Cmd]
|
||||||
|
@@ -840,7 +840,7 @@ public partial class Gambling : GamblingModule<GamblingService>
|
|||||||
else if (result.Result == RpsResultType.Win)
|
else if (result.Result == RpsResultType.Win)
|
||||||
{
|
{
|
||||||
if ((long)result.Won > 0)
|
if ((long)result.Won > 0)
|
||||||
embed.AddField(GetText(strs.won), N(amount.Value));
|
embed.AddField(GetText(strs.won), N((long)result.Won));
|
||||||
|
|
||||||
msg = GetText(strs.rps_win(ctx.User.Mention,
|
msg = GetText(strs.rps_win(ctx.User.Mention,
|
||||||
GetRpsPick(pick),
|
GetRpsPick(pick),
|
||||||
|
@@ -108,10 +108,10 @@ public sealed partial class GamesConfig : ICloneable<GamesConfig>
|
|||||||
public sealed partial class ChatGptConfig
|
public sealed partial class ChatGptConfig
|
||||||
{
|
{
|
||||||
[Comment(@"Which GPT-3 Model should bot use.
|
[Comment(@"Which GPT-3 Model should bot use.
|
||||||
'ada' - cheapest and fastest
|
'ada001' - cheapest and fastest
|
||||||
'babbage' - 2nd option
|
'babbage001' - 2nd option
|
||||||
'curie' - 3rd option
|
'curie001' - 3rd option
|
||||||
'davinci' - Most expensive, slowest")]
|
'davinci003' - Most expensive, slowest")]
|
||||||
public Gpt3Model Model { get; set; } = Gpt3Model.Ada001;
|
public Gpt3Model Model { get; set; } = Gpt3Model.Ada001;
|
||||||
|
|
||||||
[Comment(@"The maximum number of tokens to use per GPT-3 API call")]
|
[Comment(@"The maximum number of tokens to use per GPT-3 API call")]
|
||||||
|
@@ -36,7 +36,7 @@ public partial class Games
|
|||||||
var (opts, _) = OptionsParser.ParseFrom(new TriviaOptions(), args);
|
var (opts, _) = OptionsParser.ParseFrom(new TriviaOptions(), args);
|
||||||
|
|
||||||
var config = _gamesConfig.Data;
|
var config = _gamesConfig.Data;
|
||||||
if (config.Trivia.MinimumWinReq > 0 && config.Trivia.MinimumWinReq > opts.WinRequirement)
|
if (opts.WinRequirement != 0 && config.Trivia.MinimumWinReq > 0 && config.Trivia.MinimumWinReq > opts.WinRequirement)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var trivia = new TriviaGame(opts, _cache);
|
var trivia = new TriviaGame(opts, _cache);
|
||||||
|
@@ -157,7 +157,7 @@ public sealed class TriviaGame
|
|||||||
|
|
||||||
var isWin = false;
|
var isWin = false;
|
||||||
// if user won the game, tell the game to stop
|
// if user won the game, tell the game to stop
|
||||||
if (val >= _opts.WinRequirement)
|
if (_opts.WinRequirement != 0 && val >= _opts.WinRequirement)
|
||||||
{
|
{
|
||||||
_isStopped = true;
|
_isStopped = true;
|
||||||
isWin = true;
|
isWin = true;
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
using NadekoBot.Modules.Searches;
|
||||||
|
|
||||||
namespace NadekoBot.Modules.Music;
|
namespace NadekoBot.Modules.Music;
|
||||||
|
|
||||||
@@ -27,11 +28,12 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
|
|||||||
|
|
||||||
private readonly IGoogleApiService _google;
|
private readonly IGoogleApiService _google;
|
||||||
|
|
||||||
public YtdlYoutubeResolver(ITrackCacher trackCacher, IGoogleApiService google)
|
public YtdlYoutubeResolver(ITrackCacher trackCacher, IGoogleApiService google, SearchesConfigService scs)
|
||||||
{
|
{
|
||||||
_trackCacher = trackCacher;
|
_trackCacher = trackCacher;
|
||||||
_google = google;
|
_google = google;
|
||||||
|
|
||||||
|
|
||||||
_ytdlPlaylistOperation = new("-4 "
|
_ytdlPlaylistOperation = new("-4 "
|
||||||
+ "--geo-bypass "
|
+ "--geo-bypass "
|
||||||
+ "--encoding UTF8 "
|
+ "--encoding UTF8 "
|
||||||
@@ -44,7 +46,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
|
|||||||
+ "--no-check-certificate "
|
+ "--no-check-certificate "
|
||||||
+ "-i "
|
+ "-i "
|
||||||
+ "--yes-playlist "
|
+ "--yes-playlist "
|
||||||
+ "-- \"{0}\"");
|
+ "-- \"{0}\"", scs.Data.YtProvider != YoutubeSearcher.Ytdl);
|
||||||
|
|
||||||
_ytdlIdOperation = new("-4 "
|
_ytdlIdOperation = new("-4 "
|
||||||
+ "--geo-bypass "
|
+ "--geo-bypass "
|
||||||
@@ -56,7 +58,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
|
|||||||
+ "--get-thumbnail "
|
+ "--get-thumbnail "
|
||||||
+ "--get-duration "
|
+ "--get-duration "
|
||||||
+ "--no-check-certificate "
|
+ "--no-check-certificate "
|
||||||
+ "-- \"{0}\"");
|
+ "-- \"{0}\"", scs.Data.YtProvider != YoutubeSearcher.Ytdl);
|
||||||
|
|
||||||
_ytdlSearchOperation = new("-4 "
|
_ytdlSearchOperation = new("-4 "
|
||||||
+ "--geo-bypass "
|
+ "--geo-bypass "
|
||||||
@@ -69,7 +71,7 @@ public sealed class YtdlYoutubeResolver : IYoutubeResolver
|
|||||||
+ "--get-duration "
|
+ "--get-duration "
|
||||||
+ "--no-check-certificate "
|
+ "--no-check-certificate "
|
||||||
+ "--default-search "
|
+ "--default-search "
|
||||||
+ "\"ytsearch:\" -- \"{0}\"");
|
+ "\"ytsearch:\" -- \"{0}\"", scs.Data.YtProvider != YoutubeSearcher.Ytdl);
|
||||||
}
|
}
|
||||||
|
|
||||||
private YtTrackData ResolveYtdlData(string ytdlOutputString)
|
private YtTrackData ResolveYtdlData(string ytdlOutputString)
|
||||||
|
@@ -39,7 +39,7 @@ public partial class Searches
|
|||||||
[Cmd]
|
[Cmd]
|
||||||
public async Task MagicItem()
|
public async Task MagicItem()
|
||||||
{
|
{
|
||||||
if (!_service.WowJokes.Any())
|
if (!_service.MagicItems.Any())
|
||||||
{
|
{
|
||||||
await ReplyErrorLocalizedAsync(strs.magicitems_not_loaded);
|
await ReplyErrorLocalizedAsync(strs.magicitems_not_loaded);
|
||||||
return;
|
return;
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
#nullable disable
|
#nullable disable
|
||||||
using Microsoft.Extensions.Caching.Memory;
|
using Microsoft.Extensions.Caching.Memory;
|
||||||
using NadekoBot.Modules.Administration.Services;
|
using NadekoBot.Modules.Administration.Services;
|
||||||
using NadekoBot.Modules.Searches.Common;
|
using NadekoBot.Modules.Searches.Common;
|
||||||
@@ -199,7 +199,7 @@ public partial class Searches : NadekoModule<SearchesService>
|
|||||||
if (!await ValidateQuery(ffs))
|
if (!await ValidateQuery(ffs))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var shortenedUrl = await _google.ShortenUrl($"https://lmgtfy.com/?q={Uri.EscapeDataString(ffs)}");
|
var shortenedUrl = await _google.ShortenUrl($"https://letmegooglethat.com/?q={Uri.EscapeDataString(ffs)}");
|
||||||
await SendConfirmAsync($"<{shortenedUrl}>");
|
await SendConfirmAsync($"<{shortenedUrl}>");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -325,7 +325,7 @@ public partial class Searches : NadekoModule<SearchesService>
|
|||||||
return _eb.Create()
|
return _eb.Create()
|
||||||
.WithOkColor()
|
.WithOkColor()
|
||||||
.WithUrl(item.Permalink)
|
.WithUrl(item.Permalink)
|
||||||
.WithAuthor(item.Word)
|
.WithTitle(item.Word)
|
||||||
.WithDescription(item.Definition);
|
.WithDescription(item.Definition);
|
||||||
},
|
},
|
||||||
items.Length,
|
items.Length,
|
||||||
|
@@ -296,8 +296,8 @@ public class SearchesService : INService
|
|||||||
public async Task<string> GetChuckNorrisJoke()
|
public async Task<string> GetChuckNorrisJoke()
|
||||||
{
|
{
|
||||||
using var http = _httpFactory.CreateClient();
|
using var http = _httpFactory.CreateClient();
|
||||||
var response = await http.GetStringAsync(new Uri("http://api.icndb.com/jokes/random/"));
|
var response = await http.GetStringAsync(new Uri("https://api.chucknorris.io/jokes/random"));
|
||||||
return JObject.Parse(response)["value"]["joke"] + " 😆";
|
return JObject.Parse(response)["value"] + " 😆";
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<MtgData> GetMtgCardAsync(string search)
|
public async Task<MtgData> GetMtgCardAsync(string search)
|
||||||
|
@@ -550,15 +550,20 @@ public partial class Utility : NadekoModule
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var embed = msg.Embeds.FirstOrDefault();
|
if (!msg.Embeds.Any())
|
||||||
if (embed is null)
|
|
||||||
{
|
{
|
||||||
await ReplyErrorLocalizedAsync(strs.not_found);
|
await ReplyErrorLocalizedAsync(strs.not_found);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var json = SmartEmbedText.FromEmbed(embed, msg.Content).ToJson(_showEmbedSerializerOptions);
|
var json = new SmartEmbedTextArray()
|
||||||
await SendConfirmAsync(Format.Sanitize(json).Replace("](", "]\\("));
|
{
|
||||||
|
Content = msg.Content,
|
||||||
|
Embeds = msg.Embeds
|
||||||
|
.Map(x => new SmartEmbedArrayElementText(x))
|
||||||
|
}.ToJson(_showEmbedSerializerOptions);
|
||||||
|
|
||||||
|
await SendConfirmAsync(Format.Code(json, "json").Replace("](", "]\\("));
|
||||||
}
|
}
|
||||||
|
|
||||||
[Cmd]
|
[Cmd]
|
||||||
|
@@ -7,7 +7,7 @@ namespace NadekoBot.Services;
|
|||||||
|
|
||||||
public sealed class StatsService : IStatsService, IReadyExecutor, INService
|
public sealed class StatsService : IStatsService, IReadyExecutor, INService
|
||||||
{
|
{
|
||||||
public const string BOT_VERSION = "4.3.12";
|
public const string BOT_VERSION = "4.3.16";
|
||||||
|
|
||||||
public string Author
|
public string Author
|
||||||
=> "Kwoth#2452";
|
=> "Kwoth#2452";
|
||||||
|
@@ -1559,7 +1559,7 @@ timezones:
|
|||||||
args:
|
args:
|
||||||
- ""
|
- ""
|
||||||
timezone:
|
timezone:
|
||||||
desc: "Sets this guilds timezone. This affects bot's time output in this server (logs, etc..)"
|
desc: "Sets this guilds timezone. This affects bot's time output in this server (logs, etc..) **Setting timezone requires Administrator server permission.**"
|
||||||
args:
|
args:
|
||||||
- ""
|
- ""
|
||||||
- "GMT Standard Time"
|
- "GMT Standard Time"
|
||||||
|
@@ -237,20 +237,25 @@ namespace Ayu.Discord.Voice
|
|||||||
_udpEp = new(IPAddress.Parse(ready.Ip), ready.Port);
|
_udpEp = new(IPAddress.Parse(ready.Ip), ready.Port);
|
||||||
|
|
||||||
var ssrcBytes = BitConverter.GetBytes(Ssrc);
|
var ssrcBytes = BitConverter.GetBytes(Ssrc);
|
||||||
var ipDiscoveryData = new byte[70];
|
Array.Reverse(ssrcBytes);
|
||||||
Buffer.BlockCopy(ssrcBytes, 0, ipDiscoveryData, 0, ssrcBytes.Length);
|
var ipDiscoveryData = new byte[74];
|
||||||
|
Buffer.BlockCopy(ssrcBytes, 0, ipDiscoveryData, 4, ssrcBytes.Length);
|
||||||
|
ipDiscoveryData[0] = 0x00;
|
||||||
|
ipDiscoveryData[1] = 0x01;
|
||||||
|
ipDiscoveryData[2] = 0x00;
|
||||||
|
ipDiscoveryData[3] = 0x46;
|
||||||
await _udpClient.SendAsync(ipDiscoveryData, ipDiscoveryData.Length, _udpEp);
|
await _udpClient.SendAsync(ipDiscoveryData, ipDiscoveryData.Length, _udpEp);
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
var buffer = _udpClient.Receive(ref _udpEp);
|
var buffer = _udpClient.Receive(ref _udpEp);
|
||||||
|
|
||||||
if (buffer.Length == 70)
|
if (buffer.Length == 74)
|
||||||
{
|
{
|
||||||
//Log.Information("Received IP discovery data.");
|
//Log.Information("Received IP discovery data.");
|
||||||
|
|
||||||
var myIp = Encoding.UTF8.GetString(buffer, 4, buffer.Length - 8);
|
var myIp = Encoding.UTF8.GetString(buffer, 8, buffer.Length - 10);
|
||||||
MyIp = myIp.TrimEnd('\0');
|
MyIp = myIp.TrimEnd('\0');
|
||||||
MyPort = BitConverter.ToUInt16(buffer, buffer.Length - 2);
|
MyPort = (ushort)((buffer[^2] << 8) | buffer[^1]);
|
||||||
|
|
||||||
//Log.Information("{MyIp}:{MyPort}", MyIp, MyPort);
|
//Log.Information("{MyIp}:{MyPort}", MyIp, MyPort);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user