Eveldee/Cocotte
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Activity] Add activity join/leave

Browse Source
This commit is contained in:
Eveldee
2023-03-21 22:20:00 +01:00
parent 094f07ea3c
commit bffa7d06bb
24 changed files with 312 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
Cocotte/Migrations/20230320145030_InitialCreate.Designer.cs generated
View File

@@ -1,122 +0,0 @@
// <auto-generated />
using Cocotte.Services;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace Cocotte.Migrations
{
[DbContext(typeof(CocotteContext))]
[Migration("20230320145030_InitialCreate")]
partial class InitialCreate
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "7.0.4");
modelBuilder.Entity("Cocotte.Modules.Activity.Models.Activity", b =>
{
b.Property<ulong>("ActivityId")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<int>("ActivityName")
.HasColumnType("INTEGER");
b.Property<int>("ActivityType")
.HasColumnType("INTEGER");
b.Property<ulong>("CreatorId")
.HasColumnType("INTEGER");
b.Property<string>("Description")
.HasColumnType("TEXT");
b.Property<string>("Discriminator")
.IsRequired()
.HasColumnType("TEXT");
b.Property<uint>("MaxPlayers")
.HasColumnType("INTEGER");
b.HasKey("ActivityId");
b.ToTable("Activities");
b.HasDiscriminator<string>("Discriminator").HasValue("Activity");
b.UseTphMappingStrategy();
});
modelBuilder.Entity("Cocotte.Modules.Activity.Models.ActivityPlayer", b =>
{
b.Property<ulong>("UserId")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<ulong>("ActivityId")
.HasColumnType("INTEGER");
b.Property<string>("Discriminator")
.IsRequired()
.HasColumnType("TEXT");
b.Property<string>("PlayerName")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("UserId");
b.HasIndex("ActivityId");
b.ToTable("ActivityPlayers");
b.HasDiscriminator<string>("Discriminator").HasValue("ActivityPlayer");
b.UseTphMappingStrategy();
});
modelBuilder.Entity("Cocotte.Modules.Activity.Models.StagedActivity", b =>
{
b.HasBaseType("Cocotte.Modules.Activity.Models.Activity");
b.Property<uint>("Stage")
.HasColumnType("INTEGER");
b.HasDiscriminator().HasValue("StagedActivity");
});
modelBuilder.Entity("Cocotte.Modules.Activity.Models.ActivityRolePlayer", b =>
{
b.HasBaseType("Cocotte.Modules.Activity.Models.ActivityPlayer");
b.Property<byte>("Roles")
.HasColumnType("INTEGER");
b.HasDiscriminator().HasValue("ActivityRolePlayer");
});
modelBuilder.Entity("Cocotte.Modules.Activity.Models.ActivityPlayer", b =>
{
b.HasOne("Cocotte.Modules.Activity.Models.Activity", "Activity")
.WithMany("ActivityPlayers")
.HasForeignKey("ActivityId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Activity");
});
modelBuilder.Entity("Cocotte.Modules.Activity.Models.Activity", b =>
{
b.Navigation("ActivityPlayers");
});
#pragma warning restore 612, 618
}
}
}

70
Cocotte/Migrations/20230320145030_InitialCreate.cs
View File

@@ -1,70 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Cocotte.Migrations
{
/// <inheritdoc />
public partial class InitialCreate : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "Activities",
columns: table => new
{
ActivityId = table.Column<ulong>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
CreatorId = table.Column<ulong>(type: "INTEGER", nullable: false),
Description = table.Column<string>(type: "TEXT", nullable: true),
ActivityType = table.Column<int>(type: "INTEGER", nullable: false),
ActivityName = table.Column<int>(type: "INTEGER", nullable: false),
MaxPlayers = table.Column<uint>(type: "INTEGER", nullable: false),
Discriminator = table.Column<string>(type: "TEXT", nullable: false),
Stage = table.Column<uint>(type: "INTEGER", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Activities", x => x.ActivityId);
});
migrationBuilder.CreateTable(
name: "ActivityPlayers",
columns: table => new
{
UserId = table.Column<ulong>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
PlayerName = table.Column<string>(type: "TEXT", nullable: false),
ActivityId = table.Column<ulong>(type: "INTEGER", nullable: false),
Discriminator = table.Column<string>(type: "TEXT", nullable: false),
Roles = table.Column<byte>(type: "INTEGER", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_ActivityPlayers", x => x.UserId);
table.ForeignKey(
name: "FK_ActivityPlayers_Activities_ActivityId",
column: x => x.ActivityId,
principalTable: "Activities",
principalColumn: "ActivityId",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_ActivityPlayers_ActivityId",
table: "ActivityPlayers",
column: "ActivityId");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "ActivityPlayers");
migrationBuilder.DropTable(
name: "Activities");
}
}
}

