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

fix: Fixed UserId patron table error

Browse Source 
fix: Added au and kz countries as en and kz languages respectively
fix: Strikeout is thinner now on plants
This commit is contained in:
Kwoth
2024-11-03 08:24:00 +00:00
parent 32fc8b6e03
commit b6b6b4e19e
13 changed files with 7076 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -2,6 +2,8 @@
Mostly based on [keepachangelog](https://keepachangelog.com/en/1.0.0/) except date format. a-c-f-r-o
## [5.1.19]
## [5.1.18] - 02.11.2024
### Added

14
src/NadekoBot.GrpcApiBase/protos/xp.proto
View File

@@ -15,6 +15,17 @@ service GrpcXp {
rpc AddReward(AddRewardRequest) returns (AddRewardReply);
rpc DeleteReward(DeleteRewardRequest) returns (DeleteRewardReply);
rpc SetServerExclusion(SetServerExclusionRequest) returns (SetServerExclusionReply);
}
message SetServerExclusionRequest {
uint64 guildId = 1;
bool serverExcluded = 2;
}
message SetServerExclusionReply {
bool success = 1;
}
message GetXpLbRequest {
@@ -32,7 +43,8 @@ message XpLbUserReply {
string username = 2;
int64 xp = 3;
int64 level = 4;
string avatar = 5;
int64 levelPercent = 5;
string avatar = 6;
}
message ResetUserXpRequest {

1
src/NadekoBot/Db/Models/support/PatronQuota.cs
View File

@@ -3,6 +3,7 @@ namespace NadekoBot.Db.Models;
public class PatronUser
{
public int Id { get; set; }
public string UniquePlatformUserId { get; set; }
public ulong UserId { get; set; }
public int AmountCents { get; set; }

2
src/NadekoBot/Db/NadekoContext.cs
View File

@@ -618,7 +618,7 @@ public abstract class NadekoContext : DbContext
modelBuilder.Entity<PatronUser>(pu =>
{
pu.HasIndex(x => x.UniquePlatformUserId).IsUnique();
pu.HasKey(x => x.UserId);
pu.HasIndex(x => x.UserId).IsUnique(false);
});
// quotes are per user id

3860
src/NadekoBot/Migrations/PostgreSql/20241103082305_patron-fix.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

58
src/NadekoBot/Migrations/PostgreSql/20241103082305_patron-fix.cs Normal file
View File

@@ -0,0 +1,58 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace NadekoBot.Migrations.PostgreSql
{
/// <inheritdoc />
public partial class patronfix : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropPrimaryKey(
name: "pk_patrons",
table: "patrons");
migrationBuilder.AddColumn<int>(
name: "id",
table: "patrons",
type: "integer",
nullable: false,
defaultValue: 0)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
migrationBuilder.AddPrimaryKey(
name: "pk_patrons",
table: "patrons",
column: "id");
migrationBuilder.CreateIndex(
name: "ix_patrons_userid",
table: "patrons",
column: "userid");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropPrimaryKey(
name: "pk_patrons",
table: "patrons");
migrationBuilder.DropIndex(
name: "ix_patrons_userid",
table: "patrons");
migrationBuilder.DropColumn(
name: "id",
table: "patrons");
migrationBuilder.AddPrimaryKey(
name: "pk_patrons",
table: "patrons",
column: "userid");
}
}
}

17
src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs
View File

@@ -1753,10 +1753,12 @@ namespace NadekoBot.Migrations.PostgreSql
modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b =>
{
b.Property<decimal>("UserId")
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("numeric(20,0)")
.HasColumnName("userid");
.HasColumnType("integer")
.HasColumnName("id");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int>("AmountCents")
.HasColumnType("integer")
@@ -1770,17 +1772,24 @@ namespace NadekoBot.Migrations.PostgreSql
.HasColumnType("text")
.HasColumnName("uniqueplatformuserid");
b.Property<decimal>("UserId")
.HasColumnType("numeric(20,0)")
.HasColumnName("userid");
b.Property<DateTime>("ValidThru")
.HasColumnType("timestamp without time zone")
.HasColumnName("validthru");
b.HasKey("UserId")
b.HasKey("Id")
.HasName("pk_patrons");
b.HasIndex("UniquePlatformUserId")
.IsUnique()
.HasDatabaseName("ix_patrons_uniqueplatformuserid");
b.HasIndex("UserId")
.HasDatabaseName("ix_patrons_userid");
b.ToTable("patrons", (string)null);
});

2978
src/NadekoBot/Migrations/Sqlite/20241103082255_patron-fix.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

75
src/NadekoBot/Migrations/Sqlite/20241103082255_patron-fix.cs Normal file
View File

@@ -0,0 +1,75 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace NadekoBot.Migrations
{
/// <inheritdoc />
public partial class patronfix : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropPrimaryKey(
name: "PK_Patrons",
table: "Patrons");
migrationBuilder.AlterColumn<ulong>(
name: "UserId",
table: "Patrons",
type: "INTEGER",
nullable: false,
oldClrType: typeof(ulong),
oldType: "INTEGER")
.OldAnnotation("Sqlite:Autoincrement", true);
migrationBuilder.AddColumn<int>(
name: "Id",
table: "Patrons",
type: "INTEGER",
nullable: false,
defaultValue: 0)
.Annotation("Sqlite:Autoincrement", true);
migrationBuilder.AddPrimaryKey(
name: "PK_Patrons",
table: "Patrons",
column: "Id");
migrationBuilder.CreateIndex(
name: "IX_Patrons_UserId",
table: "Patrons",
column: "UserId");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropPrimaryKey(
name: "PK_Patrons",
table: "Patrons");
migrationBuilder.DropIndex(
name: "IX_Patrons_UserId",
table: "Patrons");
migrationBuilder.DropColumn(
name: "Id",
table: "Patrons");
migrationBuilder.AlterColumn<ulong>(
name: "UserId",
table: "Patrons",
type: "INTEGER",
nullable: false,
oldClrType: typeof(ulong),
oldType: "INTEGER")
.Annotation("Sqlite:Autoincrement", true);
migrationBuilder.AddPrimaryKey(
name: "PK_Patrons",
table: "Patrons",
column: "UserId");
}
}
}

