wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-09-24 02:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change auto topic subs to re-subscribe you if you unsubscribed

Browse source 
Bug: T295950
Change-Id: I7d3136c8bd7042b03487d85decea30a56dc3cde6
This commit is contained in:
Bartosz Dziewoński 2021-11-29 21:17:40 +01:00
parent eb0ca647ef
commit d3a7476cef
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/SubscriptionStore.php
View file

@ -321,11 +321,10 @@ class SubscriptionStore {
string $itemName string $itemName
): bool { ): bool {
// Check for existing subscriptions. // Check for existing subscriptions.
// Note that this includes subscriptions with state=STATE_UNSUBSCRIBED.
$subscriptionItems = $this->getSubscriptionItemsForUser( $subscriptionItems = $this->getSubscriptionItemsForUser(
$user, $user,
[ $itemName ], [ $itemName ],
null, [ self::STATE_SUBSCRIBED, self::STATE_AUTOSUBSCRIBED ],
[ 'forWrite' => true ] [ 'forWrite' => true ]
); );
if ( $subscriptionItems ) { if ( $subscriptionItems ) {

2
modules/controller.js
View file

@ -432,7 +432,7 @@ function updateSubscriptionStates( $container, headingsToUpdate ) {
if ( subscribedState === STATE_AUTOSUBSCRIBED ) { if ( subscribedState === STATE_AUTOSUBSCRIBED ) {
maybeShowFirstTimeAutoTopicSubPopup(); maybeShowFirstTimeAutoTopicSubPopup();
} else if ( subscribedState === null ) { } else if ( subscribedState === null || subscribedState === STATE_UNSUBSCRIBED ) {
topicsToCheck.push( headingName ); topicsToCheck.push( headingName );
pending.push( el ); pending.push( el );
} }