119
Cocotte/Migrations/CocotteContextModelSnapshot.cs
View File

@@ -1,119 +0,0 @@
// <auto-generated />
using Cocotte.Services;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace Cocotte.Migrations
{
[DbContext(typeof(CocotteContext))]
partial class CocotteContextModelSnapshot : ModelSnapshot
{
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "7.0.4");
modelBuilder.Entity("Cocotte.Modules.Activity.Models.Activity", b =>
{
b.Property<ulong>("ActivityId")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<int>("ActivityName")
.HasColumnType("INTEGER");
b.Property<int>("ActivityType")
.HasColumnType("INTEGER");
b.Property<ulong>("CreatorId")
.HasColumnType("INTEGER");
b.Property<string>("Description")
.HasColumnType("TEXT");
b.Property<string>("Discriminator")
.IsRequired()
.HasColumnType("TEXT");
b.Property<uint>("MaxPlayers")
.HasColumnType("INTEGER");
b.HasKey("ActivityId");
b.ToTable("Activities");
b.HasDiscriminator<string>("Discriminator").HasValue("Activity");
b.UseTphMappingStrategy();
});
modelBuilder.Entity("Cocotte.Modules.Activity.Models.ActivityPlayer", b =>
{
b.Property<ulong>("UserId")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<ulong>("ActivityId")
.HasColumnType("INTEGER");
b.Property<string>("Discriminator")
.IsRequired()
.HasColumnType("TEXT");
b.Property<string>("PlayerName")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("UserId");
b.HasIndex("ActivityId");
b.ToTable("ActivityPlayers");
b.HasDiscriminator<string>("Discriminator").HasValue("ActivityPlayer");
b.UseTphMappingStrategy();
});
modelBuilder.Entity("Cocotte.Modules.Activity.Models.StagedActivity", b =>
{
b.HasBaseType("Cocotte.Modules.Activity.Models.Activity");
b.Property<uint>("Stage")
.HasColumnType("INTEGER");
b.HasDiscriminator().HasValue("StagedActivity");
});
modelBuilder.Entity("Cocotte.Modules.Activity.Models.ActivityRolePlayer", b =>
{
b.HasBaseType("Cocotte.Modules.Activity.Models.ActivityPlayer");
b.Property<byte>("Roles")
.HasColumnType("INTEGER");
b.HasDiscriminator().HasValue("ActivityRolePlayer");
});
modelBuilder.Entity("Cocotte.Modules.Activity.Models.ActivityPlayer", b =>
{
b.HasOne("Cocotte.Modules.Activity.Models.Activity", "Activity")
.WithMany("ActivityPlayers")
.HasForeignKey("ActivityId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Activity");
});
modelBuilder.Entity("Cocotte.Modules.Activity.Models.Activity", b =>
{
b.Navigation("ActivityPlayers");
});
#pragma warning restore 612, 618
}
}
}

96
Cocotte/Modules/Activities/ActivityFormatter.cs Normal file
View File

