I read somewhere that they were to change the law, so only Dutch nationals can buy marijuana in coffeeshops, has this come into effect. if not, when will it?

Also, have magic mushrooms become outlawed at present? I read they were also going to be banned from being sold in shops completely.