Add in locking changes from folia, plus fix some diffs. I'm sure it'll be error-free.
The note is not visible to the blocked user.