@@ -0,0 +1,96 @@
using System.Text;
using Cocotte.Modules.Activities.Models;
using Cocotte.Options;
using Cocotte.Utils;
using Discord;
using Microsoft.Extensions.Options;
namespace Cocotte.Modules.Activities;
public class ActivityFormatter
{
private readonly ActivityOptions _options;
public ActivityFormatter(IOptions<ActivityOptions> options)
{
_options = options.Value;
}
public static string FormatActivityName(ActivityName activityName)
{
return activityName switch
{
ActivityName.Abyss => "Abîme du Néant",
ActivityName.Raids => "Raids",
ActivityName.FrontierClash => "Conflit Frontalier",
ActivityName.VoidRift => "Failles du Néant",
ActivityName.OriginsOfWar => "Origines de la Guerre",
ActivityName.JointOperation => "Opération Conjointe",
ActivityName.InterstellarExploration => "Exploration Interstellaire",
ActivityName.BreakFromDestiny => "Échapper au Destin (3v3)",
ActivityName.CriticalAbyss => "Abîme Critique (8v8)",
ActivityName.Event => "Event",
ActivityName.Fishing => "Pêche",
ActivityName.MirroriaRace => "Course Mirroria",
_ => throw new ArgumentOutOfRangeException(nameof(activityName), activityName, null)
};
}
public EmbedBuilder ActivityEmbed(Activity activity, IEnumerable<ActivityPlayer> players)
{
// Get activity emote
var activityEmote = GetActivityEmote(activity.Name);
// Players field
var playersField = new EmbedFieldBuilder()
.WithName("Joueurs inscrits")
.WithValue($"{(!players.Any() ? "*Aucun joueur inscrit*" : string.Join("\n", players.Select(FormatActivityPlayer)))}");
return new EmbedBuilder()
.WithColor(Colors.CocotteBlue)
.WithTitle($"{activityEmote} {FormatActivityName(activity.Name)} ({players.Count()}/{activity.MaxPlayers})")
.WithDescription($"{activity.Description}")
.WithFields(playersField);
}
private static string GetActivityEmote(ActivityName activityName) => activityName switch
{
ActivityName.Abyss => ":fox:",
ActivityName.Raids => ":crossed_swords:",
ActivityName.Fishing => ":fishing_pole_and_fish:",
_ => ":white_circle:"
};
public string FormatActivityPlayer(ActivityPlayer player) => player switch
{
ActivityRolePlayer rolePlayer => $"{player.Name} {RolesToEmotes(rolePlayer.Roles)}",
_ => $"{player.Name})"
};
private string RolesToEmotes(ActivityRoles rolePlayerRoles)
{
var emotesBuilder = new StringBuilder();
if (rolePlayerRoles.HasFlag(ActivityRoles.Helper))
{
emotesBuilder.Append($"{_options.HelperEmote}/");
}
if (rolePlayerRoles.HasFlag(ActivityRoles.Dps))
{
emotesBuilder.Append(_options.DpsEmote);
}
if (rolePlayerRoles.HasFlag(ActivityRoles.Tank))
{
emotesBuilder.Append(_options.TankEmote);
}
if (rolePlayerRoles.HasFlag(ActivityRoles.Support))
{
emotesBuilder.Append(_options.SupportEmote);
}
return emotesBuilder.ToString();
}
}

26
Cocotte/Modules/Activity/ActivityHelper.cs → Cocotte/Modules/Activities/ActivityHelper.cs
View File

