Delete attachments on email delete

Author: yungcomputerchair

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);