Commit graph

2826 commits

Author SHA1 Message Date
William Pitcock 773f532b14 http: actually pass the options list to the Connection factory 2019-03-08 22:56:16 +00:00
William Pitcock 50ba4ba2c9 http: connection: merge hackney option lists instead of concatenating them
this ensures the right pools are used
2019-03-08 22:56:16 +00:00
William Pitcock 2a83c0ba93 http: safely catch erlang exits and elixir errors from hackney (ref #672) 2019-03-08 22:56:16 +00:00
kaniini 46200d8fac Merge branch 'fix-tlsv1.3' into 'develop'
Fix supported TLS versions as TLS 1.3 support seems buggy.

Closes #708

See merge request pleroma/pleroma!892
2019-03-08 22:53:12 +00:00
kaniini 735f40047a Merge branch 'delete-status' into 'develop'
Allow an admin to delete a user status #721 (MastoAPI)

See merge request pleroma/pleroma!914
2019-03-08 22:47:41 +00:00
kaniini 130fc9eae6 Merge branch 'fetch-posts-on-first-federation' into 'develop'
Fetch user's outbox posts on first federation with that user

Closes #131

See merge request pleroma/pleroma!907
2019-03-08 22:33:31 +00:00
eugenijm 2827dfea50 Allow an admin to delete a user status 2019-03-08 20:21:56 +03:00
Ekaterina Vaartis 5021b7836f Fetch user's outbox posts on first federation with that user 2019-03-08 16:27:56 +03:00
William Pitcock e53a9fd15e MRF: anti followbot: gracefully handle accounts without a display name 2019-03-07 12:13:48 +00:00
rinpatch 992145e64c Merge branch 'bugfix/delete-activity-audience' into 'develop'
expand the audience of delete activities to all recipients of the deleted object

Closes #682

See merge request pleroma/pleroma!891
2019-03-07 11:31:08 +00:00
Karen Konou c2faae70df Adjust delete activity audience to match the deleted object 2019-03-07 12:26:03 +01:00
Karen Konou 6a69ece437 Revert existing object check 2019-03-07 11:53:15 +01:00
eugenijm 7342b5a45f Preserve parameters in link headers (Mastodon API) 2019-03-07 09:12:16 +03:00
kaniini 0fe715f3ba Merge branch 'chore/merge-search-into-list-users' into 'develop'
Merge search endpoint into /users

See merge request pleroma/pleroma!898
2019-03-06 22:27:42 +00:00
kaniini 39b766cc43 Merge branch 'bugfix/connect-src-https' into 'develop'
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src

See merge request pleroma/pleroma!900
2019-03-06 13:22:02 +00:00
kaniini 07f8c79a69 Merge branch 'bugfix/rel-me_list' into 'develop'
Web.RelMe: Fix having other values in rel attr

See merge request pleroma/pleroma!901
2019-03-06 13:20:51 +00:00
Maksim bc7570c282 [#647] tests for web push 2019-03-06 13:20:12 +00:00
Haelwenn 96901b6554 Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
Properly escape reserved URI charachters in upload urls

Closes #700

See merge request pleroma/pleroma!905
2019-03-06 01:45:17 +00:00
Karen Konou 28d5b40d0a Add handling of objects not in database 2019-03-05 23:15:22 +01:00
rinpatch 4263edc9c9 Properly escape reserved URI charachters in upload urls 2019-03-05 18:09:23 +03:00
rinpatch bcd8ef65e0 Merge branch 'add-admin-to-node-info' into 'develop'
Include admins in nodeinfo

Closes #689

See merge request pleroma/pleroma!899
2019-03-05 07:05:44 +00:00
Haelwenn (lanodan) Monnier 788a354ce0
Web.RelMe: Fix having other values in rel attr
One example of this is Github which puts a rel="nofollow me" on the
profile link.
2019-03-05 02:13:22 +01:00
Haelwenn (lanodan) Monnier fc37e5815f
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469
2019-03-05 01:44:24 +01:00
eugenijm d1de0a30cc Include admins in nodeinfo 2019-03-05 03:17:24 +03:00
Maxim Filippov 2d30fc279f Typo 2019-03-05 02:11:15 +03:00
William Pitcock b7aa1ea9e6 rich media: helpers: rework validate_page_url() 2019-03-04 18:39:13 +00:00
William Pitcock 9f3cb38012 helpers: use AutoLinker to validate URIs as well as the other tests 2019-03-04 18:31:49 +00:00
William Pitcock d38d537bee rich media: don't crawl bogus URIs 2019-03-04 18:31:49 +00:00
kaniini d45dbdce5a Merge branch 'feature/add-status-text-to-notifications' into 'develop'
Add status text to notifications (mentions and reposts)

Closes #696

See merge request pleroma/pleroma!897
2019-03-04 18:29:13 +00:00
Maxim Filippov f620199836 Merge search endpoint into /users 2019-03-04 21:26:32 +03:00
Maxim Filippov 0245ce842f Remove unused code 2019-03-04 20:49:20 +03:00
Maxim Filippov cc7b35e097 Add status text to notifications (mentions and reposts) 2019-03-04 20:47:34 +03:00
kaniini ca5d894e68 Merge branch 'fix/like-adressing' into 'develop'
Stop adresssing like activities to actor's follower collection on non-public posts

See merge request pleroma/pleroma!896
2019-03-04 15:59:57 +00:00
rinpatch 33c614bce0 Stop adresssing like activities to actor's follower collection on non-public posts 2019-03-04 18:09:58 +03:00
kaniini 10248d86a2 Merge branch 'unify-follow' into 'develop'
Unify follow code with CommonAPI

Closes #690

See merge request pleroma/pleroma!889
2019-03-04 13:25:32 +00:00
KokaKiwi bf43f055dd Set content types settings on mastofe endpoint. 2019-03-04 12:00:02 +01:00
KokaKiwi b57913b13a Fix supported TLS versions as TLS 1.3 support seems buggy. 2019-03-04 11:30:26 +01:00
Karen Konou 1445dc25d4 fix format 2019-03-04 11:18:45 +01:00
Karen Konou aab86698a5 Expand "to" of delete activities 2019-03-04 11:18:45 +01:00
eugenijm 86e4b48a5e Fix DM visibility for blocking users 2019-03-04 06:24:27 +03:00
eugenijm 594694607c Unify Mastodon and Twitter follow implementations using CommonAPI 2019-03-04 01:00:37 +03:00
kaniini dd5865535e Merge branch 'muting' into 'develop'
Don't stream muted accounts

See merge request pleroma/pleroma!888
2019-03-03 21:10:10 +00:00
William Pearson 818a7894da Don't stream muted accounts 2019-03-03 20:54:53 +00:00
kaniini ace4231628 Merge branch 'features/bio_rel_me' into 'develop'
Add rel=me to the User bio

Closes #423

See merge request pleroma/pleroma!813
2019-03-03 16:00:49 +00:00
kaniini 6c6a2dbfdd Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
Add pagination and search to users

See merge request pleroma/pleroma!873
2019-03-03 15:59:15 +00:00
kaniini b531e366df Merge branch 'get-follow-requests-sql' into 'develop'
Use sql query in User.get_follow_requests/1 for filtering logic

See merge request pleroma/pleroma!883
2019-03-03 15:51:32 +00:00
kaniini 413cf00cc3 Merge branch 'atomic-note-count-updates' into 'develop'
Atomic update for note count and follower count

See merge request pleroma/pleroma!885
2019-03-03 15:50:41 +00:00
kaniini c93479c6f5 Merge branch 'count-only-public-statuses' into 'develop'
Increment user note count only on public activities #703

See merge request pleroma/pleroma!884
2019-03-03 15:49:19 +00:00
eugenijm d5418e9ff7 Remove follow_request_count as it's not needed for FE anymore.
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
2019-03-03 18:42:27 +03:00
eugenijm af0039a3a0 Use atomic update for note count and follower count 2019-03-03 17:41:34 +03:00
lambda 9b63fda9c7 Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
[#675] Do not show DMs in mentions timeline

See merge request pleroma/pleroma!877
2019-03-03 11:13:59 +00:00
eugenijm c46950d3b1 Increment user note count only on public activities 2019-03-03 14:08:43 +03:00
eugenijm 1a1f4520cd Use sql query in User.get_follow_requests/1 for filtering logic 2019-03-02 22:18:56 +03:00
Maxim Filippov 2ec8cf5665 Add pagination to search 2019-03-02 17:21:30 +03:00
rinpatch f38c316e6e Merge branch 'bugfix/oauth-scopes-join' into 'develop'
Bugfix: OAuth scopes formatting

Closes #702

See merge request pleroma/pleroma!881
2019-03-02 06:39:07 +00:00
Haelwenn (lanodan) Monnier f2452d5700
Pleroma.User: mix format 2019-03-02 07:04:49 +01:00
Haelwenn (lanodan) Monnier 8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil 2019-03-02 06:58:42 +01:00
Haelwenn (lanodan) Monnier 39a5bea9b7
Pleroma.User: Fix syntax and user.ap_id call 2019-03-02 06:57:28 +01:00
Haelwenn (lanodan) Monnier 3d22642352
Pleroma.User: Pass an array to profile_urls 2019-03-02 06:33:15 +01:00
Haelwenn (lanodan) Monnier 9b83236fb0
Pleroma.Web.RelMe: fixups 2019-03-02 06:32:03 +01:00
Haelwenn (lanodan) Monnier 56d4e39012
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile 2019-03-02 05:36:48 +01:00
Haelwenn (lanodan) Monnier b6a001a34c
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response 2019-03-02 04:04:16 +01:00
Maxim Filippov f635b675b2 Refactor a little bit 2019-03-01 21:17:23 +03:00
Maxim Filippov f1a4c3163b Show current user in users list as well 2019-03-01 20:23:03 +03:00
Maxim Filippov 5b08b470f6 Add "local" params to users search 2019-03-01 20:13:02 +03:00
William Pitcock 689b0730f8 activitypub: fix date header format
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
2019-03-01 12:22:45 +00:00
lambda 2f00814475 Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
Bugfix #236 Prefer user look-up by nickname

See merge request pleroma/pleroma!860
2019-03-01 09:48:24 +00:00
rinpatch 1341ee650e [#675] Do not show DMs in mentions timeline 2019-03-01 09:37:29 +03:00
William Pitcock 28b4093233 mastodon websocket: return errors using ok, not stop 2019-02-28 16:23:55 +00:00
William Pitcock 388a3f4ca2 mastodon websocket: bring back infinity timeout 2019-02-28 16:23:24 +00:00
Maxim Filippov 46f29b9da1 Add search users endpoint 2019-02-28 19:04:47 +03:00
William Pitcock f1d37a5e23 mastodon websocket: use pattern match to get query data, robustly handle errors 2019-02-28 16:02:48 +00:00
William Pitcock bc53dff5b6 mastodon api: websocket: update code for cowboy 2.x 2019-02-28 15:44:12 +00:00
Maxim Filippov 72b7a0797e Use Mastodon API views in Admin API 2019-02-28 17:43:09 +03:00
href a47cc5a2cf Merge branch 'customizable_auth' into 'develop'
Authenticator tweaks

See merge request pleroma/pleroma!875
2019-02-28 11:18:01 +00:00
Ivan Tashkinov 3281a3f074 Renamed *DatabaseAuthenticator to *Authenticator. 2019-02-28 14:12:41 +03:00
Ivan Tashkinov 4e77f68414 Added auth_template/0 to DatabaseAuthenticator. 2019-02-28 13:58:58 +03:00
kaniini cf426a719d Merge branch 'with-mutes' into 'develop'
Add `with_muted` param.

Closes #683

See merge request pleroma/pleroma!872
2019-02-28 10:22:19 +00:00
href 90a24fbf95 Merge branch 'customizable_auth' into 'develop'
Auth customization support

See merge request pleroma/pleroma!852
2019-02-28 10:12:26 +00:00
kaniini 089e2588a3 Merge branch 'speedup-follow-requests' into 'develop'
Speedup follow requests

Closes #677

See merge request pleroma/pleroma!871
2019-02-28 10:10:03 +00:00
kaniini 3c849d0438 Merge branch 'deactivated-in-user-view' into 'develop'
Add activation status to the regular user view

See merge request pleroma/pleroma!874
2019-02-28 10:08:31 +00:00
Ivan Tashkinov b6f915313f Made auth customization be runtime-configurable. 2019-02-28 13:00:54 +03:00
eugenijm 6b11011039 Added deactivated to the user view 2019-02-28 09:08:34 +03:00
Maxim Filippov 2883f75a3a Add pagination to users admin API 2019-02-28 01:11:56 +03:00
lain bbbdbec4fd Remove parts of the old activity view.
Not used anymore.
2019-02-27 17:24:51 +01:00
lain 9ade1242c2 Add user muted status info to twitterapi. 2019-02-27 16:52:03 +01:00
lain c1ae495878 Add user muted status info to MastodonAPI. 2019-02-27 16:46:47 +01:00
lain c4235f96bd Add with_muted param. 2019-02-27 16:37:42 +01:00
lain b24cc44e8d Follower requests: Utilize object index.
Closes #677
2019-02-27 15:01:54 +01:00
William Pitcock 1536640962 mastodon api: embed relationship card under account card for Pleroma FE convenience 2019-02-27 13:01:10 +00:00
Egor Kislitsyn 5d961d536c fix formatter 2019-02-27 15:40:30 +07:00
Egor c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
Maxim Filippov 90d0d055fc Add more admin actions 2019-02-27 00:13:38 +03:00
Ivan Tashkinov e98d34e5fb Added missing copyright headers. 2019-02-26 16:26:54 +03:00
Ivan Tashkinov fd46edb473 Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth 2019-02-26 15:29:43 +03:00
Ivan Tashkinov e82b70eb53 Database authenticator behaviour / Pleroma implementation refactoring. 2019-02-26 15:27:01 +03:00
William Pitcock fc9d895ebc twitter card: remove IO.inspect() spam 2019-02-24 18:56:44 +00:00
11backslashes efa506b874 delegate user retrieval to the User module 2019-02-24 13:23:47 -05:00
lain 9e0686efa6 Move visibility into own module. 2019-02-22 13:29:52 +01:00
lain 62296f5a25 Fix private post card handling. 2019-02-22 12:02:51 +01:00