Commit graph

2342 commits

Author SHA1 Message Date
701815e64c [ActivityPub] Configurable ActivityPub actor type 2019-12-10 13:19:26 +00:00
Ivan Tashkinov
835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
#	CHANGELOG.md
2019-12-10 08:55:14 +03:00
rinpatch
37c34ccec3 Merge branch 'fix/prefer-url-over-search' into 'develop'
status search: prefer the status fetched by url over other results

See merge request pleroma/pleroma!2050
2019-12-09 17:55:48 +00:00
rinpatch
f4b7f32d51 status search: prefer the status fetched by url over other results 2019-12-09 20:45:04 +03:00
Maksim Pechnikov
2b821036c4 Merge branch 'develop' into issue/1383 2019-12-09 19:41:43 +03:00
lain
b3c80b8404 Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
Fix exclude_visibilities filter for followers-only Like notifications

See merge request pleroma/pleroma!1957
2019-12-09 14:55:42 +00:00
Maksim Pechnikov
95e6a2acd9 Merge branch 'develop' into issue/1342 2019-12-08 21:25:26 +03:00
Maksim Pechnikov
5876a9cb79 Merge branch 'develop' into issue/1383 2019-12-08 19:52:46 +03:00
rinpatch
8404f8c8fb Merge branch 'improve-move-notificaions-api' into 'develop'
Add `with_move` query param to the notifications API

See merge request pleroma/pleroma!2032
2019-12-08 13:07:05 +00:00
rinpatch
29a3f70cba Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
ActivityPub: For user timelines, respects blocks.

Closes #1463

