From 524c97d9bfa4489b8375f3e3ead0ab9b4711554d Mon Sep 17 00:00:00 2001
From: Toastie <toastie@toastiet0ast.com>
Date: Sun, 30 Mar 2025 15:43:43 +1300
Subject: [PATCH] fixed quests completion, removed logs
---
.../Modules/Games/Quests/QuestService.cs | 21 +++----------------
.../Modules/Games/Quests/db/UserQuest.cs | 2 +-
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/EllieBot/Modules/Games/Quests/QuestService.cs b/src/EllieBot/Modules/Games/Quests/QuestService.cs
index e184087..7139cdd 100644
--- a/src/EllieBot/Modules/Games/Quests/QuestService.cs
+++ b/src/EllieBot/Modules/Games/Quests/QuestService.cs
@@ -1,6 +1,5 @@
using LinqToDB;
using LinqToDB.EntityFrameworkCore;
-using Microsoft.CodeAnalysis.Operations;
using EllieBot.Common.ModuleBehaviors;
using EllieBot.Db.Models;
@@ -46,44 +45,30 @@ public sealed class QuestService(
_ = Task.Run(async () =>
{
- Log.Information("Action reported by {UserId}: {EventType} {Metadata}",
- userId,
- eventType,
- metadata.ToJson());
metadata ??= new();
var now = DateTime.UtcNow;
-
- Log.Information("done?");
+
var alreadyDone = await botCache.GetAsync(UserCompletedDailiesKey(userId));
if (alreadyDone.IsT0)
return;
-
- Log.Information("not done");
var userQuests = await GetUserQuestsAsync(userId, now);
-
- Log.Information("got quests");
+
foreach (var (q, uq) in userQuests)
{
// deleted quest
if (q is null)
continue;
-
- Log.Information("not deleted {QuestEventType} - {EventType}", q.EventType, eventType);
// user already completed or incorrect event
if (uq.IsCompleted || q.EventType != eventType)
continue;
-
- Log.Information("Gonna update progress");
var newProgress = q.TryUpdateProgress(metadata, uq.Progress);
// user already did that part of the quest
if (newProgress == uq.Progress)
continue;
-
- Log.Information("new progress");
var isCompleted = newProgress >= q.RequiredAmount;
@@ -95,7 +80,7 @@ public sealed class QuestService(
.UpdateAsync();
uq.IsCompleted = isCompleted;
-
+
if (userQuests.All(x => x.UserQuest.IsCompleted))
{
var timeUntilTomorrow = now.Date.AddDays(1) - DateTime.UtcNow;
diff --git a/src/EllieBot/Modules/Games/Quests/db/UserQuest.cs b/src/EllieBot/Modules/Games/Quests/db/UserQuest.cs
index 9ddfaec..c67ab52 100644
--- a/src/EllieBot/Modules/Games/Quests/db/UserQuest.cs
+++ b/src/EllieBot/Modules/Games/Quests/db/UserQuest.cs
@@ -15,7 +15,7 @@ public class UserQuest
public QuestIds QuestId { get; set; }
- public int Progress { get; set; }
+ public long Progress { get; set; }
public bool IsCompleted { get; set; }