Merge pull request #11 from theiam79/dev

Adds play file subscriptions

src/BGStats.Bot/BGStats.Bot.csproj

@@ -12,6 +12,12 @@
     <PackageReference Include="Discord.Addons.Hosting" Version="3.0.0" />
     <PackageReference Include="Discord.Addons.Interactive" Version="2.0.0" />
     <PackageReference Include="Discord.Net" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.7" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.6" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.6" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
@@ -30,6 +36,9 @@
     <None Update="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="TestSubscribers.db">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>

src/BGStats.Bot/Context/SubscriberContext.cs

@@ -0,0 +1,32 @@
+using BGStats.Bot.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Design;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BGStats.Bot.Context
+{
+  public class SubscriberContext : DbContext
+  {
+    public SubscriberContext(DbContextOptions<SubscriberContext> options) : base(options) { }
+
+    public DbSet<Subscriber> Subscribers { get; set; }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+      modelBuilder.Entity<Subscriber>()
+        .Property(p => p.SubscriberId)
+        .ValueGeneratedOnAdd();
+    }
+  }
+
+  public class SubscriberContextFactory : IDesignTimeDbContextFactory<SubscriberContext>
+  {
+    public SubscriberContext CreateDbContext(string[] args)
+    {
+      var optionsBuilder = new DbContextOptionsBuilder<SubscriberContext>().UseSqlite("Data Source = TestSubscribers.db");
+      return new SubscriberContext(optionsBuilder.Options);
+    }
+  }
+}

src/BGStats.Bot/Migrations/20200822044922_init.cs

@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace BGStats.Bot.Migrations
+{
+    public partial class init : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Subscribers",
+                columns: table => new
+                {
+                    SubscriberId = table.Column<int>(nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    DiscordId = table.Column<ulong>(nullable: false),
+                    PlayerName = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Subscribers", x => x.SubscriberId);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Subscribers");
+        }
+    }
+}

src/BGStats.Bot/Migrations/20200822050642_autoId.cs

@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace BGStats.Bot.Migrations
+{
+    public partial class autoId : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

src/BGStats.Bot/Migrations/SubscriberContextModelSnapshot.cs

@@ -0,0 +1,37 @@
+// <auto-generated />
+using BGStats.Bot.Context;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace BGStats.Bot.Migrations
+{
+    [DbContext(typeof(SubscriberContext))]
+    partial class SubscriberContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "3.1.7");
+
+            modelBuilder.Entity("BGStats.Bot.Models.Subscriber", b =>
+                {
+                    b.Property<int>("SubscriberId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<ulong>("DiscordId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("PlayerName")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("SubscriberId");
+
+                    b.ToTable("Subscribers");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/BGStats.Bot/Models/Subscriber.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BGStats.Bot.Models
+{
+  public class Subscriber
+  {
+
+    public int SubscriberId { get; set; }
+    public ulong DiscordId { get; set; }
+    public string PlayerName { get; set; }
+  }
+}

src/BGStats.Bot/Modules/PlayFileModule.cs

@@ -4,6 +4,7 @@
 using Discord.Commands;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text;
@@ -17,12 +18,14 @@ public class PlayFileModule : ModuleBase<SocketCommandContext>
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly PlayFormatService _playFormatService;
     private readonly PostingService _postingService;
+    private readonly INotificationService _notificationService;
 
-    public PlayFileModule(IHttpClientFactory httpClientFactory, PlayFormatService playFormatService, PostingService postingService)
+    public PlayFileModule(IHttpClientFactory httpClientFactory, PlayFormatService playFormatService, PostingService postingService, INotificationService notificationService)
     {
       _httpClientFactory = httpClientFactory;
       _playFormatService = playFormatService;
       _postingService = postingService;
+      _notificationService = notificationService;
     }
 
     [Command("sharePlayFile")]
@@ -33,12 +36,16 @@ public async Task SharePlayFile()
       var playFile = Context.Message.Attachments.FirstOrDefault(x => x.Filename.EndsWith(".bgsplay"));
       var playFileContents = await _httpClientFactory.CreateClient().GetStreamAsync(playFile.Url);
 
+      var contentStream = new MemoryStream();
+      await playFileContents.CopyToAsync(contentStream);
+      contentStream.Seek(0, SeekOrigin.Begin);
+
       var serializerOptions = new JsonSerializerOptions();
       serializerOptions.Converters.Add(new AutoIntToBoolConverter());
 
-      var play = await JsonSerializer.DeserializeAsync<PlayFile>(playFileContents, serializerOptions);
-
+      var play = await JsonSerializer.DeserializeAsync<PlayFile>(contentStream, serializerOptions);
       await _postingService.PostAsync(_playFormatService.FormatPlay(play));
+      await _notificationService.Notify(playFile.Filename, contentStream, play, Context.User.Id);
     }
   }
 

src/BGStats.Bot/Modules/SubscribeModule.cs

@@ -0,0 +1,66 @@
+using BGStats.Bot.Services;
+using Discord.Commands;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BGStats.Bot.Modules
+{
+  [Group("subscription")]
+  public class SubscribeModule : ModuleBase<SocketCommandContext>
+  {
+    private readonly INotificationService _notificationService;
+
+    public SubscribeModule(INotificationService notificationService)
+    {
+      _notificationService = notificationService;
+    }
+
+    [Command("add")]
+    [Summary("Subscribe to recieve any play files sent by others that include the given player name")]
+    public async Task Subscribe([Remainder] string playerName)
+    {
+      await _notificationService.Subscribe(Context.User.Id, playerName);
+      await ReplyAsync($"Successfully subscribed to plays that include {playerName}");
+    }
+
+    [Command("remove")]
+    [Summary("Remove one of your existing subscriptions")]
+    public async Task Unsubscribe([Remainder] string playerName)
+    {
+      await _notificationService.Unsubscribe(Context.User.Id, playerName);
+      await ReplyAsync($"Successfully unsubscribed from plays that include {playerName}");
+    }
+
+    [Command("removeAll")]
+    [Summary("Remove all of your existing subscriptions")]
+    public async Task UnsubscribeAll()
+    {
+      await _notificationService.Unsubscribe(Context.User.Id);
+      await ReplyAsync($"Successfully unsubscribed from all plays");
+    }
+
+    [Command("list")]
+    [Summary("List all of your current subscriptions")]
+    public async Task ListSubscriptions()
+    {
+      var subs = await _notificationService.GetSubscriptions(Context.User.Id);
+
+      var message = new StringBuilder().AppendLine($"Found {subs.Count} subscriptions for {Context.User.Username}").AppendJoin('\n', subs.Where(s => s.DiscordId == Context.User.Id).Select(s => s.PlayerName)).ToString();
+      var channel = await Context.User.GetOrCreateDMChannelAsync();
+      await channel.SendMessageAsync(message);
+    }
+
+    [Command("listAll")]
+    [RequireOwner]
+    public async Task ListAllSubscriptions()
+    {
+      var subs = await _notificationService.GetAllSubscriptions();
+      var message = new StringBuilder().AppendLine($"Found {subs.Count} total subscriptions").AppendJoin('\n', subs.Select(s => $"{Context.Client.GetUser(s.DiscordId).Username} - {s.PlayerName}")).ToString();
+      var channel = await Context.User.GetOrCreateDMChannelAsync();
+      await channel.SendMessageAsync(message);
+    }
+  }
+}