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
dbfdb1f6e3
add some missing tesla fixtures
2019-10-18 14:50:10 +00:00
Ariadne Conill
d379b48769
kill almost all of the OStatus module
2019-10-18 14:50:09 +00:00
Ariadne Conill
4f82e42e4e
websub: remove entirely
2019-10-18 14:50:09 +00:00
lain
203d61b950
Transmogrifier: Make proper use of the LikeValidator.
2019-10-17 19:35:31 +02: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
6e4f52f8a2
Introduce new ingestion pipeline structure, implement internal Likes with it.
2019-10-16 16:16:39 +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
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
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
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
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
lain
6a85f7d1ea
Transmogrifier: Extend misskey like compatibility.
2019-10-05 10:45:42 +02:00
lain
43a211bcb1
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
2019-10-04 17:01:04 +02:00
lain
c9043c6c80
Transmogrifier: Handle incoming Undos for EmojiReactions.
2019-10-03 18:37:23 +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
Thibaut Girka
86880b9821
Inline object when Announcing a self-owned private object
2019-10-02 12:15:06 +02:00
lain
dae744478e
Transmogrifier: Handle compact objects in undos.
2019-09-30 18:13:05 +02:00
lain
6068d2254e
PleromaAPIController: Fixes and refactoring.
2019-09-30 15:13:25 +02:00
Egor Kislitsyn
c55facf78b
Fix warning in TransmogrifierTest
2019-09-30 19:10:56 +07:00
lain
b923842e96
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-30 13:57:54 +02:00
Ariadne Conill
71eff09e56
common api: make sure the generated IR is actually federatable
2019-09-30 10:39:48 +00:00
Ariadne Conill
e7309d3b60
test: transmogrifier: add test proving that transmogrifier can handle outgoing listens
2019-09-30 10:39:48 +00:00
Ariadne Conill
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
2019-09-30 10:39:17 +00:00
Maksim Pechnikov
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-19 07:35:34 +03:00
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
--stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2019-09-18 23:21:11 +02: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
lain
a7f31bf06c
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-13 16:31:27 +02:00
Maksim Pechnikov
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-13 06:55:05 +03:00
Mark Felder
102eb4455c
Fix associated test as well
2019-09-12 12:29:08 -05:00
lain
8d4b661ecb
Transmogrifier: Strip internal emoji reaction fields.
2019-09-12 18:59:13 +02: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
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
lain
a0b21c8928
Transmogrifier: Handle incoming emoji reactions.
2019-08-26 16:47:31 -05:00
kPherox
d74efde94e
Update test for custom profile fields
2019-08-26 02:06:52 +09:00
Ivan Tashkinov
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-22 21:01:28 +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
85bd8a4e31
fixed clear config after test
2019-08-21 21:24:35 +03: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
5178f960c3
Support user attachment update in Transmogrifier
2019-08-14 14:52:54 +07:00
Ivan Tashkinov
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
2019-08-13 20:20:26 +03:00
Sergey Suprunenko
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
2019-08-10 18:47:40 +00:00
rinpatch
196cad46f3
Resolve merge conflicts
2019-07-20 22:04:47 +03:00
Egor Kislitsyn
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-07-15 14:11:54 +07:00
Ariadne Conill
841314c2d5
tests: fix object containment violations in the transmogrifier tests
...
Some objects were not completely rewritten in the tests, which caused object
containment violations. Fix them by rewriting the object IDs to be in an
appropriate namespace.
2019-07-14 19:24:22 +00:00
rinpatch
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
2019-07-13 19:27:49 +03:00
Egor Kislitsyn
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
Alex S
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
Alex S
f8786fa6f2
adding following_address field to user
2019-07-10 17:42:18 +03:00
Sergey Suprunenko
2d2b50ccca
Send and handle "Delete" activity for deleted users
2019-07-10 05:16:08 +00:00
Ivan Tashkinov
829e997223
[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
...
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
2019-07-09 21:46:16 +03:00
Ivan Tashkinov
daff85a985
[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
2019-07-08 19:53:02 +03:00
Ivan Tashkinov
2b9d914089
[ #161 ] Refactoring, documentation.
2019-06-30 15:58:50 +03:00
Ivan Tashkinov
5b7b1040b3
[ #161 ] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
2019-06-29 20:04:50 +03:00
Alex S
2e2edcb461
capturing errors
2019-06-16 20:10:12 +08:00
rinpatch
dffc9f060a
replace missing mock with a 404
2019-06-07 20:48:25 +03:00
rinpatch
d020f68e87
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
2019-06-07 20:40:38 +03:00
lain
8b9a0dd4a7
User: Don't error out when following a user that's already followed.
...
This leads to a few situations where it is impossible to follow a user.
2019-06-05 12:06:45 +02:00
Egor Kislitsyn
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-04 16:28:23 +07:00
rinpatch
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 11:14:52 +03:00
rinpatch
65db5e9f52
Resolve merge conflicts
2019-06-01 16:29:58 +03:00
Sergey Suprunenko
2bbc2a801f
Remove all follower collections but actor's from "cc"
2019-06-01 03:26:45 +00:00
rinpatch
a9eaa55885
Fix fix_explicit_addressing moving follower collection to cc and add tests for it
2019-05-31 14:17:05 +03:00
rinpatch
19c90d47c4
Normalize poll votes to Answer objects
2019-05-22 21:17:57 +03:00
rinpatch
aafe30d94e
Handle poll votes
2019-05-21 14:12:10 +03:00
rinpatch
62e42b03ab
Handle incoming Question objects
2019-05-15 20:10:16 +03:00
Egor Kislitsyn
d474995efa
Add Tests
2019-05-14 20:12:47 +07:00
Alex S
f11e7037c2
test fixes
2019-05-01 16:09:53 +07:00
William Pitcock
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
2019-04-25 00:48:45 +00:00
Egor
b9cdf6d3b9
Use `User.get_cached*` everywhere
2019-04-22 07:20:43 +00:00
Ekaterina Vaartis
aef3a3ca46
Fix tests that used finmoji
2019-04-20 11:34:00 +03:00
rinpatch
35ac672b8d
Remove containment tests from transmogrifier and fix thread visibility solver
2019-04-17 17:59:15 +03:00
rinpatch
d1eb578a57
Refactor tests that used ActivityPub.fetch_object_from_id
2019-04-17 17:03:35 +03:00
rinpatch
ff8d76c670
Refactor all tests that acessed the embeded object
2019-04-17 15:46:59 +03:00
rinpatch
627e5a0a49
Merge branch 'develop' into feature/database-compaction
2019-04-17 12:22:32 +03:00
rinpatch
5d73dca064
Remove inReplyToStatusId
2019-04-15 11:50:36 +03:00
Egor Kislitsyn
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
2019-04-04 16:10:43 +07:00
Egor Kislitsyn
11c2d6bdc4
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
2019-04-02 17:08:03 +07:00
Egor Kislitsyn
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
2019-04-02 17:01:26 +07:00
William Pitcock
455bb526f6
test: add test for list sanitization
2019-03-19 17:53:40 +00:00
William Pitcock
fd0aa58ee0
tests: add test for as:Public issues
2019-03-19 17:49:29 +00:00
William Pitcock
414d4b8088
test: add a test for accepting inbound Flag activities
2019-03-14 19:04:33 +00:00
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
William Pitcock
889ad95a2a
tests: add some reserialization tests based on IR differences
2019-02-14 00:59:18 +00:00
lain
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
2019-01-23 13:05:58 +01:00
lain
762fafe738
Fix buggy test.
2019-01-21 17:54:11 +01:00
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
2019-01-21 08:00:41 +01:00
William Pitcock
cf3099231d
test: transmogrifier: verify directMessage flag is sent outbound based on declared visibility
2019-01-20 02:28:28 +00:00
William Pitcock
21ac35fcc0
tests: add tests for DM sanitizer
2019-01-20 02:27:48 +00:00
William Pitcock
31517bec12
test: add regression test for to/cc clobbering
2019-01-18 22:32:01 +00:00