@@ -2,7 +2,7 @@
using Discord.WebSocket; using Discord.WebSocket;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Cocotte.Modules.Activity; namespace Cocotte.Modules.Activities;
public class ActivityHelper public class ActivityHelper
{ {
@@ -15,28 +15,20 @@ public class ActivityHelper
_options = options.Value; _options = options.Value;
} }
public ActivityRoles GetPlayerRoles(IReadOnlyCollection<SocketRole> userRoles) public ActivityRoles GetPlayerRoles(IEnumerable<SocketRole> userRoles)
{ {
var roles = ActivityRoles.None; var roles = ActivityRoles.None;
foreach (var socketRole in userRoles) foreach (var socketRole in userRoles)
{ {
if (socketRole.Id == _options.HelperRoleId) roles |= socketRole.Id switch
{ {
roles |= ActivityRoles.Helper; var role when role == _options.HelperRoleId => ActivityRoles.Helper,
} var role when role == _options.DpsRoleId => ActivityRoles.Dps,
else if (socketRole.Id == _options.DpsRoleId) var role when role == _options.TankRoleId => ActivityRoles.Tank,
{ var role when role == _options.SupportRoleId => ActivityRoles.Support,
roles |= ActivityRoles.Dps; _ => ActivityRoles.None
} };
else if (socketRole.Id == _options.TankRoleId)
{
roles |= ActivityRoles.Tank;
}
else if (socketRole.Id == _options.SupportRoleId)
{
roles |= ActivityRoles.Support;
}
} }
return roles; return roles;

84
Cocotte/Modules/Activity/ActivityModule.cs → Cocotte/Modules/Activities/ActivityModule.cs
View File

@@ -1,5 +1,5 @@
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Cocotte.Modules.Activity.Models; using Cocotte.Modules.Activities.Models;
using Cocotte.Options; using Cocotte.Options;
using Cocotte.Utils; using Cocotte.Utils;
using Discord; using Discord;
@@ -7,7 +7,7 @@ using Discord.Interactions;
using Discord.WebSocket; using Discord.WebSocket;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Cocotte.Modules.Activity; namespace Cocotte.Modules.Activities;
/// <summary> /// <summary>
/// Module to ask and propose groups for different activities: Abyss, OOW, FC, ... /// Module to ask and propose groups for different activities: Abyss, OOW, FC, ...
@@ -20,12 +20,14 @@ public class ActivityModule : InteractionModuleBase<SocketInteractionContext>
private readonly ActivityOptions _options; private readonly ActivityOptions _options;
private readonly ActivityHelper _activityHelper; private readonly ActivityHelper _activityHelper;
private readonly ActivitiesRepository _activitiesRepository; private readonly ActivitiesRepository _activitiesRepository;
private readonly ActivityFormatter _activityFormatter;
public ActivityModule(ILogger<ActivityModule> logger, IOptions<ActivityOptions> options, ActivityHelper activityHelper, ActivitiesRepository activitiesRepository) public ActivityModule(ILogger<ActivityModule> logger, IOptions<ActivityOptions> options, ActivityHelper activityHelper, ActivitiesRepository activitiesRepository, ActivityFormatter activityFormatter)
{ {
_logger = logger; _logger = logger;
_activityHelper = activityHelper; _activityHelper = activityHelper;
_activitiesRepository = activitiesRepository; _activitiesRepository = activitiesRepository;
_activityFormatter = activityFormatter;
_options = options.Value; _options = options.Value;
} }
@@ -41,7 +43,7 @@ public class ActivityModule : InteractionModuleBase<SocketInteractionContext>
"""); """);
} }
[SlashCommand("abyss", "Créer un groupe pour l'Abîme du Néant")] [SlashCommand("abime", "Créer un groupe pour l'Abîme du Néant")]
public async Task ActivityAbyss([Summary("étage", "A quel étage êtes vous")] uint stage, [Summary("description", "Message accompagnant la demande de groupe")] string description = "") public async Task ActivityAbyss([Summary("étage", "A quel étage êtes vous")] uint stage, [Summary("description", "Message accompagnant la demande de groupe")] string description = "")
{ {
const ActivityName activityName = ActivityName.Abyss; const ActivityName activityName = ActivityName.Abyss;
@@ -51,24 +53,25 @@ public class ActivityModule : InteractionModuleBase<SocketInteractionContext>
var activity = new StagedActivity var activity = new StagedActivity
{ {
ActivityId = 0, ActivityId = 0,
CreatorId = Context.User.Id, CreatorDiscordId = Context.User.Id,
CreatorDiscordName = ((SocketGuildUser)Context.User).DisplayName,
Description = description, Description = description,
ActivityType = activityType, Type = activityType,
ActivityName = activityName, Name = activityName,
MaxPlayers = maxPlayers, MaxPlayers = maxPlayers,
Stage = stage, Stage = stage
ActivityPlayers = new()
}; };
await CreateRoleActivity(activity); await CreateRoleActivity(activity);
} }
private async Task CreateRoleActivity(Models.Activity activity) private async Task CreateRoleActivity(Activity activity)
{ {
_logger.LogTrace("Creating activity {Activity}", activity); var user = (SocketGuildUser)Context.User;
_logger.LogTrace("{User} is creating activity {Activity}", user.DisplayName, activity);
// Activities are identified using their original message id // Activities are identified using their original message id
await RespondAsync("`Création de l'activité en cours...`"); await RespondAsync("> *Création de l'activité en cours...*");
var response = await GetOriginalResponseAsync(); var response = await GetOriginalResponseAsync();
activity.ActivityId = response.Id; activity.ActivityId = response.Id;
@@ -76,6 +79,18 @@ public class ActivityModule : InteractionModuleBase<SocketInteractionContext>
// Add activity to db // Add activity to db
await _activitiesRepository.AddActivity(activity); await _activitiesRepository.AddActivity(activity);
// Add creator to activity
var rolePlayer = new ActivityRolePlayer
{
Activity = activity,
DiscordId = user.Id,
Name = user.DisplayName,
Roles = _activityHelper.GetPlayerRoles(user.Roles)
};
activity.ActivityPlayers.Add(rolePlayer);
await _activitiesRepository.SaveChanges();
// Add components // Add components
var components = ActivityRoleComponent(activity.ActivityId); var components = ActivityRoleComponent(activity.ActivityId);
@@ -83,7 +98,7 @@ public class ActivityModule : InteractionModuleBase<SocketInteractionContext>
{ {
m.Content = ""; m.Content = "";
m.Components = components.Build(); m.Components = components.Build();
// m.Embed = embed.Build(); m.Embed = _activityFormatter.ActivityEmbed(activity, Enumerable.Repeat(rolePlayer, 1)).Build();
}); });
} }
@@ -117,12 +132,21 @@ public class ActivityModule : InteractionModuleBase<SocketInteractionContext>
_logger.LogTrace("Player {Player} joined activity {Id}", user.DisplayName, activityId); _logger.LogTrace("Player {Player} joined activity {Id}", user.DisplayName, activityId);
var roles = _activityHelper.GetPlayerRoles(user.Roles); var roles = _activityHelper.GetPlayerRoles(user.Roles);
var activityRolePlayer = new ActivityRolePlayer { UserId = user.Id, PlayerName = user.DisplayName, Roles = roles, ActivityId = activityId, Activity = activity }; var activityRolePlayer = new ActivityRolePlayer
{
Activity = activity,
DiscordId = user.Id,
Name = user.DisplayName,
Roles = roles
};
// Add player to activity // Add player to activity
activity.ActivityPlayers.Add(activityRolePlayer); activity.ActivityPlayers.Add(activityRolePlayer);
await _activitiesRepository.SaveChanges(); await _activitiesRepository.SaveChanges();
// Update activity embed
await UpdateActivityEmbed(activity);
await RespondAsync( await RespondAsync(
ephemeral: true, ephemeral: true,
embed: EmbedUtils.SuccessEmbed("Vous avez bien été inscrit pour cette activité").Build() embed: EmbedUtils.SuccessEmbed("Vous avez bien été inscrit pour cette activité").Build()
@@ -161,18 +185,40 @@ public class ActivityModule : InteractionModuleBase<SocketInteractionContext>
activity.ActivityPlayers.Remove(activityPlayer); activity.ActivityPlayers.Remove(activityPlayer);
await _activitiesRepository.SaveChanges(); await _activitiesRepository.SaveChanges();
// Update activity embed
await UpdateActivityEmbed(activity);
await RespondAsync( await RespondAsync(
ephemeral: true, ephemeral: true,
embed: EmbedUtils.SuccessEmbed("Vous avez bien été désinscrit pour cette activité").Build() embed: EmbedUtils.SuccessEmbed("Vous avez bien été désinscrit pour cette activité").Build()
); );
} }
[ComponentInteraction("activity event_join:*", ignoreGroupNames: true)] // [ComponentInteraction("activity event_join:*", ignoreGroupNames: true)]
private async Task JoinEventActivity(ulong activityId) // private async Task JoinEventActivity(ulong activityId)
{ // {
_logger.LogTrace("Player {Player} joined activity {Id}", ((IGuildUser)Context.User).DisplayName, activityId); // _logger.LogTrace("Player {Player} joined activity {Id}", ((IGuildUser)Context.User).DisplayName, activityId);
//
// await RespondAsync(activityId.ToString());
// }
await RespondAsync(activityId.ToString()); private async Task UpdateActivityEmbed(Activity activity)
{
// Get channel
var channel = await Context.Interaction.GetChannelAsync();
if (channel is null)
{
return;
}
// Fetch players
var players = await _activitiesRepository.LoadActivityPlayers(activity);
await channel.ModifyMessageAsync(activity.ActivityId, properties =>
{
properties.Embed = _activityFormatter.ActivityEmbed(activity, players).Build();
});
} }
private static ComponentBuilder ActivityRoleComponent(ulong activityId) private static ComponentBuilder ActivityRoleComponent(ulong activityId)

