Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-06-25 06:09:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: some mail features (#1826)

Browse Source
This commit is contained in:
David Markowitz 2025-06-23 20:58:55 -07:00 committed by GitHub
parent 9f92f48a0f
commit 4ed7bd6767
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dGame/dUtilities/Mail.cpp
View File

@ -132,6 +132,7 @@ namespace Mail {
} else { } else {
response.status = eSendResponse::SenderAccountIsMuted; response.status = eSendResponse::SenderAccountIsMuted;
} }
LOG("Finished send with status %s", StringifiedEnum::ToString(response.status).data());
response.Send(sysAddr); response.Send(sysAddr);
} }
@ -158,6 +159,7 @@ namespace Mail {
DataResponse response; DataResponse response;
response.playerMail = playerMail; response.playerMail = playerMail;
response.Send(sysAddr); response.Send(sysAddr);
LOG("DataRequest");
} }
void DataResponse::Serialize(RakNet::BitStream& bitStream) const { void DataResponse::Serialize(RakNet::BitStream& bitStream) const {
@ -196,6 +198,7 @@ namespace Mail {
response.status = eAttachmentCollectResponse::Success; response.status = eAttachmentCollectResponse::Success;
} }
} }
LOG("AttachmentCollectResponse %s", StringifiedEnum::ToString(response.status).data());
response.Send(sysAddr); response.Send(sysAddr);
} }
@ -218,14 +221,15 @@ namespace Mail {
response.mailID = mailID; response.mailID = mailID;
auto mailData = Database::Get()->GetMail(mailID); auto mailData = Database::Get()->GetMail(mailID);
if (mailData && !(mailData->itemLOT != 0 && mailData->itemCount > 0)) { if (mailData && !(mailData->itemLOT > 0 && mailData->itemCount > 0)) {
Database::Get()->DeleteMail(mailID); Database::Get()->DeleteMail(mailID);
response.status = eDeleteResponse::Success; response.status = eDeleteResponse::Success;
} else if (mailData && mailData->itemLOT != 0 && mailData->itemCount > 0) { } else if (mailData && mailData->itemLOT > 0 && mailData->itemCount > 0) {
response.status = eDeleteResponse::HasAttachments; response.status = eDeleteResponse::HasAttachments;
} else { } else {
response.status = eDeleteResponse::NotFound; response.status = eDeleteResponse::NotFound;
} }
LOG("DeleteRequest status %s", StringifiedEnum::ToString(response.status).data());
response.Send(sysAddr); response.Send(sysAddr);
} }
@ -250,6 +254,8 @@ namespace Mail {
response.status = eReadResponse::Success; response.status = eReadResponse::Success;
Database::Get()->MarkMailRead(mailID); Database::Get()->MarkMailRead(mailID);
} }
LOG("ReadRequest %s", StringifiedEnum::ToString(response.status).data());
response.Send(sysAddr); response.Send(sysAddr);
} }
@ -267,6 +273,8 @@ namespace Mail {
response.status = eNotificationResponse::NewMail; response.status = eNotificationResponse::NewMail;
response.mailCount = unreadMailCount; response.mailCount = unreadMailCount;
} }
LOG("NotificationRequest %s", StringifiedEnum::ToString(response.status).data());
response.Send(sysAddr); response.Send(sysAddr);
} }
} }
@ -288,6 +296,7 @@ void Mail::HandleMail(RakNet::BitStream& inStream, const SystemAddress& sysAddr,
LOG_DEBUG("Error Reading Mail Request: %s", StringifiedEnum::ToString(data.messageID).data()); LOG_DEBUG("Error Reading Mail Request: %s", StringifiedEnum::ToString(data.messageID).data());
return; return;
} }
LOG("Received mail message %s", StringifiedEnum::ToString(data.messageID).data());
request->Handle(); request->Handle();
} else { } else {
LOG_DEBUG("Unhandled Mail Request with ID: %i", data.messageID); LOG_DEBUG("Unhandled Mail Request with ID: %i", data.messageID);

4
dGame/dUtilities/Mail.h
View File

@ -119,12 +119,15 @@ namespace Mail {
struct SendRequest : public MailLUBitStream { struct SendRequest : public MailLUBitStream {
MailInfo mailInfo; MailInfo mailInfo;
SendRequest() : MailLUBitStream(eMessageID::SendRequest) {}
bool Deserialize(RakNet::BitStream& bitStream) override; bool Deserialize(RakNet::BitStream& bitStream) override;
void Handle() override; void Handle() override;
}; };
struct SendResponse :public MailLUBitStream { struct SendResponse :public MailLUBitStream {
eSendResponse status = eSendResponse::UnknownError; eSendResponse status = eSendResponse::UnknownError;
SendResponse() : MailLUBitStream(eMessageID::SendResponse) {}
void Serialize(RakNet::BitStream& bitStream) const override; void Serialize(RakNet::BitStream& bitStream) const override;
}; };
@ -137,6 +140,7 @@ namespace Mail {
}; };
struct DataRequest : public MailLUBitStream { struct DataRequest : public MailLUBitStream {
DataRequest() : MailLUBitStream(eMessageID::DataRequest) {}
bool Deserialize(RakNet::BitStream& bitStream) override { return true; }; bool Deserialize(RakNet::BitStream& bitStream) override { return true; };
void Handle() override; void Handle() override;
}; };

1
dNet/MailInfo.cpp
View File

@ -58,6 +58,7 @@ bool MailInfo::Deserialize(RakNet::BitStream& bitStream) {
bitStream.IgnoreBytes(4); // padding bitStream.IgnoreBytes(4); // padding
DluAssert(bitStream.GetNumberOfUnreadBits() == 0); DluAssert(bitStream.GetNumberOfUnreadBits() == 0);
LOG_DEBUG("MailInfo: %llu, %s, %s, %s, %llu, %i, %llu, %i, %llu, %i", id, subject.GetAsString().c_str(), body.GetAsString().c_str(), recipientName.GetAsString().c_str(), itemID, itemLOT, itemSubkey, itemCount, timeSent, wasRead);
return true; return true;
} }