Tidy up logic to correctly expire in cases where expiry is expected
Tidy up logic to correctly expire in cases where expiry is expected

smoogipoo/osu,ppy/osu,peppy/osu,peppy/osu-new,smoogipoo/osu,smoogipoo/osu,NeoAdonis/osu,smoogipooo/osu,UselessToucan/osu,peppy/osu,UselessToucan/osu,peppy/osu,NeoAdonis/osu,ppy/osu,UselessToucan/osu,ppy/osu,NeoAdonis/osu