mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-04-19 14:53:50 +02:00
Update DBMerger
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputPath>..\build\DBMerger\</OutputPath>
|
<OutputPath>..\..\build\DBMerger\</OutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net9</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<Configurations>Debug;Release</Configurations>
|
<Configurations>Debug;Release</Configurations>
|
||||||
<Platforms>x64</Platforms>
|
<Platforms>x64</Platforms>
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
|
|||||||
@@ -257,10 +257,8 @@ namespace DBMerger
|
|||||||
private void MergeUsers()
|
private void MergeUsers()
|
||||||
{
|
{
|
||||||
MergeTable(
|
MergeTable(
|
||||||
table => userIDRegex.IsMatch(table)
|
table => userIDRegex.IsMatch(table) &&
|
||||||
&& !table.EndsWith("_avatar_history")
|
(table.EndsWith("_notifications") || table.EndsWith("_moderation")),
|
||||||
&& (table.EndsWith("_notifications")
|
|
||||||
|| table.EndsWith("_moderation")),
|
|
||||||
[0],
|
[0],
|
||||||
(old, existing) =>
|
(old, existing) =>
|
||||||
{
|
{
|
||||||
@@ -339,7 +337,9 @@ namespace DBMerger
|
|||||||
i--;
|
i--;
|
||||||
|
|
||||||
// Skip friend log current for obvious reasons
|
// 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;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user