Haelwenn (lanodan) Monnier
e89078ac2a
User: remove source_data
2020-04-10 06:20:03 +02:00
Haelwenn (lanodan) Monnier
3420dec494
Remove User.fields/1
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
62656ab259
User: Move inbox & shared_inbox to own fields
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
b6bed1a284
Types.URI: New
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
19eedb3d04
User: Move public_key from source_data to own field
2020-04-10 06:16:18 +02:00
lain
d35e114acd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-09 13:25:27 +02:00
lain
2e78686686
SideEffects: Handle ChatMessage creation.
2020-04-09 12:44:20 +02:00
Haelwenn (lanodan) Monnier
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
2020-04-09 04:36:39 +02:00
lain
3775683a04
ChatMessage: Basic incoming handling.
2020-04-08 15:55:43 +02:00
lain
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
2020-04-06 11:59:01 +00:00
lain
772bc258cd
ObjectID Validator: Refactor.
2020-04-06 13:53:24 +02:00
lain
e67cde0ed6
Transmogrifier: Refactoring / Renaming.
2020-04-06 13:46:34 +02:00
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
2020-04-01 17:05:09 +00:00
lain
037b49c415
Validators: Correct ObjectID filename
2020-04-01 16:10:17 +02:00
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
2020-03-31 23:55:29 +02:00
lain
c982093cc2
Transmogrifier: Fix BAD code by RINPATCH
2020-03-31 19:33:41 +02:00
lain
1b323ce1c6
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:28:18 +00:00
lain
ecac57732a
Transmogrifier: Only add context if it really is onne.
2020-03-31 19:16:45 +02:00
lain
288f2b5a7c
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:00:55 +00:00
lain
0be1fa0a86
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:00:48 +00:00
lain
643f15e77b
Validators: ObjectID is an http uri.
2020-03-31 16:11:38 +02:00
lain
f6835333be
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 12:55:25 +00:00
Ivan Tashkinov
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
2020-03-30 19:08:37 +03:00
Alexander Strizhakov
b607ae1a1c
removing grouped reports admin api endpoint
2020-03-30 13:51:45 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
Haelwenn
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-03-29 19:18:22 +00:00
Ivan Tashkinov
be9d18461a
FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).
2020-03-28 18:49:03 +03:00
lain
29ab1d9f8d
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-26 17:24:10 +01:00
lain
69fc1dd69f
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
2020-03-26 14:45:28 +00:00
lain
0c60c0a76a
Validators: Use correct type for IDs.
2020-03-26 15:44:14 +01:00
lain
0adaab8e75
Bump copyright dates.
2020-03-26 15:37:42 +01:00
lain
eaacc64839
Refactors.
2020-03-26 15:33:10 +01:00
lain
ee979dd6d7
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-26 15:24:06 +01:00
lain
d7aa0b645b
Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
2020-03-26 14:23:19 +00:00
lain
4cf1007a7d
ActivityPub: Small refactor.
2020-03-26 15:16:54 +01:00
Ivan Tashkinov
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-25 09:05:17 +03:00
Ivan Tashkinov
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
2020-03-25 09:04:00 +03:00
rinpatch
f316882464
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
2020-03-24 18:37:53 +00:00
lain
aaf00f1ff5
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
2020-03-24 18:24:09 +00:00
lain
74560e888e
Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex
2020-03-24 18:20:58 +00:00
Egor Kislitsyn
4a2538967c
Support pagination in conversations
2020-03-24 20:18:27 +04:00
Egor Kislitsyn
d1a9716a98
Fix activity deletion
2020-03-24 17:38:18 +04:00
rinpatch
981e015f1b
Mastodon API Account view: Remove an outdated hack
...
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
2020-03-22 17:10:37 +03:00
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration
2020-03-20 22:08:34 +04:00
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun
2020-03-20 20:47:54 +03:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
2020-03-20 16:36:20 +03:00
Haelwenn (lanodan) Monnier
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
2020-03-19 19:10:03 +01:00
lain
9b9d67bbec
Fix linting.
2020-03-19 18:16:12 +01:00
lain
3c2c32b460
Merge branch 'remake-remodel' into develop
2020-03-19 18:00:55 +01:00
Haelwenn (lanodan) Monnier
f9d622d25a
WIP
2020-03-19 15:39:11 +01:00
Ivan Tashkinov
0e07c5ef57
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-16 17:58:42 +03:00
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration
2020-03-16 15:31:31 +04:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
Haelwenn (lanodan) Monnier
8176ca9e40
static_fe: Sanitize HTML in users
2020-03-15 20:44:04 +01:00
lain
fa4ec17c84
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
...
[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
2020-03-15 19:15:20 +00:00
Ivan Tashkinov
7c8003c3fc
[ #1364 ] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
2020-03-15 21:00:12 +03:00
rinpatch
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-15 15:59:17 +03:00
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
2020-03-12 18:31:10 +03:00
Egor Kislitsyn
d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-12 16:02:24 +04:00
Ivan Tashkinov
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
2020-03-12 12:07:07 +03:00
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
2020-03-11 15:10:09 +00:00
Haelwenn (lanodan) Monnier
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-11 13:46:42 +01:00
Ivan Tashkinov
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
2020-03-09 20:51:44 +03:00
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun
2020-03-07 12:41:37 +03:00
Ivan Tashkinov
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-06 11:48:30 +03:00
Ivan Tashkinov
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
2020-03-05 21:19:21 +03:00
lain
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
2020-03-04 12:43:06 +00:00
Alexander Strizhakov
22d52f5691
same copyright date format
2020-03-04 09:41:23 +03:00
Mark Felder
4427161ca3
Merge branch 'develop' into gun
2020-03-03 17:15:49 -06:00
Mark Felder
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
Ivan Tashkinov
b6fc98d9cd
[ #1560 ] ActivityPubController federation state restrictions adjustments. Adjusted tests.
2020-03-03 22:22:02 +03:00
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun
2020-03-03 10:08:07 +03:00
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-03 00:32:34 +04:00
Ivan Tashkinov
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-02 18:41:12 +03:00
Haelwenn
764a50f8a6
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
...
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
2020-03-02 07:58:01 +00:00
Alexander Strizhakov
cc98d010ed
relay list shows hosts without accepted follow
2020-03-02 09:27:20 +03:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
Alexander Strizhakov
34f1d09f3a
spec fix
2020-03-01 12:01:39 +03:00
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun
2020-02-29 11:34:50 +03:00
Egor Kislitsyn
cb60a9c42f
Do not fail when user has no email
2020-02-27 17:27:49 +04:00
eugenijm
e2a6a40367
Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only)
2020-02-26 20:21:38 +03:00
Egor Kislitsyn
22018adae6
Fix Dialyzer warnings
2020-02-25 18:34:56 +04:00
Ivan Tashkinov
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
2020-02-22 19:48:41 +03:00
Egor Kislitsyn
011ede4536
Update documentation
2020-02-21 14:42:43 +04:00
Egor Kislitsyn
819cd46717
Auto-expire Create activities only
2020-02-20 22:04:02 +04:00
Mark Felder
cf94349287
Merge branch 'develop' into gun
2020-02-18 09:06:27 -06:00
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-18 17:46:09 +03:00
lain
3fa2ac68df
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
...
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
2020-02-18 14:36:10 +00:00
Alexander Strizhakov
514c899275
adding gun adapter
2020-02-18 08:19:01 +03:00
rinpatch
472132215e
Use floki's new APIs for parsing fragments
2020-02-16 01:55:26 +03:00
Ivan Tashkinov
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
2020-02-15 20:41:38 +03:00
Mark Felder
478619782b
Standardize @behaviour usage in MRFs
2020-02-14 11:02:24 -06:00
Egor Kislitsyn
57878f8708
Improve readability
2020-02-14 15:50:31 +04:00
Egor Kislitsyn
4d459b0e99
Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4
2020-02-13 22:27:10 +04:00
Egor Kislitsyn
241a3d744a
Add ActivityExpirationPolicy
2020-02-13 22:27:10 +04:00
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
rinpatch
ea1631d7e6
Make Floki use fast_html
2020-02-11 16:17:21 +03:00
Ivan Tashkinov
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests.
2020-02-09 17:34:48 +03:00
Ivan Tashkinov
6ea3c06d8d
[ #1505 ] Minor refactoring.
2020-02-09 14:09:01 +03:00
Ivan Tashkinov
7c3991f59e
[ #1505 ] Fixed replies serialization (included objects' ids instead of activities' ids).
2020-02-09 10:17:21 +03:00
Ivan Tashkinov
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-08 19:59:37 +03:00
Ivan Tashkinov
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
2020-02-08 19:58:02 +03:00
Haelwenn
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
2020-02-07 16:10:43 +00:00
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
Egor Kislitsyn
8c71f7e11a
Add support for cancellation of a follow request
2020-02-05 20:22:15 +04:00
Ivan Tashkinov
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-05 07:56:36 +03:00
lain
a0d9d42eaa
Emoji Reactions: Actually use the validation.
2020-01-30 16:07:37 +01:00
lain
46915207b6
Remove whole_db parameter everywhere, it's not used anymore
2020-01-28 14:40:40 +01:00
Ivan Tashkinov
86e4d23acb
[ #1505 ] Background fetching of incoming activities' replies collections.
2020-01-25 10:47:30 +03:00
lain
34fc0ca053
Emoji reactions: Add sanity checks for the cache
2020-01-23 12:34:34 +01:00
Ivan Tashkinov
cf96c40057
[ #1505 ] Added Mastodon-compatible replies collection to Note federated representation.
2020-01-22 21:10:17 +03:00
rinpatch
6e6f1ead31
Merge branch 'no-error-404' into 'develop'
...
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
2020-01-22 17:55:49 +00:00
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
2020-01-22 17:13:17 +00:00
lain
dd3fc50ea4
Emoji reactions: Change cache and reply format
2020-01-22 13:57:42 +01:00
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be
2020-01-21 10:32:27 +03:00
lain
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
2020-01-20 14:42:43 +00:00
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5
2020-01-20 12:17:14 +01:00
Haelwenn (lanodan) Monnier
6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
2020-01-19 07:06:15 +01:00
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
2020-01-14 14:52:00 +03:00
Mark Felder
2f5b8fbeb3
Merge branch 'develop' into issue/1354
2020-01-12 12:12:15 -06:00
Alexander Strizhakov
1630ecaa20
Merge branch 'develop' into admin-be
2020-01-11 12:15:42 +03:00
Alex S
2753285b77
config editing through database
2020-01-10 15:51:59 +03:00
Maksim Pechnikov
70410dfafd
fix create service actor
2020-01-08 16:40:49 +03:00
rinpatch
c51e93978e
Merge branch 'feature/custom-runtime-modules' into 'develop'
...
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
2019-12-21 11:56:24 +00:00
Maksim Pechnikov
7bd0bca2ab
fixed remote follow
2019-12-20 16:33:44 +03:00
Egor Kislitsyn
432b3067d4
Do not crash when remote user follower and following counters are hidden
2019-12-19 19:26:46 +07:00
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
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-16 22:34:21 +07:00
Phil Hagelberg
02c3031e99
Don't log when users or objects are deleted.
2019-12-13 12:05:53 -08: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
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-13 01:51:52 +07: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
Egor Kislitsyn
ee6805850c
Set log level to debug for not important messages
2019-12-11 17:47:19 +07:00
Sadposter
1ad96d667a
remove single-step pipe
2019-12-11 09:08:20 +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
minibikini
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:38:25 +00:00
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
Egor Kislitsyn
a37bd5c255
Change log level
2019-12-10 15:08:57 +07:00
lain
d4bafabfd1
Beginnings of the create validator
2019-12-09 10:39:14 +01: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
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
lain
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
2019-12-06 14:25:13 +01: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
lain
1993d7096d
Validators: Add a type for the datetime used in AP.
2019-12-05 12:33:06 +01: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
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-12-04 16:35:59 +01:00
Maxim Filippov
4b60d41db9
Add report notes
2019-12-04 00:26:37 +09: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
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
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
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
Maxim Filippov
1364d303f8
AdminAPI: Fix grouped reports for closed/resolved reports
2019-11-26 00:13:11 +09:00
rinpatch
02f7383891
ActivityPub controller: do not render remote users
2019-11-25 17:19:33 +03:00
5f981178d0
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
...
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
2019-11-25 13:29:53 +00:00
9374b52756
Merge branch 'fix/update-reports-old-format' into 'develop'
...
Admin API: Fix error when trying to update reports in the "old" format
See merge request pleroma/pleroma!1986
2019-11-25 13:29:22 +00: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
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
555edd01ab
[ #1335 ] User AP ID relations fetching performance optimizations.
2019-11-20 12:19:07 +03: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
Maksim Pechnikov
5cee51fac5
fix order by for fetch_favorites
2019-11-18 21:34:54 +03:00
Maksim Pechnikov
0937895182
updated fetch_favorites
2019-11-18 16:56:47 +03:00
Maksim Pechnikov
4beb3ce5c5
/api/v1/favourites: added sorting for activites by adds to favorites
2019-11-18 09:44:08 +03:00
Maxim Filippov
c506cc48ef
Admin API: Error when trying to update reports in the "old" format
2019-11-16 18:44:48 +09: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
Ariadne Conill
eecd64cc07
object age policy: remove debug logging
2019-11-14 19:56:14 -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
Maxim Filippov
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-11 19:18:12 +09: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
lain
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
2019-11-08 13:27:11 +01:00
Maxim Filippov
7258db023e
Support old flag format
2019-11-08 18:21:29 +09:00
Maxim Filippov
f171095960
Grouped reports with status data baked in
2019-11-06 21:25:46 +10:00
lain
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-11-05 15:21:00 +01:00
lain
faced6236b
NoteValidator: Add very basic validator for Note objects.
2019-11-05 15:02:31 +01:00
lain
3d1b445cbf
Object Validators: Extract common validations.
2019-11-05 15:02:09 +01: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
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
Maxim Filippov
6f9d3d30fa
AdminAPI: Omit relay user from users list
2019-10-31 02:26:02 +03:00
Egor Kislitsyn
61fc739ab8
Handle "Move" activity
2019-10-30 18:21:49 +07:00
kPherox
0c361eeb25
Add pending to handle incoming for Follow activity
2019-10-29 17:12:49 +09:00
Egor Kislitsyn
4270861085
Merge branch 'develop' into feature/move-activity
2019-10-28 15:10:47 +07: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
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
c0246309a5
[ #1304 ] Extra bullet-proofing.
2019-10-23 19:30:02 +03: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
lain
1adafa0966
Credo fixes.
2019-10-23 12:18:05 +02:00
lain
97d5c79aa0
Add Pipeline module, test for federation.
2019-10-23 11:52:27 +02:00
Ariadne Conill
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
2019-10-22 20:50:46 -05:00
Ivan Tashkinov
7c7f90bc4f
[ #1304 ] Merged develop, handled User.Info.invisible.
2019-10-21 11:58:22 +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
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
Ivan Tashkinov
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
Ariadne Conill
c9280b9730
rework to use properties instead of compound typing, per SocialCG
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
1469a084d4
relay: set invisible to true
2019-10-19 23:21:37 +00:00
Maxim Filippov
019147f115
Merge branch 'develop' into feature/relay-list
2019-10-18 18:35:58 +02:00
Ariadne Conill
bae96de273
activitypub: tag containment checks for better error tracing
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
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
Maxim Filippov
2473702be2
Merge branch 'develop' into feature/relay-list
2019-10-18 10:24:29 +02:00
lain
203d61b950
Transmogrifier: Make proper use of the LikeValidator.
2019-10-17 19:35:31 +02:00
lain
66452f518f
ObjectValidator: Rewrite LikeValidator with Ecto.
2019-10-17 18:36:52 +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
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
081e8206ab
Transmogrifier: Use new ingestion pipeline for Likes.
2019-10-16 17:03:21 +02:00
lain
6e4f52f8a2
Introduce new ingestion pipeline structure, implement internal Likes with it.
2019-10-16 16:16:39 +02: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
Maxim Filippov
90d516d42b
Store status data inside flag activity
2019-10-15 16:52:41 +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
cc6875b582
Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
2019-10-11 19:12:29 +03: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
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
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
2019-10-10 14:40:59 +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
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
Ariadne Conill
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
2019-10-07 12:29:33 +00:00
lain
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-07 12:30:59 +02: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
rinpatch
fefbd31c6e
Move local keys out of user.info
2019-10-06 16:56:36 +03:00
lain
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-06 08:11:47 +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
lain
4b8524f392
ActivityPub / Transmogrifier: Correctly store incoming Update id.
2019-10-05 14:49:45 +02:00
Thibaut Girka
791d93ff0e
Make credo happy
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
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
Maxim Filippov
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
2019-10-04 19:00:58 +03: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
c9043c6c80
Transmogrifier: Handle incoming Undos for EmojiReactions.
2019-10-03 18:37:23 +02:00
lain
9cfe9a57c5
CommonAPI: Add unreactions.
2019-10-02 15:38:57 +02:00
lain
dfe5c958eb
ActivityPub: Add undo for emoji reactions.
2019-10-02 15:08:20 +02:00
lain
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-02 13:27:55 +02:00
Thibaut Girka
86880b9821
Inline object when Announcing a self-owned private object
2019-10-02 12:15:06 +02: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
fe538973dd
Ensure self-announces do not widen the audience of the original post
2019-10-01 18:38:57 +02:00
KokaKiwi
1f0be71ea4
Make activity announceable by its author.
2019-10-01 17:47:43 +02:00
Egor Kislitsyn
2dad6dd020
Extract apps actions from MastodonAPIController to AppController
2019-10-01 15:21:46 +07:00
lain
dae744478e
Transmogrifier: Handle compact objects in undos.
2019-09-30 18:13:05 +02:00
lain
19bc0b8c79
.
2019-09-30 16:38:19 +02:00
lain
08256e9299
ActivityPub: Federate reactions.
2019-09-30 15:51:09 +02:00
lain
a7f22c6e93
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-30 13:58:14 +02:00
lain
b923842e96
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-30 13:57:54 +02:00
kaniini
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00
Ariadne Conill
84712c35f9
activitypub: object view: include child object for Listen activities
2019-09-30 10:39:48 +00:00
Ariadne Conill
7cad6ea67a
pleroma api: hook up scrobbler controller
2019-09-30 10:39:17 +00:00
Ariadne Conill
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
2019-09-30 10:39:17 +00:00
Ariadne Conill
1f9de2a8cd
activitypub: implement IR-level considerations for Listen activities
2019-09-30 10:39:17 +00:00
rinpatch
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
2019-09-29 18:43:27 +03:00
Roman Chvanikov
b4b147000c
Merge develop
2019-09-26 10:38:54 +03:00
kaniini
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
2019-09-26 03:00:38 +00:00
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
kaniini
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
2019-09-26 02:51:54 +00:00
kaniini
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
2019-09-26 02:49:45 +00:00
rinpatch
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
2019-09-25 13:38:45 +00:00
rinpatch
f2880d7d29
Credo considered harmful
2019-09-25 16:36:46 +03:00
rinpatch
c7d8ccd0c4
Remove useless with clause
2019-09-25 16:26:47 +03:00
rinpatch
1ddd403339
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-25 13:20:48 +00:00
rinpatch
d87be2ec96
Don't embed the first page in inboxes/outboxes and refactor the views to
...
follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
2019-09-25 15:59:04 +03:00
Egor Kislitsyn
b5dfe83433
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
Maxim Filippov
60cbea5bb2
Allow activities pagination via limit/offset
2019-09-25 01:25:42 +03:00
