Commit graph

3325 commits

Author SHA1 Message Date
Roan Kattouw 0807c3c5ad NotifUser: Refactor getNotificationCount() and friends, add caching for global counts
Previously, getNotificationCount() only looked at local notifications,
and foreign notifications were added in separately by getMessageCount()
and getAlertCount(). This didn't make any sense and resulted in
counter-intuitive things like I4d49b543.

Instead, add a $global flag to getNotificationCount(). If $global=false,
the local count is returned as before, but if $global=true, the
global count (=local+foreign) is returned. If $global is omitted,
the user's cross-wiki notification preference determines which is returned.

Update getLastUnreadNotificationCount() in the same way, since it had
the same issues.

Also add caching for global counts and timestamps, using a global
memc key.

Bug: T133623
Change-Id: If78bfc710acd91a075771b565cc99f4c302a104d
2016-05-02 16:16:57 -07:00
Roan Kattouw d6aba7613e Clarify beta feature description
Bug: T134014
Change-Id: I933169e2d7a6e1cc5a4e7134748702f8efb21b85
2016-05-02 15:16:53 -07:00
Roan Kattouw 73b0a083d4 FooterNoticeWidget: Top-align the close icon
Bug: T117669
Change-Id: I70d8df95e719824c8f135d01d6d9bf63a20daf02
2016-05-02 14:36:01 -07:00
jenkins-bot 3f4e024f3a Merge "Move section methods into a trait" 2016-05-02 12:29:39 +00:00
Translation updater bot d0007081d6 Localisation updates from https://translatewiki.net.
Change-Id: I01d80d43486516e8ee44667491ee1e531eb93333
2016-05-01 23:16:51 +02:00
Translation updater bot 396dc318a2 Localisation updates from https://translatewiki.net.
Change-Id: I08da917f6231ce9867370e0d699494223ad2bc56
2016-04-29 22:34:28 +02:00
Roan Kattouw 6a626e2685 Enable emailuser notifications by default
Bug: T133927
Change-Id: I3cbbc4b5980e61fba9d71d12684db0f1be2db6af
2016-04-28 17:01:24 -07:00
Matthew Flaschen bd317224ac Have getTimestamp actually return max for all sections.
Before, it was just returning the timestamp of the messages section.

Tested by creating a message on one foreign wiki, then an alert on
another and using:

http://mobile.wiki.local.wmftest.net:8080/w/api.php?action=query&format=jsonfm&meta=notifications&notsections=message|alert&notformat=model&notlimit=25&notunreadfirst=1&notprop=list|count&uselang=en&notcrosswikisummary=1&_=1461881446668

Change-Id: I870229b09a8add08eb3542e3ab70db58352d00b8
2016-04-28 23:26:13 +00:00
Catrope 3a018f9e10 Revert "Localisation updates from https://translatewiki.net."
Removed qqq which broke banana, again.

This reverts commit 8037ff307b.

Change-Id: I9088e5de5900f833b28c203d81b935fe0d827be7
2016-04-28 22:52:04 +00:00
Translation updater bot 8037ff307b Localisation updates from https://translatewiki.net.
Change-Id: I9ff1f66950aedc768a08fb62dcdda63414b85e99
2016-04-28 23:27:52 +02:00
Roan Kattouw 33124f35a8 Move section methods into a trait
Change-Id: Ief2005918b92945ff93aea85d17e595c7c38adf2
2016-04-28 20:52:09 +00:00
Matthew Flaschen 6d6845d9e4 Display special: Add which section (curr. Alert v. Msg.) each type's in
Replace getAlertEvents and getMessageEvents with
getEventsForSection.

Also, add IDs for linking to sections

Bug: T123018
Change-Id: Ic480320a52a401609d853fc8c75c781b89bb8722
2016-04-28 20:33:52 +00:00
Roan Kattouw e864b1fc47 ForeignNotifications: Fix fatal when one section has no timestamp
Bug: T133921
Change-Id: Iab82fa9439e26832731f4f56b5be18985203f49c
2016-04-28 10:39:05 -07:00
Roan Kattouw fbf702aa7e Follow-up 1608a5e6fc: add hasOwnProperty check
To prevent crashes when wikis extend Array.prototype.

Bug: T133817
Change-Id: I40063d7997a1dfb72053eb09e48d4480dbf371a8
2016-04-28 00:34:11 +00:00
Catrope f37585b947 Revert "Localisation updates from https://translatewiki.net."
Undid changes to qqq.json, which broke banana-checker.

This reverts commit 7b4dd7d046.

