Commit Graph

672 Commits

Author SHA1 Message Date
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
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 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
kaniini 6dc24422dc Merge branch 'issue/1177' into 'develop'
[#1177] fixed unfollow for relay actor

See merge request pleroma/pleroma!1589
2019-08-25 19:43:27 +00:00
kPherox d74efde94e
Update test for custom profile fields 2019-08-26 02:06:52 +09:00
Maksim Pechnikov 654d291b6d update tests 2019-08-24 17:41:53 +03:00
Maksim Pechnikov 73bcbf4fa3 add tests 2019-08-24 11:03:13 +03:00
Maksim Pechnikov 399ca9133b fix test 2019-08-22 21:54:37 +03:00
Maksim Pechnikov f95b67c933 Merge branch 'develop' into issue/1177 2019-08-22 21:13:03 +03: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 64bfb41c55 fixed unfollow for relay actor 2019-08-22 06:57:55 +03:00
Maksim Pechnikov 85bd8a4e31 fixed clear config after test 2019-08-21 21:24:35 +03: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
Maksim a320358703 added test helpers to clear config after tests 2019-08-19 15:34:29 +00:00
Ariadne Conill a2fdc32368 tests: activitypub: fix typo 2019-08-18 22:31:59 +00:00
rinpatch a4a3e3becd Hide muted theads from home/public timelines unless `with_muted` is set 2019-08-15 17:37:30 +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 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
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 dd0b71ea6d tests: add tests for MRF.describe() 2019-08-13 22:19:15 +00:00
Maksim fea4d89e9f tests for Web/ActivityPub/Relay 2019-08-13 21:12:59 +00:00
Ariadne Conill f7e3b7ff75 tests: add tests for mrf_vocabulary 2019-08-13 20:55:42 +00:00
Ivan Tashkinov 0e1c481a94 [#1149] Added more oban workers. Refactoring. 2019-08-13 20:20:26 +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
Ivan Tashkinov 267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-09 20:09:56 +03:00
Ivan Tashkinov b7fad8d395 [#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues. 2019-08-09 20:08:01 +03:00
rinpatch 32018a4ee0 ActivityPub tests: remove assertions of embedded object being updated,
because the objects are no longer supposed to be embedded
2019-08-07 00:36:13 +03:00
Sergey Suprunenko e8ad116c2a Do not add the "next" key to likes.json if there is no more items 2019-08-04 17:13:06 +00:00
Ivan Tashkinov 23d279e03e [#1149] Replaced RetryQueue with oban-based retries. 2019-08-01 17:28:00 +03:00
rinpatch 301ea0dc04 Add tests for counters being updated on follow 2019-07-31 21:09:13 +03:00
rinpatch 41e0304757 Merge branch 'develop' into feature/hide-follows-remote 2019-07-25 18:43:30 +03:00
Maksim c49a09ed88 tests for Pleroma.Web.ActivityPub.Publisher 2019-07-23 19:15:48 +00:00
Alexander Strizhakov b70e659304 Feature/1087 wildcard option for blocks 2019-07-22 14:33:58 +00:00
Ariadne Conill 56019d53a8 activitypub: publisher: align sharedinbox usage with AP specification rules
While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification.  Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.
2019-07-22 02:38:31 +00:00
rinpatch 196cad46f3 Resolve merge conflicts 2019-07-20 22:04:47 +03:00
Ariadne Conill 3d23a12d75 tests: add test for fetching the internal fetch actor 2019-07-17 17:48:08 +00:00
RX14 96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors 2019-07-17 15:16:55 +01:00
Egor Kislitsyn de13c9bb8f List messages must be visible for mentioned users 2019-07-15 14:54:40 +07: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 0c2dcb4c69 Add follow information refetching after following/unfollowing 2019-07-14 01:58:39 +03:00
rinpatch 183da33e00 Add tests for fetch_follow_information_for_user and check object type
when fetching the page
2019-07-14 00:56:02 +03: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
rinpatch 97b79efbcd ActivityPub Controller: Actually pass for_user to following/followers
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
2019-07-12 20:54:20 +03:00
rinpatch 1f6ac7680d ActivityPub User view: Following/Followers refactoring
- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it
2019-07-12 19:41:55 +03:00
rinpatch 27ed260eed AP user view: Add a test for hiding totalItems in following/followers 2019-07-12 18:36:14 +03:00
Egor Kislitsyn 9e06873d58 Add `list` to Visibility 2019-07-11 19:29:24 +07: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
feld 93a0eeab16 Add license/copyright to all project files 2019-07-10 05:13:23 +00:00
Maksim bb8065a1fd tests MRF filters 2019-07-10 05:12:21 +00:00
Ivan Tashkinov 8a41d34673 [#878] Tests improvements per code review. 2019-07-09 22:37:59 +03:00
Ivan Tashkinov 6fc0c27be3 [#878] Uncommented test statement. 2019-07-09 22:28:04 +03: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
Haelwenn 95c085174d Merge branch 'test-speedup' into 'develop'
Testing: Don't federate in testing.

See merge request pleroma/pleroma!1391
2019-07-09 15:35:28 +00:00
lain abe2e8881f Testing: Don't federate in testing. 2019-07-09 15:30:51 +09: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
William Pitcock c22f0bfb80 test: add tests for mediaproxy warming policy 2019-06-28 23:41:42 +00:00
Alex S b37ede5df3 log capturing 2019-06-23 08:16:28 +03:00
William Pitcock 21dacd4b15 unbreak polls 2019-06-19 16:33:49 +00:00
William Pitcock 736d8ad6be implement anti link spam MRF 2019-06-19 15:58:32 +00: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 ad19bfc7fe Utils: Split update_follow_state and update_follow_state_for_all. 2019-06-05 16:43:35 +02:00
lain 3115b64cfe Transmogrifier: Add tests for incoming follows to locked accounts. 2019-06-05 14:10:46 +02:00
lain 024dfdc39c Typo + Linting. 2019-06-05 12:45:28 +02: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 6ba9055b51 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-06-05 12:54:30 +07:00
Maksim Pechnikov d3d1704e84 Merge branch 'develop' into issue/941 2019-06-04 15:06:58 +03:00
rinpatch bbff7554de Add tests for get_existing_votes 2019-06-04 13:47:53 +03:00
Egor Kislitsyn 9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-06-04 16:28:23 +07:00
Maksim Pechnikov 4f2e359687 Merge branch 'develop' into issue/941 2019-06-04 09:49:08 +03:00
kaniini 9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop'
MRF: subchain policy

See merge request pleroma/pleroma!1233
2019-06-04 05:49:54 +00:00
Maksim Pechnikov 080e1aa70e add option skip_thread_containment 2019-06-03 16:13:37 +03:00
rinpatch 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo 2019-06-03 11:14:52 +03:00
William Pitcock 38a275b31f test: add tests for subchain policy 2019-06-02 10:08:51 +00:00
rinpatch 65db5e9f52 Resolve merge conflicts 2019-06-01 16:29:58 +03:00
kaniini e706b42f51 Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility

See merge request pleroma/pleroma!1230
2019-06-01 03:39:13 +00:00
Sergey Suprunenko 2bbc2a801f Remove all follower collections but actor's from "cc" 2019-06-01 03:26:45 +00:00
William Pitcock f2efe24cf8 visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility 2019-06-01 03:24:08 +00:00
rinpatch d9c0650ff9 Mastodon API: Fix lists leaking private posts
Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).

Reported by @kurisu@iscute.moe via a DM
2019-05-31 15:25:17 +03: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
William Pitcock 79503ce90f mrf: simple policy: fix matching imported activitypub and ostatus statuses 2019-05-26 02:01:24 +00:00
Egor Kislitsyn a7affbdd6d Fix tests 2019-05-24 21:41:11 +07:00
Egor Kislitsyn f333041a0a Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-24 21:05:57 +07:00
William Pitcock 8086c7aed6 tests: add tests for banner and avatar removal 2019-05-22 18:53:12 +00:00
rinpatch 19c90d47c4 Normalize poll votes to Answer objects 2019-05-22 21:17:57 +03:00
William Pitcock 045803346d move key generation functions into Pleroma.Keys module 2019-05-22 03:58:15 +00:00
rinpatch aafe30d94e Handle poll votes 2019-05-21 14:12:10 +03:00
Aaron Tinio 2375e9a95b Add report filtering to MRF.SimplePolicy 2019-05-20 06:02:50 +08:00
rinpatch 5ece901af3 Resolve merge conflicts and remove IO.inspects 2019-05-18 13:37:38 +03:00
Egor Kislitsyn 557f0e33a7 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-17 19:57:14 +07:00
Aaron Tinio 443cd68a4c Add tests for MRF.SimplePolicy 2019-05-17 09:02:34 +08:00
feld e190b3022b Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
Fix domain-unblocked reblogs

Closes #892

See merge request pleroma/pleroma!1157
2019-05-16 18:57:14 +00:00
Mark Felder ebb0482116 Merge branch 'develop' into conversations-import 2019-05-16 13:11:17 -05:00
Egor Kislitsyn fc7246d715 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-05-16 17:54:24 +07:00
Aaron Tinio 2b6119dfbf Restrict reblogs of activities from blocked domains 2019-05-16 05:53:51 +08:00
Aaron Tinio 64495b96e9 Add test for blocked domains 2019-05-16 05:53:51 +08:00
rinpatch 62e42b03ab Handle incoming Question objects 2019-05-15 20:10:16 +03:00
William Pitcock f09c3afdf5 chase test failures 2019-05-15 16:23:01 +00:00
William Pitcock c7644313e7 test: update obsolete test 2019-05-15 15:54:10 +00:00
lain f168a1cbdc Merge remote-tracking branch 'origin/develop' into conversations-import 2019-05-15 17:47:29 +02:00
lain cbb3451023 CommonAPI: Refactor visibility, forbid public to private replies. 2019-05-15 16:30:08 +02:00
Egor Kislitsyn d474995efa Add Tests 2019-05-14 20:12:47 +07:00
William Pitcock 582bd9d170 tests: fix AP test failures 2019-05-12 14:40:57 +00:00
lain a4598b5e8b Visibility: Make it more resilient. 2019-05-08 18:08:50 +02:00
lain 81d1aa424d Streamer: Stream out Conversations/Participations. 2019-05-03 13:39:14 +02:00
Roman Chvanikov 8af55728e4 Fix tests 2019-05-01 19:03:55 +02:00
lain 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three 2019-05-01 18:40:41 +02: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
kaniini 9da8b287f8 Merge branch 'feature/database-compaction' into 'develop'
database compaction

See merge request pleroma/pleroma!473
2019-04-19 16:55:33 +00:00
rinpatch 83589ca6a5 Merge branch 'develop' into feature/database-compaction 2019-04-18 12:56:38 +03:00
rinpatch 2abc09570f Use the preloaded object in tag queries 2019-04-18 01:37:04 +03:00
William Pitcock 36f78c6dcd activitypub: fix filtering of boosts from blocked users 2019-04-17 22:27:59 +00:00
William Pitcock 2140e164d7 activitypub: properly filter out transitive activities concerning blocked users 2019-04-17 20:05:09 +00: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 54b82f236b Fix note count test 2019-04-17 15:03:17 +03:00
rinpatch 627e5a0a49 Merge branch 'develop' into feature/database-compaction 2019-04-17 12:22:32 +03:00
William Pitcock 750b369d04 activitypub: allow indirect messages from users being followed at a personal inbox 2019-04-16 18:31:12 +00:00
rinpatch 5d73dca064 Remove inReplyToStatusId 2019-04-15 11:50:36 +03:00
lain 36ec8d9694 ActivityPub: Fix specs. 2019-04-11 13:20:46 +02:00
lambda e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
Improve Transmogrifier.upgrade_user_from_ap_id/2

See merge request pleroma/pleroma!1019
2019-04-08 11:42:20 +00:00
Alexander Strizhakov 36c0a10fdf adding language tag 2019-04-08 11:03:10 +00:00
Egor Kislitsyn cfa6e7289f Improve Transmogrifier.upgrade_user_from_ap_id/2 2019-04-04 16:10:43 +07:00
lain 39bcf93007 Merge remote-tracking branch 'origin/develop' into fix-slow-relationships 2019-04-02 16:10:38 +02:00
lain fd07745d1b ActivityPub Utils: Greatly speed up the follow / block activity fetching. 2019-04-02 16:08:55 +02:00
Egor Kislitsyn 9a59c26619 replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)` 2019-04-02 17:47:52 +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
rinpatch 776bb5137f Fix muting reblogs tests 2019-03-27 13:43:43 +03:00
lambda ff3b09f6b3 Merge branch 'fix/ap-icon' into 'develop'
Do not federate instance avatar

Closes #759

See merge request pleroma/pleroma!977
2019-03-26 16:12:50 +00:00
lain 10a7a4a868 AP UserView: Refactor banner / avatar display code, add test. 2019-03-26 16:59:28 +01:00
eugenijm 568e348588 Increment replies_count on replies (MastoAPI) 2019-03-26 15:27:04 +03:00
William Pitcock 26b0c802c3 fix up missing announcements with preloads 2019-03-25 07:38:09 +00:00
William Pitcock 4a3dd86a55 tests: fix up activity collision test 2019-03-23 03:17:51 +00:00
William Pitcock 73efe95368 activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious) 2019-03-23 01:09:12 +00: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
kaniini 6d6f48d079 Merge branch 'feature/federated-flags' into 'develop'
Federated reports

See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
Karen Konou da53c079db Refactor to store user ap_id, add tests 2019-03-15 14:20:08 +01: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
kaniini 130fc9eae6 Merge branch 'fetch-posts-on-first-federation' into 'develop'
Fetch user's outbox posts on first federation with that user

Closes #131

See merge request pleroma/pleroma!907
2019-03-08 22:33:31 +00:00
Ekaterina Vaartis b775fded10 Add tests for fetch_ordered_collection 2019-03-08 16:28:40 +03:00
William Pitcock 3c5926fe91 tests: add regression test 2019-03-07 12:20:04 +00:00
rinpatch 992145e64c Merge branch 'bugfix/delete-activity-audience' into 'develop'
expand the audience of delete activities to all recipients of the deleted object

Closes #682

See merge request pleroma/pleroma!891
2019-03-07 11:31:08 +00:00
Karen Konou 28d5b40d0a Add handling of objects not in database 2019-03-05 23:15:22 +01:00
rinpatch 33c614bce0 Stop adresssing like activities to actor's follower collection on non-public posts 2019-03-04 18:09:58 +03:00
Karen Konou aab86698a5 Expand "to" of delete activities 2019-03-04 11:18:45 +01:00
kaniini c93479c6f5 Merge branch 'count-only-public-statuses' into 'develop'
Increment user note count only on public activities #703

See merge request pleroma/pleroma!884
2019-03-03 15:49:19 +00:00
lambda 9b63fda9c7 Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
[#675] Do not show DMs in mentions timeline

See merge request pleroma/pleroma!877
2019-03-03 11:13:59 +00:00
eugenijm c46950d3b1 Increment user note count only on public activities 2019-03-03 14:08:43 +03:00
rinpatch 1341ee650e [#675] Do not show DMs in mentions timeline 2019-03-01 09:37:29 +03:00
lain c4235f96bd Add `with_muted` param. 2019-02-27 16:37:42 +01:00
lain 9e0686efa6 Move visibility into own module. 2019-02-22 13:29:52 +01:00
KZ 7c722c08f5 Fix: Fixing an outbox related bug when local user activity is empty 2019-02-22 04:37:48 +00:00
William Pitcock e95dbecf3e tests: fix formatting 2019-02-20 20:49:10 +00:00
William Pitcock aa45674be6 tests: add test for fetching AP objects with application/json. 2019-02-20 20:45:09 +00:00
Egor bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
lain 9ae79bb71a Add test for muting functionality. 2019-02-20 13:47:44 +01:00
rinpatch d0a94f98e0 more tests for HellthreadPolicy 2019-02-17 14:33:44 +03:00
rinpatch 921571c19b Merge branch 'hellthread-filter-fix' into 'develop'
Hellthread filter fix

Closes #634

See merge request pleroma/pleroma!831
2019-02-15 13:18:35 +00:00
Karen Konou dca6bee2f7 Rename test, add check for follower collection when delisting 2019-02-15 13:43:14 +01:00
Karen Konou d943c90249 Add tests, change default config values, fix a bug 2019-02-15 12:47:50 +01:00
lambda ea2698beb7 Merge branch 'bugfix/activitypub-reserialization' into 'develop'
activitypub transmogrifier: fix reserialization edge cases

See merge request pleroma/pleroma!826
2019-02-14 19:54:16 +00:00
kaniini 19756d68f2 Merge branch 'fix/credo-issues-test' into 'develop'
Fix credo issues in ./test

See merge request pleroma/pleroma!808
2019-02-14 03:55:26 +00:00
William Pitcock e031cc6473 tests: update tests for totalItems leak fix 2019-02-14 03:22:54 +00:00
William Pitcock 64620d8980 activitypub: user view: do not expose oAuth endpoints for instance users 2019-02-14 02:41:21 +00:00
William Pitcock 889ad95a2a tests: add some reserialization tests based on IR differences 2019-02-14 00:59:18 +00:00
William Pitcock d54c483964 tests: add tests for endpoints 2019-02-13 19:48:24 +00:00
rinpatch 379d04692c Filter summary in keywordpolicy 2019-02-11 21:35:40 +03:00
Haelwenn (lanodan) Monnier 8bb7e19b38
test: de-group alias/es 2019-02-11 03:44:15 +01:00
rinpatch b05a341187 oof 2019-02-09 08:12:30 +03:00
rinpatch 9a23f8f3ea Add tests and fix a typo in docs 2019-02-08 20:23:26 +03:00
Mark Felder 74518d0b60 hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
This was a dirty regex replace which worked on my server
2019-02-06 22:34:44 +00:00
Maxim Filippov 16ce129e38 Split hide_network into hide_followers & hide_followings (fixed) 2019-02-03 21:55:04 +03:00
Ivan Tashkinov 3913b0196e [#582] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
Added tests.
2019-02-03 13:28:13 +03:00
kaniini 486749064f Revert "Merge branch 'feature/split-hide-network' into 'develop'"
This reverts merge request !733
2019-02-01 20:22:58 +00:00
kaniini 0a82a7e6d6 Merge branch 'feature/split-hide-network' into 'develop'
Split hide_network into hide_followers & hide_followings

See merge request pleroma/pleroma!733
2019-02-01 17:05:29 +00:00
href b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop'
[#534] Unreachable federation targets retirement

Closes #534

See merge request pleroma/pleroma!703
2019-02-01 09:14:35 +00:00
lain c53b96a024 Fix specs. 2019-01-30 19:45:31 +01:00
Ivan Tashkinov 92753b0cd9 [#534] Made federation push sender be determined basing on content instead of `referer` header. Updated tests. 2019-01-29 13:12:28 +03:00
Maxim Filippov 50d6183893 Split hide_network into hide_followers & hide_followings 2019-01-28 21:40:08 +03:00
Ivan Tashkinov d3f9e6f6fe [#534] Merged `upstream/develop`. 2019-01-28 15:39:14 +03:00
Ivan Tashkinov 1d2f41642c [#534] Various tweaks. Tests for Instances and Instance. 2019-01-28 15:25:06 +03:00
kaniini 5eb81d2c72 Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
MastodonAPI multi-hashtag

See merge request pleroma/pleroma!652
2019-01-27 12:45:50 +00:00
Haelwenn (lanodan) Monnier 5a84def6a6
Fix the logic in multi-hashtag TLs 2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier 4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests 2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier 499a4591a4
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null 2019-01-26 04:23:52 +01:00
Ivan Tashkinov d99650270b [#534] Federation reachability filtering tests. 2019-01-25 20:38:54 +03:00
kaniini 4c99b6d35a Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list

Closes #390

See merge request pleroma/pleroma!683
2019-01-25 05:19:32 +00:00
William Pitcock 13d72826df test: add anti-followbot policy tests 2019-01-24 09:50:40 +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
Haelwenn (lanodan) Monnier f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1 2019-01-21 08:00:38 +01:00
Haelwenn (lanodan) Monnier b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1 2019-01-21 07:49:59 +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 8d06be35e0 activitypub: utils: add determine_explicit_mentions() and tests 2019-01-20 02:27:48 +00:00
Maxim Filippov 651a1d64b5 Add current user to mentioned 2019-01-19 04:25:15 +03:00
William Pitcock 31517bec12 test: add regression test for to/cc clobbering 2019-01-18 22:32:01 +00:00
sxsdv1 868034375c Add likes to activitypub object representation
Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.
2019-01-12 20:24:41 +01:00
sxsdv1 581edd5a91 Add route to get object like activities 2019-01-12 20:24:38 +01:00
sxsdv1 36711e1c83 Handle client submitted activitypub like activity 2019-01-12 20:24:35 +01:00
sxsdv1 1eb7318831 Prepare all types objects before serialising
Activities returned from inbox can include other types of objects like
Article
2019-01-12 20:24:32 +01:00
kaniini e4afe1359b Merge branch 'activitypub-dereference-activity-id' into 'develop'
Support activity+json request for activity

See merge request pleroma/pleroma!641
2019-01-10 18:42:36 +00:00
kaniini 7f5efddd6e Merge branch 'feature/pinned-posts' into 'develop'
Pinned Statuses

Closes #440

See merge request pleroma/pleroma!636
2019-01-10 02:39:53 +00:00
lain 5027f82cde Add activity visibility index. 2019-01-09 16:45:09 +01:00
sxsdv1 20c0dd1e24 Support activity+json request for activity 2019-01-09 09:33:30 +01:00
Egor Kislitsyn 7b6c5f0a9d improve test readability 2019-01-08 16:01:35 +07:00
Egor Kislitsyn 63dbd87568 rename `post` to `status` 2019-01-08 15:25:50 +07:00
Egor Kislitsyn 380e9fba21 add pinned posts 2019-01-07 20:45:33 +07:00
sxsdv1 2d7da5f437 Don't crash on AP request for tombstone
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
2019-01-05 11:16:05 +01:00
sxsdv1 4e1cc2bab6 Implement delete activity 2019-01-01 23:20:43 +01:00
sxsdv1 551c3d9391 Split create activity specifics from update_outbox 2019-01-01 23:20:28 +01:00
sxsdv1 569bad8210 Create activity when client posts to outbox 2018-12-30 12:01:39 +01:00
sxsdv1 26dc2dddab Implement ActivityPub inbox view
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
2018-12-30 12:01:39 +01:00
sxsdv1 aa082ca7b6 Wire up stub routes for client calls of activitypub inbox/outbox
Code style: remove wrapping function of outbox
2018-12-29 22:22:03 +01:00
kaniini 3dc5f04976 Merge branch 'carrot-bullying' into 'develop'
Add some hard limits on inserted activities.

See merge request pleroma/pleroma!595
2018-12-29 11:46:06 +00:00
kaniini bee6acd51d Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
Create tombstone instead of object deletion

See merge request pleroma/pleroma!593
2018-12-27 19:37:55 +00:00
Vyr Cossont e4562105e7 Implement exclude_reblogs and include_rts 2018-12-26 21:38:00 -08:00
lain 5811e65e67 Add some hard limits on inserted activities. 2018-12-26 12:39:35 +01:00
Maxim Filippov f75f707f6c Revert Activity tombstones, add ObjectTombstone struct 2018-12-25 03:00:06 +03:00
Maxim Filippov 18a4cbb244 Capitalize "tombstone" 2018-12-24 20:09:18 +03:00
Maxim Filippov 0f412cf6e6 Create tombstone instead of object deletion 2018-12-24 02:25:36 +03:00
William Pitcock 3c08d229db tests: add legal boilerplate 2018-12-23 20:57:10 +00:00
William Pitcock 71f6d9f418 transmogrifier: significantly rework handling of peertube videos, add test 2018-12-23 13:31:08 +00:00
Maksim Pechnikov 89b3729afa fix warnings 2018-12-12 09:09:19 +03:00
lain 76d6b1c6ab Merge remote-tracking branch 'origin' into follower-hiding 2018-12-05 21:27:56 +01:00
Maksim Pechnikov dd8aee332c formatting the code 2018-12-04 17:48:55 +03:00
Maksim Pechnikov 5c6d47614d all tests passed 2018-12-04 17:44:15 +03:00
Maksim Pechnikov a9e4a97586 update test 2018-12-04 14:04:06 +03:00
Maksim Pechnikov 80bfdb4e7d update test 2018-12-04 14:04:06 +03:00
William Pitcock f85949cc69 object: factor out fetching functions into Pleroma.Object.Fetcher module 2018-12-04 04:52:09 +00:00
William Pitcock e8caecb5c7 object: move object containment out of transmogrifier into it's own module 2018-12-04 04:52:09 +00:00
William Pitcock fe000f82f8 tests: activitypub: fix broken test due to invalid child object 2018-12-04 04:52:09 +00:00
William Pitcock 4ca4c83871 tests: fix most remaining failures 2018-12-04 04:52:09 +00:00
lain 6be0ab1e55 Hide network in ap. 2018-12-02 17:35:32 +01:00
lain badbe2656c More fixes. 2018-11-27 18:12:03 +01:00
William Pitcock f6be980f4f activitypub: object view: avoid leaking private details 2018-11-17 22:30:53 +00:00
William Pitcock dfcfb184b1 activitypub: transmogrifier: make deletes secure 2018-11-17 21:22:57 +00:00
William Pitcock 55640c4804 tests: add a test to verify the general fake direction protection works in all cases 2018-11-17 20:31:20 +00:00
William Pitcock dc1d8e13b4 tests: add a testcase for user collision 2018-11-17 20:20:45 +00:00
William Pitcock 1a940cb46e tests: add tests for contain_origin_from_id() 2018-11-17 20:16:03 +00:00
William Pitcock b483ae0a72 tests: add a second spoofing variant 2018-11-17 18:25:32 +00:00
William Pitcock 9c8adfb6ef test: fix more test defects 2018-11-17 18:16:55 +00:00
William Pitcock d9cb081f07 tests: add additional spoofing tests 2018-11-17 18:12:11 +00:00
William Pitcock 2ab8e28728 transmogrifier tests: fix defective spoofing test 2018-11-17 18:11:46 +00:00
William Pitcock 69b8c0e299 tests: add test for internal data stripping 2018-11-10 12:24:25 +00:00
kaniini 99a8ef967e Merge branch 'tests/prismo-url-map' into 'develop'
Test that prismo url-map transforms into a string

See merge request pleroma/pleroma!414
2018-11-10 11:17:12 +00:00
lain 34bd411781 Unify json ld header handling. 2018-11-08 16:39:38 +01:00
lain 3b02fd9fb7 Small refactor. 2018-11-08 16:05:28 +01:00
href 7d328c658d
Small wrapper module around Application.get_env/put_env
Same API as the old Pleroma.Config
2018-11-06 16:00:48 +01:00
href 36ca3c1b3e
format 2018-11-06 15:17:29 +01:00
href 2bc924ba45
Get rid of Pleroma.Config in favor of Application
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
2018-11-06 15:12:53 +01:00
Haelwenn (lanodan) Monnier c5f26f3ce2
Test that prismo url-map transforms into a string 2018-11-01 11:30:50 +01:00
lain 1e9ced5af4 Test Relay, switch to runtime configuration. 2018-11-01 09:01:43 +00:00
William Pitcock 2ac13061af testsuite: formatting 2018-10-26 06:37:00 +00:00
William Pitcock 0d0c1dcf44 tests: add testsuite for broken thread filter 2018-10-26 06:35:06 +00:00
William Pitcock b1d1f9bc27 tests: add test for user inbox 2018-10-25 05:24:17 +00:00
William Pitcock d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs 2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor 2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier 2c820e10b8
transmogrifier_test: incoming notices with tag not being an array (kroeg) 2018-09-27 20:00:47 +02:00
William Pitcock 303af9ba4c tests: add regression tests 2018-09-01 23:33:10 +00:00
William Pitcock bc36d40bee tests: add a testcase for verifying that objects without a valid ID are always rejected 2018-08-23 01:25:27 +00:00
Haelwenn (lanodan) Monnier 74c74decf5
Basic peertube support. 2018-08-21 18:24:09 +02:00
kaniini 5fbb14f5ec Merge branch 'bugfix/federation-kroeg' into 'develop'
fix federation with kroeg

See merge request pleroma/pleroma!272
2018-08-16 15:20:15 +00:00
kaniini 38361e7b5e Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
Fix: Output repeats at ActivityPub outbox

Closes #191

See merge request pleroma/pleroma!175
2018-08-16 15:19:46 +00:00
William Pitcock 7fbcd4caaf test: add kroeg fixtures 2018-08-14 17:09:17 +00:00
hakabahitoyo 9c1b6f11c5 improve test 2018-07-21 02:57:56 +09:00
hakabahitoyo 908cefd84a debug 2018-07-21 02:19:20 +09:00
hakabahitoyo 9c2afb2e71 improve test 2018-07-21 01:44:35 +09:00
Haelwenn (lanodan) Monnier 24b5a75d09
Add test for Plume Articles 2018-07-12 23:08:28 +02:00
William Pitcock 8546551257 activitypub: switch to using x509 representation for public keys instead of pkcs#1 2018-07-12 03:30:22 +00:00
lambda be800d7936 Merge branch 'bugfix/block-follow-relationships' into 'develop'
fix follow relationship leaks when blocked

See merge request pleroma/pleroma!230
2018-06-19 09:42:45 +00:00
William Pitcock 3707a7fa42 tests: transmogrifier: ensure incoming blocks have the same effect as local blocks 2018-06-19 00:59:28 +00:00
William Pitcock a2c6778ce6 tests: add regression test for contentMap-only posts 2018-06-18 22:14:51 +00:00
lambda 8c7fdcb31b Merge branch 'feature/twitterapi-unrepeat' into 'develop'
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce

See merge request pleroma/pleroma!218
2018-06-14 07:19:36 +00:00
Francis Dinh 1555c66650 Add unretweet TwAPI endpoint and cleanup AP.unannounce 2018-06-13 21:33:36 -04:00