[01:30:37] Reedy: so, about https://gerrit.wikimedia.org/r/c/mediawiki/extensions/OAuth/+/1240413 … should i submit that fix as a pull request to https://github.com/wikimedia/oauth2-server ? or are you doing it, or how does that repo work now? [01:30:54] It's still a fork [01:31:13] I'm just trying to decide what the best way of maintaining these... differences is [01:31:53] there's branches in the fork for the updated versions of the 2 different PR [01:32:21] It would feel... Like doing commits in both of those, and then cherry picking those commits onto the branch in use keeps divergence... as limited as is feasible [01:33:41] do we even need the fork's changes in AccessTokenTrait any more? we may not be using that code anymore, now that it was copied into OAuth's AccessTokenEntity.php [01:34:25] There's a chance that the two PR actually get merged in some form because of other things going on there [01:34:51] hm, nevermind, we probably need at least some of them. we override that method, but not others [01:35:15] I'm not exactly sure why we're not using that version anyway... I'm guessing some weird composition of classes and traits [01:36:16] (I'm not on the right computer to do that tracing) [01:46:51] oauth extension and vendor patches up to bring that in [01:48:15] i've been looking at the oauth2-server pull requests and their history in the meantime… for all their insistence that the project is still maintained, the maintainer doesn't seem to be maintaining it [01:50:08] it's not great, for sure [01:52:01] https://github.com/thephpleague/oauth2-server/compare/9.3.0...master much change [02:41:39] Reedy: i've been reading the oauth2-server code and i am pretty sure that we could just copy a couple of files into mw/ext/OAuth, and then migrate off the fork. i guess we would want to do that, per https://phabricator.wikimedia.org/T261462 ? maybe i'll find some time to do the needful [02:46:07] We possibly can... I honestly don't know how much of the two PR we actually use... [02:46:32] Or like I think you're suggesting, how much of that we actually need to be supporting directly in the library code [02:47:13] I guess originally there was a hope of upstream accepting the patches, the fork was "temporary" [02:48:40] With the updated PR/branches, the actual changes are more obvious [02:51:34] https://github.com/wikimedia/oauth2-server/commit/b8b36aa0627c81093b77705b78d832d0a7ef2eec [03:03:43] i'll give it a try tomorrow. see ya [08:43:19] Reedy: thank you :-] Makes me wonder whether we should do it the other way around, aka phase out exturlusage in favor of the generic query > querypage but yeah hmm... dupe is fine I guess :] [08:43:32] and I have discovered $wgAPIUselessQueryPages :] [08:47:04] anyone around who'd like to deploy https://gerrit.wikimedia.org/r/c/mediawiki/extensions/OAuth/+/1240430 and https://gerrit.wikimedia.org/r/c/mediawiki/extensions/OAuth/+/1240418 ? [18:32:35] James_F, https://gerrit.wikimedia.org/r/c/mediawiki/core/+/1233340 went well at last without issues. But thank you very much for flagging it, I appreciate. [18:32:58] And thanks Amir1 for the patch improvements 🎉 [18:43:11] now the spicy one: https://gerrit.wikimedia.org/r/c/mediawiki/core/+/1239156 [18:57:22] xSavitar: Excellent news!