boolean doesMatch = ue.getState() == UserState.Approved;\r
\r
Date lastSeen = bot.bncManager.getUserServer(ue).getLastSeen(ue);\r
+ // If we haven't been seen...\r
if (lastSeen == null || lastSeen.getTime() == 0L) {\r
- doesMatch &= (int) ((System.currentTimeMillis() - ue.getTimeRequested().getTime()) / 86400000) > days;\r
+ if(ue.getActionTime() == null || ue.getActionTime().getTime() == 0L) // ...and we have no action...what?!\r
+ doesMatch &= (int) ((System.currentTimeMillis() - ue.getTimeRequested().getTime()) / 86400000) > days;\r
+ else // ...use action time.\r
+ doesMatch &= (int) ((System.currentTimeMillis() - ue.getActionTime().getTime()) / 86400000) > days;\r
} else {\r
doesMatch &= (int) ((System.currentTimeMillis() - lastSeen.getTime()) / 86400000) > days;\r
}\r