Work around orphaned email attachments

* Attempt to update Windows action runner to 2022

* Fix VS path

.github/workflows/check-builds.yaml

@@ -8,6 +8,7 @@ on:
         - .github/workflows/check-builds.yaml
         - CMakeLists.txt
         - Makefile
+        - tdata
   pull_request:
     types: [opened, reopened, synchronize, ready_for_review]
     paths:
@@ -19,7 +20,7 @@ on:
 
 jobs:
   ubuntu-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Set environment
         run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
@@ -48,6 +49,7 @@ jobs:
               Rename-Item -Path "bin/fusion" -newName "$version-fusion"
               Write-Output "Built version $version"
           }
+          Copy-Item -Path "tdata" -Destination "bin/tdata" -Recurse
           Copy-Item -Path "sql" -Destination "bin/sql" -Recurse
           Copy-Item -Path "config.ini" -Destination "bin"
         shell: pwsh
@@ -58,7 +60,7 @@ jobs:
           path: bin
 
   windows-build:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Set environment
         run: $s = $env:GITHUB_SHA.subString(0, 7); echo "SHORT_SHA=$s" >> $env:GITHUB_ENV
@@ -73,7 +75,7 @@ jobs:
           $configurations = "Release"
           # "Debug" builds are disabled, since we don't really need them
 
-          $vsPath = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise"
+          $vsPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
 
           Import-Module "$vsPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
           Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation
@@ -100,6 +102,7 @@ jobs:
                   }
                   Rename-Item -Path "bin/$configuration" -newName "$version-$configuration"
                   Write-Output "Built version $version $configuration"
+                  Copy-Item -Path "tdata" -Destination "bin/$version-$configuration/tdata" -Recurse
                   Copy-Item -Path "sql" -Destination "bin/$version-$configuration/sql" -Recurse
                   Copy-Item -Path "config.ini" -Destination "bin/$version-$configuration"
               }
@@ -108,11 +111,11 @@ jobs:
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: 'windows-vs2019-bin-x64-${{ env.SHORT_SHA }}'
+          name: 'windows-vs2022-bin-x64-${{ env.SHORT_SHA }}'
           path: bin
 
   copy-artifacts:
-    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
+    if: github.event_name != 'pull_request' && (github.ref_type == 'tag' || github.ref_name == 'master')
     runs-on: ubuntu-latest
     needs: [windows-build, ubuntu-build]
     env:
@@ -121,7 +124,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          submodules: recursive
           fetch-depth: 0
       - run: |
           GITDESC=$(git describe --tags)

src/db/email.cpp

@@ -196,18 +196,16 @@ void Database::updateEmailContent(EmailData* data) {
     sqlite3_finalize(stmt);
 }
 
-void Database::deleteEmailAttachments(int playerID, int index, int slot) {
-    std::lock_guard<std::mutex> lock(dbCrit);
-
+static void _deleteEmailAttachments(int playerID, int index, int slot) {
     sqlite3_stmt* stmt;
 
     std::string sql(R"(
         DELETE FROM EmailItems
-        WHERE PlayerID = ? AND MsgIndex = ?;
+        WHERE PlayerID = ? AND MsgIndex = ?
         )");
 
     if (slot != -1)
-        sql += " AND \"Slot\" = ? ";
+        sql += " AND \"Slot\" = ?";
     sql += ";";
 
     sqlite3_prepare_v2(db, sql.c_str(), -1, &stmt, NULL);
@@ -221,6 +219,11 @@ void Database::deleteEmailAttachments(int playerID, int index, int slot) {
     sqlite3_finalize(stmt);
 }
 
+void Database::deleteEmailAttachments(int playerID, int index, int slot) {
+    std::lock_guard<std::mutex> lock(dbCrit);
+    _deleteEmailAttachments(playerID, index, slot);
+}
+
 void Database::deleteEmails(int playerID, int64_t* indices) {
     std::lock_guard<std::mutex> lock(dbCrit);
 
@@ -234,12 +237,15 @@ void Database::deleteEmails(int playerID, int64_t* indices) {
     sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);
 
     for (int i = 0; i < 5; i++) {
+        int64_t msgIndex = indices[i];
         sqlite3_bind_int(stmt, 1, playerID);
-        sqlite3_bind_int64(stmt, 2, indices[i]);
+        sqlite3_bind_int64(stmt, 2, msgIndex);
         if (sqlite3_step(stmt) != SQLITE_DONE) {
             std::cout << "[WARN] Database: Failed to delete an email: " << sqlite3_errmsg(db) << std::endl;
         }
         sqlite3_reset(stmt);
+        // delete all attachments
+        _deleteEmailAttachments(playerID, msgIndex, -1);
     }
     sqlite3_finalize(stmt);
 
@@ -323,12 +329,23 @@ bool Database::sendEmail(EmailData* data, std::vector<sItemBase> attachments, Pl
         sqlite3_bind_int(stmt, 7, item.iTimeLimit);
 
         if (sqlite3_step(stmt) != SQLITE_DONE) {
-            std::cout << "[WARN] Database: Failed to send email: " << sqlite3_errmsg(db) << std::endl;
-            sqlite3_exec(db, "ROLLBACK TRANSACTION;", NULL, NULL, NULL);
-            sqlite3_finalize(stmt);
-            return false;
+            // very likely the UNIQUE constraint failing due to
+            // orphaned attachments from an old email.
+            // try deleting them first
+            _deleteEmailAttachments(data->PlayerId, data->MsgIndex, -1);
+
+            // try again
+            sqlite3_reset(stmt);
+            if (sqlite3_step(stmt) != SQLITE_DONE) {
+                // different error, give up
+                std::cout << "[WARN] Database: Failed to send email: " << sqlite3_errmsg(db) << std::endl;
+                sqlite3_exec(db, "ROLLBACK TRANSACTION;", NULL, NULL, NULL);
+                sqlite3_finalize(stmt);
+                return false;
+            }
         }
         sqlite3_reset(stmt);
+        sqlite3_clear_bindings(stmt);
     }
     sqlite3_finalize(stmt);