Commit graph

3808 commits

Author SHA1 Message Date
d2f1c4f658
Add ActivityPub Object Event type support
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17 16:16:21 +01:00
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated 2019-12-17 13:34:07 +07:00
rinpatch
bcd16676a7 Publisher: check out a connection for inserting publish_one jobs
Related to #1474, federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them.
2019-12-13 14:27:10 +03:00
Ivan Tashkinov
81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
2019-12-12 16:00:06 +03:00
lain
8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
AdminAPI: Merge account views for list instance statuses

See merge request pleroma/pleroma!2054
2019-12-12 09:28:27 +00:00
Maxim Filippov
3ecf131511 Merge branch 'develop' into feature/report-notes 2019-12-12 02:16:23 +03:00
Mark Felder
9ef912aecf Merge branch 'develop' into issue/1411 2019-12-11 15:02:53 -06:00
Maxim Filippov
82fae3e23f AdminAPI: Merge account views for list instance statuses 2019-12-11 18:57:36 +03:00
rinpatch
72f3b22134 Merge branch 'domain-block-precedence' into 'develop'
make follows take precedence over domain blocks

See merge request pleroma/pleroma!2019
2019-12-11 09:57:00 +00:00
Sadposter
1ad96d667a remove single-step pipe 2019-12-11 09:08:20 +00:00
67a478d709 Merge branch 'fix/unsubscribe-route' into 'develop'
Do not apply http signature pipeline to the unsubscribe route

See merge request pleroma/pleroma!2052
2019-12-10 17:25:56 +00:00
Sadposter
8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence'
# Conflicts:
#   lib/pleroma/user.ex
2019-12-10 16:54:25 +00:00
Sadposter
25f774f7c1 format activity_pub.ex 2019-12-10 16:41:43 +00:00
Sadposter
19d228cc58 modify SQL to include followed-but-domain-blocked activities 2019-12-10 16:40:12 +00:00
Egor Kislitsyn
75b419d7c8 Do not apply http signature pipeline to the unsubscribe route 2019-12-10 22:36:03 +07:00
lain
1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes'
# Conflicts:
#   CHANGELOG.md
2019-12-10 13:34:54 +00:00
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
lain
0d2c13a119 Merge branch 'fix/otp-parsers' into 'develop'
OTP: Fix runtime upload limit config being ignored

Closes #1109

See merge request pleroma/pleroma!2045
2019-12-09 15:10:05 +00:00
lain
e4ea0e20b3 Merge branch 'issue/1342' into 'develop'
[#1342] Added privacy option to push notifications

See merge request pleroma/pleroma!1920
2019-12-09 14:30:35 +00:00
Maksim Pechnikov
95e6a2acd9 Merge branch 'develop' into issue/1342 2019-12-08 21:25:26 +03:00
rinpatch
3c45ed4f47 OTP: Fix runtime upload limit config being ignored
Closes #1109
2019-12-08 21:08:25 +03:00
rinpatch
bd3aa8500c OAuth token cleanup: Get rid of compile-time configuration 2019-12-08 20:03:33 +03:00
rinpatch
af5fef1f22 Merge branch 'fix/clause-never-matches' into 'develop'
Fix never matching clause

See merge request pleroma/pleroma!2042
2019-12-08 13:50:57 +00:00
rinpatch
a21340caa1 Fix never matching clause
`length/1` is only used with lists.
2019-12-08 16:46:18 +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
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
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
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
lain
aa97fe8f17 ChatChannel: Ignore messages that are too long. 2019-12-04 12:48:34 +01: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
0326683932
hide follower/following for friendica 2019-11-30 15:43:05 +09:00
Ivan Tashkinov
51111e286b [#1427] Initial support for OAuth admin scopes. 2019-11-29 18:57:19 +03: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