Forget the repatriation flight. I been on the list for months. Get an Emirates flight this month. I'm on one. I was informed by Thai embassy about a limited number of flight this month.
You would think that any foreign visitors would be welcome for as long as they want and can support themselves without burden on Thailand as it's all Thailand has at this time.