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

Cleanup, Added string and repeat limit fixes from 1.9 branch

Browse Source
This commit is contained in:
Kwoth
2021-06-19 07:21:10 +02:00
parent 797e93da1d
commit 81406cb46a
5 changed files with 3 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/NadekoBot/Db/Extensions/WaifuExtensions.cs
View File

@@ -77,17 +77,6 @@ namespace NadekoBot.Db
.Sum(x => x.Price); .Sum(x => x.Price);
} }
public static int AffinityCount(this DbSet<WaifuUpdate> updates, ulong userId)
{
return updates
.FromSqlInterpolated($@"SELECT 1
FROM WaifuUpdates
WHERE UserId = (SELECT Id from DiscordUser WHERE UserId={userId}) AND
UpdateType = 0 AND
NewId IS NOT NULL")
.Count();
}
public static ulong GetWaifuUserId(this DbSet<WaifuInfo> waifus, ulong ownerId, string name) public static ulong GetWaifuUserId(this DbSet<WaifuInfo> waifus, ulong ownerId, string name)
{ {
return waifus return waifus

150
src/NadekoBot/Modules/Games/Services/GamesConfigService.cs
View File

@@ -20,154 +20,4 @@ namespace NadekoBot.Modules.Games.Services
ConfigPrinters.ToString, val => val >= 0); ConfigPrinters.ToString, val => val >= 0);
} }
} }
// public sealed class GamesConfigMigrator : IConfigMigrator
// {
// // private readonly DbService _db;
// private readonly GamesConfigService _gss;
//
// public GamesConfigMigrator(DbService dbService, GamesConfigService gss)
// {
// _log = LogManager.GetCurrentClassLogger();
// _db = dbService;
// _gss = gss;
// }
//
// public void EnsureMigrated()
// {
// using var uow = _db.GetDbContext();
// using var conn = uow.Database.GetDbConnection();
// MigrateRaceAnimals(conn);
// MigrateEightBall(conn);
// }
//
// private void MigrateTrivia(DbConnection conn)
// {
// using (var checkTableCommand = conn.CreateCommand())
// {
// // make sure table still exists
// checkTableCommand.CommandText =
// "SELECT name FROM sqlite_master WHERE type='table' AND name='BotConfig';";
// var checkReader = checkTableCommand.ExecuteReader();
// if (!checkReader.HasRows)
// return;
// }
//
// Log.Information("Migrating trivia...");
//
// using var com = conn.CreateCommand();
// com.CommandText = $@"SELECT MinimumTriviaWinReq, TriviaCurrencyReward FROM BotConfig";
// using var reader = com.ExecuteReader();
//
// if (!reader.Read())
// return;
//
// _gss.ModifyConfig(ModifyTriviaAction(reader));
//
// Log.Information("Trivia config migrated to data/games.yml");
// }
//
// private static Action<GamesConfig> ModifyTriviaAction(DbDataReader reader)
// => realConfig =>
// {
// var val = (int) (long) reader["MinimumTriviaWinReq"];
// realConfig.Trivia.MinimumWinReq = val <= 0 ? 1 : val;
// realConfig.Trivia.CurrencyReward = (long) reader["TriviaCurrencyReward"];
// };
//
// private void MigrateEightBall(DbConnection conn)
// {
// using (var checkTableCommand = conn.CreateCommand())
// {
// // make sure table still exists
// checkTableCommand.CommandText =
// "SELECT name FROM sqlite_master WHERE type='table' AND name='EightBallResponses';";
// var checkReader = checkTableCommand.ExecuteReader();
// if (!checkReader.HasRows)
// return;
// }
//
// try
// {
// using (var com = conn.CreateCommand())
// {
// com.CommandText = $@"SELECT Text FROM EightBallResponses";
// using var reader = com.ExecuteReader();
//
// if (!reader.Read())
// return;
//
// Log.Information("Migrating eightball...");
// _gss.ModifyConfig(Modify8ballAction(reader));
// }
//
// Log.Information("Eightball migrated to data/games.yml");
// MigrateTrivia(conn);
// }
// finally
// {
//
// using var deleteEightBallCommand = conn.CreateCommand();
// deleteEightBallCommand.CommandText = "DROP TABLE IF EXISTS EightBallResponses";
// deleteEightBallCommand.ExecuteNonQuery();
// }
//
// }
//
// private static Action<GamesConfig> Modify8ballAction(DbDataReader reader)
// => realConfig =>
// {
// realConfig.EightBallResponses.Clear();
// do
// {
// realConfig.EightBallResponses.Add((string) reader["Text"]);
// } while (reader.Read());
// };
//
// private void MigrateRaceAnimals(DbConnection conn)
// {
// using (var checkTableCommand = conn.CreateCommand())
// {
// // make sure table still exists
// checkTableCommand.CommandText =
// "SELECT name FROM sqlite_master WHERE type='table' AND name='RaceAnimals';";
// var checkReader = checkTableCommand.ExecuteReader();
// if (!checkReader.HasRows)
// return;
// }
//
// using (var com = conn.CreateCommand())
// {
// com.CommandText = $@"SELECT Name, Icon FROM RaceAnimals";
// using var reader = com.ExecuteReader();
//
// if (!reader.Read())
// return;
//
// Log.Information("Migrating race animals...");
// _gss.ModifyConfig(ModifyRaceAnimalsAction(reader));
// }
//
// Log.Information("Race animals migrated to data/games.yml");
//
// using var deleteRaceAnimalsCommand = conn.CreateCommand();
// deleteRaceAnimalsCommand.CommandText = "DROP TABLE IF EXISTS RaceAnimals";
// deleteRaceAnimalsCommand.ExecuteNonQuery();
// }
//
// private static Action<GamesConfig> ModifyRaceAnimalsAction(DbDataReader reader)
// => realConfig =>
// {
// realConfig.RaceAnimals.Clear();
//
// do
// {
// realConfig.RaceAnimals.Add(new RaceAnimal()
// {
// Icon = (string) reader["Icon"],
// Name = (string) reader["Name"]
// });
// } while (reader.Read());
// };
// }
} }

