Whatever is doing the single-item removal could also be used in maintenance/cleanupWatchlist.php, at the moment it does direct DB deletions.

@MusikAnimal @Mooeypoo Is the work for this task done in the same commit as T245213?

Testing the latter, I am finding that watchlist_expiry rows are not removed when deleting an item with Special:EditWatchlist/raw. They are in other ways (EditWatchlist, "star" on the page).

This is with the $wgWatchlistExpiry = true, but does not seem to matter if the expiry time has passed.

In T245224#5947415, @dom_walden wrote:

MusikAnimal Mooeypoo Is the work for this task done in the same commit as T245213?

Yes, incidentally.

Testing the latter, I am finding that watchlist_expiry rows are not removed when deleting an item with Special:EditWatchlist/raw. They are in other ways (EditWatchlist, "star" on the page).

This is with the $wgWatchlistExpiry = true, but does not seem to matter if the expiry time has passed.

I finally got around to testing this and I could not reproduce the bug. In my case I added items with expiries using the action=watch API with this patch checked out https://gerrit.wikimedia.org/r/c/mediawiki/core/+/580522. I guess we can revisit this bug after that is merged, since it'll be much easier to do testing.

Leaving this task open for now.

Testing the latter, I am finding that watchlist_expiry rows are not removed when deleting an item with Special:EditWatchlist/raw.

Things might have changed since you tested; can you have another crack at it? I can't reproduce this now. watchlist_expiry rows seem to be correctly removed when editing the raw watchlist.

In T245224#6061196, @Samwilson wrote:

Testing the latter, I am finding that watchlist_expiry rows are not removed when deleting an item with Special:EditWatchlist/raw.

Things might have changed since you tested; can you have another crack at it? I can't reproduce this now. watchlist_expiry rows seem to be correctly removed when editing the raw watchlist.

Yeah, for me too now. MediaWiki 1.35.0-alpha (a0b8a24).

• Removing an item from Special:EditWatchlist
• Removing from watchlist through the API
• Removing an item from Special:RawWatchlist
• Removing an item through the "star" or through ?action=unwatch

I have retested all of these, checking that the appropriate row is removed from watchlist_expiry (verified by looking in the database).

I have also tested Special:EditWatchlist/clear, where you can completely clear your watchlist.

Tested on https://en.wikipedia.beta.wmflabs.org (MediaWiki 1.35.0-alpha (6870c21) 08:41, 27 April 2020).