- Fixed some potential causes for ratelimit due to default message retry settings

- Fixed a patron rewards bug caused by monthly donation checking not accounting for year increase
- Fixed a patron rewards bug for users who connected the same discord account with multiple patreon accounts

src/Nadeko.Medusa/Extensions/MedusaExtensions.cs

@@ -10,7 +10,7 @@ public static class MedusaExtensions
             embed: embed.Build(),
             options: new()
             {
-                RetryMode = RetryMode.AlwaysRetry
+                RetryMode = RetryMode.Retry502
             });
 
     // unlocalized

src/NadekoBot/Bot.cs

@@ -69,7 +69,7 @@ public sealed class Bot
                 : GatewayIntents.AllUnprivileged,
             LogGatewayIntentWarnings = false,
             FormatUsersInBidirectionalUnicode = false,
-            DefaultRetryMode = RetryMode.AlwaysRetry ^ RetryMode.RetryRatelimit
+            DefaultRetryMode = RetryMode.Retry502
         });
 
         _commandService = new(new()

src/NadekoBot/Db/Models/PatronQuota.cs

@@ -27,6 +27,7 @@ public enum FeatureType
 
 public class PatronUser
 {
+    public int Id { get; set; }
     public string UniquePlatformUserId { get; set; }
     public ulong UserId { get; set; }
     public int AmountCents { get; set; }

src/NadekoBot/Db/NadekoContext.cs

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

src/NadekoBot/Migrations/Mysql/20230109010035_patron-fix.cs

@@ -0,0 +1,73 @@
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.Mysql
+{
+    public partial class patronfix : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "pk_patrons",
+                table: "patrons");
+
+            migrationBuilder.AlterColumn<ulong>(
+                name: "userid",
+                table: "patrons",
+                type: "bigint unsigned",
+                nullable: false,
+                oldClrType: typeof(ulong),
+                oldType: "bigint unsigned")
+                .OldAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AddColumn<int>(
+                name: "id",
+                table: "patrons",
+                type: "int",
+                nullable: false,
+                defaultValue: 0)
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "pk_patrons",
+                table: "patrons",
+                column: "id");
+
+            migrationBuilder.CreateIndex(
+                name: "ix_patrons_userid",
+                table: "patrons",
+                column: "userid");
+        }
+
+        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: "bigint unsigned",
+                nullable: false,
+                oldClrType: typeof(ulong),
+                oldType: "bigint unsigned")
+                .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "pk_patrons",
+                table: "patrons",
+                column: "userid");
+        }
+    }
+}

src/NadekoBot/Migrations/Mysql/MysqlContextModelSnapshot.cs

@@ -319,10 +319,10 @@ namespace NadekoBot.Migrations.Mysql
 
             modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b =>
                 {
-                    b.Property<ulong>("UserId")
+                    b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint unsigned")
+                        .HasColumnType("int")
-                        .HasColumnName("userid");
+                        .HasColumnName("id");
 
                     b.Property<int>("AmountCents")
                         .HasColumnType("int")
@@ -336,17 +336,24 @@ namespace NadekoBot.Migrations.Mysql
                         .HasColumnType("varchar(255)")
                         .HasColumnName("uniqueplatformuserid");
 
+                    b.Property<ulong>("UserId")
+                        .HasColumnType("bigint unsigned")
+                        .HasColumnName("userid");
+
                     b.Property<DateTime>("ValidThru")
                         .HasColumnType("datetime(6)")
                         .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);
                 });
 

src/NadekoBot/Migrations/PostgreSql/20230109010058_patron-fix.cs

@@ -0,0 +1,55 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace NadekoBot.Migrations.PostgreSql
+{
+    public partial class patronfix : Migration
+    {
+        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");
+        }
+
+        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");
+        }
+    }
+}

src/NadekoBot/Migrations/PostgreSql/PostgreSqlContextModelSnapshot.cs

@@ -331,10 +331,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)")
+                        .HasColumnType("integer")
-                        .HasColumnName("userid");
+                        .HasColumnName("id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
                     b.Property<int>("AmountCents")
                         .HasColumnType("integer")
@@ -348,17 +350,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);
                 });
 

src/NadekoBot/Migrations/Sqlite/20230109005417_patron-fix.cs

@@ -0,0 +1,72 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace NadekoBot.Migrations
+{
+    public partial class patronfix : Migration
+    {
+        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");
+        }
+
+        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");
+        }
+    }
+}

src/NadekoBot/Migrations/Sqlite/NadekoSqliteContextModelSnapshot.cs

@@ -251,7 +251,7 @@ namespace NadekoBot.Migrations
 
             modelBuilder.Entity("NadekoBot.Db.Models.PatronUser", b =>
                 {
-                    b.Property<ulong>("UserId")
+                    b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("INTEGER");
 
@@ -264,14 +264,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");
                 });
 

src/NadekoBot/Modules/Gambling/Events/GameStatusEvent.cs

@@ -88,10 +88,6 @@ public class GameStatusEvent : ICurrencyEvent
                 await msg.ModifyAsync(m =>
                     {
                         m.Embed = GetEmbed(PotSize).Build();
-                    },
-                    new()
-                    {
-                        RetryMode = RetryMode.AlwaysRetry
                     });
             }
 

src/NadekoBot/Modules/Gambling/Events/ReactionEvent.cs

@@ -79,10 +79,6 @@ public class ReactionEvent : ICurrencyEvent
                 await msg.ModifyAsync(m =>
                     {
                         m.Embed = GetEmbed(PotSize).Build();
-                    },
-                    new()
-                    {
-                        RetryMode = RetryMode.AlwaysRetry
                     });
             }
 

src/NadekoBot/Modules/Games/SpeedTyping/TypingGame.cs

@@ -74,11 +74,7 @@ public class TypingGame
 
             var time = _options.StartTime;
 
-            var msg = await Channel.SendMessageAsync($"Starting new typing contest in **{time}**...",
+            var msg = await Channel.SendMessageAsync($"Starting new typing contest in **{time}**...");
-                options: new()
-                {
-                    RetryMode = RetryMode.AlwaysRetry
-                });
 
             do
             {

src/NadekoBot/Modules/Utility/Patronage/PatronageService.cs

@@ -199,7 +199,7 @@ public sealed class PatronageService
                 }
                 else
                 {
-                    if (dbPatron.LastCharge.Month < lastChargeUtc.Month)
+                    if (dbPatron.LastCharge.Month < lastChargeUtc.Month || dbPatron.LastCharge.Year < lastChargeUtc.Year)
                     {
                         // user is charged again for this month
                         // if his sub would end in teh future, extend it by one month.

src/NadekoBot/_Extensions/IMessageChannelExtensions.cs

@@ -23,11 +23,7 @@ public static class MessageChannelExtensions
             embeds: embeds is null
                 ? null
                 : embeds as Embed[] ?? embeds.ToArray(),
-            components: components,
+            components: components);
-            options: new()
-            {
-                RetryMode = RetryMode.AlwaysRetry
-            });
     }
 
     public static async Task<IUserMessage> SendAsync(

src/NadekoBot/_Extensions/SocketMessageComponentExtensions.cs

@@ -23,11 +23,7 @@ public static class SocketMessageComponentExtensions
                 ? null
                 : embeds as Embed[] ?? embeds.ToArray(),
             components: components,
-            ephemeral: ephemeral,
+            ephemeral: ephemeral);
-            options: new()
-            {
-                RetryMode = RetryMode.AlwaysRetry
-            });
     }
 
     public static Task RespondAsync(