2
Cocotte/Modules/Activity/ActivityName.cs → Cocotte/Modules/Activities/ActivityName.cs
View File

@@ -1,4 +1,4 @@
namespace Cocotte.Modules.Activity; namespace Cocotte.Modules.Activities;
public enum ActivityName public enum ActivityName
{ {

2
Cocotte/Modules/Activity/ActivityRoles.cs → Cocotte/Modules/Activities/ActivityRoles.cs
View File

@@ -1,4 +1,4 @@
namespace Cocotte.Modules.Activity; namespace Cocotte.Modules.Activities;
[Flags] [Flags]
public enum ActivityRoles : byte public enum ActivityRoles : byte

2
Cocotte/Modules/Activity/ActivityType.cs → Cocotte/Modules/Activities/ActivityType.cs
View File

@@ -1,4 +1,4 @@
namespace Cocotte.Modules.Activity; namespace Cocotte.Modules.Activities;
public enum ActivityType public enum ActivityType
{ {

53
Cocotte/Modules/Activities/Models/ActivitiesRepository.cs Normal file
View File

@@ -0,0 +1,53 @@
using Cocotte.Services;
namespace Cocotte.Modules.Activities.Models;
public class ActivitiesRepository
{
private readonly CocotteDbContext _cocotteDbContext;
public ActivitiesRepository(CocotteDbContext cocotteDbContext)
{
_cocotteDbContext = cocotteDbContext;
}
public async Task<Activity?> FindActivity(ulong activityId)
{
return await _cocotteDbContext.Activities.FindAsync(activityId);
}
public async Task<StagedActivity?> FindStagedActivity(ulong activityId)
{
return await _cocotteDbContext.StagedActivities.FindAsync(activityId);
}
public async Task<ActivityPlayer?> FindActivityPlayer(ulong activityId, ulong playerId)
{
return await _cocotteDbContext.ActivityPlayers.FindAsync(activityId, playerId);
}
public async Task<ActivityRolePlayer?> FindActivityRolePlayer(ulong activityId, ulong playerId)
{
return await _cocotteDbContext.ActivityRolePlayers.FindAsync(activityId, playerId);
}
public async Task<IEnumerable<ActivityPlayer>> LoadActivityPlayers(Activity activity)
{
await _cocotteDbContext
.Entry(activity)
.Collection(a => a.ActivityPlayers)
.LoadAsync();
return activity.ActivityPlayers;
}
public async Task AddActivity(Activity activity)
{
await _cocotteDbContext.AddAsync(activity);
}
public async Task SaveChanges()
{
await _cocotteDbContext.SaveChangesAsync();
}
}

24
Cocotte/Modules/Activities/Models/Activity.cs Normal file
View File

@@ -0,0 +1,24 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Cocotte.Modules.Activities.Models;
public abstract class Activity
{
[Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
public required ulong ActivityId { get; set; }
public required ulong CreatorDiscordId { get; init; }
public required string CreatorDiscordName { get; set; }
public string? Description { get; init; }
public required ActivityType Type { get; init; }
public required ActivityName Name { get; init; }
public required uint MaxPlayers { get; set; }
public List<ActivityPlayer> ActivityPlayers { get; init; } = new();
public override string ToString()
{
return $"{nameof(ActivityId)}: {ActivityId}, {nameof(CreatorDiscordId)}: {CreatorDiscordId}, {nameof(Description)}: {Description}, {nameof(Type)}: {Type}, {nameof(Name)}: {Name}, {nameof(MaxPlayers)}: {MaxPlayers}";
}
}

21
Cocotte/Modules/Activities/Models/ActivityPlayer.cs Normal file
View File

@@ -0,0 +1,21 @@
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
namespace Cocotte.Modules.Activities.Models;
[PrimaryKey(nameof(ActivityId), nameof(DiscordId))]
public class ActivityPlayer
{
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public required ulong DiscordId { get; init; }
public required string Name { get; init; }
public ulong ActivityId { get; init; }
public required Activity Activity { get; init; }
public override string ToString()
{
return $"{nameof(DiscordId)}: {DiscordId}, {nameof(Name)}: {Name}";
}
}

2
Cocotte/Modules/Activity/Models/ActivityRolePlayer.cs → Cocotte/Modules/Activities/Models/ActivityRolePlayer.cs
View File

@@ -1,4 +1,4 @@
namespace Cocotte.Modules.Activity.Models; namespace Cocotte.Modules.Activities.Models;
public class ActivityRolePlayer : ActivityPlayer public class ActivityRolePlayer : ActivityPlayer
{ {

2
Cocotte/Modules/Activity/Models/StagedActivity.cs → Cocotte/Modules/Activities/Models/StagedActivity.cs
View File

@@ -1,4 +1,4 @@
namespace Cocotte.Modules.Activity.Models; namespace Cocotte.Modules.Activities.Models;
public class StagedActivity : Activity public class StagedActivity : Activity
{ {

24
Cocotte/Modules/Activity/ActivityFormatter.cs
View File

@@ -1,24 +0,0 @@
namespace Cocotte.Modules.Activity;
public class ActivityFormatter
{
public static string ActivityName(ActivityName activityName)
{
return activityName switch
{
Modules.Activity.ActivityName.Abyss => "Abîme du Néant",
Modules.Activity.ActivityName.Raids => "Raids",
Modules.Activity.ActivityName.FrontierClash => "Clash Frontalier",
Modules.Activity.ActivityName.VoidRift => "Failles du Néant",
Modules.Activity.ActivityName.OriginsOfWar => "Origines de la Guerre",
Modules.Activity.ActivityName.JointOperation => "Opération Conjointe",
Modules.Activity.ActivityName.InterstellarExploration => "Exploration Interstellaire",
Modules.Activity.ActivityName.BreakFromDestiny => "Échapper au Destin (3v3)",
Modules.Activity.ActivityName.CriticalAbyss => "Abîme Critique (8v8)",
Modules.Activity.ActivityName.Event => "Event",
Modules.Activity.ActivityName.Fishing => "Pêche",
Modules.Activity.ActivityName.MirroriaRace => "Course Mirroria",
_ => throw new ArgumentOutOfRangeException(nameof(activityName), activityName, null)
};
}
}

45
Cocotte/Modules/Activity/Models/ActivitiesRepository.cs
View File

@@ -1,45 +0,0 @@
using Cocotte.Services;
using Microsoft.EntityFrameworkCore;
namespace Cocotte.Modules.Activity.Models;
public class ActivitiesRepository
{
private readonly CocotteContext _cocotteContext;
public ActivitiesRepository(CocotteContext cocotteContext)
{
_cocotteContext = cocotteContext;
}
public async Task<Activity?> FindActivity(ulong activityId)
{
return await _cocotteContext.Activities.FindAsync(activityId);
}
public async Task<StagedActivity?> FindStagedActivity(ulong activityId)
{
return await _cocotteContext.StagedActivities.FindAsync(activityId);
}
public async Task<ActivityPlayer?> FindActivityPlayer(ulong activityId, ulong playerId)
{
return await _cocotteContext.ActivityPlayers.FindAsync(activityId, playerId);
}
public async Task<ActivityRolePlayer?> FindActivityRolePlayer(ulong activityId, ulong playerId)
{
return await _cocotteContext.ActivityRolePlayers.FindAsync(activityId, playerId);
}
public async Task AddActivity(Activity activity)
{
await _cocotteContext.AddAsync(activity);
await _cocotteContext.SaveChangesAsync();
}
public async Task SaveChanges()
{
await _cocotteContext.SaveChangesAsync();
}
}

23
Cocotte/Modules/Activity/Models/Activity.cs
View File

@@ -1,23 +0,0 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.EntityFrameworkCore;
namespace Cocotte.Modules.Activity.Models;
public abstract class Activity
{
[Key]
public ulong ActivityId { get; set; }
public ulong CreatorId { get; init; }
public string? Description { get; init; }
public ActivityType ActivityType { get; init; }
public ActivityName ActivityName { get; init; }
public uint MaxPlayers { get; set; }
public List<ActivityPlayer> ActivityPlayers { get; init; } = new();
public override string ToString()
{
return $"{nameof(ActivityId)}: {ActivityId}, {nameof(CreatorId)}: {CreatorId}, {nameof(Description)}: {Description}, {nameof(ActivityType)}: {ActivityType}, {nameof(ActivityName)}: {ActivityName}, {nameof(MaxPlayers)}: {MaxPlayers}";
}
}

20
Cocotte/Modules/Activity/Models/ActivityPlayer.cs
View File

@@ -1,20 +0,0 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.EntityFrameworkCore;
namespace Cocotte.Modules.Activity.Models;
[PrimaryKey(nameof(ActivityId), nameof(UserId))]
public class ActivityPlayer
{
public ulong UserId { get; init; }
public required string PlayerName { get; init; }
public ulong ActivityId { get; init; }
public required Activity Activity { get; init; }
public override string ToString()
{
return $"{nameof(UserId)}: {UserId}, {nameof(PlayerName)}: {PlayerName}";
}
}

21
Cocotte/Program.cs
View File

@@ -1,5 +1,5 @@
using Cocotte.Modules.Activity; using Cocotte.Modules.Activities;
using Cocotte.Modules.Activity.Models; using Cocotte.Modules.Activities.Models;
using Cocotte.Modules.Raids; using Cocotte.Modules.Raids;
using Cocotte.Options; using Cocotte.Options;
using Cocotte.Services; using Cocotte.Services;
@@ -13,7 +13,7 @@ DiscordSocketConfig discordSocketConfig = new()
{ {
LogLevel = LogSeverity.Debug, LogLevel = LogSeverity.Debug,
MessageCacheSize = 200, MessageCacheSize = 200,
GatewayIntents = GatewayIntents.AllUnprivileged GatewayIntents = GatewayIntents.GuildMembers | GatewayIntents.Guilds
}; };
IHost host = Host.CreateDefaultBuilder(args) IHost host = Host.CreateDefaultBuilder(args)
@@ -29,7 +29,7 @@ IHost host = Host.CreateDefaultBuilder(args)
services.Configure<ActivityOptions>(context.Configuration.GetSection(ActivityOptions.SectionName)); services.Configure<ActivityOptions>(context.Configuration.GetSection(ActivityOptions.SectionName));
// Database // Database
services.AddDbContext<CocotteContext>(options => services.AddDbContext<CocotteDbContext>(options =>
options.UseSqlite(context.Configuration.GetConnectionString("CocotteContext")), ServiceLifetime.Transient, ServiceLifetime.Transient); options.UseSqlite(context.Configuration.GetConnectionString("CocotteContext")), ServiceLifetime.Transient, ServiceLifetime.Transient);
services.AddTransient<ActivitiesRepository>(); services.AddTransient<ActivitiesRepository>();
@@ -63,4 +63,17 @@ IHost host = Host.CreateDefaultBuilder(args)
}) })
.Build(); .Build();
// Recreate database if in development environment
await using(var scope = host.Services.CreateAsyncScope())
{
var hostEnvironment = scope.ServiceProvider.GetRequiredService<IHostEnvironment>();
if (hostEnvironment.IsDevelopment())
{
var dbContext = scope.ServiceProvider.GetRequiredService<CocotteDbContext>();
// await dbContext.Database.EnsureDeletedAsync();
await dbContext.Database.EnsureCreatedAsync();
}
}
await host.RunAsync(); await host.RunAsync();

8
Cocotte/Properties/launchSettings.json
View File

@@ -7,6 +7,14 @@
"DOTNET_ENVIRONMENT": "Development" "DOTNET_ENVIRONMENT": "Development"
}, },
"workingDirectory": "bin/Debug/net7.0" "workingDirectory": "bin/Debug/net7.0"
},
"Cocotte-Prod": {
"commandName": "Project",
"dotnetRunMessages": true,
"environmentVariables": {
"DOTNET_ENVIRONMENT": "Production"
},
"workingDirectory": "bin/Debug/net7.0"
} }
} }
} }