Change-Id: I5ed1c8913e8e8538023c1dfd91bc2287a271c995
2016-04-28 00:09:30 +00:00
Translation updater bot 7b4dd7d046 Localisation updates from https://translatewiki.net.
Change-Id: If22e1f6da05323b240b9c12810c3088354f0c9e5
2016-04-27 22:54:08 +02:00
jenkins-bot ff67a0377b Merge "Repurpose survey call-out in the footer for beta feature invitation" 2016-04-27 19:53:34 +00:00
jenkins-bot e4d953168b Merge "ForeignNotifications: Move preference check out of constructor and allow force-enable" 2016-04-27 16:57:47 +00:00
jenkins-bot 56b4f161e4 Merge "Clean up section title handling in mention and edit-user-talk presentation models" 2016-04-27 16:29:49 +00:00
Roan Kattouw 314e00def5 ForeignNotifications: Move preference check out of constructor and allow force-enable
Instead of checking the cross-wiki notifications preference
in the constructor, move it to a method that other code can reuse.
Also add a parameter allowing foreign notification data to be
inspected even if the user has disabled the preference.

Change-Id: I6600ff27aa5af1737b3a6c3cde586d325886bc86
2016-04-27 16:23:21 +00:00
jenkins-bot ae9b7b80bd Merge "ForeignNotifications: Use ALL instead of null as defaults for $section params" 2016-04-27 16:16:53 +00:00
Roan Kattouw d8bf305e68 ForeignNotifications: Use ALL instead of null as defaults for $section params
Change-Id: Ieab7090742fd7f75c079be72cd9c07e3e1448ed1
2016-04-27 08:31:15 -07:00
jenkins-bot 84074fb799 Merge "Make EchoForeignNotifications::getApiEndpoints() static" 2016-04-27 15:06:42 +00:00
Roan Kattouw 4f7f1a3a09 Repurpose survey call-out in the footer for beta feature invitation
Removing the info popup because we don't have to show
a privacy notice when linking within the wiki.

This adds a database query to every page view for logged-in
users; If78bfc710, once merged, will fix that.

Bug: T117669
Change-Id: I8451db34ae8e94264e4921ecd6df6e4b32c7623a
2016-04-27 07:23:30 +00:00
Roan Kattouw 5152385887 Make EchoForeignNotifications::getApiEndpoints() static
It doesn't use $this, except to call getWikiTitle(), so make that
static too. This allows us to use it in EchoForeignPresentationModel
without creating a second instance there.

Change-Id: If778db0852de1cbf5c2190ce50ce561745bb3887
2016-04-26 17:33:30 -07:00
Roan Kattouw 1608a5e6fc Follow-up b10bd7003: allow object instead of array for b/c with wikis running old code
Change-Id: I1566b73e0d8daea6c2e701f60cbcb9dd42129ec9
2016-04-26 15:57:25 -07:00
Roan Kattouw 91a7833209 Follow-up 57ee9759: add notnoforn=1 for b/c with wikis running old code
Change-Id: I24b697d59f9306b9cfa40372c5d4a92ba331b20b
2016-04-26 15:55:07 -07:00
jenkins-bot 605f28effe Merge "Remove forced -p (progress) flag from phpcs.xml" 2016-04-26 21:38:45 +00:00
Roan Kattouw cf1da49904 Remove forced -p (progress) flag from phpcs.xml
This causes phpcs to emit invalid JSON when the --report=json
flag is set and no issues are found, which breaks editor plugins
(atom-linter-phpcs in my case).

Add this flag in composer.json instead.

Change-Id: Ibb0b4c084e25e06be72389f1d4998804cfd53295
2016-04-26 14:21:28 -07:00
Translation updater bot 0503734eb9 Localisation updates from https://translatewiki.net.
Change-Id: Idc05bc28f76e543be5cce5c406ac2869cee5acbf
2016-04-26 22:27:21 +02:00
Željko Filipin ef7e22786e Do not run broken Selenium test in CI
Bug: T128190
Change-Id: Iadaede037ed0d4560c56ed9f06bcd96eff1e9f58
2016-04-26 15:51:15 +00:00
Translation updater bot a3482ef810 Localisation updates from https://translatewiki.net.
Change-Id: Iefefd6e959aa26d46fd7452dc6cfdd5e225f134a
2016-04-25 22:46:34 +02:00
jenkins-bot 29b0fb5688 Merge "Migration of browsertests* Jenkins jobs to selenium* jobs" 2016-04-25 16:12:17 +00:00
Željko Filipin 269d965a4a Migration of browsertests* Jenkins jobs to selenium* jobs
selenium* jobs are a new way of running Ruby based Selenium tests. The
jobs are triggered daily.
Bug: T128190
Change-Id: If240d2da8f0c55ed46f1f2f34c6aca05bcba09ac
2016-04-25 17:54:45 +02:00
Translation updater bot a04a0e518b Localisation updates from https://translatewiki.net.
Change-Id: If03e6201473c668436c622fbd143e1ae752af9ad
2016-04-24 22:33:32 +02:00
Translation updater bot 0f70dce007 Localisation updates from https://translatewiki.net.
Change-Id: I9aa976545f2111531ec9ad2c06406875340ae1d6
2016-04-23 22:21:22 +02:00
jenkins-bot 2bc334cc62 Merge "Unlisted special page for displaying notification configuration" 2016-04-23 03:54:08 +00:00
Matthew Flaschen d27f32f9b1 Unlisted special page for displaying notification configuration
This provides a simple unlisted special page,
Special:DisplayNotificationsConfiguration, to document how the
notifications are structured and configured.  It shows:

