95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
5 years ago
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
39f99dc6cd
Merge branch 'develop' into support/tests
5 years ago
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.
5 years ago
8cbad5500c
add tests for activity_pub/utils.ex
5 years ago
dd017c65a4
[ #1149 ] Refactored Oban workers API (introduced `enqueue/3`).
5 years ago
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
00abe099cd
added tests for ActivityPub.like\unlike
5 years ago
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
5 years ago
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
5 years ago
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
5 years ago
5171aa5b4d
Refactor check_actor_is_active
5 years ago
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
5 years ago
a4a3e3becd
Hide muted theads from home/public timelines unless `with_muted` is set
5 years ago
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
5 years ago
2b94ae3b39
Do not check if actor is active when deleting a user
5 years ago
bd5ad0af78
Cache follow state
5 years ago
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
e457fcc479
Add `:max_remote_account_fields` config option
5 years ago
5c35d2f1d8
Merge branch 'preload-user-timelines' into 'develop'
...
Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563
5 years ago
8202f1634a
Preload thread mutes/bookmarks in user_statuses
5 years ago
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.
5 years ago
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
5 years ago
dfae61c25c
Fix deactivated user deletion
5 years ago
73d8d5c49f
Stop depending on the embedded object in restrict_favorited_by
5 years ago
8b2fa31fed
Handle MRF rejections of incoming AP activities
5 years ago
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
5 years ago
b93498eb52
constants: add as_public constant and use it everywhere
5 years ago
41e0304757
Merge branch 'develop' into feature/hide-follows-remote
5 years ago
03471151d6
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
5 years ago
196cad46f3
Resolve merge conflicts
5 years ago
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
739bbe0d3b
security: detect object containment violations at the IR level
...
It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers. OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.
5 years ago
0c2dcb4c69
Add follow information refetching after following/unfollowing
5 years ago
183da33e00
Add tests for fetch_follow_information_for_user and check object type
...
when fetching the page
5 years ago
d06d1b751d
Use atoms when updating user info
5 years ago
e5b850a991
Refactor fetching follow information to a separate function
5 years ago
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
5 years ago
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
5 years ago
f8786fa6f2
adding following_address field to user
5 years ago
2d2b50ccca
Send and handle "Delete" activity for deleted users
5 years ago
f2c03425b0
Broadcast conversation update when DM is deleted
5 years ago
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
1e7bb69a95
update ActivityPub#fetch_activities_query
5 years ago
0acfcf6c52
update ActivityPub#fetch_activities_query
5 years ago
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
rinpatch