083f78b8fb
Stub out Glitch::ApplyKeywordMutesService. #199 .
...
This service will apply/unapply keyword mutes to home and mentions
timelines. Maybe other timelines if I find a way to make it work.
2018-06-13 03:32:30 -05:00
5cff053944
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
2018-06-12 18:13:30 -05:00
99b2bc2668
keyword mute: Add missing scope for regex escape test
2018-06-12 17:48:38 -05:00
908a770d2b
keyword mute: use mentions scope in home feed filtering ( #454 )
...
If a status shows up in mentions because all keyword mutes that might
apply to it are marked as "don't apply to mentions", then it ought to
show up in the home feed also.
2018-06-12 17:14:35 -05:00
e931cf656d
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
...
Conflicts:
app/models/glitch/keyword_mute.rb
2018-06-12 16:39:30 -05:00
4d8d1fa129
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-06-12 13:17:21 +00:00
6151308c47
Add missing tests for admin/accounts_controller ( #7791 )
2018-06-12 21:24:46 +09:00
7086aa598b
Add tests for intents_controller ( #7763 )
2018-06-09 22:47:50 +02:00
10f51c9886
Fix domain hiding logic ( #7765 )
...
* Send rejections to followers when user hides domain they're on
* Use account domain blocks for "authorized followers" action
Replace soft-blocking (block & unblock) behaviour with follow rejection
* Split sync and async work of account domain blocking
Do not create domain block when removing followers by domain, that
is probably unexpected from the user's perspective.
* Adjust confirmation message for domain block
* yarn manage:translations
2018-06-09 22:46:54 +02:00
8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
5bf5003384
2018-06-07 05:13:49 -05:00
12fa2500c4
Add missing tests for sessions controller ( #7744 )
2018-06-06 10:23:22 +09:00
a640c322c1
Escape metacharacters in non-whole-word keyword mutes. Fixes #533 .
...
Also addresses #463 .
2018-06-05 02:49:28 -05:00
cf28049f0a
Add a FeedManager example demonstrating non-mention keywords. #454 .
2018-06-03 23:04:00 -05:00
a40e322f4b
Fix spacing in some FeedManager examples.
2018-06-03 23:02:01 -05:00
26573ad7e6
Thread scopes through #matches?. #454 .
...
Also add an apply_to_mentions attribute on Glitch::KeywordMute, which is
used to calculate scope. Next up: additions to the test suite to
demonstrate how scoping works.
2018-06-03 23:00:50 -05:00
22caa32ba2
Add tests for embeds controller ( #7719 )
...
* Small refactoring of status_finder_spec
* Add tests for embeds_controller
2018-06-04 10:35:56 +09:00
3550470c18
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
The above conflicts appear to be a text conflict introduced by
glitch-soc's additional level of columns (i.e. moving a bunch of columns
under the Misc option). They were resolved via accept-ours.
2018-06-02 16:15:36 -05:00
00512ecf87
Add tests for migrations_controller ( #7707 )
2018-06-02 18:52:16 +09:00
165b5dc7f5
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-31 01:17:25 +00:00
a7d726c383
Improve counter caches on Status and Account ( #7644 )
...
Do not touch statuses_count on accounts table when mass-destroying
statuses to reduce load when removing accounts, same for
reblogs_count and favourites_count
Do not count statuses with direct visibility in statuses_count
Fix #828
2018-05-30 02:50:23 +02:00
c087738270
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-29 13:52:26 +02:00
b0b34a5e38
Add a test for emojis_controller ( #7652 )
2018-05-28 22:56:58 +09:00
b87a1229c7
optimize direct timeline ( #7614 )
...
* optimize direct timeline
* fix typo in class name
* change filter condition for direct timeline
* fix codestyle issue
* revoke index_accounts_not_silenced because direct timeline does not use it.
* revoke index_accounts_not_silenced because direct timeline does not use it.
* fix rspec test condition.
* fix rspec test condition.
* fix rspec test condition.
* revoke adding column and partial index
* (direct timeline) move merging logic to model
* fix pagination parameter
* add method arguments that switches return array of status or cache_ids
* fix order by
* returns ActiveRecord.Relation in default behavor
* fix codestyle issue
2018-05-28 11:04:06 +02:00
e0ef89c73f
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-23 16:05:19 +02:00
6d99a0b652
Fix tests for invites controller (regression from 4d81809f36) ( #7597 )
2018-05-23 06:32:10 +02:00
12e590edd7
Add tests for report notes controller ( #7589 )
2018-05-22 14:45:10 +02:00
b481e4fac1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
8378b72eba
Ensure push subscription is immediately removed when application is revoked ( #7548 )
...
* Ensure push subscription is immediately removed when application is revoked
* When token is revoked from app, unsubscribe too
2018-05-19 21:05:08 +02:00
e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/settings/preferences_controller.rb
app/lib/user_settings_decorator.rb
app/models/user.rb
config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
57b503d4ef
Resolve unknown status from Add activity, skip Remove if unknown ( #7526 )
...
Fix #7518
2018-05-18 11:33:56 +02:00
2636a23092
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-17 11:17:21 +00:00
b48a166c82
Add tests for account_moderation_notes_controller ( #7524 )
2018-05-17 04:26:51 +02:00
45fce0e496
Merge branch 'master' into glitch-soc/merge
...
Conflicts:
app/controllers/invites_controller.rb
app/serializers/initial_state_serializer.rb
config/locales/ko.yml
2018-05-11 18:12:42 +02:00
50491e0d92
Add tests for invites controller ( #7441 )
...
* Add tests for invites controller
* Small refactoring and fix for invites controller
2018-05-11 13:14:33 +02:00
b4fb766b23
Add REST API for Web Push Notifications subscriptions ( #7445 )
...
- POST /api/v1/push/subscription
- PUT /api/v1/push/subscription
- DELETE /api/v1/push/subscription
- New OAuth scope: "push" (required for the above methods)
2018-05-11 11:49:12 +02:00
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
ac788ad47e
Disable simplecov on CircleCI ( #7416 )
...
* Disable simplecov on CircleCI
* Remove --format progress
2018-05-09 16:59:58 +02:00
ce35d81db7
Add tests for admin/roles_controller ( #7421 )
2018-05-09 08:41:46 +02:00
35eff337d5
Add tests for admin/invites_controller ( #7412 )
2018-05-09 08:41:26 +02:00
01dfd6dbc8
Take the first recognized actor_type. ( #7410 )
2018-05-08 13:30:04 +02:00
bd10a7e480
Add resend confirmation for admin ( #7378 )
...
* Add confirmations_controller#resend
* Add tests for confirmations_controller#resend
* Add translations
2018-05-06 10:59:03 +02:00
8c35d163a5
Port travis_retry for CI ( #7379 )
...
* Port travis_retry for CI
* Add license
2018-05-06 10:55:50 +02:00
c7d1a2e400
Improve admin UI for accounts ( #7360 )
...
* Improve design of account statuses admin UI (consistent with reports)
* Make account moderation notes look consistent with report notes
* i18n-tasks remove-unused
* Fix code style issues
* Fix tests
2018-05-05 23:06:29 +02:00
661f7e6d9d
Add tests for admin/custom_emojis_controller ( #7350 )
2018-05-05 15:53:59 +02:00
c73ce7b695
Store home feeds for 7 days instead of 14 ( #7354 )
...
* Store home feeds for 7 days instead of 14
Reduces workload for status fan-out to active followers
* Fix test for user model
2018-05-05 00:54:24 +02:00
7600067a30
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
db/schema.rb
2018-05-04 14:16:30 -05:00
6793bec4c6
Store URIs of follows, follow requests and blocks for ActivityPub ( #7160 )
...
Same URI passed between follow request and follow, since they are
the same thing in ActivityPub. Local URIs are generated during
creation using UUIDs and are passed to serializers.
2018-05-04 21:14:34 +02:00
c816701550
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
2018-05-03 17:23:44 -05:00
28b366d065
Add missing tests for report.rb ( #7324 )
2018-05-03 10:42:36 +02:00
28bd4b9800
Serialize webfinger XML with Ox instead of Nokogiri ( #7319 )
...
25ms -> 0.5ms
2018-05-02 22:28:46 +02:00
David Yip
Jenkins
Shuhei Kitagawa
Eugen Rochko
Thibaut Girka
tateisu
Yamagishi Kazutoshi
Surinna Curtis