From 2a950abe1cd7f7fb3bba3fc742c2ef76a91b9003 Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Thu, 20 Nov 2025 21:08:13 +1100
Subject: [PATCH] Update DBMerger

---
 Dotnet/DBMerger/DBMerger.csproj |  4 ++--
 Dotnet/DBMerger/Merger.cs       | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dotnet/DBMerger/DBMerger.csproj b/Dotnet/DBMerger/DBMerger.csproj
index 234c57a8..f026feb6 100644
--- a/Dotnet/DBMerger/DBMerger.csproj
+++ b/Dotnet/DBMerger/DBMerger.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<OutputPath>..\build\DBMerger\</OutputPath>
+		<OutputPath>..\..\build\DBMerger\</OutputPath>
 	</PropertyGroup>
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net9</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<Configurations>Debug;Release</Configurations>
 		<Platforms>x64</Platforms>
 		<PlatformTarget>x64</PlatformTarget>
diff --git a/Dotnet/DBMerger/Merger.cs b/Dotnet/DBMerger/Merger.cs
index 4bf1bc7d..88d1854d 100644
--- a/Dotnet/DBMerger/Merger.cs
+++ b/Dotnet/DBMerger/Merger.cs
@@ -257,10 +257,8 @@ namespace DBMerger
         private void MergeUsers()
         {
             MergeTable(
-                table => userIDRegex.IsMatch(table) 
-                    && !table.EndsWith("_avatar_history") 
-                    && (table.EndsWith("_notifications")
-                        || table.EndsWith("_moderation")),
+                table => userIDRegex.IsMatch(table) &&
+                         (table.EndsWith("_notifications") || table.EndsWith("_moderation")),
                 [0],
                 (old, existing) =>
                 {
@@ -339,7 +337,9 @@ namespace DBMerger
                 i--;
 
                 // Skip friend log current for obvious reasons
-                if (table.EndsWith("_friend_log_current"))
+                // Skip notes and mutual friends since they aren't time based
+                if (table.EndsWith("_friend_log_current") || table.EndsWith("_notes") ||
+                    table.EndsWith("_mutual_graph_friends") || table.EndsWith("_mutual_graph_links"))
                 {
                     continue;
                 }