mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo
synced 2024-11-24 07:54:13 +00:00
1ac72cc01a
Split the notifications into 'alert' and 'message' badget with two different flyouts. Also clean up styling and module behavior. ** Depends on ooui change Id4bbe14ba0bf6c for footers in popups. ** Depends on ooui change Ie93e4d6ed5637c for fixing a bug in inverted icons. ** MobileFrontend must also be updated to support the new modules in this patch I168f485d6e54cb4067 In this change: * Split notifcations into alert and messages and display those in two different badges. * Create two separate flyout/popups for each category with their notifications. * Create a view-model to control notification state and emit events for both the popup and the badge to intercept and react to. * Clean up module load and distribution: * Create an ext.echo.ui module for javascript-ui support and ooui widgets. * Create an ext.echo.nojs module that unifies all base classes that are needed for both nojs and js support, that the js version builds upon. * Create a separate ext.echo.logger module as a singleton that can be called to perform all logging. * Clean up style uses * Move the special page LESS file into nojs module so all styles load properly even in nojs mode. * Transfer some of the styling from JS to LESS for consistency. * Make the 'read more' button load already with the styles it needs to look like a button, since its behavior is similar in nojs and js vesions, but before its classes were applied only by the js, making it inconsistent and also making its appearance 'jump' from a link to a button. * Delete and clean up all old and unused files. * Moved 'Help.png' icon from modules/overlay to modules/icons for later use. Bug: T108190 Change-Id: I55f440ed9f64c46817f620328a6bb522d44c9ca9
316 lines
8.3 KiB
PHP
316 lines
8.3 KiB
PHP
<?php
|
|
|
|
class EchoNotification extends EchoAbstractEntity {
|
|
|
|
/**
|
|
* @var User
|
|
*/
|
|
protected $user;
|
|
|
|
/**
|
|
* @var EchoEvent
|
|
*/
|
|
protected $event;
|
|
|
|
/**
|
|
* The target page object for the notification if there is one. Null means
|
|
* the information has not been loaded.
|
|
*
|
|
* @var EchoTargetPage[]|null
|
|
*/
|
|
protected $targetPages;
|
|
|
|
/**
|
|
* @var string
|
|
*/
|
|
protected $timestamp;
|
|
|
|
/**
|
|
* @var string
|
|
*/
|
|
protected $readTimestamp;
|
|
|
|
/**
|
|
* Determine whether this is a bundle base. Default is 1,
|
|
* which means it's a bundle base
|
|
* @var int
|
|
*/
|
|
protected $bundleBase = 1;
|
|
|
|
/**
|
|
* The hash used to determine if a set of event could be bundled
|
|
* @var string
|
|
*/
|
|
protected $bundleHash = '';
|
|
|
|
/**
|
|
* The hash used to bundle events to display
|
|
* @var string
|
|
*/
|
|
protected $bundleDisplayHash = '';
|
|
|
|
/**
|
|
* Do not use this constructor.
|
|
*/
|
|
protected function __construct() {}
|
|
|
|
/**
|
|
* Creates an EchoNotification object based on event and user
|
|
* @param $info array The following keys are required:
|
|
* - 'event' The EchoEvent being notified about.
|
|
* - 'user' The User being notified.
|
|
* @throws MWException
|
|
* @return EchoNotification
|
|
*/
|
|
public static function create( array $info ) {
|
|
$obj = new EchoNotification();
|
|
static $validFields = array( 'event', 'user' );
|
|
|
|
foreach ( $validFields as $field ) {
|
|
if ( isset( $info[$field] ) ) {
|
|
$obj->$field = $info[$field];
|
|
} else {
|
|
throw new MWException( "Field $field is required" );
|
|
}
|
|
}
|
|
|
|
if ( !$obj->user instanceof User && !$obj->user instanceof StubObject ) {
|
|
throw new MWException( 'Invalid user parameter, expected: User/StubObject object' );
|
|
}
|
|
|
|
if ( !$obj->event instanceof EchoEvent ) {
|
|
throw new MWException( 'Invalid event parameter, expected: EchoEvent object' );
|
|
}
|
|
|
|
// Notification timestamp should be the same as event timestamp
|
|
$obj->timestamp = $obj->event->getTimestamp();
|
|
// Safe fallback
|
|
if ( !$obj->timestamp ) {
|
|
$obj->timestamp = wfTimestampNow();
|
|
}
|
|
|
|
//@Todo - Database insert logic should not be inside the model
|
|
$obj->insert();
|
|
|
|
return $obj;
|
|
}
|
|
|
|
/**
|
|
* Adds this new notification object to the backend storage.
|
|
*/
|
|
protected function insert() {
|
|
global $wgEchoNotifications;
|
|
|
|
$notifMapper = new EchoNotificationMapper();
|
|
|
|
// Get the bundle key for this event if web bundling is enabled
|
|
$bundleKey = '';
|
|
if ( !empty( $wgEchoNotifications[$this->event->getType()]['bundle']['web'] ) ) {
|
|
Hooks::run( 'EchoGetBundleRules', array( $this->event, &$bundleKey ) );
|
|
}
|
|
|
|
// The list of event ids to be removed from echo_target_page,
|
|
// this is mainly for bundled notifications when an event is
|
|
// no longer the bundle base
|
|
$eventIds = array();
|
|
if ( $bundleKey ) {
|
|
$hash = md5( $bundleKey );
|
|
$this->bundleHash = $hash;
|
|
$lastNotif = $notifMapper->fetchNewestByUserBundleHash( $this->user, $hash );
|
|
|
|
// Use a new display hash if:
|
|
// 1. there was no last bundle notification
|
|
// 2. last bundle notification with the same hash was read
|
|
if ( $lastNotif && !$lastNotif->getReadTimestamp() ) {
|
|
$this->bundleDisplayHash = $lastNotif->getBundleDisplayHash();
|
|
$lastEvent = $lastNotif->getEvent();
|
|
if ( $lastEvent ) {
|
|
$eventIds[] = $lastEvent->getId();
|
|
}
|
|
} else {
|
|
$this->bundleDisplayHash = md5( $bundleKey . '-display-hash-' . wfTimestampNow() );
|
|
}
|
|
}
|
|
|
|
// Create a target page object if specified by event
|
|
$event = $this->event;
|
|
$user = $this->user;
|
|
$targetPages = self::resolveTargetPages( $event->getExtraParam( 'target-page' ) );
|
|
if ( $targetPages ) {
|
|
$notifMapper->attachListener( 'insert', 'add-target-page', function() use ( $event, $user, $eventIds, $targetPages ) {
|
|
$targetMapper = new EchoTargetPageMapper();
|
|
if ( $eventIds ) {
|
|
$targetMapper->deleteByUserEvents( $user, $eventIds );
|
|
}
|
|
foreach ( $targetPages as $title ) {
|
|
$targetPage = EchoTargetPage::create( $user, $title, $event );
|
|
if ( $targetPage ) {
|
|
$targetMapper->insert( $targetPage );
|
|
}
|
|
}
|
|
} );
|
|
}
|
|
|
|
$notifUser = MWEchoNotifUser::newFromUser( $user );
|
|
$section = $this->event->getSection();
|
|
|
|
// Add listener to refresh notification count upon insert
|
|
$notifMapper->attachListener( 'insert', 'refresh-notif-count',
|
|
function() use ( $notifUser, $section ) {
|
|
$notifUser->resetNotificationCount( DB_MASTER );
|
|
if ( $section === EchoAttributeManager::MESSAGE && !$notifUser->hasMessages() ) {
|
|
$notifUser->cacheHasMessages();
|
|
}
|
|
}
|
|
);
|
|
|
|
$notifMapper->insert( $this );
|
|
|
|
// Clear applicable section status from cache upon new notification creation
|
|
$notifUser->clearSectionStatusCache( $section );
|
|
|
|
if ( $event->getType() === 'edit-user-talk' ) {
|
|
$notifUser->flagCacheWithNewTalkNotification();
|
|
}
|
|
Hooks::run( 'EchoCreateNotificationComplete', array( $this ) );
|
|
}
|
|
|
|
/**
|
|
* @param int[]|int|false $targetPageIds
|
|
* @return Title[]
|
|
*/
|
|
protected static function resolveTargetPages( $targetPageIds ) {
|
|
if ( !$targetPageIds ) {
|
|
return array();
|
|
}
|
|
if ( !is_array( $targetPageIds ) ) {
|
|
$targetPageIds = array( $targetPageIds );
|
|
}
|
|
$result = array();
|
|
foreach ( $targetPageIds as $targetPageId ) {
|
|
// Make sure the target-page id is a valid id
|
|
$title = Title::newFromID( $targetPageId );
|
|
// Try master if there is no match
|
|
if ( !$title ) {
|
|
$title = Title::newFromID( $targetPageId, Title::GAID_FOR_UPDATE );
|
|
}
|
|
if ( $title ) {
|
|
$result[] = $title;
|
|
}
|
|
}
|
|
return $result;
|
|
}
|
|
|
|
/**
|
|
* Load a notification record from std class
|
|
* @param stdClass
|
|
* @param EchoTargetPage[]|null An array of EchoTargetPage instances, or null if not loaded.
|
|
* @return EchoNotification
|
|
*/
|
|
public static function newFromRow( $row, $targetPages = null ) {
|
|
$notification = new EchoNotification();
|
|
|
|
if ( property_exists( $row, 'event_type' ) ) {
|
|
$notification->event = EchoEvent::newFromRow( $row );
|
|
} else {
|
|
$notification->event = EchoEvent::newFromID( $row->notification_event );
|
|
}
|
|
|
|
$notification->targetPages = $targetPages;
|
|
$notification->user = User::newFromId( $row->notification_user );
|
|
// Notification timestamp should never be empty
|
|
$notification->timestamp = wfTimestamp( TS_MW, $row->notification_timestamp );
|
|
// Only convert to MW format if it is not empty, otherwise
|
|
// wfTimestamp would use current timestamp for empty cases
|
|
if ( $row->notification_read_timestamp ) {
|
|
$notification->readTimestamp = wfTimestamp( TS_MW, $row->notification_read_timestamp );
|
|
}
|
|
$notification->bundleBase = $row->notification_bundle_base;
|
|
$notification->bundleHash = $row->notification_bundle_hash;
|
|
$notification->bundleDisplayHash = $row->notification_bundle_display_hash;
|
|
return $notification;
|
|
}
|
|
|
|
/**
|
|
* Convert object property to database row array
|
|
* @return array
|
|
*/
|
|
public function toDbArray() {
|
|
return array(
|
|
'notification_event' => $this->event->getId(),
|
|
'notification_user' => $this->user->getId(),
|
|
'notification_timestamp' => $this->timestamp,
|
|
'notification_read_timestamp' => $this->readTimestamp,
|
|
'notification_bundle_base' => $this->bundleBase,
|
|
'notification_bundle_hash' => $this->bundleHash,
|
|
'notification_bundle_display_hash' => $this->bundleDisplayHash
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Getter method
|
|
* @return EchoEvent The event for this notification
|
|
*/
|
|
public function getEvent() {
|
|
return $this->event;
|
|
}
|
|
|
|
/**
|
|
* Getter method
|
|
* @return User The recipient of this notification
|
|
*/
|
|
public function getUser() {
|
|
return $this->user;
|
|
}
|
|
|
|
/**
|
|
* Getter method
|
|
* @return string Notification creation timestamp
|
|
*/
|
|
public function getTimestamp() {
|
|
return $this->timestamp;
|
|
}
|
|
|
|
/**
|
|
* Getter method
|
|
* @return string|null Notification read timestamp
|
|
*/
|
|
public function getReadTimestamp() {
|
|
return $this->readTimestamp;
|
|
}
|
|
|
|
/**
|
|
* Getter method
|
|
* @return int Notification bundle base
|
|
*/
|
|
public function getBundleBase() {
|
|
return $this->bundleBase;
|
|
}
|
|
|
|
/**
|
|
* Getter method
|
|
* @return string|null Notification bundle hash
|
|
*/
|
|
public function getBundleHash() {
|
|
return $this->bundleHash;
|
|
}
|
|
|
|
/**
|
|
* Getter method
|
|
* @return string|null Notification bundle display hash
|
|
*/
|
|
public function getBundleDisplayHash() {
|
|
return $this->bundleDisplayHash;
|
|
}
|
|
|
|
/**
|
|
* Getter method. Returns an array of EchoTargetPages, or null if they have
|
|
* not been loaded.
|
|
*
|
|
* @return EchoTargetPage[]|null
|
|
*/
|
|
public function getTargetPages() {
|
|
return $this->targetPages;
|
|
}
|
|
}
|