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
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
2019-09-24 15:03:20 +07:00
kaniini
760df67a7b
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
...
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes #1223
See merge request pleroma/pleroma!1703
2019-09-23 22:35:09 +00:00
kaniini
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
2019-09-23 22:34:52 +00:00
Steven Fuchs
e1d2d69c87
Clean up views
2019-09-23 22:33:59 +00:00
Maksim Pechnikov
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-23 21:32:50 +03:00
Haelwenn (lanodan) Monnier
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23 20:00:12 +02:00
Haelwenn (lanodan) Monnier
2ad50583f0
Document and test /api/ap/whoami
2019-09-23 19:47:35 +02:00
eugenijm
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public)
2019-09-20 18:27:00 +03:00
D Anzorge
0e6085da10
Fix pagination in AP outbox.json
2019-09-19 16:09:07 +02:00
Maksim Pechnikov
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-19 07:35:34 +03:00
Haelwenn
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
2019-09-18 22:28:10 +00:00
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
2019-09-18 21:13:15 +00:00
rinpatch
d32894ae51
Move object internal fields to a constant
2019-09-18 19:24:20 +03:00
Maksim Pechnikov
7dd51652f9
Merge branch 'develop' into issue/733
2019-09-17 21:20:08 +03:00
Haelwenn
2301de3d75
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
...
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
See merge request pleroma/pleroma!1677
2019-09-17 17:16:39 +00:00
rinpatch
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
2019-09-17 14:47:26 +00:00
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)
2019-09-17 14:45:47 +03:00
Roman Chvanikov
76c3e290fc
Merge develop
2019-09-16 20:30:42 +03:00
Egor Kislitsyn
085d014f08
Fix Transmogrifier.upgrade_user_from_ap_id/1
2019-09-16 19:26:00 +07:00
Egor Kislitsyn
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
kaniini
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
Steven Fuchs
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
kaniini
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
2019-09-16 07:39:58 +00:00
Maksim Pechnikov
d75bc728e7
Merge branch 'develop' into issue/733
2019-09-16 07:34:22 +03:00
Maksim Pechnikov
8751809e1e
Merge branch 'develop' into support/tests
2019-09-15 14:22:15 +03:00
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
2019-09-14 16:11:44 +03:00
rinpatch
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
2019-09-13 19:42:53 +03:00
Roman Chvanikov
0bd2b85edb
Separate Subscription Notifications from regular Notifications
2019-09-13 18:25:27 +03:00
rinpatch
8900cb68ae
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 15:25:15 +00:00
rinpatch
2784962dba
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 15:23:03 +00:00
lain
a7f31bf06c
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-13 16:31:27 +02:00
lain
e5b3ad3d04
ActivityPub: Use is_unicode_emoji? function.
2019-09-13 16:06:34 +02:00
rinpatch
3896a51b8a
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 10:09:56 +00:00
rinpatch
5170170483
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 10:09:46 +00:00
rinpatch
fb96facc32
Remove unused functions and fix credo issues
2019-09-13 12:29:42 +03:00
rinpatch
ce23529d91
Use delivery info when federating deletes
2019-09-13 11:38:17 +03:00
Egor Kislitsyn
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
2019-09-13 12:44:59 +07:00
Maksim Pechnikov
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-13 06:55:05 +03:00
rinpatch
769fb778d4
Track object/create activity fetches
2019-09-12 21:37:36 +03:00
lain
8d4b661ecb
Transmogrifier: Strip internal emoji reaction fields.
2019-09-12 18:59:13 +02:00
Maksim Pechnikov
4f548cb2b7
added test for Ostatus
2019-09-12 10:25:43 +03:00
Mark Felder
74e4c72c4a
Fix double quotes in error logs
...
Example:
pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca "", error: nil
2019-09-11 16:16:09 -05:00
Maksim Pechnikov
007e0c1ce1
added tests
2019-09-11 23:19:06 +03:00
Maksim Pechnikov
fcf604fa43
added tests
2019-09-11 07:23:33 +03:00
Maksim Pechnikov
a31af93e1d
added tests /activity_pub/transmogrifier.ex
2019-09-10 16:43:10 +03:00
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
2019-09-09 18:53:08 +00:00
edbaf78176
Merge branch 'fix/read-inbox' into 'develop'
...
Fix `ActivityPubController.read_inbox/2`
Closes #1248
See merge request pleroma/pleroma!1649
2019-09-09 18:21:29 +00:00
Egor Kislitsyn
e0f84d0043
Fix ActivityPubController.read_inbox/2
2019-09-10 01:11:57 +07:00
Ivan Tashkinov
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-08 08:41:10 +03:00
Maksim Pechnikov
39f99dc6cd
Merge branch 'develop' into support/tests
2019-09-07 22:13:43 +03:00
Ariadne Conill
5effb2cbca
activitypub: help ecto build a better query for thread mute filtering
...
using an indexed value in thread_mute table helps ecto build a better query.
2019-09-06 23:11:26 +00:00
Alex S
79dde58044
one more temp commit
2019-09-05 16:02:20 +03:00
Maksim Pechnikov
ae506ca997
fix formatting
2019-09-04 21:40:53 +03:00
Maksim
e2011a667c
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
2019-09-04 18:35:01 +00:00
Maksim
8306078de1
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
2019-09-04 17:31:14 +00:00
Maksim Pechnikov
a890451187
fetch_announcements -> take_announcements
2019-09-04 17:42:27 +03:00
Maksim Pechnikov
8cbad5500c
add tests for activity_pub/utils.ex
2019-09-04 15:25:12 +03:00
lain
9bc12b88b3
ActivityPub: Save emoji reactions in object.
2019-09-03 16:50:04 -05:00
Ivan Tashkinov
dd017c65a4
[ #1149 ] Refactored Oban workers API (introduced enqueue/3).
2019-08-31 21:58:42 +03:00
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
7853b3f17d
Fix AntiFollowbotPolicy when trying to follow a relay
2019-08-30 00:38:03 +00:00
Haelwenn
d9d7765383
Merge branch 'fix-osada-follow' into 'develop'
...
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
2019-08-28 07:10:35 +00:00
lain
f017260cdc
Merge remote-tracking branch 'origin/develop' into reactions
2019-08-27 16:38:51 -05:00
Maksim
ffcd742aa0
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-08-27 17:37:19 +00:00
lain
c30cc039e4
Transmogrifier: Use Containment.get_actor to get actors.
2019-08-27 12:22:30 -05:00
Maksim Pechnikov
00abe099cd
added tests for ActivityPub.like\unlike
2019-08-27 16:21:03 +03:00
lain
a0b21c8928
Transmogrifier: Handle incoming emoji reactions.
2019-08-26 16:47:31 -05:00
lain
6e1ec4c5da
ActivityPub: Basic EmojiReactions.
2019-08-26 16:29:51 -05:00
lain
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
2019-08-26 14:34:52 -05:00
Maksim Pechnikov
654d291b6d
update tests
2019-08-24 17:41:53 +03:00
Maksim Pechnikov
6062017493
put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
2019-08-24 17:17:17 +03:00
Maksim Pechnikov
8dc6a6b210
fix /inbox for Relay
2019-08-22 22:48:07 +03:00
Maksim Pechnikov
399ca9133b
fix test
2019-08-22 21:54:37 +03:00
Ivan Tashkinov
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
2019-08-22 20:59:58 +03:00
Maksim Pechnikov
64bfb41c55
fixed unfollow for relay actor
2019-08-22 06:57:55 +03:00
lain
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
2019-08-20 19:34:47 +00:00
lain
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
2019-08-20 12:44:14 +00:00
Maxim Filippov
5171aa5b4d
Refactor check_actor_is_active
2019-08-19 20:36:25 +03:00
kaniini
18c8c8d176
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
...
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
2019-08-18 21:57:55 +00:00
rinpatch
a4a3e3becd
Hide muted theads from home/public timelines unless with_muted is set
2019-08-15 17:37:30 +03:00
Maxim Filippov
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
2019-08-14 22:45:32 +00:00
Maxim Filippov
2b94ae3b39
Do not check if actor is active when deleting a user
2019-08-15 01:35:29 +03:00
rinpatch
bd5ad0af78
Cache follow state
2019-08-15 00:47:30 +03:00
rinpatch
dc902ad3df
Merge branch 'fix/http-signatures-post' into 'develop'
...
activitypub: publisher: add (request-target) to http signature when POSTing
See merge request pleroma/pleroma!1569
2019-08-14 19:16:52 +00:00
kaniini
1754f8ce6d
Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
2019-08-14 19:05:44 +00:00
Ariadne Conill
5bb418a90d
activitypub: publisher: add (request-target) to http signature when POSTing
2019-08-14 19:01:51 +00:00
Ariadne Conill
626e094589
MRF: fix up unserializable option lists in describe implementations
2019-08-14 18:54:17 +00:00
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
Egor Kislitsyn
e457fcc479
Add :max_remote_account_fields config option
2019-08-14 14:58:06 +07:00
Egor Kislitsyn
f7bbf99caa
Use info.fields instead of source_data for remote users
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
7d6f8a7fd7
Linkify custom fields values in ActivityPub.UserViewx
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
5178f960c3
Support user attachment update in Transmogrifier
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
88598c9baf
Add profile custom fields to ActivityPub.UserView
2019-08-14 14:52:54 +07:00
kaniini
5c35d2f1d8
Merge branch 'preload-user-timelines' into 'develop'
...
Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563
2019-08-14 01:04:07 +00:00
kaniini
fe42844bda
Merge branch 'get-context-optimizations' into 'develop'
...
Preload thread mutes/bookmarks in get_context
See merge request pleroma/pleroma!1562
2019-08-14 01:03:54 +00:00
rinpatch
8202f1634a
Preload thread mutes/bookmarks in user_statuses
2019-08-14 03:02:09 +03:00
rinpatch
f4e087ee48
Preload thread mutes/bookmarks in get_context
...
Also removes filtering for creates (was done on the database side
already) and filtering for the requested activity (moved to the database
side) from application side.
2019-08-14 02:36:54 +03:00
rinpatch
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
Ariadne Conill
abfbcfdcb3
mrf_vocabulary: add describe API support
2019-08-13 22:39:26 +00:00
Ariadne Conill
4244e17de0
fix credo
2019-08-13 22:36:24 +00:00
Ariadne Conill
c574b7a1fc
MRF: add describe() to all modules, add base MRF configuration to base describe()
2019-08-13 22:08:58 +00:00
Ariadne Conill
694bc43123
MRF: add describe() for gathering and describing the MRF configuration
2019-08-13 21:26:24 +00:00
Maksim
fea4d89e9f
tests for Web/ActivityPub/Relay
2019-08-13 21:12:59 +00:00
Ariadne Conill
3fdbeb7087
MRF: add vocabulary policy module
2019-08-13 20:55:38 +00:00
Ivan Tashkinov
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
2019-08-13 20:20:26 +03:00
Ariadne Conill
f46cd7e9c7
config: remove legacy activitypub accept_blocks setting
...
Anyone who is interested in dropping blocks can write their own MRF
policy at this point. This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy.
2019-08-13 02:15:21 +00:00
rinpatch
92479c6f48
Do not fetch the reply object in fix_type unless the object has the
...
`name` key and use a depth limit when fetching it
2019-08-11 22:49:55 +03:00
Ariadne Conill
9cfc289594
MRF: ensure that subdomain_match calls are case-insensitive
2019-08-10 21:19:26 +00:00
Sergey Suprunenko
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
2019-08-10 18:47:40 +00:00
Maxim Filippov
dfae61c25c
Fix deactivated user deletion
2019-08-09 23:05:28 +03:00