2
src/NadekoBot/Modules/Utility/Services/RepeaterService.cs
View File

@@ -343,7 +343,7 @@ where ((guildid >> 22) % {_creds.TotalShards}) == {_client.ShardId};")
using var uow = _db.GetDbContext(); using var uow = _db.GetDbContext();
if (await uow.Repeaters.AsNoTracking().CountAsyncEF() < MAX_REPEATERS) if (await uow.Repeaters.AsNoTracking().CountAsyncEF(x => x.GuildId == guildId) < MAX_REPEATERS)
uow.Repeaters.Add(rep); uow.Repeaters.Add(rep);
else else
return null; return null;

2
src/NadekoBot/NadekoBot.csproj
View File

@@ -70,7 +70,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Version)' == '' "> <PropertyGroup Condition=" '$(Version)' == '' ">
<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">2.0.0</VersionPrefix> <VersionPrefix Condition=" '$(VersionPrefix)' == '' ">3.0.0</VersionPrefix>
<Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix).$(VersionSuffix)</Version> <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix).$(VersionSuffix)</Version>
<Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version> <Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
</PropertyGroup> </PropertyGroup>

1
src/NadekoBot/data/strings/responses/responses.en-US.json
View File

@@ -626,6 +626,7 @@
"messages": "Messages", "messages": "Messages",
"repeater_created": "Repeater Created", "repeater_created": "Repeater Created",
"repeater_removed": "Repeater #{0} Removed", "repeater_removed": "Repeater #{0} Removed",
"repeater_exceed_limit": "You cannot have more than {0} repeaters per server.",
"repeater_remove_fail": "Failed removing repeater on that index. Either you've specified invalid index, or repeater was in executing state at that time, in which case, try again in a few seconds.", "repeater_remove_fail": "Failed removing repeater on that index. Either you've specified invalid index, or repeater was in executing state at that time, in which case, try again in a few seconds.",
"interval:": "Interval:", "interval:": "Interval:",
"executes_in:": "Executes in:", "executes_in:": "Executes in:",