6
Cocotte/Services/CocotteContext.cs → Cocotte/Services/CocotteDbContext.cs
View File

@@ -1,9 +1,9 @@
using Cocotte.Modules.Activity.Models; using Cocotte.Modules.Activities.Models;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
namespace Cocotte.Services; namespace Cocotte.Services;
public class CocotteContext : DbContext public class CocotteDbContext : DbContext
{ {
public DbSet<Activity> Activities => Set<Activity>(); public DbSet<Activity> Activities => Set<Activity>();
public DbSet<StagedActivity> StagedActivities => Set<StagedActivity>(); public DbSet<StagedActivity> StagedActivities => Set<StagedActivity>();
@@ -11,7 +11,7 @@ public class CocotteContext : DbContext
public DbSet<ActivityPlayer> ActivityPlayers => Set<ActivityPlayer>(); public DbSet<ActivityPlayer> ActivityPlayers => Set<ActivityPlayer>();
public DbSet<ActivityRolePlayer> ActivityRolePlayers => Set<ActivityRolePlayer>(); public DbSet<ActivityRolePlayer> ActivityRolePlayers => Set<ActivityRolePlayer>();
public CocotteContext(DbContextOptions<CocotteContext> options) : base(options) public CocotteDbContext(DbContextOptions<CocotteDbContext> options) : base(options)
{ {
} }

7
Cocotte/Services/CocotteService.cs
View File

@@ -1,4 +1,5 @@
using System.Reflection; using System.Reflection;
using Cocotte.Modules.Activities;
using Cocotte.Options; using Cocotte.Options;
using Discord; using Discord;
using Discord.Interactions; using Discord.Interactions;
@@ -51,7 +52,11 @@ public class CocotteService : BackgroundService
} }
// Initialize modules and commands // Initialize modules and commands
await _interactionService.AddModulesAsync(Assembly.GetEntryAssembly(), _serviceProvider); // await _interactionService.AddModulesAsync(Assembly.GetEntryAssembly(), _serviceProvider);
#if DEBUG
await _interactionService.AddModuleAsync(typeof(Modules.Ping.PingModule), _serviceProvider);
#endif
await _interactionService.AddModuleAsync(typeof(ActivityModule), _serviceProvider);
_client.Ready += ClientOnReady; _client.Ready += ClientOnReady;
_client.InteractionCreated += HandleInteraction; _client.InteractionCreated += HandleInteraction;

