Commit Graph

7407 Commits

Author SHA1 Message Date
Ariadne Conill 44e64af5e7 object: containment: simplify the pattern match for OStatus testsuite hack 2019-10-18 15:39:15 +00:00
Ariadne Conill e99fdfc32d object: containment: only allow OStatus references in test suite environment 2019-10-18 15:37:14 +00:00
Ariadne Conill a8eb1f0975 tests: mastodon search: search for an account that is visible via activitypub, not ostatus 2019-10-18 14:50:10 +00:00
Ariadne Conill 3c785b85a6 object: fetcher: fix up formatting 2019-10-18 14:50:10 +00:00
Ariadne Conill dbfdb1f6e3 add some missing tesla fixtures 2019-10-18 14:50:10 +00:00
Ariadne Conill bae96de273 activitypub: tag containment checks for better error tracing 2019-10-18 14:50:10 +00:00
Ariadne Conill 7295a05cee object: containment: also allow OStatus object IDs through when comparing origins 2019-10-18 14:50:10 +00:00
Ariadne Conill a177f22e02 object: fetcher: improve error reporting 2019-10-18 14:50:10 +00:00
Ariadne Conill bf2107743f object: containment: don't try to contain ostatus objects 2019-10-18 14:50:10 +00:00
Ariadne Conill 85ddcaf418 tests: fix up signature tests 2019-10-18 14:50:10 +00:00
Ariadne Conill 700c654208 tests: fix relay tests 2019-10-18 14:50:10 +00:00
Ariadne Conill 6f110fc04c object fetcher: fix up error handling 2019-10-18 14:50:09 +00:00
Ariadne Conill af9aa8e358 tests: simplify object fetching and containment tests 2019-10-18 14:50:09 +00:00
Ariadne Conill 597cb8897b tests: remove some more ostatus tests 2019-10-18 14:50:09 +00:00
Ariadne Conill 48059c03c9 fix up some tests 2019-10-18 14:50:09 +00:00
Ariadne Conill d379b48769 kill almost all of the OStatus module 2019-10-18 14:50:09 +00:00
Ariadne Conill 6a1f4c5145 federator: remove OStatus incoming document support 2019-10-18 14:50:09 +00:00
Ariadne Conill 835ad52378 remove Salmon module 2019-10-18 14:50:09 +00:00
Ariadne Conill beb9861f9d router: disconnect Salmon 2019-10-18 14:50:09 +00:00
Ariadne Conill a7b92bba68 webfinger: stop pulling Salmon data out of WebFinger 2019-10-18 14:50:09 +00:00
Ariadne Conill c00ae10af8 feed: don't advertise salmon endpoint 2019-10-18 14:50:09 +00:00
Ariadne Conill adb639db56 publisher: move remote_users() from Salmon module 2019-10-18 14:50:09 +00:00
Ariadne Conill 4f82e42e4e websub: remove entirely 2019-10-18 14:50:09 +00:00
Ariadne Conill b16a460916 federator: remove websub stuff 2019-10-18 14:50:09 +00:00
Ariadne Conill 25b7ff56c3 application: don't start Federator.init/1 anymore 2019-10-18 14:50:09 +00:00
Ariadne Conill c6de0cbb4a config: disable Websub and Salmon publisher modules 2019-10-18 14:50:09 +00:00
Ariadne Conill 4e270964d7 update changelog 2019-10-18 14:50:09 +00:00
rinpatch 223c0c0136 Merge branch 'fix/changelog-typo' into 'develop'
Fix wrong list level in the changelog

See merge request pleroma/pleroma!1860
2019-10-18 13:00:33 +00:00
rinpatch c2f1cc4f16 Fix wrong list level in the changelog 2019-10-18 15:56:14 +03:00
rinpatch 153f652d41 Merge branch 'chore/develop-changelog-sync' into 'develop'
Sync the changelog from stable and collapse the API sections

See merge request pleroma/pleroma!1859
2019-10-18 12:47:45 +00:00
rinpatch 09c1e7a82e Sync the changelog from stable and collapse the API sections 2019-10-18 15:46:51 +03:00
rinpatch 30a59ae97d Merge branch 'backport/develop-safe-jsonb' into 'develop'
Backport safe_jsonb_set fixes to develop

See merge request pleroma/pleroma!1858
2019-10-18 12:42:09 +00:00
rinpatch b085cd2660 Add a test for safe_jsonb_set 2019-10-18 15:22:16 +03:00
rinpatch 39e996528c Fix a migration wiping user info of users that don't have any mutes
And introduce safe_jsonb_set
2019-10-18 15:22:07 +03:00
rinpatch 724f611b0e Merge branch 'cleanup/deprecated_config_upload' into 'develop'
upload.ex: Remove deprecated configuration

See merge request pleroma/pleroma!1855
2019-10-18 11:34:48 +00:00
Haelwenn (lanodan) Monnier 3c6fd0bb99
upload.ex: Remove deprecated configuration 2019-10-18 12:34:09 +02:00
Maxim Filippov 2473702be2 Merge branch 'develop' into feature/relay-list 2019-10-18 10:24:29 +02:00
kaniini 7511f3d192 Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`

See merge request pleroma/pleroma!1847
2019-10-18 04:42:02 +00:00
kaniini 733b73b71c Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex 2019-10-18 04:36:37 +00:00
feld 6c82b6e3bf Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'
Mastodon API / Conversations: Mark the conversation as read for the author when they send a new direct message

See merge request pleroma/pleroma!1853
2019-10-17 20:05:01 +00:00
eugenijm 359dd1890e Mastodon API: Mark the conversation as read for the author when they send a new direct message 2019-10-17 16:49:39 +03:00
Maksim Pechnikov 66b5d0ff55 add Markers /api/v1/markers 2019-10-17 15:26:59 +03:00
Ivan Tashkinov 10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
lain 1bfdf57fc7 Merge branch 'user-search-experiments' into 'develop'
User search: Remove trigram and refactor the module

See merge request pleroma/pleroma!1850
2019-10-16 12:29:08 +00:00
feld 21f0757b0d Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
Ability to toggle activation status, permission group & delete multiple users

Closes admin-fe#39

See merge request pleroma/pleroma!1825
2019-10-16 12:14:47 +00:00
rinpatch b8be6a4dc9 Remove a failing search test due to it being unrealistic
While the case tested (`lain@ple`) gives wrong ordering due to
using only trigram to order, it almost never happens in reality. In reality
it would be either `lain` (in which case it's fine to list the user with `lain`
in display name first), or `@lain@pleroma.soykaf.com`/`lain@pleroma.soykaf.com` (which is
handled fine as well)
2019-10-16 15:09:39 +03:00
lain 6977cddff9 Merge branch 'benchmark-finishing' into 'develop'
Benchmark finishing

Closes #755

See merge request pleroma/pleroma!1848
2019-10-16 11:54:49 +00:00
rinpatch 0a5175ecbb Order fts results by trigram 2019-10-16 13:49:33 +03:00
rinpatch c10ce113d4 User search: Remove trigram and refactor the module
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
2019-10-16 12:52:47 +03:00
Maxim Filippov da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array 2019-10-15 17:33:29 +02:00