See merge request pleroma/pleroma!2041
2019-12-08 11:23:31 +00:00
Maxim Filippov
a7f77785c2 Implement report notes destruction 2019-12-08 11:27:23 +03:00
Ivan Tashkinov
1770602747 [#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests. 2019-12-07 17:49:53 +03:00
Ivan Tashkinov
40e1817f70 [#1427] Fixes / improvements of admin scopes support. Added tests. 2019-12-06 20:33:47 +03:00
rinpatch
6cb31edd76 Merge branch 'feature/1455-chat-character-limit' into 'develop'
Feature/1455 chat character limit

Closes #1455

See merge request pleroma/pleroma!2034
2019-12-06 15:36:30 +00:00
lain
e8cee4d9a0 ActivityPub: For user timelines, respects blocks.
Unless the timeline belongs to a blocked user.
2019-12-06 14:25:13 +01:00
Maxim Filippov
08c89fd2b8 Fix incorrect report count 2019-12-06 17:17:24 +09:00
Maksim Pechnikov
22fc271e23 init tag feed 2019-12-06 09:33:40 +03:00
Ivan Tashkinov
13926537b6 Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes 2019-12-06 00:26:31 +03:00
Ivan Tashkinov
af42c00cff [#1427] Reworked admin scopes support.
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
2019-12-06 00:25:44 +03:00
rinpatch
cdff5b8267 Merge branch 'develop' into fix/mrf-delete 2019-12-06 00:12:21 +03:00
rinpatch
9f99640cfc ActivityPub: Fix deletes being exempt from MRF
Closes #1461
2019-12-05 21:45:57 +03:00
lain
67d8df04a4 Merge branch '1335-user-api-id-fields-relations' into 'develop'
[#1335] User: refactoring of AP ID fields into relations

Closes #1335

See merge request pleroma/pleroma!1963
2019-12-05 17:16:23 +00:00
d0bd4348b3 Merge branch 'feature/admin-api-render-whole-status' into 'develop'
Miscellaneous grouped reports fixes

Closes admin-fe#48 and admin-fe#51

See merge request pleroma/pleroma!2007
2019-12-05 13:34:34 +00:00
Maksim Pechnikov
3fe7a1fd35 Merge branch 'develop' into issue/1342 2019-12-05 15:46:27 +03:00
Maksim Pechnikov
e21afdb7c7 Merge branch 'develop' into issue/1411 2019-12-05 12:18:59 +03:00
Egor Kislitsyn
d4953474ac Merge branch 'develop' into improve-move-notificaions-api 2019-12-05 14:55:48 +07:00
Maxim Filippov
4453a9cb73 Add failing test, which exposes a bug 2019-12-05 12:07:53 +09:00
Maksim Pechnikov
3c3bba0b7c fix ScheduledActivity 2019-12-04 21:18:05 +03:00
Ivan Tashkinov
30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
#	lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
Maksim Pechnikov
680e071dba Merge branch 'develop' into issue/1383 2019-12-04 16:31:45 +03:00
lain
24599c519f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit 2019-12-04 14:25:00 +01:00
Maksim Pechnikov
ed7f850ad2 fix test 2019-12-04 16:22:01 +03:00
lain
aa97fe8f17 ChatChannel: Ignore messages that are too long. 2019-12-04 12:48:34 +01:00
Maksim Pechnikov
29a98b86b7 Merge branch 'develop' into issue/1383 2019-12-04 09:34:44 +03:00
Maksim Pechnikov
652cc6ba4b updated ScheduledActivity 2019-12-04 09:12:17 +03:00
Maxim Filippov
4b60d41db9 Add report notes 2019-12-04 00:26:37 +09:00
Egor Kislitsyn
624e720aa4 Add with_move query param to the notifications API 2019-12-03 22:13:38 +07:00
lain
7722e5a67a Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity

Closes #1316

See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
Maksim Pechnikov
88f7cf51d4 Merge branch 'develop' into issue/1411 2019-12-01 16:18:16 +03:00
kPherox
1915b23e72
test missing first field 2019-11-30 15:43:12 +09:00
Ivan Tashkinov
52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
#	mix.lock
2019-11-29 10:17:59 +03:00
Maksim Pechnikov
04a8ffbe84 added privacy option to push notifications 2019-11-28 22:13:11 +03:00
Maksim Pechnikov
a52da55eb9 added User.NotificationSetting struct 2019-11-28 22:08:30 +03:00
Maksim Pechnikov
b7c449118b Merge branch 'develop' into issue/1383 2019-11-28 21:27:01 +03:00
lain
8627fb0bb5 Merge branch 'cleanup-tests-output' into 'develop'
Cleanup tests output

See merge request pleroma/pleroma!2018
2019-11-28 12:19:15 +00:00
Egor Kislitsyn
c4b468a95b
Cleanup tests output 2019-11-28 16:44:48 +07:00
Maxim Filippov
fcabcab443 Fetch account from report, not from status (it might be deleted) 2019-11-28 00:09:00 +09:00
Maxim Filippov
5135656f57 Handle reopened reports with deleted statuses 2019-11-27 22:54:12 +09:00
lain
50b152766f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count 2019-11-27 14:48:28 +01:00
Egor Kislitsyn
f595cfe623
Remove User.user_info/2 2019-11-27 19:43:47 +07:00
Egor Kislitsyn
1fc28a4b44
Add a view for the move notification 2019-11-27 17:52:02 +07:00
Maksim Pechnikov
ac3abb5414 moved Pleroma.Stats to Oban Periodic jobs 2019-11-26 10:54:30 +03:00
Ivan Tashkinov
c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
2019-11-26 10:42:36 +03:00
Maxim Filippov
5869a43fe7 Fix tests 2019-11-26 01:06:54 +09:00
Maxim Filippov
b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status 2019-11-26 00:25:43 +09:00
lain
dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop'
Disable rendering AP representation for remote users and objects

See merge request pleroma/pleroma!2010
2019-11-25 15:23:45 +00:00
Maxim Filippov
b3b4e5ca80 AdminAPI: Grouped reports old/new fix
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
2019-11-26 00:20:46 +09:00
rinpatch
4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead 2019-11-25 17:55:17 +03:00
rinpatch
02f7383891 ActivityPub controller: do not render remote users 2019-11-25 17:19:33 +03:00
Maxim Filippov
82f4e4760e Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance 2019-11-25 01:46:18 +09:00
Maxim Filippov
fd24467b92 Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance 2019-11-25 01:43:11 +09:00
Maxim Filippov
2b341627da Admin API: Render whole status in grouped reports 2019-11-25 00:04:29 +09:00
lain
bd62946020 Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
AdminAPI: Confirm user account, resend confirmation email

See merge request pleroma/pleroma!1994
2019-11-22 15:39:19 +00:00
Ivan Tashkinov
cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
#	lib/pleroma/user/search.ex
#	test/user_test.exs
2019-11-21 16:47:52 +03:00
lain
8feb5dcb42 Merge branch 'issue/1348' into 'develop'
[#1348] excluded invisible actors from gets  /api/v1/accounts/:id

See merge request pleroma/pleroma!1937
2019-11-21 13:13:14 +00:00
Ivan Tashkinov
4f88b1b435 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-20 15:47:11 +03:00
Ivan Tashkinov
de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality. 2019-11-20 15:46:11 +03:00
Egor Kislitsyn
63711258ce
Fix sporadically failing test 2019-11-20 14:25:00 +07:00
Ivan Tashkinov
ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring. 2019-11-19 23:22:10 +03:00
Maksim Pechnikov
708fd234bd fix order favorites activites 2019-11-19 20:19:41 +03:00
Maxim Filippov
b88dbc17c8 Fix tests 2019-11-19 22:50:24 +09:00
Maxim Filippov
46eb160135 AdminAPI: Confirm user account, resend confirmation email 2019-11-19 20:14:02 +09:00
Maksim Pechnikov
7d727dbfec added test 2019-11-18 22:32:43 +03:00
Ivan Tashkinov
3aaf3aa2c2 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-18 20:43:19 +03:00
kaniini
81cba405af Merge branch 'nodeinfo-fields-limit' into 'develop'
Add fieldsLimit to metadata of nodeinfo

See merge request pleroma/pleroma!1983
2019-11-15 20:29:38 +00:00
Ivan Tashkinov
01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-15 21:40:14 +03:00
Ivan Tashkinov
c31ddce51e [#1335] Reorganized users.mutes as relation to UserMute entity. 2019-11-15 21:38:54 +03:00
kPherox
c9a06b14ab Add test 2019-11-15 23:55:28 +09:00
Ariadne Conill
7c59bc9ef9 fix credo 2019-11-14 20:18:45 -06:00
Ariadne Conill
5705cf0e3e MRF: add ObjectAgePolicy which deals with old posts being imported 2019-11-14 19:48:10 -06:00
Maxim Filippov
114930b5fd Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance 2019-11-14 23:45:29 +09:00
Maxim Filippov
30af5da330 Admin API: list all statuses from a given instance 2019-11-14 23:44:07 +09:00
1afeaf82fa Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query

Closes admin-fe#43

See merge request pleroma/pleroma!1815
2019-11-14 13:35:41 +00:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity 2019-11-14 16:39:45 +07:00
rinpatch
6085c71bd1 Merge branch 'reactions' into 'develop'
Emoji Reactions

See merge request pleroma/pleroma!1662
2019-11-14 08:47:10 +00:00
Phil Hagelberg
3c60adbc1f Support redirecting by activity UUID in static FE as well. 2019-11-13 08:22:11 -08:00
Phil Hagelberg
0867cb083e Support redirecting by object ID in static FE.
This matches the behavior of pleroma-fe better.

Fixes #1412.
2019-11-13 08:02:02 -08:00
Phil Hagelberg
62f3a93049 For remote notices, redirect to the original instead of 404.
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.

This new redirecting behavior should improve that situation.
2019-11-12 09:40:29 -08:00
Egor Kislitsyn
27cd1374e3
Add a notification for Move activities 2019-11-12 18:48:14 +07:00
Egor Kislitsyn
e6d7e27bd6
Add allow_following_move setting to User 2019-11-12 18:45:28 +07:00
eugenijm
f86a7d5d8b Fix exclude_visibilities filter for followers-only Like notifications 2019-11-11 23:57:30 +03:00
e27d78e768 Merge branch 'nodeinfo-federation-enabled' into 'develop'
report federating status in nodeinfo

See merge request pleroma/pleroma!1971
2019-11-11 19:14:06 +00:00
kaniini
2cc043591c Merge branch 'feature/static-fe' into 'develop'
Static frontend

See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00
href
b39b49cc14 report federating status in nodeinfo 2019-11-11 19:03:43 +01:00
lain
1ca7b877a1 Merge branch 'iss-1376' into 'develop'
Check client and token in GET /oauth/authorize

See merge request pleroma/pleroma!1940
2019-11-11 12:27:33 +00:00
Maxim Filippov
46787b9fe1 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-11 19:18:12 +09:00
Alexander
6a4201e0b4
fix for migrate task 2019-11-10 22:54:37 +03:00
Ivan Tashkinov
3db988250b [#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
lain
a88e834dba Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-11-10 11:32:50 +00:00
Maksim Pechnikov
9d0b989521 add subject to atom feed 2019-11-10 11:10:20 +03:00
Phil Hagelberg
6ef8049664 Add changelog entry, cheatsheet docs, and alphabetize. 2019-11-09 18:09:29 -08:00
Phil Hagelberg
ef7c3bdc7a Add some further test cases.
Including like ... private visibility, cos that's super important.
2019-11-09 18:08:45 -08:00
Phil Hagelberg
2bf592f5dc Add tests for static_fe controller. 2019-11-09 18:08:45 -08:00
lain
b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions 2019-11-08 13:27:11 +01:00
Maxim Filippov
b14bf9044f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-08 18:30:49 +09:00
Maxim Filippov
7258db023e Support old flag format 2019-11-08 18:21:29 +09:00
eugenijm
7888803ffe Mastodon API: Add the recipients parameter to GET /api/v1/conversations 2019-11-07 08:26:24 +03:00
Maxim Filippov
f171095960 Grouped reports with status data baked in 2019-11-06 21:25:46 +10:00
AkiraFukushima
e1fc6cb78f Check client and token in GET /oauth/authorize 2019-11-05 23:52:47 +09:00
Maxim Filippov
2cbfa256fd Merge branch 'develop' into feature/multiple-users-force-password-reset 2019-11-05 11:36:47 +10:00
Maxim Filippov
43ea16870f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-05 02:12:48 +03:00
Maksim Pechnikov
4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id 2019-11-04 20:44:24 +03:00
eugenijm
ed29be24cb Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload. 2019-11-04 18:36:16 +03:00
lain
a304a2a845 Merge branch 'transmogrifier-test-errors' into 'develop'
capture test log where errors are expected

See merge request pleroma/pleroma!1915
2019-11-04 15:19:29 +00:00
Steven Fuchs
5271bbcf11 add missing tesla mocks 2019-11-04 15:18:32 +00:00
lain
556da92902 Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
Store status data inside flag activity

See merge request pleroma/pleroma!1849
2019-11-04 14:11:44 +00:00
rinpatch
8dd7c099a7 Merge branch 'bugfix/streamer-follows' into 'develop'
streamer: use direct object for filter checks when there is no valid child object in an activity

Closes #1291

See merge request pleroma/pleroma!1931
2019-11-03 17:09:57 +00:00
kaniini
74135e1318 Merge branch 'feature/omit-relay-user' into 'develop'
AdminAPI: Omit relay user from users list

Closes #1349

See merge request pleroma/pleroma!1924
2019-11-03 16:19:27 +00:00
Ariadne Conill
4bf942583f streamer: use direct object for filter checks when there is no valid child object in an activity
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.

Closes #1291
2019-11-03 09:05:12 -06:00
Maxim Filippov
743b622b7b Force password reset for multiple users 2019-11-01 18:45:47 +03:00
Maxim Filippov
6f9d3d30fa AdminAPI: Omit relay user from users list 2019-10-31 02:26:02 +03:00
Mark Felder
fcea6a9d2c Merge branch 'develop' into feature/fast_sanitize 2019-10-30 17:51:15 -05:00
Egor Kislitsyn
61fc739ab8
Handle "Move" activity 2019-10-30 18:21:49 +07:00
rinpatch
ae59b38203 Rip out the rest of htmlsanitizeex 2019-10-30 09:20:13 +03:00
kPherox
c2f2d7bcf6 Add test follow activity for locked account 2019-10-29 18:46:22 +09:00
rinpatch
08f6837065 Switch from HtmlSanitizeEx to FastSanitize 2019-10-29 01:18:08 +03:00
stwf
56e42602b0 capture where errors are expected 2019-10-28 12:51:58 -04:00
Egor Kislitsyn
4270861085
Merge branch 'develop' into feature/move-activity 2019-10-28 15:10:47 +07:00
lain
2480200759 Merge branch 'refactor/following-relationships' into 'develop'
Move following relationships to a separate table

Closes #1233

See merge request pleroma/pleroma!1814
2019-10-28 07:27:45 +00:00
Maxim Filippov
8282b6ac3d Make sure incoming flags are updated with status data 2019-10-27 16:17:37 +03:00
Maxim Filippov
791bcfd90f Merge branch 'develop' into feature/store-statuses-data-inside-flag 2019-10-27 16:11:25 +03:00
Maxim Filippov
8eff05d4c6 Strip status data from Flag (when federating or closing/resolving report) 2019-10-27 16:05:32 +03:00
Egor Kislitsyn
b777083f3f
Add also_known_as field to Pleroma.User 2019-10-25 19:14:18 +07:00
stwf
5329b361ec fix test 2019-10-24 12:48:17 -04:00
Egor Kislitsyn
4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships 2019-10-24 14:55:36 +07:00
Maxim Filippov
b08b1d5d91 Store status data inside Flag activity 2019-10-23 21:27:22 +02:00
Ivan Tashkinov
8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	lib/pleroma/notification.ex
2019-10-23 17:22:42 +03:00
Ariadne Conill
3f6a596922 activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors 2019-10-22 20:50:46 -05:00
Ariadne Conill
277aea45b9 tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization
There appears to be confusion on whether or not Pleroma can handle this particular
sin of JSON-LD.  It can, and we will add regression tests to prove that it can handle
this particular sin.  Which, by the way, this is actually not a "feature" of JSON-LD,
but whatever.
2019-10-22 19:43:31 -05:00
kaniini
6281e4795a Merge branch 'feature/push-subject-for-dm' into 'develop'
Direct messages should provide a distinct push notification subject

See merge request pleroma/pleroma!1864
2019-10-21 23:50:01 +00:00
Mark Felder
0c628fafc5 Spelling 2019-10-21 18:35:43 -05:00
Mark Felder
2cbb3f2364 Add tests for the subject of push notifications 2019-10-21 18:34:20 -05:00
Ivan Tashkinov
7c7f90bc4f [#1304] Merged develop, handled User.Info.invisible. 2019-10-21 11:58:22 +03:00
Maksim Pechnikov
243719a965 Merge branch 'develop' into feature/masto_api_markers 2019-10-21 11:32:28 +03:00
Ivan Tashkinov
a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21 11:05:09 +03:00
Egor Kislitsyn
c6fba62666
Fix Relay 2019-10-21 14:47:07 +07:00
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships 2019-10-21 14:19:15 +07:00
Ivan Tashkinov
ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
2019-10-20 22:29:56 +03:00
Ivan Tashkinov
c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
2019-10-20 20:43:18 +03:00
Ariadne Conill
05c58eaece change Maksim's test description 2019-10-19 23:23:13 +00:00
Ariadne Conill
ba92522c69 tests: add test to ensure invisible actors are rendered with the invisible hint set to true 2019-10-19 23:21:37 +00:00
Ariadne Conill
52d56ed705 tests: add test verifying the relay user is invisible 2019-10-19 23:21:37 +00:00
Maksim Pechnikov
189a288925 fix test 2019-10-19 23:21:37 +00:00
Maksim Pechnikov
9694d51437 added test fo Pleroma.Web.MastodonAPI.StatusController 2019-10-19 23:21:37 +00:00
Ariadne Conill
80d3912a56 test: activitypub: use User.invisible?/1 for testing invisibility 2019-10-19 23:21:37 +00:00
Ariadne Conill
ef659331b0 implement invisible support for remote users 2019-10-19 23:21:37 +00:00
Ariadne Conill
cd90735a4b tests: ostatus controller tests: fix sporadic compilation failure 2019-10-19 23:16:15 +00:00
eugenijm
52ed2f8f2d Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read 2019-10-19 15:24:06 +03:00
Maxim Filippov
019147f115 Merge branch 'develop' into feature/relay-list 2019-10-18 18:35:58 +02:00
Ariadne Conill
c2ae6310dc tests: mastodon api: fix broken test that used OStatus 2019-10-18 15:46:46 +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
dbfdb1f6e3 add some missing tesla fixtures 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
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
835ad52378 remove 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
c6de0cbb4a config: disable Websub and Salmon publisher modules 2019-10-18 14:50:09 +00:00
Maxim Filippov
2473702be2 Merge branch 'develop' into feature/relay-list 2019-10-18 10:24:29 +02: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
Maxim Filippov
da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array 2019-10-15 17:33:29 +02:00
eugenijm
a97b642289 Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints 2019-10-14 02:57:21 +03:00
Maxim Filippov
751513b6df This line either causes a warning, or a failed test 2019-10-11 19:31:00 +03:00
Maxim Filippov
cc6875b582 Add GET /api/pleroma/admin/relay endpoint - lists all followed relays 2019-10-11 19:12:29 +03:00
Maxim Filippov
c0aca32dd0 Merge branch 'develop' into feature/multiple-users-activation-permissions 2019-10-11 15:59:35 +03:00
Maxim Filippov
aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it 2019-10-11 15:58:45 +03:00
lain
cb8492962e SearchController: Fix test.
Turns out you can't actually find the user with this.
2019-10-11 12:41:44 +02:00
lain
37812740c4 Transmogrifier: Correctly save incoming ids for Accept/Reject. 2019-10-11 11:48:58 +02:00
lain
9b963064eb Transmogrifier: Actually store who deleted a note. 2019-10-11 11:25:45 +02:00
Maxim Filippov
f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it 2019-10-11 00:24:31 +03:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship 2019-10-11 02:35:32 +07:00
lain
29647dfd09 Transmogrifier: Save correct ids for incoming deletes. 2019-10-10 17:17:33 +02:00
lain
d7f9679ff2 Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-10-10 12:38:51 +00:00
Maxim Filippov
24eecc3cb4 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-10-10 03:33:55 +03:00
kaniini
9fd5176c35 Merge branch 'unicode-search' into 'develop'
Search: Add tests for unicode searches.

See merge request pleroma/pleroma!1824
2019-10-09 16:33:05 +00:00
Maxim Filippov
ad42837244 Ability to toggle activation status and permission group for a group of users 2019-10-09 17:03:54 +03:00
lain
c1bae01376 Search: Add tests for unicode searches. 2019-10-09 16:03:45 +02:00
eugenijm
580a67f5ca Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id) 2019-10-09 07:27:09 +03:00
Maxim Filippov
35068baf65 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-10-07 15:41:41 +03:00
Maxim Filippov
7aceaa517b Admin API: Reports, grouped by status 2019-10-07 15:39:07 +03:00
lain
6c278cfe09 Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-10-07 12:31:51 +00:00
Sergey Suprunenko
4b3f77a99f Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
lain
73b6512907 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-07 12:30:59 +02:00
kaniini
93bdc55306 Merge branch 'mrf/simple_policy/check_actor' into 'develop'
mrf/simple_policy: check actor against accept/reject

See merge request pleroma/pleroma!1806
2019-10-07 10:19:24 +00:00
lain
91e90aa807 Merge branch 'misskey-compat' into 'reactions'
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.

See merge request pleroma/pleroma!1783
2019-10-07 07:25:27 +00:00
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject 2019-10-07 03:49:57 +02:00
Ivan Tashkinov
06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
2019-10-06 11:43:49 +03:00
lain
61097ba6ab Merge branch 'develop' into 'reactions'
# Conflicts:
#   CHANGELOG.md
2019-10-06 08:11:47 +00:00
Haelwenn
9e34919dcd Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
Fix custom fields of accounts update credentials

See merge request pleroma/pleroma!1597
2019-10-06 04:41:06 +00:00
kaniini
7a318d74e6 Merge branch 'split-masto-api/leftovers' into 'develop'
[#1278] Move a few more actions from MastodonAPIController

See merge request pleroma/pleroma!1761
2019-10-05 19:28:53 +00:00
kaniini
45b7f03f89 Merge branch 'accept-embedded-announce-object' into 'develop'
Import object from self-Announce whenever possible

See merge request pleroma/pleroma!1770
2019-10-05 19:28:29 +00:00
kaniini
17ff4b43cb Merge branch 'unread-conversation-count' into 'develop'
Add `pleroma.unread_conversation_count` to the Account entity

See merge request pleroma/pleroma!1796
2019-10-05 19:28:07 +00:00
eugenijm
8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-05 20:12:00 +03:00
lain
1ed8fbc4d9 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-05 15:10:57 +02:00
lain
276a520163 CommonAPI: Create profile updates as public.
This saves us lots of sending out because we can use sharedInbox.
2019-10-05 14:53:50 +02:00
lain
4b8524f392 ActivityPub / Transmogrifier: Correctly store incoming Update id. 2019-10-05 14:49:45 +02:00
Thibaut Girka
b1ff66dc5f Add test for handling Announces with inlined object from different origin 2019-10-05 13:56:40 +02:00
Thibaut Girka
977e711e22 Import object from self-Announce whenever possible 2019-10-05 13:56:40 +02:00
kaniini
e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
2019-10-05 10:00:05 +00:00
lain
6a85f7d1ea Transmogrifier: Extend misskey like compatibility. 2019-10-05 10:45:42 +02:00
lain
d9aaea44ff Merge remote-tracking branch 'origin/develop' into reactions 2019-10-05 10:42:29 +02:00
Maksim Pechnikov
83631752af removed legacy api: "/objects/:uuid/likes" 2019-10-04 22:35:26 +03:00
kaniini
e0c0ea9f13 Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
widen streaming API block effects

See merge request pleroma/pleroma!1784
2019-10-04 17:39:06 +00:00
kaniini
5c04e81724 Merge branch 'user-info-unread-direct-conversation' into 'develop'
Add the `unread_conversation_count` field to the user info

See merge request pleroma/pleroma!1737
2019-10-04 17:33:18 +00:00
Maxim Filippov
8dcc2f9f5e Admin API: Allow changing the state of multiple reports at once 2019-10-04 19:00:58 +03:00
Ariadne Conill
8325858ed2 tests: streamer: add a test for blocked transitive activities 2019-10-04 15:17:32 +00:00
lain
2a7f44acfe ActivityPub.Utils: Fix undo test. 2019-10-04 17:10:49 +02:00
lain
43a211bcb1 Transmogrifier: Handle misskey likes with reactions like EmojiReactions. 2019-10-04 17:01:04 +02:00
lain
568a995d64 ActivityPub: Change addressing of Undo. 2019-10-04 16:32:42 +02:00
lain
01da6344b9 Merge branch 'bugfix/notification-nil-actor' into 'develop'
notification_view.ex: Make sure `account` isn’t empty

See merge request pleroma/pleroma!1779
2019-10-04 11:28:20 +00:00
Haelwenn (lanodan) Monnier
5dc14c89ce
notification_view.ex: Make sure account isn’t empty
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
2019-10-04 07:11:53 +02:00
eugenijm
06d9df79c5 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-04 00:53:23 +03:00
lain
c9043c6c80 Transmogrifier: Handle incoming Undos for EmojiReactions. 2019-10-03 18:37:23 +02:00
Ivan Tashkinov
64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
2019-10-02 20:42:40 +03:00
lain
4cb603e1df PleromaAPI: Add unreacting. 2019-10-02 18:19:16 +02:00
Egor Kislitsyn
e0c68eeb02
Move :favourites and :bookmarks actions to StatusController 2019-10-02 21:31:19 +07:00
Egor Kislitsyn
7f2bc57725
Move follows, mutes and blocks actions to AccountController 2019-10-02 21:22:21 +07:00
Egor Kislitsyn
9b68aab8b3
Fix credo warning 2019-10-02 21:12:01 +07:00
lain
9cfe9a57c5 CommonAPI: Add unreactions. 2019-10-02 15:38:57 +02:00
Egor Kislitsyn
d3c404af12
Add MastoFEController 2019-10-02 20:36:08 +07:00
lain
dfe5c958eb ActivityPub: Add undo for emoji reactions. 2019-10-02 15:08:20 +02:00
Egor Kislitsyn
1c6e1055c8
Add CustomEmojiController 2019-10-02 19:16:34 +07:00
lain
557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-02 13:27:55 +02:00
kaniini
433f2c0f68 Merge branch 'split-masto-api/instance' into 'develop'
Extract instance actions from `MastodonAPIController` to `InstanceController`

See merge request pleroma/pleroma!1760
2019-10-02 10:46:14 +00:00
Thibaut Girka
86880b9821 Inline object when Announcing a self-owned private object 2019-10-02 12:15:06 +02:00
Egor Kislitsyn
c8b01f6667
Extract instance actions from MastodonAPIController to InstanceController 2019-10-02 14:13:52 +07:00
kaniini
89ab673d00 Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
Send an identifier alongside with error message in OAuthController

See merge request pleroma/pleroma!1765
2019-10-02 07:04:33 +00:00
kaniini
8557176808 Merge branch 'split-masto-api/auth' into 'develop'
Extract auth actions from `MastodonAPIController` to `AuthController`

See merge request pleroma/pleroma!1759
2019-10-02 07:02:56 +00:00
kaniini
9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop'
Allow receiving private self-announces over ActivityPub

See merge request pleroma/pleroma!1766
2019-10-02 07:02:24 +00:00
1255ec888d Revert "Add upload limits to /api/v1/instance"
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01 22:16:29 +00:00
Thibaut Girka
427d0c2a00 Store private announcements in object.data["announcements"], filter them on display 2019-10-01 22:39:25 +02:00
Thibaut Girka
7d5a9f3f6d Add tests for privately announcing statuses via API 2019-10-01 20:38:29 +02:00
Thibaut Girka
e0b654e202 Add tests 2019-10-01 18:38:57 +02:00
Maxim Filippov
0f9c2c8b87 Send an identifier alongside with error message in OAuthController 2019-10-01 18:10:04 +03:00
Egor Kislitsyn
af690d1033
Extract auth actions from MastodonAPIController to AuthController 2019-10-01 15:54:45 +07:00
Egor Kislitsyn
2dad6dd020
Extract apps actions from MastodonAPIController to AppController 2019-10-01 15:21:46 +07:00
Egor Kislitsyn
39695c4436 Extract suggestions actions from MastodonAPIController to SuggestionController 2019-10-01 15:07:49 +07:00
Egor Kislitsyn
585bc57edb
Extract media actions from MastodonAPIController to MediaController 2019-10-01 14:36:35 +07:00