Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/258178

Change subject: Add support for cross-wiki notifications to 
Schema:EchoInteraction
......................................................................

Add support for cross-wiki notifications to Schema:EchoInteraction

Adds support in the logger code that is unused for now.

Note that I9bf6f4bcd41d8da5 must be deployed before this can be used on
Wikimedia sites.

Bug: T120158
Change-Id: I1968f36e21139975d25231ac25c22a73dea6fd0d
---
M Echo.php
M modules/logger/mw.echo.Logger.js
2 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/78/258178/1

diff --git a/Echo.php b/Echo.php
index 1cc509b..672ace9 100644
--- a/Echo.php
+++ b/Echo.php
@@ -476,7 +476,7 @@
                ),
                'EchoInteraction' => array(
                        'enabled' => false,
-                       'revision' => 5782287,
+                       'revision' => 15065746,
                        'client' => true,
                ),
        )
diff --git a/modules/logger/mw.echo.Logger.js b/modules/logger/mw.echo.Logger.js
index b85ff40..23ad812 100644
--- a/modules/logger/mw.echo.Logger.js
+++ b/modules/logger/mw.echo.Logger.js
@@ -87,8 +87,9 @@
         * @param {int} [eventId] Notification event id
         * @param {string} [eventType] notification type
         * @param {boolean} [mobile] True if interaction was on a mobile device
+        * @param {string} [notifWiki] Wiki the notification came from
         */
-       mw.echo.Logger.prototype.logInteraction = function ( action, context, 
eventId, eventType, mobile ) {
+       mw.echo.Logger.prototype.logInteraction = function ( action, context, 
eventId, eventType, mobile, notifWiki ) {
                if ( !this.constructor.static.clickThroughEnabled ) {
                        return;
                }
@@ -111,6 +112,10 @@
                        myEvt.mobile = mobile;
                }
 
+               if ( notifWiki && notifWiki !== mw.config.get( 'wgDBname' ) ) {
+                       myEvt.notifWiki = notifWiki;
+               }
+
                this.deferred.done( function () {
                        mw.eventLog.logEvent( 'EchoInteraction', myEvt );
                } );

-- 
To view, visit https://gerrit.wikimedia.org/r/258178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1968f36e21139975d25231ac25c22a73dea6fd0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to