Can I Use the 30-Day Amnesty If My Non-O Visa Expires on June 2nd?

>My 90 days on my non o visa expires on 2nd June

That's about 6 weeks away. My advice is to:

a. If this is a multiple entry Non-O visa, to bounce when the borders re-open for another 90 day stamp.

b. If this is a single entry Non-O visa, to get an appropriate extension of stay; generally it's an extension of stay based on "retirement", an extension of stay based on marriage, or an extension of stay based on supporting a half Thai child.

If you can tell us what the decision is about this amnesty between 30 April and the 2 Jun, I will tell you if you can use it or not