mirror of
https://gitlab.com/Kwoth/nadekobot.git
synced 2024-10-03 04:23:13 +00:00
Added fixes from 1.9 branch:
- Custom reaction permission error fix - Local tracks .lq fix after they're loaded from playlist - Fixed some response strings
This commit is contained in:
parent
42d623b696
commit
5d9320941a
7 changed files with 8 additions and 8 deletions
|
@ -411,9 +411,10 @@ namespace NadekoBot.Modules.CustomReactions.Services
|
||||||
{
|
{
|
||||||
if (pc.Verbose)
|
if (pc.Verbose)
|
||||||
{
|
{
|
||||||
var returnMsg = _strings.GetText("trigger", sg.Id,
|
var returnMsg = _strings.GetText("perm_prevent", sg.Id,
|
||||||
index + 1,
|
index + 1,
|
||||||
Format.Bold(pc.Permissions[index].GetCommand(_cmd.GetPrefix(guild), sg)));
|
Format.Bold(pc.Permissions[index].GetCommand(_cmd.GetPrefix(guild), sg)));
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await msg.Channel.SendErrorAsync(_eb, returnMsg).ConfigureAwait(false);
|
await msg.Channel.SendErrorAsync(_eb, returnMsg).ConfigureAwait(false);
|
||||||
|
|
|
@ -122,8 +122,7 @@ namespace NadekoBot.Modules.Games.Services
|
||||||
{
|
{
|
||||||
if (pc.Verbose)
|
if (pc.Verbose)
|
||||||
{
|
{
|
||||||
var returnMsg = _strings.GetText("trigger", guild.Id, index + 1, Format.Bold(pc.Permissions[index].GetCommand(_cmd.GetPrefix(guild), (SocketGuild)guild)));
|
var returnMsg = _strings.GetText("perm_prevent", guild.Id, index + 1, Format.Bold(pc.Permissions[index].GetCommand(_cmd.GetPrefix(guild), (SocketGuild)guild))); try { await usrMsg.Channel.SendErrorAsync(_eb, returnMsg).ConfigureAwait(false); } catch { }
|
||||||
try { await usrMsg.Channel.SendErrorAsync(_eb, returnMsg).ConfigureAwait(false); } catch { }
|
|
||||||
Log.Information(returnMsg);
|
Log.Information(returnMsg);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -26,7 +26,7 @@ namespace NadekoBot.Modules.Music
|
||||||
=> $"🔉 {(int) (mp.Volume * 100)}%";
|
=> $"🔉 {(int) (mp.Volume * 100)}%";
|
||||||
|
|
||||||
public static string PrettyName(this ITrackInfo trackInfo)
|
public static string PrettyName(this ITrackInfo trackInfo)
|
||||||
=> $"**[{trackInfo.Title.TrimTo(60).Replace("[", "\\[").Replace("]", "\\]")}]({trackInfo.Url})**";
|
=> $"**[{trackInfo.Title.TrimTo(60).Replace("[", "\\[").Replace("]", "\\]")}]({trackInfo.Url.TrimTo(50, true)})**";
|
||||||
|
|
||||||
public static string PrettyInfo(this IQueuedTrackInfo trackInfo)
|
public static string PrettyInfo(this IQueuedTrackInfo trackInfo)
|
||||||
=> $"{trackInfo.PrettyTotalTime()} | {trackInfo.Platform} | {trackInfo.Queuer}";
|
=> $"{trackInfo.PrettyTotalTime()} | {trackInfo.Platform} | {trackInfo.Queuer}";
|
||||||
|
|
|
@ -147,7 +147,7 @@ namespace NadekoBot.Modules.Music
|
||||||
Provider = s.Platform.ToString(),
|
Provider = s.Platform.ToString(),
|
||||||
ProviderType = (MusicType)s.Platform,
|
ProviderType = (MusicType)s.Platform,
|
||||||
Title = s.Title,
|
Title = s.Title,
|
||||||
Query = s.Url,
|
Query = s.Platform == MusicPlatform.Local ? s.GetStreamUrl().Result!.Trim('"') : s.Url,
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
|
||||||
MusicPlaylist playlist;
|
MusicPlaylist playlist;
|
||||||
|
|
|
@ -339,7 +339,7 @@ where ((guildid >> 22) % {_creds.TotalShards}) == {_client.ShardId};")
|
||||||
|
|
||||||
using var uow = _db.GetDbContext();
|
using var uow = _db.GetDbContext();
|
||||||
|
|
||||||
if (await uow.Repeaters.AsNoTracking().CountAsyncEF(x => x.GuildId == guildId) < MAX_REPEATERS)
|
if (await uow.Repeaters.CountAsyncEF(x => x.GuildId == guildId) < MAX_REPEATERS)
|
||||||
uow.Repeaters.Add(rep);
|
uow.Repeaters.Add(rep);
|
||||||
else
|
else
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -1401,7 +1401,7 @@ waifutransfer:
|
||||||
args:
|
args:
|
||||||
- "@ExWaifu @NewOwner"
|
- "@ExWaifu @NewOwner"
|
||||||
waifugift:
|
waifugift:
|
||||||
desc: "Gift an item to someone. This will increase their waifu value by 50% of the gifted item's value if you are not their waifu, or 95% if you are. Provide no parameters to see a list of items that you can gift."
|
desc: "Gift an item to someone. This will increase their waifu value by 50% of the gifted item's value if they are not your waifu, or 95% if they are. Provide no parameters to see a list of items that you can gift."
|
||||||
args:
|
args:
|
||||||
- ""
|
- ""
|
||||||
- "Rose @Himesama"
|
- "Rose @Himesama"
|
||||||
|
|
|
@ -923,7 +923,7 @@
|
||||||
"global_leaderboard": "Global XP Leaderboard",
|
"global_leaderboard": "Global XP Leaderboard",
|
||||||
"modified": "Modified server XP of the user {0} by {1}",
|
"modified": "Modified server XP of the user {0} by {1}",
|
||||||
"club_create_error": "Failed creating the club. Make sure you're above level 5 and not a member of a club already.",
|
"club_create_error": "Failed creating the club. Make sure you're above level 5 and not a member of a club already.",
|
||||||
"club_create_too_long": "Club name is too long.",
|
"club_name_too_long": "Club name is too long.",
|
||||||
"club_created": "Club {0} successfully created!",
|
"club_created": "Club {0} successfully created!",
|
||||||
"club_not_exists": "That club doesn't exist.",
|
"club_not_exists": "That club doesn't exist.",
|
||||||
"club_applied": "You've applied for membership in {0} club.",
|
"club_applied": "You've applied for membership in {0} club.",
|
||||||
|
|
Loading…
Reference in a new issue