10
Cocotte/Utils/EmbedUtils.cs
View File

@@ -4,7 +4,7 @@ namespace Cocotte.Utils;
public static class EmbedUtils public static class EmbedUtils
{ {
public static EmbedBuilder ErrorEmbed(string message, string title = "Error") public static EmbedBuilder ErrorEmbed(string message, string title = "Erreur")
{ {
return new EmbedBuilder() return new EmbedBuilder()
.WithColor(Colors.ErrorColor) .WithColor(Colors.ErrorColor)
@@ -25,8 +25,8 @@ public static class EmbedUtils
) )
.WithDescription(message); .WithDescription(message);
} }
public static EmbedBuilder SuccessEmbed(string message, string title = "Success") public static EmbedBuilder SuccessEmbed(string message, string title = "Succès")
{ {
return new EmbedBuilder() return new EmbedBuilder()
.WithColor(Colors.SuccessColor) .WithColor(Colors.SuccessColor)
@@ -36,8 +36,8 @@ public static class EmbedUtils
) )
.WithDescription(message); .WithDescription(message);
} }
public static EmbedBuilder WarningEmbed(string message, string title = "Warning") public static EmbedBuilder WarningEmbed(string message, string title = "Attention")
{ {
return new EmbedBuilder() return new EmbedBuilder()
.WithColor(Colors.WarningColor) .WithColor(Colors.WarningColor)

BIN
Cocotte/cocotte.db
View File

Binary file not shown.