* Which types are in each category
* Which notify types (web/email) can be enabled for each category
* Which notify types are mandatory for each category
* Which notify types are enabled by default:
** For existing users
** For new users

Bug: T132127
Change-Id: I25b447a69a7c984941dfd703345d7977c0000bfe
2016-04-22 20:31:04 -07:00
jenkins-bot f6affc4655 Merge "BREAKING CHANGE: Change $wgEchoDefaultNotificationTypes to be logical" 2016-04-23 02:27:40 +00:00
Matthew Flaschen 5ecc6aa7c8 BREAKING CHANGE: Change $wgEchoDefaultNotificationTypes to be logical
Merge and deploy at the *same time* as:
* BounceHandler - I3c669945080d8e1f67880bd8a31af7f88a70904d
* mediawiki-config - I13817c139967ed9e230cfb0c87c5de66da793c96

Despite claiming to be about categories, $wgEchoDefaultNotificationTypes
was actually configuring both categories and types (which go inside
categories).

For example, 'thank-you-edit' is a type, but 'emailuser' is both
a category and a type (when used as a category, this has special
effects at Special:Preferences).

Since types and categories can and sometimes do have the same names,
this leaves no way to properly and clearly configure them.  It also
makes it difficult to document what is going on (as required by
T132127).

Split into three variables:

$wgDefaultNotifyTypeAvailability - Applies unless overriden

$wgNotifyTypeAvailabilityByCategory - By category; this can be and is
displayed at Special:Preferences

$wgNotifyTypeAvailabilityByNotificationType - By type; this cannot
be displayed at Special:Preferences. To avoid confusing the user,
we introduce a restriction (which was previously followed in practice,
AFAICT) that types can only be overridden if the category is not
displayed in preferences.

Otherwise, it can look to the user like a category is on/off, but the
types within might have the opposite state.

Due to this configuration change, this is a breaking change, and needs
coordinated deployments.

This also lays the groundwork for T132127

Also change terminology to consistently use "notify type" for web/email.

It was mixing between that and output format (which unfortunately
sounds like the API format, e.g. 'model').

Bug: T132820
Bug: T132127
Change-Id: I09f39f5fc5f13f3253af9f7819bca81f1601da93
2016-04-22 19:08:12 -07:00
jenkins-bot 158d19a00a Merge "Switch $wgMemc usage to proper cache/stash usage" 2016-04-22 23:01:14 +00:00
Translation updater bot 9c627215f7 Localisation updates from https://translatewiki.net.
Change-Id: Ib5bc94eefcf5afbc0fdc745bdc236d57297132ed
2016-04-22 22:21:53 +02:00
jenkins-bot dc14945dcd Merge "Change (opt-out) noforn to (opt-in) crosswikisummary" 2016-04-22 19:29:53 +00:00
jenkins-bot 4bf6c5d7cd Merge "List is no longer an associative array" 2016-04-22 19:23:06 +00:00
Matthias Mullie 57ee975984 Change (opt-out) noforn to (opt-in) crosswikisummary
I thought the name was confusing, and would be even more so
if we get real notifications from other sources.

Meanwhile also split $crossWikiSummary into 2 properties:
- 1 with the class
- 1 to indicate if it should be used

Change-Id: I0e83be7924c8c77680ea1ada3f2bd6a190ce6149
2016-04-22 12:14:21 -07:00
Matthias Mullie b10bd70033 List is no longer an associative array
This would soon become problematic when output can come from
multiple sources, with potentially conflicting ids.
The ID is already included in the result anyway.

Change-Id: Id92150c71c68958819fe0ee329e70393052c34c9
2016-04-22 12:13:21 -07:00
Aaron Schulz 33fe3490d3 Switch $wgMemc usage to proper cache/stash usage
Change-Id: I688e21ff4ff999f11c0373ad611075c14fa5db2a
2016-04-22 11:58:03 -07:00
jenkins-bot 748068b66c Merge "Remove param index" 2016-04-22 18:47:12 +00:00
jenkins-bot 6c38cb84ad Merge "Make notifications use getMainStashInstance()" 2016-04-22 18:25:36 +00:00
Roan Kattouw c5361da55a Clean up section title handling in mention and edit-user-talk presentation models
They were using different code and different approaches.
I've left getSection() and the code for creating a Title
with a section duplicated for now, and I'll move them
into a trait in the next commit. I wanted to do that
separately because we aren't using traits in this
code base yet.

Change-Id: I56cf745d2cc8a6c43caec08024187de9598cecb8
2016-04-21 18:31:12 -07:00