c3dd860a02
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
...
Fix for scheduled post with poll
Closes #2449
See merge request pleroma/pleroma!3294
4 years ago
8d2ea95402
Merge branch 'feature/2438-users-posts-total-count' into 'develop'
...
Feature/2438 users/instances posts total count
Closes #2438
See merge request pleroma/pleroma!3270
4 years ago
fb25231fbe
Add test for Answer presence into an authenticated /outbox
4 years ago
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
4 years ago
f1f773f2c7
Merge branch 'email-stub-in-verify-credentials' into 'develop'
...
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
4 years ago
d37d4106c6
Merge branch 'fix/majic-nits' into 'develop'
...
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
4 years ago
28d2917c3a
Merge branch 'develop' into fix/majic-nits
4 years ago
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
4 years ago
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
4 years ago
0dc68c157f
fix for scheduled post with poll
4 years ago
fdf1dfed56
only_remote -> remote renaming
4 years ago
77f0a0af7d
more tests and update for docs and changelog
4 years ago
2cb6dc5a3a
list timeline filtration by params
4 years ago
b6a72680e2
added only_media flag to home timeline
4 years ago
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
4 years ago
cf4765af40
[ #3213 ] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.
4 years ago
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
6fd4163ab6
[ #3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
4 years ago
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
4 years ago
380d0cce6b
[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
4 years ago
5fcab23aa3
Improve error message for ConfigDB
4 years ago
9272cef500
Switch to a build of Majic that does not try to fix extensions by default
4 years ago
60b4654038
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
...
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 .
4 years ago
bddb01bded
Add tests
4 years ago
793fc77b16
Add active user count
4 years ago
7f07871639
Merge branch 'chore/tests-use-clear_config' into 'develop'
...
Convert tests to all use clear_config instead of Pleroma.Config.put
See merge request pleroma/pleroma!3282
4 years ago
d4158e8bf0
added total
...
to the instance adminAPI endpoint
4 years ago
6806c03e85
added total
...
to the user statuses adminAPI endpoint
4 years ago
d7af0294e6
Merge branch 'service-worker-allowed-header' into 'develop'
...
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
4 years ago
e854c35e65
Convert tests to all use clear_config instead of Pleroma.Config.put
4 years ago
229acae6c3
Merge branch 'develop' into '2435-list-multiple-users'
...
# Conflicts:
# CHANGELOG.md
4 years ago
875fbaae35
support for expires_in/expires_at in filters
4 years ago
250e202098
Merge branch 'fix/missing-own_votes' into 'develop'
...
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
4 years ago
0b19534475
Merge branch 'develop' into docs/apache-config
4 years ago
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
4 years ago
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
6bfd497f4a
Include own_votes in the poll data
4 years ago
218c519606
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
4 years ago
80ccdb56f6
Make tag urls absolute
4 years ago
42e49529c2
Test URL formatting
4 years ago
0c485d5555
Improve description
4 years ago
7fcaa188a0
Allow to define custom HTTP headers per each frontend
4 years ago
133644dfa2
Ability to set the Service-Worker-Allowed header
4 years ago
c041e9c630
[ #3213 ] HashtagsTableMigrator: failures handling fix, retry function.
...
Changed default hashtags filtering strategy to non-aggregate approach.
4 years ago
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
dfc4cb6ebd
Special handling for unconfirmed users based on instance config no longer needed.
4 years ago
958a7f6ed0
Merge branch 'fix/reblog-api' into 'develop'
...
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
4 years ago
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
4 years ago
51d5951c02
Test that only author can reblog a private status
4 years ago
1b79dce7bc
Fix Reblog API
...
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
4 years ago
bdfd72630f
ListController: Fix being unable to add / remove users.
4 years ago
48b399cedb
[ #3213 ] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).
4 years ago
2c0fe2ea9e
Remove toggle_confirmation; require explicit state change
...
Also cosmetic changes to make the code clearer
4 years ago
d36182c088
Change user.confirmation_pending field to user.is_confirmed
4 years ago
ebd7d1365b
Make setting user activation status explicit
4 years ago
860b5c7804
Change user.deactivated field to user.is_active
4 years ago
f7e59c28ed
Change user.approval_pending field to user.is_approved
4 years ago
c4b74c9c3f
Linting.
4 years ago
39f3683a06
Pbkdf2: Use it everywhere.
4 years ago
e350898828
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
aff83eb7c1
Linting
4 years ago
9106048c61
Password: Replace Pbkdf2 with Password.
4 years ago
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
4 years ago
e1a547d7d3
ChatMessages: Fix pagination headers.
...
They used to contain the path parameter `id` as query param,
which would break the link.
4 years ago
5822338f3a
Merge branch 'guppe-example' into 'develop'
...
ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243
4 years ago
80167e62dd
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
...
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
4 years ago
3342f6a7ef
Backups: render ID in API
4 years ago
bd788c0939
ActivtityPub Test: Add example for guppe actor
4 years ago
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
4 years ago
4d56aca904
Merge branch 'adminapi-user-email' into 'develop'
...
AdminAPI: return user email
See merge request pleroma/pleroma!3240
4 years ago
9f6fa5877f
Add AdminAPI.AccountViewTest
4 years ago
20af025c65
AdminAPI: return user email
4 years ago
48cd336a72
allow external emoji
4 years ago
f9090e00e6
Add test to validate URLs to custom emojis are properly encoded
4 years ago
20a269ed69
Merge branch 'fix/pagination-regression' into 'develop'
...
Do not try to guess which pagination we need by the existence of an :offset param.
Closes #2399
See merge request pleroma/pleroma!3230
4 years ago
e802b48d55
User: Use ObjectID type to validate also-known-as field
4 years ago
f0e6cff583
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
4 years ago
bea69853a2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
4 years ago
95a0ae8a35
AccountControllerTest: Fix test logic
4 years ago
d44850d7a5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
4 years ago
8e5904daa5
SideEffects.DeleteTest: asyncify.
...
Replace Mock with Mox, mock out Logger.
4 years ago
0e93775ed0
Add test to validate profile pagination works with keyset
4 years ago
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
4 years ago
0ec7e9b8e9
AdminAPI: return id for moderation log entries
4 years ago
afe9c152ab
Merge branch 'fix/reports-ordering' into 'develop'
...
Do not reverse order of reports. We want newest ones sorted to the top.
Closes #2364
See merge request pleroma/pleroma!3225
4 years ago
e4791258d4
Ensure newest report is returned first in the list
4 years ago
11d40e92b7
Render AKAs in Actor endpoints
4 years ago
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
4c5f75f4e9
Support pagination in AdminAPI for user statuses
4 years ago
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
4 years ago
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
4 years ago
7bfb041658
insreasing test coverage for StealEmojiPolicy
4 years ago
4134abef63
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
cbb19d0e18
[ #3213 ] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to `hashtags` table.
4 years ago
e4f1d8f48c
Merge branch 'cachex-test' into 'develop'
...
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
4 years ago
e369b1306b
Added Hashtag entity and objects-hashtags association with auto-sync with `data.tag` on Object update.
4 years ago
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
4 years ago
ee221277b0
Encapsulation of tags / hashtags fetching from objects.
4 years ago
ab633e51ab
Linting
4 years ago
5db1e6c8d3
Pipeline test: Switch from Mock to Mox.
...
Speeds up the test and makes it possible to run async.
4 years ago
0ef0aed205
Tests: Add a helper method to reduce sleeping times in test.
...
This will 'time travel', i.e. change the inserted_at and update_at
fields of the object in question. This is used to backdate things
were we used sleeping before to ensure time differences.
4 years ago
ba19975838
Linting
4 years ago
9d5ce82221
Test: More async/sync tweaks.
4 years ago
9ba60f70d2
Tests: Make as many tests as possible async.
...
In general, tests that match these criteria can be made async:
- Doesn't use real Cachex.
- Doesn't write to the Config / Application Environment.
- Uses Mock. Using Mox is fine.
- Uses the streamer.
4 years ago
509f82e4d6
Add test for subscribe_address in JSON WebFinger response
4 years ago
95a9bdfc37
Tests: Use NullCache for async tests.
...
Caching can't work in async tests, so for them it is mocked to a
null cache that is always empty. Synchronous tests are stubbed
with the real Cachex, which is emptied after every test.
4 years ago
b4b68b71fc
Tests: Remove unneeded explicit cachex use.
...
Only use cachex when we're actually testing it.
4 years ago
80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
8b8c317c0f
Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'
...
Fix mastoapi ws posts dropping
Closes #2336
See merge request pleroma/pleroma!3198
4 years ago
6bb4f4e172
Merge branch 'support/2255_posix_errors' into 'develop'
...
[#2255 ] added error messages for posix error code
See merge request pleroma/pleroma!3138
4 years ago
cebe3c7def
Fix for dropping posts/notifs in WS when mix task is executed
...
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
4 years ago
f1c67115d8
Upgrade linkify, test URL issues, fixes #2026 #1942
4 years ago
f8c93246d6
Refactor Earmark code, fix tests
4 years ago
c4f4e48e57
Remove some N/A tests
4 years ago
e9e17e5df3
Upgrade Earmark to v1.4.10
4 years ago
7fff9c1bee
Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).
4 years ago
477c6c8e55
Merge branch 'auth-improvements' into 'develop'
...
Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112
4 years ago
1436a2fa2d
Merge branch 'stream-follow-updates' into 'develop'
...
Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183
4 years ago
c8e7ace812
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
...
# Conflicts:
# CHANGELOG.md
4 years ago
ed76323776
Merge branch 'feature/configdb-mix-tasks' into 'develop'
...
Add mix tasks to give additional ConfigDB recovery and debugging options
See merge request pleroma/pleroma!3174
4 years ago
e00c667145
[ #3174 ] Refactoring: ConfigDB fetching functions, ConfigDB tests.
...
Minor fixes.
4 years ago
a010c5b16a
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
e9859b68fc
[ #3112 ] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
4 years ago
6adad96c79
Merge branch 'issue/2256' into 'develop'
...
[#2256 ] added subject actor to moderation log
See merge request pleroma/pleroma!3164
4 years ago
c9afb350e7
Document follow relationship updates and cleanup
4 years ago
5d15486098
SideEffects: fix test
4 years ago
35ba48494f
Stream follow updates
4 years ago
fc9ebe5073
Search tests: Use on_exit for restoring `persistent_term` state
...
Otherwise if the assertion failed, the code below which resets the
state would never be reached
4 years ago
d50a3345ae
[ #3112 ] Allowed revoking same-user token from any apps. Added tests.
4 years ago
50e47a215f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
4 years ago
6aadb1cb40
digest algorithm is taken from header
4 years ago
62993db499
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
12a5981cc3
Session token setting on token exchange. Auth-related refactoring.
4 years ago
3283d0805f
Use Jason instead of Poison in tests
4 years ago
67b15cc033
Search: Save detected pg version in a persistent term.
4 years ago
f9a4cf2097
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
489b12cde4
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
ccc2cf0e87
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
4 years ago
30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
ecd1ef8cb5
Merge branch 'fix/2302-report-duplicates' into 'develop'
...
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
4 years ago
8532325d65
SearchController Test: Fix test.
4 years ago
79a509ee61
Merge branch '2301-users-search-discoverability-fix' into 'develop'
...
[#2301 ] Proper handling of User.is_discoverable
Closes #2301
See merge request pleroma/pleroma!3162
4 years ago
cd1b4155d5
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
...
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
4 years ago
66f411fba0
added subject actor to moderation log
4 years ago
b27d8f7437
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
...
# Conflicts:
# CHANGELOG.md
4 years ago
5e04f4156c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
e164c37139
[ #2301 ] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
4 years ago
c8d11c3064
Merge branch '2317-old-reset-tokens' into 'develop'
...
Resolve "Don't allow old password reset tokens"
Closes #2317
See merge request pleroma/pleroma!3160
4 years ago
783fa797bb
SearchController Test: Fix test
4 years ago
46dab37351
little fix
4 years ago
11e0d5f9ac
Password Resets: Don't accept tokens above a certain age.
...
By default, one day
4 years ago
4aaffe3a10
log capture
4 years ago
be0b874e1d
fix for mastodon forwarded reports
4 years ago
a840aefda8
formatting
4 years ago
e2bf6b1f7e
fix for forwarded reports
4 years ago
6669ac5bf7
Merge branch 'develop' into 'hide-muted-reactions'
...
# Conflicts:
# CHANGELOG.md
4 years ago
aae669d05e
Merge branch 'fix/webpush-and-emojireact' into 'develop'
...
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
4 years ago
6b32e1de23
Merge branch 'frontend-admin-api' into 'develop'
...
Add an API to manage frontends
Closes #2238
See merge request pleroma/pleroma!3108
4 years ago
9c5d1cb9ed
fix tests
4 years ago
415481a4d9
Add test for POST when push is disabled
...
Also group together the tests verifiying failure when disabled
4 years ago
3eaa5335c9
Revert adding extra alert types here
4 years ago
d9732fb7d3
Fix incorrect test description
4 years ago
ff7a4b6aa2
Test that we ignore invalid subscription alert types separately.
4 years ago
30f140e570
Ensure all supported push notification subscription alert types are tested
4 years ago
499faa82f6
Synchronize reaction notification text with PleromaFE's style
4 years ago
67a6abd071
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
4 years ago
3ce11b830e
Add capability for emoji reaction push notifications
4 years ago
bb9650f3c2
FrontendController: Return error on installation error.
4 years ago
d33b9e7b33
Merge branch 'remove/fedsockets' into 'develop'
...
Remove FedSockets
See merge request pleroma/pleroma!3155
4 years ago
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
4 years ago
d48dbfab2b
Merge remote-tracking branch 'origin/develop' into hide-muted-reactions
4 years ago
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
2c55f7d7cb
Remove FedSockets
...
Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
are just too overkill for what they were trying to accomplish, which is
reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
would approve the descision to remove them as well,
therefore I am submitting this patch.
4 years ago
61f86774d1
Merge branch 'chores/note-handling-move' into 'develop'
...
Chores/note handling move
See merge request pleroma/pleroma!3122
4 years ago
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
81293e5aad
ActivityPubController: Don't return local only objects
4 years ago
b1466661eb
Use absolute URLs to thumbnail and background in /api/v1/instance
4 years ago
e4b202d905
added test
4 years ago
fb41bd1a85
Hide reactions from muted and blocked users
4 years ago
e1d25bad0c
fix tests
4 years ago
9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
36ec604521
added test
4 years ago
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
4 years ago
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
4 years ago
6ca709816f
Fix object spoofing vulnerability in attachments
...
Validate the content-type of the response when fetching an object,
according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects .
content-type headers had to be added to many mocks in order to support
this, some of this was done with a regex. While I did go over the
resulting files to check I didn't modify anything unrelated, there is a
possibility I missed something.
Closes pleroma#1948
4 years ago
99bc175f02
Merge branch 'title-injection-change' into 'develop'
...
Title injection change
See merge request pleroma/pleroma!3132
4 years ago
966663c3f8
Fix tests for other attachment types
4 years ago
2254e5e595
Render blurhashes in Mastodon API
4 years ago
6fd72e9e85
Ingest blurhash for attachments if they were federated
4 years ago
d26a449396
Change endpoint path
4 years ago
435bf1f945
Remove FrontendInstallerWorker
4 years ago
631def2df2
RedirectController: Don't replace title, but inject into the meta
4 years ago
08cbd655d1
Merge branch 'develop' into frontend-admin-api
4 years ago
0118ccb53c
Add `local` visibility
4 years ago
3cd7ea693f
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
...
Config descriptions for custom MRF policies
Closes #2222
See merge request pleroma/pleroma!3128
4 years ago
8d218ebaf5
Moving some background jobs into simple tasks
...
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
4 years ago
f97f24b067
making credo happy and test fix
4 years ago
feld