Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix expired mails showing as unread on join #6063

Merged
merged 3 commits into from
Feb 23, 2025
Merged

Fix expired mails showing as unread on join #6063

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c3ff22
Fix expired mails showing as unread on join
JRoy Feb 23, 2025
a7edf3e
Merge branch '2.x' into fix/6062
JRoy Feb 23, 2025
3aabb1e
Merge branch '2.x' into fix/6062
JRoy Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/UserData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,17 @@ public void setMails(List<String> mails) {
}

public int getMailAmount() {
return holder.mail() == null ? 0 : holder.mail().size();
if (holder.mail() == null) {
return 0;
}

int amount = 0;
for (MailMessage element : holder.mail()) {
if (!element.isExpired()) {
amount++;
}
}
return amount;
}

public int getUnreadMailAmount() {
Expand All @@ -358,7 +368,7 @@ public int getUnreadMailAmount() {

int unread = 0;
for (MailMessage element : holder.mail()) {
if (!element.isRead()) {
if (!element.isRead() && !element.isExpired()) {
unread++;
}
}
Expand Down
Loading