Maksim Pechnikov
2c40c8b4a2
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
50f5a92021
fix not being able to pin polls
5 years ago
rinpatch
983a87175e
mastodon API: do not sanitize html in non-html fields
5 years ago
rinpatch
c27d1d65bf
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
...
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
5 years ago
rinpatch
5b62acf6e9
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
lain
a0d9d42eaa
Emoji Reactions: Actually use the validation.
5 years ago
feld
e2f2602fdc
Merge branch 'emoji-api-errors' into 'develop'
...
Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161
5 years ago
rinpatch
263abe3ba5
Merge branch 'emoji-reactions-reacted' into 'develop'
...
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
5 years ago
Haelwenn
946de2299c
Merge branch 'fix-streaming-reblog' into 'develop'
...
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
5 years ago
Alexander Strizhakov
e7fee0d6fa
emoji api error on not writable dir
5 years ago
lain
7a60cd91ff
Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog
5 years ago
lain
e2e9299b8e
Streamer Tests: code readability improvements
5 years ago
lain
b3a877d6c9
Emoji Reactions: Correctly handle deleted users
5 years ago
lain
a802e07241
Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
Alexander Strizhakov
1f4fbe9d98
title parse improvement
5 years ago
Maksim Pechnikov
ba5e8a6444
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
lain
cedee2793d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
5 years ago
lain
2c121b2623
Merge branch 'fix/1524-link_preview' into 'develop'
...
Meta tags parser respects first title tag
Closes #1524
See merge request pleroma/pleroma!2157
5 years ago
Alexander Strizhakov
7bd4c14581
meta tag parser respect first title header
5 years ago
lain
e816edbb2f
Update streamer_test.exs
5 years ago
lain
77f24525ca
Streamer: Correctly handle reblog mutes
5 years ago
Maksim Pechnikov
02c3dd2e3d
update ecto
5 years ago
Maksim Pechnikov
be926863a8
fix test
5 years ago
Maksim Pechnikov
bcffa662dc
Merge branch 'develop' into feature/tag_feed
5 years ago
Hakaba Hitoyo
dabd535e43
Remove user recommendation by third party engine
5 years ago
Maksim Pechnikov
e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
bfc70fdf29
Merge branch 'develop' into issue/1383
5 years ago
Mark Felder
d770cffce0
Merge branch 'develop' into issue/1280
5 years ago
Alexander Strizhakov
e93cc561cd
restarting pleroma from outside application
5 years ago
Ivan Tashkinov
86e4d23acb
[ #1505 ] Background fetching of incoming activities' `replies` collections.
5 years ago
Maksim Pechnikov
99c0a11c58
added atom feed
5 years ago
Maksim Pechnikov
055edd3d72
Merge branch 'develop' into feature/tag_feed
5 years ago
rinpatch
0fceeb44b3
Merge branch 'emoji-reaction-sanity-check' into 'develop'
...
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
5 years ago
lain
347f3ed2c6
Emoji reactions: Change api format once more
5 years ago
lain
34fc0ca053
Emoji reactions: Add sanity checks for the cache
5 years ago
Maksim Pechnikov
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov
5fc2fa8908
Merge branch 'develop' into issue/1383
5 years ago
Haelwenn
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
5 years ago
Mark Felder
ae78059ff4
Merge branch 'develop' into features/remote-follow-userpage-redirect
5 years ago
lain
615b72238e
Notifications: Add emoji reaction notifications
5 years ago
Ivan Tashkinov
cf96c40057
[ #1505 ] Added Mastodon-compatible `replies` collection to Note federated representation.
5 years ago
Maksim Pechnikov
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
feld
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
5 years ago
lain
dd3fc50ea4
Emoji reactions: Change cache and reply format
5 years ago
Alexander Strizhakov
d5f8a88a37
support for updating env after settings deletion
5 years ago
Alexander Strizhakov
32a643a159
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov
b8d5c09f48
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
5ea8596448
Merge branch 'develop' into feature/tag_feed
5 years ago
Haelwenn (lanodan) Monnier
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
5 years ago
rinpatch
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
5 years ago
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov
dcae5914d1
fix for db key
5 years ago
Maksim Pechnikov
41e2332007
Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov
6e88a7e591
exclude blocked user posts from search results
5 years ago
lain
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
Ivan Tashkinov
ca3b4de2c9
[ #1521 ] AdminApiControllerTest: fixed create report test (OAuth).
5 years ago
rinpatch
00d08c9231
Merge branch 'favoritng-responses' into 'develop'
...
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
5 years ago
lain
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
lain
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
5 years ago
lain
2199d63ddc
StatusControllerTest: Fix typo
5 years ago
lain
42ea480e95
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
...
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
5 years ago
lain
510776ba31
CommonAPI: Don't error out on double favs/repeats
5 years ago
lain
c814f22030
Merge branch 'fix-admin-api-scope' into 'develop'
...
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
5 years ago
lain
5fddf988ea
Pleroma API: `emoji_reactions_by` does not need authorization
5 years ago
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5
5 years ago
Alexander Strizhakov
efb8ef5abe
releases support
5 years ago
Alexander Strizhakov
e699861690
full update for some subkeys
5 years ago
Alexander Strizhakov
89e93fb33f
return db key on update requests
5 years ago
Alexander Strizhakov
7676ed8239
some clean up
5 years ago
Maksim Pechnikov
108a39c876
updated error messages for authentication process
5 years ago
Alexander Strizhakov
60ba2339a2
saving to DB only added by user settings
5 years ago
Alexander Strizhakov
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
5 years ago
Maksim Pechnikov
a5db044e57
Merge branch 'develop' into feature/tag_feed
5 years ago
Ivan Tashkinov
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
lain
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Alexander Strizhakov
59ba5c80b9
little cleanup
5 years ago
Egor Kislitsyn
023b7f605b
Fix notification controller test
5 years ago
Egor Kislitsyn
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
Maksim Pechnikov
c9f45edeac
Merge branch 'develop' into feature/tag_feed
5 years ago
Alexander Strizhakov
a9c7cd341b
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov
0d331f3d23
compilation warnings fix
5 years ago
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
feld
bb5862ea2f
Merge branch 'issue/1354' into 'develop'
...
[#1354 ] fix remote follow
See merge request pleroma/pleroma!2079
5 years ago
Mark Felder
e64059d218
Assign token that can write to follows
5 years ago
Mark Felder
2f5b8fbeb3
Merge branch 'develop' into issue/1354
5 years ago
feld
ea4a462858
Merge branch 'issue/1487' into 'develop'
...
[#1487 ] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
5 years ago
Alexander Strizhakov
1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov
d933fd3d61
more renamings
5 years ago
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
5 years ago
Ivan Tashkinov
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
Alexander Strizhakov
88a16bb9fc
deep merge in config update
5 years ago
Alexander
c841174de8
flag for delete fix
5 years ago
Alexander
0b02040327
little fixes and typos fix
5 years ago
Alexander
9c1f3bfeff
fixes for logger backends
5 years ago
Alexander
063ab6d911
logger backends fix
5 years ago
Alexander
583cee4607
parsing proxy url setting
5 years ago
Alexander
fea734ca70
errors on endpoints
5 years ago
Alexander
5cacb988b9
partially settings update
5 years ago
Alexander
0656816c77
tests for setttings without an explicit key
5 years ago
Alex S
2753285b77
config editing through database
5 years ago
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
Maksim Pechnikov
fa7d8e77e6
fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
Ivan Tashkinov
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Maksim Pechnikov
933dc12043
added code of mr#2067
5 years ago
Maksim Pechnikov
385356aad0
fix oauth scopes for AdminApi#reports_update
5 years ago
Maksim Pechnikov
969769730e
update tests
5 years ago
Maksim Pechnikov
bdd71669da
update test
5 years ago
Maksim Pechnikov
5b84156013
moved remote follow in separate controller
5 years ago
Maksim Pechnikov
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
Maxim Filippov
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
5 years ago
Mark Felder
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
5 years ago
feld
a54aa5af43
Merge branch 'feature/status-counts-by-scope' into 'develop'
...
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
5 years ago
Ivan Tashkinov
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Ivan Tashkinov
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
5 years ago
Egor Kislitsyn
34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
Egor Kislitsyn
432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
Maxim Filippov
404a9ccb9a
Stats: return status counts by scope
5 years ago
Maksim Pechnikov
b53573a837
add tag feeds
5 years ago
Thomas Citharel
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
5 years ago
Egor Kislitsyn
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
Maxim Filippov
45180d4c60
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated
5 years ago
Maksim Pechnikov
a879c396bb
Merge branch 'develop' into feature/tag_feed
5 years ago
rinpatch
eae65e3216
formatting
5 years ago
rinpatch
6ffbfdeeb2
tests: significantly reduce streamer timeout
...
there is no reason IPC between two processes on the same node should
take 4 seconds
5 years ago
rinpatch
137a3d220b
tests: remove a useless 1 second sleep
...
there is no need to wait for the task to finish, it will be deleted
when the transaction is aborted anyway.
5 years ago
rinpatch
814a99c80f
tests: remove a useless 3 second sleep
...
the ids favs use are accurate down to a microsecond, there is no need
for it
5 years ago
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
Maxim Filippov
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
5 years ago
Ivan Tashkinov
81b05340e9
[ #1427 ] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
...
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
5 years ago
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
Mark Felder
9ef912aecf
Merge branch 'develop' into issue/1411
5 years ago
Sadposter
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
Sadposter
5abee19b63
make analysis happy
5 years ago
Sadposter
19d228cc58
modify SQL to include followed-but-domain-blocked activities
5 years ago
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
rinpatch
37c34ccec3
Merge branch 'fix/prefer-url-over-search' into 'develop'
...
status search: prefer the status fetched by url over other results
See merge request pleroma/pleroma!2050
5 years ago
rinpatch
f4b7f32d51
status search: prefer the status fetched by url over other results
5 years ago
Maksim Pechnikov
2b821036c4
Merge branch 'develop' into issue/1383
5 years ago
lain
b3c80b8404
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
...
Fix exclude_visibilities filter for followers-only Like notifications
See merge request pleroma/pleroma!1957
5 years ago
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
5 years ago
Maksim Pechnikov
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
5 years ago
rinpatch
29a3f70cba
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
...
ActivityPub: For user timelines, respects blocks.
Closes #1463
See merge request pleroma/pleroma!2041
5 years ago
Maxim Filippov
a7f77785c2
Implement report notes destruction
5 years ago
Ivan Tashkinov
1770602747
[ #1427 ] Extra check that admin OAuth scope is used by admin. Adjusted tests.
5 years ago
Ivan Tashkinov
40e1817f70
[ #1427 ] Fixes / improvements of admin scopes support. Added tests.
5 years ago
rinpatch
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
5 years ago
lain
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
5 years ago
Maxim Filippov
08c89fd2b8
Fix incorrect report count
5 years ago
Maksim Pechnikov
22fc271e23
init tag feed
5 years ago
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
5 years ago
rinpatch
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
5 years ago
rinpatch
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
5 years ago
lain
67d8df04a4
Merge branch '1335-user-api-id-fields-relations' into 'develop'
...
[#1335 ] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
5 years ago
feld
d0bd4348b3
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
...
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
5 years ago
Maksim Pechnikov
3fe7a1fd35
Merge branch 'develop' into issue/1342
5 years ago
lain
1993d7096d
Validators: Add a type for the datetime used in AP.
5 years ago
Maksim Pechnikov
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
e21afdb7c7
Merge branch 'develop' into issue/1411
5 years ago
Egor Kislitsyn
d4953474ac
Merge branch 'develop' into improve-move-notificaions-api
5 years ago
Maxim Filippov
4453a9cb73
Add failing test, which exposes a bug
5 years ago
Maksim Pechnikov
3c3bba0b7c
fix ScheduledActivity
5 years ago
Ivan Tashkinov
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
lain
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
Maksim Pechnikov
680e071dba
Merge branch 'develop' into issue/1383
5 years ago
lain
24599c519f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit
5 years ago
Maksim Pechnikov
ed7f850ad2
fix test
5 years ago
lain
aa97fe8f17
ChatChannel: Ignore messages that are too long.
5 years ago
Maksim Pechnikov
29a98b86b7
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
652cc6ba4b
updated ScheduledActivity
5 years ago
Maxim Filippov
4b60d41db9
Add report notes
5 years ago
Egor Kislitsyn
624e720aa4
Add `with_move` query param to the notifications API
5 years ago
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
5 years ago
Maksim Pechnikov
88f7cf51d4
Merge branch 'develop' into issue/1411
5 years ago
kPherox
1915b23e72
test missing first field
5 years ago
Ivan Tashkinov
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
5 years ago
Maksim Pechnikov
04a8ffbe84
added privacy option to push notifications
5 years ago
Maksim Pechnikov
a52da55eb9
added User.NotificationSetting struct
5 years ago
Maksim Pechnikov
b7c449118b
Merge branch 'develop' into issue/1383
5 years ago
lain
8627fb0bb5
Merge branch 'cleanup-tests-output' into 'develop'
...
Cleanup tests output
See merge request pleroma/pleroma!2018
5 years ago
Egor Kislitsyn
c4b468a95b
Cleanup tests output
5 years ago
Maxim Filippov
fcabcab443
Fetch account from report, not from status (it might be deleted)
5 years ago
Maxim Filippov
5135656f57
Handle reopened reports with deleted statuses
5 years ago
lain
50b152766f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
5 years ago
Egor Kislitsyn
f595cfe623
Remove User.user_info/2
5 years ago
Egor Kislitsyn
1fc28a4b44
Add a view for the move notification
5 years ago
Maksim Pechnikov
ac3abb5414
moved Pleroma.Stats to Oban Periodic jobs
5 years ago
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
5 years ago
Maxim Filippov
5869a43fe7
Fix tests
5 years ago
Maxim Filippov
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
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
5 years ago
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)
5 years ago
rinpatch
4b10804f21
OStatus controller: don't serve json at /notice/, redirect instead
5 years ago
rinpatch
02f7383891
ActivityPub controller: do not render remote users
5 years ago
Maxim Filippov
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov
2b341627da
Admin API: Render whole status in grouped reports
5 years ago
lain
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
5 years ago
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
5 years ago
lain
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
5 years ago
Ivan Tashkinov
4f88b1b435
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
Egor Kislitsyn
63711258ce
Fix sporadically failing test
5 years ago
Ivan Tashkinov
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
Maksim Pechnikov
708fd234bd
fix order favorites activites
5 years ago
Maxim Filippov
b88dbc17c8
Fix tests
5 years ago
Maxim Filippov
46eb160135
AdminAPI: Confirm user account, resend confirmation email
5 years ago
Maksim Pechnikov
7d727dbfec
added test
5 years ago
Ivan Tashkinov
3aaf3aa2c2
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
kaniini
81cba405af
Merge branch 'nodeinfo-fields-limit' into 'develop'
...
Add fieldsLimit to metadata of nodeinfo
See merge request pleroma/pleroma!1983
5 years ago
Maksim Pechnikov
b9041c2097
added recount unread notifications to markers
5 years ago
Ivan Tashkinov
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
kPherox
c9a06b14ab
Add test
5 years ago
Ariadne Conill
7c59bc9ef9
fix credo
5 years ago
Ariadne Conill
5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
5 years ago
Maxim Filippov
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
Maxim Filippov
30af5da330
Admin API: list all statuses from a given instance
5 years ago
feld
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
5 years ago
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
rinpatch
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
5 years ago
Phil Hagelberg
3c60adbc1f
Support redirecting by activity UUID in static FE as well.
5 years ago
Phil Hagelberg
0867cb083e
Support redirecting by object ID in static FE.
...
This matches the behavior of pleroma-fe better.
Fixes #1412 .
5 years ago
Phil Hagelberg
62f3a93049
For remote notices, redirect to the original instead of 404.
...
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.
This new redirecting behavior should improve that situation.
5 years ago
Egor Kislitsyn
27cd1374e3
Add a notification for Move activities
5 years ago
Egor Kislitsyn
e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
eugenijm
f86a7d5d8b
Fix exclude_visibilities filter for followers-only Like notifications
5 years ago
feld
e27d78e768
Merge branch 'nodeinfo-federation-enabled' into 'develop'
...
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
5 years ago
kaniini
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
href
b39b49cc14
report federating status in nodeinfo
5 years ago
lain
1ca7b877a1
Merge branch 'iss-1376' into 'develop'
...
Check client and token in GET /oauth/authorize
See merge request pleroma/pleroma!1940
5 years ago
Maxim Filippov
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Alexander
6a4201e0b4
fix for migrate task
5 years ago
Ivan Tashkinov
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
5 years ago
lain
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maksim Pechnikov
9d0b989521
add subject to atom feed
5 years ago
Phil Hagelberg
6ef8049664
Add changelog entry, cheatsheet docs, and alphabetize.
5 years ago
Phil Hagelberg
ef7c3bdc7a
Add some further test cases.
...
Including like ... private visibility, cos that's super important.
5 years ago
Phil Hagelberg
2bf592f5dc
Add tests for static_fe controller.
5 years ago
lain
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Maxim Filippov
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov
7258db023e
Support old flag format
5 years ago
eugenijm
7888803ffe
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
5 years ago
Maxim Filippov
f171095960
Grouped reports with status data baked in
5 years ago
AkiraFukushima
e1fc6cb78f
Check client and token in GET /oauth/authorize
5 years ago
lain
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
lain
faced6236b
NoteValidator: Add very basic validator for Note objects.
5 years ago
lain
3d1b445cbf
Object Validators: Extract common validations.
5 years ago
Maxim Filippov
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
5 years ago
Maxim Filippov
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maksim Pechnikov
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
Maksim Pechnikov
ff6c727739
Merge branch 'develop' into issue/1276
5 years ago
eugenijm
ed29be24cb
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
5 years ago
lain
a304a2a845
Merge branch 'transmogrifier-test-errors' into 'develop'
...
capture test log where errors are expected
See merge request pleroma/pleroma!1915
5 years ago
Steven Fuchs
5271bbcf11
add missing tesla mocks
5 years ago
lain
556da92902
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
...
Store status data inside flag activity
See merge request pleroma/pleroma!1849
5 years ago
rinpatch
8dd7c099a7
Merge branch 'bugfix/streamer-follows' into 'develop'
...
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
5 years ago
kaniini
74135e1318
Merge branch 'feature/omit-relay-user' into 'develop'
...
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
5 years ago
Ariadne Conill
4bf942583f
streamer: use direct object for filter checks when there is no valid child object in an activity
...
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
5 years ago
Maxim Filippov
743b622b7b
Force password reset for multiple users
5 years ago
Maksim Pechnikov
1b3a942a84
fix format
5 years ago
Maxim Filippov
6f9d3d30fa
AdminAPI: Omit relay user from users list
5 years ago
Mark Felder
fcea6a9d2c
Merge branch 'develop' into feature/fast_sanitize
5 years ago
Maksim Pechnikov
209319c8d2
update marker api
5 years ago
Egor Kislitsyn
61fc739ab8
Handle "Move" activity
5 years ago
rinpatch
ae59b38203
Rip out the rest of htmlsanitizeex
5 years ago
Maksim Pechnikov
b27a92e8fa
Merge branch 'develop' into issue/1276
5 years ago
kPherox
c2f2d7bcf6
Add test follow activity for locked account
5 years ago
rinpatch
08f6837065
Switch from HtmlSanitizeEx to FastSanitize
5 years ago
stwf
56e42602b0
capture where errors are expected
5 years ago
Egor Kislitsyn
4270861085
Merge branch 'develop' into feature/move-activity
5 years ago
lain
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
5 years ago
Maxim Filippov
8282b6ac3d
Make sure incoming flags are updated with status data
5 years ago
Maxim Filippov
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
5 years ago
Maxim Filippov
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
5 years ago
Egor Kislitsyn
b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
stwf
5329b361ec
fix test
5 years ago
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Maksim Pechnikov
99cf1ef9be
Merge branch 'develop' into issue/1276
5 years ago
Maxim Filippov
b08b1d5d91
Store status data inside Flag activity
5 years ago
Ivan Tashkinov
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
lain
25077812bf
SideEffectsTest: Fix test.
5 years ago
lain
1adafa0966
Credo fixes.
5 years ago
lain
97d5c79aa0
Add Pipeline module, test for federation.
5 years ago
Ariadne Conill
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
5 years ago
Ariadne Conill
277aea45b9
tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization
...
There appears to be confusion on whether or not Pleroma can handle this particular
sin of JSON-LD. It can, and we will add regression tests to prove that it can handle
this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD,
but whatever.
5 years ago
Maksim Pechnikov
d4270397dc
Marker: added unread_count field
5 years ago
kaniini
6281e4795a
Merge branch 'feature/push-subject-for-dm' into 'develop'
...
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
5 years ago
Mark Felder
0c628fafc5
Spelling
5 years ago
Mark Felder
2cbb3f2364
Add tests for the subject of push notifications
5 years ago
Ivan Tashkinov
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
5 years ago
Maksim Pechnikov
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
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
5 years ago
Egor Kislitsyn
c6fba62666
Fix Relay
5 years ago
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
Ivan Tashkinov
ee04fbc35a
[ #1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.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
5 years ago
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
5 years ago
Ariadne Conill
05c58eaece
change Maksim's test description
5 years ago
Ariadne Conill
ba92522c69
tests: add test to ensure invisible actors are rendered with the invisible hint set to true
5 years ago
Ariadne Conill
52d56ed705
tests: add test verifying the relay user is invisible
5 years ago
Maksim Pechnikov
189a288925
fix test
5 years ago
Maksim Pechnikov
9694d51437
added test fo Pleroma.Web.MastodonAPI.StatusController
5 years ago
Ariadne Conill
80d3912a56
test: activitypub: use User.invisible?/1 for testing invisibility
5 years ago
Ariadne Conill
ef659331b0
implement invisible support for remote users
5 years ago
Ariadne Conill
cd90735a4b
tests: ostatus controller tests: fix sporadic compilation failure
5 years ago
lain
f1381d68e7
StatusControllerTest: Capture log.
5 years ago
eugenijm
52ed2f8f2d
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
Maxim Filippov
019147f115
Merge branch 'develop' into feature/relay-list
5 years ago
Ariadne Conill
c2ae6310dc
tests: mastodon api: fix broken test that used OStatus
5 years ago
Ariadne Conill
a8eb1f0975
tests: mastodon search: search for an account that is visible via activitypub, not ostatus
5 years ago
Ariadne Conill
dbfdb1f6e3
add some missing tesla fixtures
5 years ago
Ariadne Conill
700c654208
tests: fix relay tests
5 years ago
Ariadne Conill
48059c03c9
fix up some tests
5 years ago
Ariadne Conill
d379b48769
kill almost all of the OStatus module
5 years ago
Ariadne Conill
835ad52378
remove Salmon module
5 years ago
Ariadne Conill
4f82e42e4e
websub: remove entirely
5 years ago
Ariadne Conill
c6de0cbb4a
config: disable Websub and Salmon publisher modules
5 years ago
lain
15bbc34c07
Tests: Capture log.
5 years ago
lain
4ec299ea9c
CommonAPI tests: Capture logs.
5 years ago
Maxim Filippov
2473702be2
Merge branch 'develop' into feature/relay-list
5 years ago
lain
203d61b950
Transmogrifier: Make proper use of the LikeValidator.
5 years ago
lain
66452f518f
ObjectValidator: Rewrite LikeValidator with Ecto.
5 years ago
eugenijm
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
Maksim Pechnikov
66b5d0ff55
add Markers /api/v1/markers
5 years ago
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
lain
6e4f52f8a2
Introduce new ingestion pipeline structure, implement internal Likes with it.
5 years ago
Maxim Filippov
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
eugenijm
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
Maxim Filippov
751513b6df
This line either causes a warning, or a failed test
5 years ago
Maxim Filippov
cc6875b582
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
Maxim Filippov
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
Maxim Filippov
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
lain
cb8492962e
SearchController: Fix test.
...
Turns out you can't actually find the user with this.
5 years ago
lain
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
lain
9b963064eb
Transmogrifier: Actually store who deleted a note.
5 years ago
Maxim Filippov
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
Egor Kislitsyn
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
lain
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
5 years ago
lain
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
kaniini
9fd5176c35
Merge branch 'unicode-search' into 'develop'
...
Search: Add tests for unicode searches.
See merge request pleroma/pleroma!1824
5 years ago
Maxim Filippov
ad42837244
Ability to toggle activation status and permission group for a group of users
5 years ago
lain
c1bae01376
Search: Add tests for unicode searches.
5 years ago
eugenijm
580a67f5ca
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
Maxim Filippov
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov
7aceaa517b
Admin API: Reports, grouped by status
5 years ago
lain
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
5 years ago
lain
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
5 years ago
lain
91e90aa807
Merge branch 'misskey-compat' into 'reactions'
...
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783
5 years ago
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
Ivan Tashkinov
06b3bb54c5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
lain
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Haelwenn
9e34919dcd
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
...
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
5 years ago
kaniini
7a318d74e6
Merge branch 'split-masto-api/leftovers' into 'develop'
...
[#1278 ] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
5 years ago
kaniini
45b7f03f89
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
5 years ago
kaniini
17ff4b43cb
Merge branch 'unread-conversation-count' into 'develop'
...
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
5 years ago
eugenijm
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain
1ed8fbc4d9
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain
276a520163
CommonAPI: Create profile updates as public.
...
This saves us lots of sending out because we can use sharedInbox.
5 years ago
lain
4b8524f392
ActivityPub / Transmogrifier: Correctly store incoming Update id.
5 years ago
Thibaut Girka
b1ff66dc5f
Add test for handling Announces with inlined object from different origin
5 years ago
Thibaut Girka
977e711e22
Import object from self-Announce whenever possible
5 years ago
kaniini
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
5 years ago
lain
6a85f7d1ea
Transmogrifier: Extend misskey like compatibility.
5 years ago
lain
d9aaea44ff
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Maksim Pechnikov
83631752af
removed legacy api: "/objects/:uuid/likes"
5 years ago
kaniini
e0c0ea9f13
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
...
widen streaming API block effects
See merge request pleroma/pleroma!1784
5 years ago
kaniini
5c04e81724
Merge branch 'user-info-unread-direct-conversation' into 'develop'
...
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
5 years ago
Maxim Filippov
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
5 years ago
Ariadne Conill
8325858ed2
tests: streamer: add a test for blocked transitive activities
5 years ago
lain
2a7f44acfe
ActivityPub.Utils: Fix undo test.
5 years ago
lain
43a211bcb1
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
5 years ago
lain
568a995d64
ActivityPub: Change addressing of Undo.
5 years ago
lain
01da6344b9
Merge branch 'bugfix/notification-nil-actor' into 'develop'
...
notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779
5 years ago
Haelwenn (lanodan) Monnier
5dc14c89ce
notification_view.ex: Make sure `account` isn’t empty
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
5 years ago
eugenijm
06d9df79c5
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain
c9043c6c80
Transmogrifier: Handle incoming Undos for EmojiReactions.
5 years ago
Ivan Tashkinov
64095961fe
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
lain
4cb603e1df
PleromaAPI: Add unreacting.
5 years ago
Egor Kislitsyn
e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController
5 years ago
Egor Kislitsyn
7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController
5 years ago
Egor Kislitsyn
9b68aab8b3
Fix credo warning
5 years ago
lain
9cfe9a57c5
CommonAPI: Add unreactions.
5 years ago
Egor Kislitsyn
d3c404af12
Add MastoFEController
5 years ago
lain
dfe5c958eb
ActivityPub: Add undo for emoji reactions.
5 years ago
Egor Kislitsyn
1c6e1055c8
Add CustomEmojiController
5 years ago
lain
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini
433f2c0f68
Merge branch 'split-masto-api/instance' into 'develop'
...
Extract instance actions from `MastodonAPIController` to `InstanceController`
See merge request pleroma/pleroma!1760
5 years ago
Thibaut Girka
86880b9821
Inline object when Announcing a self-owned private object
5 years ago
Egor Kislitsyn
c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
5 years ago
kaniini
89ab673d00
Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
...
Send an identifier alongside with error message in OAuthController
See merge request pleroma/pleroma!1765
5 years ago
kaniini
8557176808
Merge branch 'split-masto-api/auth' into 'develop'
...
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
5 years ago
kaniini
9b38bf4af4
Merge branch 'features/private-reblogs' into 'develop'
...
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
5 years ago
feld
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
5 years ago
Thibaut Girka
427d0c2a00
Store private announcements in object.data["announcements"], filter them on display
5 years ago
Thibaut Girka
7d5a9f3f6d
Add tests for privately announcing statuses via API
5 years ago
Thibaut Girka
e0b654e202
Add tests
5 years ago
Maxim Filippov
0f9c2c8b87
Send an identifier alongside with error message in OAuthController
5 years ago
Egor Kislitsyn
af690d1033
Extract auth actions from `MastodonAPIController` to `AuthController`
5 years ago
Egor Kislitsyn
2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
5 years ago
Egor Kislitsyn
39695c4436
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
5 years ago
Egor Kislitsyn
585bc57edb
Extract media actions from `MastodonAPIController` to `MediaController`
5 years ago
Egor Kislitsyn
36a34c36fe
Extract poll actions from `MastodonAPIController` to `PollController`
5 years ago
kPherox
f364438032
Add `rel="ugc"`
5 years ago
kPherox
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
5 years ago
lain
dae744478e
Transmogrifier: Handle compact objects in undos.
5 years ago
lain
19bc0b8c79
.
5 years ago
lain
08256e9299
ActivityPub: Federate reactions.
5 years ago
lain
6068d2254e
PleromaAPIController: Fixes and refactoring.
5 years ago
Egor Kislitsyn
0c6009dd2e
Extract mascot actions from `MastodonAPIController` to MascotController
5 years ago
Egor Kislitsyn
c55facf78b
Fix warning in TransmogrifierTest
5 years ago
Egor Kislitsyn
987e0b8be8
Move update_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn
122cc050ab
Move account_lists test to MastodonAPI.AccountControllerTest
5 years ago
Egor Kislitsyn
38db4878a4
Disable async in DomainBlockControllerTest
5 years ago
Egor Kislitsyn
3c5ecb70b4
Add PleromaAPI.AccountController
5 years ago
Egor Kislitsyn
e7aef27c00
Fix merge
5 years ago
lain
a7f22c6e93
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain
b923842e96
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Egor Kislitsyn
1207e88195
Fix ReportControllerTest
5 years ago
kaniini
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
5 years ago
kaniini
0e356cc800
Merge branch 'split-masto-api/reports' into 'develop'
...
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
5 years ago
kaniini
74d8fadf37
Merge branch 'split-masto-api/conversations' into 'develop'
...
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
5 years ago
Egor Kislitsyn
b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
...
Update MastodonAPI.ReportView
5 years ago
Ariadne Conill
1d7cbdaf7b
change new scrobble endpoint
5 years ago
Ariadne Conill
211008ae2f
test: fix scrobble controller tests
5 years ago
Ariadne Conill
71eff09e56
common api: make sure the generated IR is actually federatable
5 years ago
Ariadne Conill
e7309d3b60
test: transmogrifier: add test proving that transmogrifier can handle outgoing listens
5 years ago
Ariadne Conill
7cad6ea67a
pleroma api: hook up scrobbler controller
5 years ago
Ariadne Conill
2c82d8603b
common api: implement scrobbling
5 years ago
Ariadne Conill
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
5 years ago
Ariadne Conill
1f9de2a8cd
activitypub: implement IR-level considerations for Listen activities
5 years ago
Ariadne Conill
b7877e9b1c
mastodon api: implement rendering of listen activities
5 years ago
Egor Kislitsyn
d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
5 years ago
rinpatch
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10
, reversing
changes made to c4fbb56984
.
5 years ago
kaniini
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
5 years ago
Maksim Pechnikov
1053319cd6
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Haelwenn (lanodan) Monnier
9202904da9
status_controller.ex: Posting media status without content defined
5 years ago
rinpatch
374f83d29b
Fix not being able to post empty statuses with attachments
...
Attachment field was filled in after the empty status check
5 years ago
kaniini
92d08d4113
Merge branch 'split-masto-api/follow-requests' into 'develop'
...
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
5 years ago
kaniini
68bf99baf2
Merge branch 'split-masto-api/domain-blocks' into 'develop'
...
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
5 years ago
kaniini
27a3221d57
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
...
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
5 years ago
Egor Kislitsyn
408750b94e
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
5 years ago
Egor Kislitsyn
99c5a35890
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
5 years ago
Egor Kislitsyn
0a5b106ddd
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
5 years ago
Egor Kislitsyn
621377f378
Extract filter actions from `MastodonAPIController` to `FilterController`
5 years ago
kaniini
91e2bcf218
Merge branch 'refactor/status-controller' into 'develop'
...
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
5 years ago
Ariadne Conill
14294243a2
mastodon api: implement follow_requests_count
5 years ago
Egor Kislitsyn
5ea5c58a85
Move view logic from StatusController.context to StatusView and add a test
5 years ago
Egor Kislitsyn
76b7e5cd5b
Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest
5 years ago
kaniini
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
5 years ago
Egor Kislitsyn
98d1347a4e
Extract status actions from `MastodonAPIController` into `StatusController`
5 years ago
kaniini
dc0fdb5e84
Merge branch 'refactor/timeline-controller' into 'develop'
...
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
5 years ago
Maksim Pechnikov
b4fc96f640
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maksim Pechnikov
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Roman Chvanikov
b4b147000c
Merge develop
5 years ago
Egor Kislitsyn
3572cf29b7
Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
kaniini
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
5 years ago
kaniini
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
5 years ago
kaniini
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
5 years ago
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
kaniini
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
5 years ago
kaniini
1b9cd4c866
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
...
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern
See merge request pleroma/pleroma!1716
5 years ago
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.
5 years ago
Ekaterina Vaartis
118d6dcdf4
Fix nodeinfo handling
5 years ago
Ekaterina Vaartis
ba9d35a904
Add an API endpoint for listing remote packs
5 years ago
Maxim Filippov
60cbea5bb2
Allow activities pagination via limit/offset
5 years ago
Haelwenn (lanodan) Monnier
0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
5 years ago
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
Maxim Filippov
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Egor Kislitsyn
a66a7a328f
Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
Maksim Pechnikov
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
kaniini
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
5 years ago
kaniini
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
5 years ago
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
5 years ago
kaniini
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
5 years ago
Steven Fuchs
e1d2d69c87
Clean up views
5 years ago
Maksim Pechnikov
494bb6bac6
updated tests
5 years ago
Maksim Pechnikov
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Maksim Pechnikov
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
5 years ago
rinpatch
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
5 years ago
Haelwenn (lanodan) Monnier
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
5 years ago
Haelwenn (lanodan) Monnier
2ad50583f0
Document and test /api/ap/whoami
5 years ago
Maxim Filippov
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Maxim Filippov
72a01f1350
Use router helper to generate reset password link
5 years ago
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
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`)
5 years ago
lain
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
5 years ago
D Anzorge
9aca2cc95d
Add test for correct AP outbox pagination
5 years ago
Ivan Tashkinov
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
Egor Kislitsyn
95c948110c
Add `rel="ugc"` to hashtags and mentions
5 years ago
Egor Kislitsyn
cf3041220a
Add support for `rel="ugc"`
5 years ago
eugenijm
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
Maksim Pechnikov
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
Haelwenn
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
5 years ago
rinpatch
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
5 years ago
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/'
5 years ago
Ekaterina Vaartis
b585134c90
Get the nodeinfo address from the well-known
5 years ago
Ekaterina Vaartis
a1325d5fd9
Change path from nodeinfo to metadata->features
5 years ago
Ekaterina Vaartis
36f2275dc9
A feature for shareable emoji packs, use it in download_from & tests
5 years ago
Ekaterina Vaartis
74fb6d8647
Move EmojiAPIController from EmojiAPI to PleromaAPI
5 years ago
Ekaterina Vaartis
6cd651a38b
Make the emoji controller api more RESTy
5 years ago
Ekaterina Vaartis
7c784128fd
Change emoji api responses to JSON
5 years ago
Ekaterina Vaartis
9eb2ee4df0
Allow importing old (emoji.txt / plain) packs from the filesystem
5 years ago
Ekaterina Vaartis
f5131540dc
Add a way to create emoji packs via an endpoint
5 years ago
Ekaterina Vaartis
8dbdd5c280
Allow uploading new emojis to packs from URLs
5 years ago
Ekaterina Vaartis
9afe7258dd
Implememt emoji pack file updating + write tests
5 years ago
Ekaterina Vaartis
9dc9689144
Add tests for pack metadata updating
5 years ago
Ekaterina Vaartis
adf31d596e
Add tests for downloading from fallback url
5 years ago
Ekaterina Vaartis
2a94eca096
Change YAML to JSON
5 years ago
Ekaterina Vaartis
2d4b8f3d20
Add an endpoint for deleting emoji packs
5 years ago
Ekaterina Vaartis
7e4c8b56ea
Add tests for emoji pack sharing
5 years ago
feld
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
5 years ago
feld
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
5 years ago
feld
220afadc55
Merge branch 'restore-tests' into 'develop'
...
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
5 years ago
Alex S
4faf2b1555
post for creating invite tokens in admin api
5 years ago
Ivan Tashkinov
01c1078015
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
Maksim Pechnikov
0447c42715
Merge branch 'develop' into issue/733
5 years ago
rinpatch
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
...
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
5 years ago
Maksim Pechnikov
7dd51652f9
Merge branch 'develop' into issue/733
5 years ago
rinpatch
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
5 years ago
Roman Chvanikov
e9f69a3eb7
Move pleroma_api controllers into controllers sub-folders
5 years ago
Roman Chvanikov
7d1773bc6b
Rename SubscriptionNotificationController list and get actions to index and show
5 years ago
Roman Chvanikov
015597c2ab
Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs
5 years ago
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
5 years ago
Roman Chvanikov
6042e21b25
Move subscription notifications to a separate controller
5 years ago
Roman Chvanikov
76c3e290fc
Merge develop
5 years ago
Maxim Filippov
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maxim Filippov
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
5 years ago
Egor Kislitsyn
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd33126
, reversing
changes made to 4fabf83ad0
.
5 years ago
rinpatch
e8120944d8
Fix signed fetch inclusion publisher test
...
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
5 years ago
kaniini
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
Steven Fuchs
aab264db82
Streamer refactoring
5 years ago
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
5 years ago
Egor Kislitsyn
ca88e37a8f
Fix a race condition in tests
5 years ago
Egor Kislitsyn
43f17c2e67
Restore tests for `change_password` and `delete_account`
5 years ago
Maksim Pechnikov
d75bc728e7
Merge branch 'develop' into issue/733
5 years ago
Ivan Tashkinov
efbc2edba1
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
# lib/pleroma/web/router.ex
5 years ago
Ivan Tashkinov
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
Maksim Pechnikov
8751809e1e
Merge branch 'develop' into support/tests
5 years ago
Ivan Tashkinov
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
Roman Chvanikov
d7457c9165
Merge branch 'develop' into refactor/subscription
5 years ago
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
rinpatch
a78a7ee455
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
5 years ago
rinpatch
85b6144ffd
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
5 years ago
rinpatch
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
lain
a9b78f55e3
Merge branch 'capture-test-errors' into 'develop'
...
Capture test error messages where appropriate
See merge request pleroma/pleroma!1665
5 years ago
rinpatch
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
5 years ago
stwf
25a64a4aa0
Capture test error messages where appropriate
5 years ago
Roman Chvanikov
0bd2b85edb
Separate Subscription Notifications from regular Notifications
5 years ago
lain
a7f31bf06c
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain
e5b3ad3d04
ActivityPub: Use is_unicode_emoji? function.
5 years ago
Haelwenn
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
5 years ago
rinpatch
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
5 years ago
Maksim Pechnikov
bc3e8c033b
fix formatting
5 years ago
Maksim Pechnikov
ec5aaf5bd7
fix tests
5 years ago
rinpatch
fb96facc32
Remove unused functions and fix credo issues
5 years ago
rinpatch
ce23529d91
Use delivery info when federating deletes
5 years ago
Egor Kislitsyn
25d8216804
Add email change endpoint
5 years ago
Maksim Pechnikov
d8a178274b
fix Activity.get_by_id
5 years ago
Maksim
58b17196fa
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
5 years ago
Maksim Pechnikov
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
Maksim Pechnikov
936951826e
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch
769fb778d4
Track object/create activity fetches
5 years ago
Mark Felder
102eb4455c
Fix associated test as well
5 years ago
lain
8d4b661ecb
Transmogrifier: Strip internal emoji reaction fields.
5 years ago
lain
05e9776517
PleromaAPIController: Add endpoint to fetch emoji reactions.
5 years ago
Maksim Pechnikov
4f548cb2b7
added test for Ostatus
5 years ago
Maksim Pechnikov
007e0c1ce1
added tests
5 years ago
Alex S
a1f2dfb10a
expanding regex sigils to use modifiers
5 years ago
Maksim Pechnikov
fcf604fa43
added tests
5 years ago
Maksim Pechnikov
a31af93e1d
added tests /activity_pub/transmogrifier.ex
5 years ago
Egor Kislitsyn
b40b10b53d
Add an endpoint to get multiple statuses by IDs
5 years ago
Maxim Filippov
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
5 years ago
Egor Kislitsyn
e0f84d0043
Fix `ActivityPubController.read_inbox/2`
5 years ago
Ivan Tashkinov
b63faf9819
[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
5 years ago
Maksim Pechnikov
39f99dc6cd
Merge branch 'develop' into support/tests
5 years ago
Maksim Pechnikov
ab2f21e470
tests for mastodon_api_controller.ex
5 years ago
Ivan Tashkinov
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
5 years ago
rinpatch
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
5 years ago
Haelwenn
fe7cf44c40
Merge branch 'feature/mastoapi-accounts-external' into 'develop'
...
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622
5 years ago
rinpatch
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
Ivan Tashkinov
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
lain
99ea990a16
PleromaAPIController: Add emoji reactions.
5 years ago
Maxim Filippov
af746fa4a8
Return total for reports
5 years ago
Maxim Filippov
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maksim Pechnikov
8cbad5500c
add tests for activity_pub/utils.ex
5 years ago
rinpatch
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
5 years ago
rinpatch
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
5 years ago
lain
9bc12b88b3
ActivityPub: Save emoji reactions in object.
5 years ago
rinpatch
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
5 years ago
Ivan Tashkinov
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
5 years ago
Maxim Filippov
6c2fd1b78b
Fix tests
5 years ago
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
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
5 years ago
rinpatch
9cabc02864
Remove a useless import
5 years ago
rinpatch
dbfcba85ec
Add a changelog entry for twitterapi removal and fix credo issues
5 years ago
rinpatch
64410497d2
Remove TwitterAPI representers
5 years ago
rinpatch
985122cc03
Remove Activity, User and Notification views from TwitterAPI
5 years ago
rinpatch
90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
5 years ago
Maxim Filippov
f182f0f6bd
Add ability to search moderation logs
5 years ago
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
5 years ago
lain
b770ed1d99
CommonAPI: Support emoji reactions.
5 years ago
lain
f017260cdc
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain
66519f2100
Merge branch 'list-controller' into 'develop'
...
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
5 years ago
Maxim Filippov
5e4fde1d3d
Filter logs by date
5 years ago
Maksim Pechnikov
00abe099cd
added tests for ActivityPub.like\unlike
5 years ago
rinpatch
eb1739c596
Remove most of TwitterAPIController
5 years ago
lain
a0b21c8928
Transmogrifier: Handle incoming emoji reactions.
5 years ago
lain
6e1ec4c5da
ActivityPub: Basic EmojiReactions.
5 years ago
lain
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
Maxim Filippov
c338224c93
Fix sporadic test
5 years ago
Egor Kislitsyn
019ced0558
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
5 years ago
Egor Kislitsyn
30510ade0e
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
kPherox
eb75ea502d
Update test for custom fields when content-type urlencoded
5 years ago
kaniini
6dc24422dc
Merge branch 'issue/1177' into 'develop'
...
[#1177 ] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
5 years ago
Maxim Filippov
37dd3867bb
Log admin/moderator actions
5 years ago
kaniini
503139b343
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
...
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
5 years ago
kPherox
b8777b01ae
Update test for custom fields when name empty string
5 years ago
kPherox
d74efde94e
Update test for custom profile fields
5 years ago
Haelwenn (lanodan) Monnier
211e163770
Implement missing mocks for rel=me
5 years ago
kPherox
45e21a9df4
Rename fields to fields_attributes
5 years ago
lain
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
5 years ago
lain
efb8818e9e
Activity Expiration: Switch to 'expires_in' system.
5 years ago
Maksim Pechnikov
654d291b6d
update tests
5 years ago
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Maksim Pechnikov
73bcbf4fa3
add tests
5 years ago
Ivan Tashkinov
71700ea6d4
[ #1149 ] Updated docs & tests.
5 years ago
Maksim Pechnikov
399ca9133b
fix test
5 years ago
Maksim Pechnikov
f95b67c933
Merge branch 'develop' into issue/1177
5 years ago
Ivan Tashkinov
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
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
5 years ago
Maksim Pechnikov
64bfb41c55
fixed unfollow for relay actor
5 years ago
Maksim Pechnikov
85bd8a4e31
fixed clear config after test
5 years ago
Ariadne Conill
76bb3572dd
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
5 years ago
lain
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
5 years ago
Sergey Suprunenko
75a5dd41ee
Add more tests for Database tasks and DigestEmailWorker
5 years ago
Maksim
a320358703
added test helpers to clear config after tests
5 years ago
Ariadne Conill
a2fdc32368
tests: activitypub: fix typo
5 years ago
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
5 years ago
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
rinpatch
a4a3e3becd
Hide muted theads from home/public timelines unless `with_muted` is set
5 years ago
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
a180c1360e
[ #1149 ] Oban mailer job. Adjusted tests.
5 years ago
stwf
d81f63845a
Implement Pleroma.Stats as GenServer
5 years ago
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Egor Kislitsyn
e457fcc479
Add `:max_remote_account_fields` config option
5 years ago
Egor Kislitsyn
f7bbf99caa
Use info.fields instead of source_data for remote users
5 years ago
Egor Kislitsyn
2c35d4b0b0
Add configurable account field name length limit
5 years ago
Egor Kislitsyn
db3c05f6b4
Add configurable account field value length limit
5 years ago
Egor Kislitsyn
7d6f8a7fd7
Linkify custom fields values in ActivityPub.UserViewx
5 years ago
Egor Kislitsyn
5178f960c3
Support user attachment update in Transmogrifier
5 years ago
Egor Kislitsyn
88598c9baf
Add profile custom fields to ActivityPub.UserView
5 years ago
Egor Kislitsyn
d6094b405d
Fix tests
5 years ago
Egor Kislitsyn
e0ac5c7a66
Add custom profile fields
5 years ago
rinpatch
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
5 years ago
Ariadne Conill
10fef2fcee
tests: fix up nodeinfo tests
5 years ago
Ariadne Conill
dd0b71ea6d
tests: add tests for MRF.describe()
5 years ago
Maksim
fea4d89e9f
tests for Web/ActivityPub/Relay
5 years ago
Maksim
04da1166db
tests for /web/mastodon_api/mastodon_api.ex
5 years ago
Ariadne Conill
f7e3b7ff75
tests: add tests for mrf_vocabulary
5 years ago
Ivan Tashkinov
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
5 years ago
lain
511ccea5aa
ConversationView: Align parameter names with other views.
5 years ago
lain
60231ec7bd
Conversation: Add endpoint to get a conversation by id.
5 years ago
lain
23c46f7e72
Conversations: Use 'recipients' for accounts in conversation view.
...
According to gargron, this is the intended usage.
5 years ago
Ariadne Conill
9cfc289594
MRF: ensure that subdomain_match calls are case-insensitive
5 years ago
kaniini
84808e1697
Merge branch 'develop' into 'fix/hide-follows-counters'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Sergey Suprunenko
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
5 years ago
Ivan Tashkinov
33a5fc4a70
[ #1149 ] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
5 years ago
rinpatch
0802a08871
Mastodon API: Fix thread mute detection
...
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
5 years ago
Ivan Tashkinov
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
5 years ago
rinpatch
409bcad54b
Mastodon API: Set follower/following counters to 0 when hiding
...
followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency.
5 years ago
lain
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Haelwenn
aa718ab8f6
Merge branch 'fix/object-reembeds' into 'develop'
...
Do not rembed the object after updating it
Closes #1142
See merge request pleroma/pleroma!1538
5 years ago
rinpatch
5329e84d62
OStatus tests: stop relying on embedded objects
5 years ago
rinpatch
32018a4ee0
ActivityPub tests: remove assertions of embedded object being updated,
...
because the objects are no longer supposed to be embedded
5 years ago
Maksim
139b196bc0
[ #1150 ] fixed parser TwitterCard
5 years ago
Maksim
bdc9a7222c
tests for CommonApi/Utils
5 years ago
lain
d6fe220e32
Linting.
5 years ago
lain
b64b6fee2a
CommonAPI: Replies to conversations also get the correct context id.
5 years ago
lain
3af6d14da7
Pleroma Conversations API: Add a way to set recipients.
5 years ago
Sergey Suprunenko
e8ad116c2a
Do not add the "next" key to likes.json if there is no more items
5 years ago
Alexander Strizhakov
de0f3b73dd
Admin fixes
5 years ago
Sergey Suprunenko
040347b248
Remove spaces from the domain search
5 years ago
Sergey Suprunenko
8b2fa31fed
Handle MRF rejections of incoming AP activities
5 years ago
lain
eee98aaa73
Pleroma API: Add endpoint to get conversation statuses.
5 years ago
feld
d93d777915
Fix/mediaproxy whitelist base url
5 years ago
lain
56b1c3af13
CommonAPI: Extend api with conversation replies.
5 years ago
lain
5ff8f07ca9
Merge branch 'feature/hide-follows-remote' into 'develop'
...
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
5 years ago
Ivan Tashkinov
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
5 years ago
Egor Kislitsyn
f98235f2ad
Clean up tests output
5 years ago
kaniini
6c06529cd4
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
...
Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512
5 years ago
rinpatch
813c686dd7
Disallow following locked accounts over OStatus
5 years ago
Maksim
6eb33e7303
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
5 years ago
Ariadne Conill
f72e0b7cad
ostatus: explicitly disallow protocol downgrade from activitypub
...
This closes embargoed bug #1135 .
5 years ago
rinpatch
301ea0dc04
Add tests for counters being updated on follow
5 years ago
Maksim
58443d0cd6
tests for TwitterApi/UtilController
5 years ago
lain
7483679a7b
StatusView: Return direct conversation id.
5 years ago
rinpatch
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
5 years ago
Alexander Strizhakov
51b3b6d816
Admin changes
5 years ago
kaniini
5835069215
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
...
This reverts merge request !1504
5 years ago
Ariadne Conill
5795a890e9
markdown: clean up html generated by earmark
5 years ago
lain
1dfde4151c
Merge branch 'refactor/use-constants' into 'develop'
...
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
5 years ago
Sergey Suprunenko
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
5 years ago
Maksim
159bbec570
added tests for OstatusController
5 years ago
Ariadne Conill
b93498eb52
constants: add as_public constant and use it everywhere
5 years ago
Sachin Joshi
242f5c585e
add account confirmation email resend in mastodon api
5 years ago
Maksim
6b77a88365
[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/
5 years ago
rinpatch
41e0304757
Merge branch 'develop' into feature/hide-follows-remote
5 years ago
kaniini
19835be067
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
...
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
5 years ago
Sergey Suprunenko
b20020da16
Show the url advertised in the Activity in the Status JSON response
5 years ago
kPherox
8d9f43e1d1
Add WebFinger test for AP-only account
5 years ago
Mike Verdone
0e2b5a3e6a
WIP
5 years ago
Maksim
55341ac717
tests WebFinger
5 years ago
Eugenij
4504135894
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
5 years ago
Mike Verdone
2c83eb0b15
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
...
This reverts commit 2981821db8
.
5 years ago
Mike Verdone
2981821db8
squash! Expose expires_at datetime in mastoAPI only for the activity actor
...
NOTE: rewrite the commit msg
5 years ago
Mike Verdone
3cb471ec06
Expose expires_at datetime in mastoAPI only for the activity actor
...
In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.
The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.
5 years ago
Mike Verdone
704960b3c1
Add support for activity expiration to common and Masto API
...
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not.
5 years ago
Mike Verdone
8ba7a151ad
Cleanup: fix a comment
5 years ago
sadposter
f5d574f4ed
check both item and parent domain blocks
5 years ago
Sadposter
4af4f6166b
honour domain blocks on streaming notifications
5 years ago
kaniini
9c6357324e
Merge branch 'feature/admin-api-user-statuses' into 'develop'
...
Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413
5 years ago
Ariadne Conill
d3bdb8e704
rich media: parser: splice the given URL into the result
5 years ago
Maxim Filippov
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Maxim Filippov
03471151d6
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
5 years ago
Alexander Strizhakov
5e72554f3c
Admin config fix
5 years ago
Maksim
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
5 years ago
Sadposter
c400565427
fix test names because i cannot type
5 years ago
Sadposter
299c0e965b
actually reblog on the reblog test
5 years ago
Sadposter
7026018c8c
Use correct URL for tests
5 years ago
Sadposter
452980652d
Mix format
5 years ago
Sadposter
fd1fa5a2ec
add tests for unauthed reqs to liked/reblogged_by
5 years ago
Alexander Strizhakov
b70e659304
Feature/1087 wildcard option for blocks
5 years ago
Haelwenn
674ad5e1df
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
...
activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464
5 years ago
Sadposter
f712ee879a
Bugfix: muted/blocked user notification streaming
5 years ago