9
src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs
View File

@@ -1307,7 +1307,7 @@ namespace NadekoBot.Migrations
modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b =>
{
b.Property<ulong>("UserId")
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
@@ -1320,14 +1320,19 @@ namespace NadekoBot.Migrations
b.Property<string>("UniquePlatformUserId")
.HasColumnType("TEXT");
b.Property<ulong>("UserId")
.HasColumnType("INTEGER");
b.Property<DateTime>("ValidThru")
.HasColumnType("TEXT");
b.HasKey("UserId");
b.HasKey("Id");
b.HasIndex("UniquePlatformUserId")
.IsUnique();
b.HasIndex("UserId");
b.ToTable("Patrons");
});

2
src/NadekoBot/Modules/Gambling/PlantPick/PlantPickService.cs
View File

@@ -169,7 +169,7 @@ public class PlantPickService : INService, IExecNoCommand
Start = 0,
End = pass.GetGraphemeCount(),
Font = font,
StrikeoutPen = new SolidPen(Color.White, 5),
StrikeoutPen = new SolidPen(Color.White, 3),
TextDecorations = TextDecorations.Strikeout
};

3
src/NadekoBot/Modules/Searches/Translate/FlagTranslateService_SupportedFlags.cs
View File

@@ -69,5 +69,8 @@ public partial class FlagTranslateService
YE ar
AL sq
AE ar
AU en
NZ en
KZ kz
""";
}

103
src/NadekoBot/Services/GrpcApi/XpSvc.cs
View File

@@ -67,12 +67,12 @@ public class XpSvc : GrpcXp.GrpcXpBase, IGrpcSvc, INService
});
rews = rews.Concat(roleRews.Select(x => new RewItemReply()
{
Level = x.Level,
Type = "Role",
Value = guild.GetRole(x.RoleId)?.ToString() ?? x.RoleId.ToString()
}))
.OrderBy(x => x.Level);
{
Level = x.Level,
Type = x.Remove ? "RemoveRole" : "AddRole",
Value = guild.GetRole(x.RoleId)?.ToString() ?? x.RoleId.ToString()
}))
.OrderBy(x => x.Level);
reply.Rewards.AddRange(rews);
@@ -207,15 +207,15 @@ public class XpSvc : GrpcXp.GrpcXpBase, IGrpcSvc, INService
public override async Task<GetXpLbReply> GetXpLb(GetXpLbRequest request, ServerCallContext context)
{
if (request.Page < 0)
throw new RpcException(new Status(StatusCode.InvalidArgument, "Page must be greater than or equal to 0"));
if (request.Page < 1)
throw new RpcException(new Status(StatusCode.InvalidArgument, "Page must be greater than or equal to 1"));
var guild = _client.GetGuild(request.GuildId);
if (guild is null)
throw new RpcException(new Status(StatusCode.NotFound, "Guild not found"));
var data = await _xp.GetGuildUserXps(request.GuildId, request.Page);
var data = await _xp.GetGuildUserXps(request.GuildId, request.Page - 1);
var total = await _xp.GetTotalGuildUsers(request.GuildId);
var reply = new GetXpLbReply
@@ -223,45 +223,60 @@ public class XpSvc : GrpcXp.GrpcXpBase, IGrpcSvc, INService
Total = total
};
reply.Users.AddRange(await data
.Select(async x =>
{
var user = guild.GetUser(x.UserId);
var users = await data
.Select(async x =>
{
var user = guild.GetUser(x.UserId);
if (user is null)
{
var du = await _duSvc.GetUserAsync(x.UserId);
if (du is null)
return new XpLbUserReply
{
UserId = x.UserId,
Avatar = string.Empty,
Username = string.Empty,
Xp = x.Xp,
Level = new LevelStats(x.Xp).Level
};
if (user is null)
{
var du = await _duSvc.GetUserAsync(x.UserId);
if (du is null)
return new XpLbUserReply
{
UserId = x.UserId,
Avatar = string.Empty,
Username = string.Empty,
Xp = x.Xp,
Level = new LevelStats(x.Xp).Level
};
return new XpLbUserReply()
{
UserId = x.UserId,
Avatar = du.RealAvatarUrl()?.ToString() ?? string.Empty,
Username = du.ToString() ?? string.Empty,
Xp = x.Xp,
Level = new LevelStats(x.Xp).Level
};
}
return new XpLbUserReply()
{
UserId = x.UserId,
Avatar = du.RealAvatarUrl()?.ToString() ?? string.Empty,
Username = du.ToString() ?? string.Empty,
Xp = x.Xp,
Level = new LevelStats(x.Xp).Level
};
}
return new XpLbUserReply
{
UserId = x.UserId,
Avatar = user?.GetAvatarUrl() ?? string.Empty,
Username = user?.ToString() ?? string.Empty,
Xp = x.Xp,
Level = new LevelStats(x.Xp).Level
};
})
.WhenAll());
return new XpLbUserReply
{
UserId = x.UserId,
Avatar = user?.GetAvatarUrl() ?? string.Empty,
Username = user?.ToString() ?? string.Empty,
Xp = x.Xp,
Level = new LevelStats(x.Xp).Level
};
})
.WhenAll();
reply.Users.AddRange(users);
return reply;
}
public override async Task<SetServerExclusionReply> SetServerExclusion(
SetServerExclusionRequest request,
ServerCallContext context)
{
await Task.Yield();
var newValue = _xp.ToggleExcludeServer(request.GuildId);
return new()
{
Success = newValue
};
}
}