jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404243 )
Change subject: Hygiene: inline the summary call to _collectRawPageData
......................................................................
Hygiene: inline the summary call to _collectRawPageData
This makes it easier to move things around.
Change-Id: Ie5a28f7110b374d043adb8d876561c4e3b4134af
---
M lib/mobile-util.js
M routes/mobile-sections.js
2 files changed, 7 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 52ba34b..ad68b28 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -180,12 +180,11 @@
* Build a page summary
* @param {!String} domain the request domain
* @param {!Object} title a mediawiki-title object for the page title
- * @param {!Object} pageData raw page data for the page
+ * @param {!Object} page page content and metadata from Parsoid
+ * @param {!Object} meta metadata from MW API
* @return {!Object} a summary 2.0 spec-compliant page summary object
*/
-mUtil.buildSummary = function(domain, title, pageData) {
- const page = pageData.page;
- const meta = pageData.meta;
+mUtil.buildSummary = function(domain, title, page, meta) {
const isContentModelWikitext = meta.contentmodel === 'wikitext';
const isWhiteListedNamespace =
mUtil.SUMMARY_NS_WHITELIST.includes(meta.ns);
const isRedirect = meta.redirect;
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index b34d9f7..979e2c8 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -361,11 +361,13 @@
*/
router.get('/summary/:title/:revision?/:tid?', (req, res) => {
return BBPromise.props({
- pageData: _collectRawPageData(req, false),
+ page: parsoid.pageJsonPromise(app, req, false),
+ meta: mwapi.getMetadata(app, req),
+ title: mwapi.getTitleObj(app, req),
siteinfo: mwapi.getSiteInfo(app, req)
}).then((response) => {
const title = Title.newFromText(req.params.title, response.siteinfo);
- const summary = mUtil.buildSummary(req.params.domain, title,
response.pageData);
+ const summary = mUtil.buildSummary(req.params.domain, title,
response.page, response.meta);
res.status(summary.code);
if (summary.code === 200) {
delete summary.code;
--
To view, visit https://gerrit.wikimedia.org/r/404243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5a28f7110b374d043adb8d876561c4e3b4134af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
