Commit graph

2381 commits

Author SHA1 Message Date
lain fd07745d1b ActivityPub Utils: Greatly speed up the follow / block activity fetching. 2019-04-02 16:08:55 +02:00
eugenijm 10c81fc902 Add user show endpoint for Pleroma admin API 2019-03-27 21:44:15 +03:00
lambda 926bf114b7 Merge branch 'feature/more-user-filters' into 'develop'
Add more user filters + move search to its own module

See merge request pleroma/pleroma!982
2019-03-27 11:33:13 +00:00
rinpatch ce6d64bbd8 Fix missing announces in MastoAPI home timeline
Closes #762
2019-03-27 12:28:53 +03:00
Maxim Filippov 3cf7539bca Add more user filters + move search to its own module 2019-03-27 03:51:59 +05:00
eugenijm a4ab60ac54 Add vapid_key to the POST /api/v1/apps response 2019-03-26 23:27:37 +03:00
eugenijm 691d1208b5 Add GET /api/v1/apps/verify_credentials 2019-03-26 21:53:28 +03:00
lambda ff3b09f6b3 Merge branch 'fix/ap-icon' into 'develop'
Do not federate instance avatar

Closes #759

See merge request pleroma/pleroma!977
2019-03-26 16:12:50 +00:00
lambda c6ab5ebe7c Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
Mastodon 2.7.2 instance attributes (registrations, languages)

See merge request pleroma/pleroma!979
2019-03-26 16:01:52 +00:00
lain 10a7a4a868 AP UserView: Refactor banner / avatar display code, add test. 2019-03-26 16:59:28 +01:00
lambda 9e3899bf36 Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
Mastodon-based auth error messages. User#auth_active?/1 refactoring.

See merge request pleroma/pleroma!978
2019-03-26 15:13:55 +00:00
lambda 21ff78cd40 Merge branch 'replies-count' into 'develop'
Increment replies_count (MastoAPI)

Closes #756

See merge request pleroma/pleroma!974
2019-03-26 14:49:09 +00:00
rinpatch 406d19331f Remove ActivityRepresenter 2019-03-26 17:16:21 +03:00
Ivan Tashkinov eef1042b16 Mastodon 2.7.2 instance attributes (registrations, languages). 2019-03-26 16:27:17 +03:00
eugenijm 568e348588 Increment replies_count on replies (MastoAPI) 2019-03-26 15:27:04 +03:00
Ivan Tashkinov b0759f821b Comments split. 2019-03-26 15:24:29 +03:00
Ivan Tashkinov 263ca3dea2 Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true. 2019-03-26 15:09:06 +03:00
Mark Felder c410296120 Try sending an empty map 2019-03-25 19:00:35 -05:00
Mark Felder 6f090f981b Attempt to fix incorrect federation of default instance avatars 2019-03-25 18:47:04 -05:00
kaniini 63ffa4842c Merge branch 'fix/mastoapi-liked' into 'develop'
Serve non-public activities in /api/v1/favourites

Closes #648

See merge request pleroma/pleroma!970
2019-03-25 02:24:27 +00:00
rinpatch a7f58b3c13 Serve non-public activities in /api/v1/favourites
Fixes #648
2019-03-25 02:15:45 +03:00
rinpatch 750de7d842 Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil

See merge request pleroma/pleroma!968
2019-03-24 15:02:13 +00:00
Haelwenn (lanodan) Monnier eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil 2019-03-24 15:47:50 +01:00
William Pitcock debf7f016d ostatus: use preload objects with Object.normalize() when opportunistic 2019-03-23 03:05:57 +00:00
William Pitcock 8c70156157 activitypub: object view: use preloaded object when possible 2019-03-23 03:05:14 +00:00
William Pitcock ce47eb8b29 activitypub: when fetching objects, use the preloaded object from the synthesized activity 2019-03-23 03:05:10 +00:00
William Pitcock 07cdd9ed02 streamer: use the preloaded object if possible 2019-03-23 02:29:01 +00:00
William Pitcock c62220c500 rich media: helpers: only crawl Create activities 2019-03-23 02:28:59 +00:00
William Pitcock 4cedf45423 relay: use preloaded object since we always have it 2019-03-23 02:28:56 +00:00
William Pitcock e430a71d37 ostatus: fetch preloaded object in note handler for testsuite 2019-03-23 01:17:26 +00:00
William Pitcock 73efe95368 activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious) 2019-03-23 01:09:12 +00:00
William Pitcock ba7299fc87 activitypub: add missing with_preloaded_object() 2019-03-23 00:53:35 +00:00
William Pitcock e4307cadc8 activitypub: splice in the child object if we have one 2019-03-23 00:40:08 +00:00
William Pitcock a6973a668e formatting 2019-03-23 00:28:16 +00:00
William Pitcock b3bf523c09 rich media: use optimized Object.normalize() 2019-03-23 00:22:57 +00:00
William Pitcock e75e43b949 common api: use the optimized Object.normalize whenever possible 2019-03-23 00:22:14 +00:00
William Pitcock 9aea7cc224 activitypub: preload child objects when fetching timelines 2019-03-23 00:10:17 +00:00
rinpatch 1b33986bfa Fix text being nullable in TwitterAPI 2019-03-23 00:10:50 +03:00
lambda fee360e581 Merge branch 'safe-mentions' into 'develop'
NodeInfo: Return safe_dm_mentions feature flag.

See merge request pleroma/pleroma!964
2019-03-22 11:03:56 +00:00
lain e2afce34b6 NodeInfo: Return safe_dm_mentions feature flag. 2019-03-22 11:57:20 +01:00
kaniini 1c3d3d0c2b Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.

See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
William Pitcock 3cc2554fa3 mastodon api: add conversation_id extension (ref #674) 2019-03-21 23:25:41 +00:00
William Pitcock fea3696799 common api: move context functions from twitterapi 2019-03-21 23:24:04 +00:00
rinpatch b92a16aa00 Merge branch 'ecto-3-migration' into 'develop'
Ecto 3.0.7 (ecto_sql 3.0.5) migration

See merge request pleroma/pleroma!957
2019-03-21 16:24:57 +00:00
lain bf27190f7f UtilController: Return state of safe dm mentions. 2019-03-21 16:20:58 +01:00
lain 8468f3f6d4 Add safe dm mode option. 2019-03-20 21:09:36 +01:00
rinpatch 9a7b817c9a Ecto 3.0.5 migration
kms
2019-03-20 15:59:54 +03:00
William Pitcock 1685e4258f transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection 2019-03-19 18:39:33 +00:00
William Pitcock cd055983c3 transmogrifier: when determining followers collection URI, we may need to fetch the actor 2019-03-19 18:04:57 +00:00
William Pitcock d487b753c3 activitypub: transmogrifier: do not allow missing lists to be interpreted as nil 2019-03-19 17:30:25 +00:00