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
98990d2d61
Merge branch 'fed-testing-updates' into 'develop'
...
Add federated test infrastructure
See merge request pleroma/pleroma!2014
5 years ago
lain
8627fb0bb5
Merge branch 'cleanup-tests-output' into 'develop'
...
Cleanup tests output
See merge request pleroma/pleroma!2018
5 years ago
Sadposter
c7cc80a9ee
obligatory format commit
5 years ago
Sadposter
fa97eddf8a
make follows take precedence over domain blocks
5 years ago
Egor Kislitsyn
c4b468a95b
Cleanup tests output
5 years ago
Maksim Pechnikov
1403a1441d
added tests
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
lain
f36724efb1
User: Never return nil for user follower counts.
5 years ago
Maksim Pechnikov
a4f834a687
moved DigestEmail to Oban Periodic jobs
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
c5766a8100
moved ActivityExpiration to Oban Periodic jobs
5 years ago
Maksim Pechnikov
6f202a401b
moved ScheduledActivity to Oban Periodic jobs
5 years ago
stwf
bd1984f054
update tests and Oban
5 years ago
lain
717d246491
Tests: Don't run federated tests by default
5 years ago
Chris McCord
f01881e82a
Add federated test infrastructure
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
feld
5f981178d0
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
...
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
5 years ago
Sadposter
d3656c2725
add ability to set a custom user-agent string
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
Ivan Tashkinov
1636cc5b7e
Removed users.info and remaining usages.
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
Egor Kislitsyn
d38ab4bb89
Fix user.following_count
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
565f261338
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
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
Egor Kislitsyn
36686f5245
Support authentication via `x-admin-token` HTTP header
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
rinpatch
22554ac5ca
Merge branch 'bugfix/1395-email-activation' into 'develop'
...
Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965
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
lain
60cc5a7750
Merge branch 'fix-rate-limiter-test' into 'develop'
...
Fix random fails of the rate limiter tests (hopefully)
See merge request pleroma/pleroma!1978
5 years ago
Egor Kislitsyn
72cf6a76f4
Fix random fails of the rate limiter tests
5 years ago
lain
facc37aaa6
Merge branch 'static-remote-redirect' into 'develop'
...
For remote notices, redirect to the original instead of 404 in static-fe
See merge request pleroma/pleroma!1974
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
lain
e835cd97f6
Containment: Add a catch-all clause to contain_origin.
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
lain
417f9a782f
Merge branch 'fix/1399' into 'develop'
...
fix for migrate config to db task
Closes #1399
See merge request pleroma/pleroma!1964
5 years ago
Steven Fuchs
94627baa5c
New rate limiter
5 years ago
lain
f6056e9c9c
UserEnabledPlug: Don't authenticate unconfirmed users.
5 years ago
lain
8521553ad9
User: Don't let deactivated users authenticate.
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
lain
3a1aaadc18
Merge branch 'issue/1339' into 'develop'
...
[#1339 ] add subject to atom feed
See merge request pleroma/pleroma!1961
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
Ariadne Conill
5b60d82592
object containment: handle all cases where ID is invalid (missing, nil, non-string)
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
rinpatch
84175fe30e
Set better Cache-Control header for static content
...
Closes #1382
5 years ago
feld
8b19464176
Merge branch 'feature/multiple-users-force-password-reset' into 'develop'
...
Force password reset for multiple users
Closes admin-fe#46
See merge request pleroma/pleroma!1928
5 years ago
Maxim Filippov
f171095960
Grouped reports with status data baked in
5 years ago
rinpatch
54746c6c26
Object Fetcher: set cache after reinjecting
...
Probably fixes the issue hj had, where polls would have different
counters between endpoints.
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
Maksim Pechnikov
e52955c961
update following_relationship.ex
5 years ago
Maksim Pechnikov
62bc0657e7
excluded invisible users from search results
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
rinpatch
fee1276963
Merge branch 'failing-search-fixes' into 'develop'
...
User Search: Remove superfluous setweight and random test.
See merge request pleroma/pleroma!1935
5 years ago
lain
4e53520917
User Search: Remove superfluous setweight and random test.
...
The test tested for a behavior that isn't actually enforced anymore.
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
kaniini
61bcd4595f
Merge branch 'feature/fast_sanitize' into 'develop'
...
Switching to FastSanitize
See merge request pleroma/pleroma!1916
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
kPherox
d1ae51b02a
Update test for get_recipients_from_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
rinpatch
61400d7eb7
Fix XSS emoji test
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
eugenijm
0580654485
Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
...
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
5 years ago
Egor Kislitsyn
b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
stwf
5329b361ec
fix test
5 years ago
Maksim Pechnikov
922e3d082c
add 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
Maksim Pechnikov
d3fb9e02cc
add tests
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
Maksim Pechnikov
9a4afbd2a0
added update unread_count for notifications
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
rinpatch
6712b6e4de
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
...
Do not include notifications from blocked users when with_muted is set
See merge request pleroma/pleroma!1869
5 years ago
rinpatch
2dbee29cf5
Do not include notifications from blocked users when with_muted is set
...
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
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
Ivan Tashkinov
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
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
Ariadne Conill
c9280b9730
rework to use properties instead of compound typing, per SocialCG
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
95871cb462
user: implement User.invisible?/1
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
85ddcaf418
tests: fix up signature tests
5 years ago
Ariadne Conill
700c654208
tests: fix relay tests
5 years ago
Ariadne Conill
af9aa8e358
tests: simplify object fetching and containment tests
5 years ago
Ariadne Conill
597cb8897b
tests: remove some more ostatus 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
rinpatch
b085cd2660
Add a test for safe_jsonb_set
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
lain
1bfdf57fc7
Merge branch 'user-search-experiments' into 'develop'
...
User search: Remove trigram and refactor the module
See merge request pleroma/pleroma!1850
5 years ago
rinpatch
b8be6a4dc9
Remove a failing search test due to it being unrealistic
...
While the case tested (`lain@ple`) gives wrong ordering due to
using only trigram to order, it almost never happens in reality. In reality
it would be either `lain` (in which case it's fine to list the user with `lain`
in display name first), or `@lain@pleroma.soykaf.com`/`lain@pleroma.soykaf.com` (which is
handled fine as well)
5 years ago
rinpatch
c10ce113d4
User search: Remove trigram and refactor the module
...
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
5 years ago
Maxim Filippov
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
Egor Kislitsyn
1d46944fbd
Do not add `follower_address` to `following` for non local users
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
Steven Fuchs
dc6d20b68d
provide mocks for webfinger endpoints
5 years ago
lain
1357ec1a10
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
...
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`
See merge request pleroma/pleroma!1822
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
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users
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
b4f3c16885
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
...
[#1234 ] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
5 years ago
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
kaniini
2411d09215
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
...
Move local keys out of `user.info`
See merge request pleroma/pleroma!1799
5 years ago
feld
1d8e956c32
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
5 years ago
rinpatch
fefbd31c6e
Move local keys out of `user.info`
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
27110793a7
Merge branch 'featrue/job-monitor' into 'develop'
...
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
5 years ago
lain
27e914955e
Merge branch 'fix/nickname-fail' into 'develop'
...
Fix get_cached_by_nickname_or_id not allowing to get local users by nickname
Closes #1293
See merge request pleroma/pleroma!1777
5 years ago
rinpatch
8217292085
Fix get_cached_by_nickname_or_id not allowing to get local users by
...
nickname
Closes #1293
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
0fc29deba0
Add tests for Pleroma.JobQueueMonitor
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
Sergey Suprunenko
c541b83bef
Track failed proxy urls and don't request them again
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
Ariadne Conill
c3d09921e4
test: factory: implement support for generating mock audio and listen objects
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
minibikini
f9380289eb
Add `remote_ip` plug
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
Egor Kislitsyn
75290cbfbd
Add Pleroma.JobQueueMonitor
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
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
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
16487716af
Merge branch 'support/test' into 'develop'
...
clears `robot.txt` after tests
See merge request pleroma/pleroma!1715
5 years ago
Maksim
dd4263da5a
Apply suggestion to test/tasks/instance_test.exs
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
Maksim Pechnikov
1b2e4a0ae0
clears `robot.txt` after tests
5 years ago
Egor Kislitsyn
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
Maksim Pechnikov
1a858134ed
Merge branch 'develop' into issue/1218
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
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
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
Haelwenn
56286447ee
Merge branch 'fix/test-upload-cleanup' into 'develop'
...
Cleanup uploads after the tests are finished
See merge request pleroma/pleroma!1695
5 years ago
rinpatch
a12aeb09c4
Cleanup uploads after the tests are finished
5 years ago
rinpatch
eb87a86b5b
Preserve internal fields when reinjecting
5 years ago
rinpatch
84a40f6f26
Capture log in object refetch tests
5 years ago
rinpatch
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
5 years ago
Alex S
4faf2b1555
post for creating invite tokens in admin api
5 years ago
Ivan Tashkinov
b17f217bf3
[ #1234 ] Addressed code analysis issue.
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
Ivan Tashkinov
76068873db
[ #1234 ] Defined admin OAuth scopes, refined other scopes. Added tests.
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
Steven Fuchs
80c5c3495b
remove remaining errors from tests
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
rinpatch
62bbba80f3
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
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
Egor Kislitsyn
b870ae08fd
Fix `Activity.all_by_actor_and_id/2` test
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
53a3ad6043
Merge branch 'cleanup-activity' into 'develop'
...
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
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
Egor Kislitsyn
5bfbad13ad
Add more tests for Pleroma.Activity
5 years ago
Egor Kislitsyn
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
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
lain
a697f0d791
Emoji: Add function to detect if a character is an emoji
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
Egor Kislitsyn
3d12e05f43
Fix `Activity.all_by_ids_with_object/1` test
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
Maksim Pechnikov
eb74c3d5c7
Merge branch 'develop' into issue/1218
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
Sadposter
2975da284b
truncate remote user bio/display name
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
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
b15cfd80ef
Return "total" optionally
5 years ago
Maxim Filippov
a4c5f71e93
Return total from pagination + tests
5 years ago
Ivan Tashkinov
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
5 years ago
Sadposter
e73685834c
add mandatory fields for user update
5 years ago
Sadposter
05c935c396
mix format
5 years ago
Sadposter
35ef470d00
truncate fields for remote users instead
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
Maksim Pechnikov
6ef0103ca0
added Emoji struct
5 years ago
Maxim Filippov
f182f0f6bd
Add ability to search moderation logs
5 years ago
Maksim Pechnikov
d8098d142a
added Emoji.Formatter
5 years ago
Maksim Pechnikov
d7808b5db4
added code\path fields without html tags in ets
5 years ago
Maksim Pechnikov
cef2e980b1
division emoji.ex on loader.ex and emoji.ex
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
Egor Kislitsyn
3b1b631c2a
Add validation in Pleroma.List.create/2
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
lain
5e7098cf69
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
...
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
5 years ago
Haelwenn (lanodan) Monnier
20c3f613d8
HttpRequestMock: Remove useless `error = error`
5 years ago
Haelwenn (lanodan) Monnier
f3b1266273
user_test.exs: fix rel=me tests
5 years ago
Haelwenn (lanodan) Monnier
211e163770
Implement missing mocks for rel=me
5 years ago
Haelwenn (lanodan) Monnier
e22737ffb5
HttpRequestMock: Improve non-implemented error message
5 years ago
Haelwenn (lanodan) Monnier
18668447d2
HttpRequestMock: Log mock errors as warnings
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
Ivan Tashkinov
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
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
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
5 years ago
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
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
lain
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
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
lain
49ae3191df
Merge branch 'hotfix/user_unfollow' into 'develop'
...
[#1177 ] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
5 years ago
Maksim Pechnikov
e652cef76b
removes duplicates from relay subscription list
5 years ago
Ariadne Conill
a2fdc32368
tests: activitypub: fix typo
5 years ago
kaniini
475fcb3e6c
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
...
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
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
Sadposter
58c1391c4d
use commonAPI in tests
5 years ago
Sadposter
94e336d9d5
clear follow requests when blocking a user
5 years ago
Maksim Pechnikov
3315a2a1c3
fixed User.unfollow with synchronization external user
5 years ago
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
Mark Felder
6a3b1a526e
max_body_size -> max_body_length, as it should be
5 years ago
rinpatch
a4a3e3becd
Hide muted theads from home/public timelines unless `with_muted` is set
5 years ago
Maxim Filippov
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
2b94ae3b39
Do not check if actor is active when deleting a user
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
stwf
51bdf0cab6
use default child_specs
5 years ago
lain
d3af9e19ed
Conversations: Load relations in one query.
5 years ago
Egor Kislitsyn
4b7f1c6995
Improve digest email template
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
kaniini
c3a54cc34d
Merge branch 'feature/mrf-describe' into 'develop'
...
MRF describe API
See merge request pleroma/pleroma!1561
5 years ago
rinpatch
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
5 years ago
Ariadne Conill
4244e17de0
fix credo
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
Ariadne Conill
7089400675
test: add mock MRF module for describe() testing
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
Maksim
11d08c2de0
tests for Pleroma.Uploaders
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
Maksim
bb9c539580
Uploader.S3 added support stream uploads
5 years ago
Maxim Filippov
dfae61c25c
Fix deactivated user deletion
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
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
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
lain
a49c92f6ae
Participation: Setting recipients will always add the owner.
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
Eugenij
96028cd585
Remove Reply-To from report emails
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
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
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
lain
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
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
Egor Kislitsyn
9ca4506355
Add configurable length limits for `User.bio` and `User.name`
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
Ariadne Conill
492d854e7a
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
...
Closes #1104
5 years ago
Sachin Joshi
242f5c585e
add account confirmation email resend in mastodon api
5 years ago
Maksim
6a4b8b2681
fixed User.update_and_set_cache for stale user
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
Maksim
03c386614f
fixed test for elixir 1.7.4
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
feld
84fca14c3c
Do not prepend /media/ when using base_url
...
This ensures admin has full control over the path where media resides.
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
Roman Chvanikov
d2da3d30f3
Merge branch 'develop' into feature/digest-email
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
36012ef6c1
Require that ephemeral posts live for at least one hour
...
If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them.
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
378f5f0fbe
Add activity expiration worker
...
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
5 years ago
Mike Verdone
666514194a
Add activity expirations table
...
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
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
kaniini
8d3cf7e519
Merge branch 'bugfix/unauthed-liked-by' into 'develop'
...
Bugfix: don't error out on unauthorized request to liked/favourited_by
See merge request pleroma/pleroma!1474
5 years ago
kaniini
03d89e182e
Merge branch 'fix/subscriber-notifications' into 'develop'
...
Do not notify subscribers for messages from users which are replies to others
See merge request pleroma/pleroma!1477
5 years ago
Mark Felder
ec7b085b76
Fix test
5 years ago
Mark Felder
fd287387a0
Do not notify subscribers for messages from users which are replies to others
5 years ago
Ariadne Conill
e7c64f106e
signature: properly deduce the actor from misskey key IDs
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
Maxim Filippov
14ab2fd0f4
remove pry
5 years ago
Sergey Suprunenko
9340896c9e
Exclude tests that use :crypt.crypt/2 on macOS
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
Sergey Suprunenko
05b5af8075
Add tests for users tasks and PleromaAuthenticator
5 years ago
Sadposter
a5d6287ba8
Hide blocked users from interactions
5 years ago
Ariadne Conill
56019d53a8
activitypub: publisher: align sharedinbox usage with AP specification rules
...
While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification. Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.
5 years ago
rinpatch
196cad46f3
Resolve merge conflicts
5 years ago
Roman Chvanikov
8292331b35
Merge branch 'develop' into feature/digest-email
5 years ago
Sergey Suprunenko
43a7cd27fe
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
5 years ago
Roman Chvanikov
36049f08ef
Merge develop
5 years ago
kaniini
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
5 years ago
kaniini
716afc83ce
Merge branch 'refactor/http-signature-plug' into 'develop'
...
http signature plug: separation of concerns
See merge request pleroma/pleroma!1449
5 years ago
Maksim
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
5 years ago
Sachin Joshi
de9906ad56
change the structure of image ttl parsar
5 years ago
Maxim Filippov
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Ariadne Conill
c947cfec5a
mapped signature plug: use `user` assign like authentication plug
5 years ago
Maksim
f435217e50
tests for Plugs.AuthenticationPlug
5 years ago
Ariadne Conill
621cacf667
tests: add tests for mapped signature plug
5 years ago
Ariadne Conill
88d064d80e
http signature plug: remove redundant checks handled by HTTPSignatures library
...
the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests. but now, the adapter has been corrected.
5 years ago
kaniini
f9a0014681
Merge branch 'feature/signed-object-fetches' into 'develop'
...
signed object fetches
See merge request pleroma/pleroma!1446
5 years ago
Maksim
b6b748d3e7
tests for Uploader with webhook
5 years ago
Ariadne Conill
1345e0c2bf
tests: add tests for signed object fetches
5 years ago
kaniini
1e48af9acf
Merge branch 'feature/instance-fetch-actor' into 'develop'
...
instance fetch service actor
See merge request pleroma/pleroma!1440
5 years ago
kaniini
60b54ee64a
Merge branch 'feature/http-signatures-keyid' into 'develop'
...
http signatures: derive actor from key IDs
See merge request pleroma/pleroma!1442
5 years ago
Ariadne Conill
f84fb340b7
http signatures: derive actor ID from key ID.
...
Almost all AP servers return their key ID as the actor URI with #main-key
added. Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched.
5 years ago
Eugenij
4bf2bb9cff
Fix password reset for non-test env
...
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
5 years ago
Ariadne Conill
3d23a12d75
tests: add test for fetching the internal fetch actor
5 years ago
Ariadne Conill
62e5ff624e
user: add is_internal_user? helper function
5 years ago
kaniini
ce73d5f6a5
Merge branch 'feature/mention-mrf' into 'develop'
...
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
5 years ago
RX14
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
5 years ago
Alexander Strizhakov
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
5 years ago
Maksim
21e3f9ac69
added tests for Pleroma.Upload.Filter
5 years ago
Sachin Joshi
18234cc44e
add the rich media ttl based on image exp time
5 years ago
Roman Chvanikov
9bca70b10a
Merge develop
5 years ago
Eugenij
520ee6c591
Add `pleroma.deactivated` to the Account entity (Mastodon API)
5 years ago
Eugenij
c4ca142e14
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
5 years ago
rinpatch
996fd58ac4
Merge branch 'bugfix/poll-id-as-string' into 'develop'
...
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
5 years ago
lain
7a24def473
Mastodon Controller: Fix tests.
5 years ago
lain
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
5 years ago
feld
9f987dd017
Merge branch 'match-file-name' into 'develop'
...
try to always match the filename for proxy url
See merge request pleroma/pleroma!1405
5 years ago
Sergey Suprunenko
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
5 years ago
Sachin Joshi
1d906ffa82
Merge branch 'develop' into match-file-name
...
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
5 years ago
kaniini
03c4ea44ad
Merge branch 'admin-configure-atom-keys' into 'develop'
...
admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424
5 years ago
Maksim
c32384c1ea
tests for Pleroma.Signature
5 years ago
Alex S
b8607c151c
migrating task refactor
5 years ago
Alex S
c66044b923
atom keys with leading :
5 years ago
Egor Kislitsyn
de13c9bb8f
List messages must be visible for mentioned users
5 years ago
Egor Kislitsyn
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn
a87c313309
Support `list` visibility in StatusView
5 years ago
Maksim
fa17879c20
added tests for Web.MediaProxy
5 years ago
Sergey Suprunenko
dce8ebc9ea
Unfollow should also unsubscribe
5 years ago
Ariadne Conill
841314c2d5
tests: fix object containment violations in the transmogrifier tests
...
Some objects were not completely rewritten in the tests, which caused object
containment violations. Fix them by rewriting the object IDs to be in an
appropriate namespace.
5 years ago
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
Ariadne Conill
739bbe0d3b
security: detect object containment violations at the IR level
...
It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers. OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.
5 years ago
kaniini
cef4337f95
Merge branch 'bugfix/llal-object-containment' into 'develop'
...
Object.Fetcher: Handle error on Containment.contain_origin/2
See merge request pleroma/pleroma!1414
5 years ago
Haelwenn (lanodan) Monnier
a2c601acb5
FetcherTest: Containment refute called(OStatus.fetch_activity_from_url)
5 years ago
Alexander Strizhakov
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
Haelwenn (lanodan) Monnier
f00562ed6b
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site
5 years ago
Haelwenn (lanodan) Monnier
efa9a13d4e
HttpRequestMock: Add missing mocks for object containment tests
5 years ago
rinpatch
0c2dcb4c69
Add follow information refetching after following/unfollowing
5 years ago
rinpatch
183da33e00
Add tests for fetch_follow_information_for_user and check object type
...
when fetching the page
5 years ago
Maxim Filippov
418ae6638d
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Maxim Filippov
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
5 years ago
Ariadne Conill
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
5 years ago
rinpatch
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
5 years ago
Ivan Tashkinov
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
5 years ago
rinpatch
095117a58c
Merge branch 'develop' into fix/ap-hide-follows
5 years ago
rinpatch
97b79efbcd
ActivityPub Controller: Actually pass for_user to following/followers
...
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
5 years ago
Sachin Joshi
f8e3ae6154
try to always match the filename for proxy url
5 years ago
Maksim
92055941bd
Pleroma.Web.Metadata - tests
5 years ago
rinpatch
1f6ac7680d
ActivityPub User view: Following/Followers refactoring
...
- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it
5 years ago
Mark Felder
360e4cdaa2
Move these to pleroma namespace in Mastodon API
5 years ago
rinpatch
27ed260eed
AP user view: Add a test for hiding totalItems in following/followers
5 years ago
Sachin Joshi
6a6c4d134b
preserve the original path/filename (no encoding/decoding) for proxy
5 years ago
Roman Chvanikov
eae991b06a
merge develop
5 years ago
Eugenij
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
5 years ago
Alexander Strizhakov
846ad9a463
admin api configure changes
5 years ago
kaniini
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
5 years ago
Egor Kislitsyn
9e06873d58
Add `list` to Visibility
5 years ago
Egor Kislitsyn
958fb9aa80
Add "listMessage"
5 years ago
Egor Kislitsyn
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
5 years ago
Alexander Strizhakov
a237c6a2d4
support for idna domains
5 years ago
Haelwenn (lanodan) Monnier
252e129b1e
MastoAPI: Add categories to custom emojis
...
Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.
5 years ago
Alex S
beba7bbc85
removing synchronization worker
5 years ago
Alex S
ade213cb35
robots txt test fix
5 years ago
Alex S
f8786fa6f2
adding following_address field to user
5 years ago
Sergey Suprunenko
ff55e3c16f
Create mentions only for explicitly mentioned users
5 years ago
Egor Kislitsyn
c2a589d9a3
Fix credo warning
5 years ago
Egor Kislitsyn
0d54a571ca
Add SetLocalePlug
5 years ago
Maksim
008c55e4e9
add test for search_controller/ 100% coverage
5 years ago
Maksim
12b1454245
[ #1062 ] added option to disable send email
5 years ago
Sergey Suprunenko
2d2b50ccca
Send and handle "Delete" activity for deleted users
5 years ago
kaniini
75be90a6d1
Merge branch 'release/listener' into 'develop'
...
add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393
5 years ago
feld
93a0eeab16
Add license/copyright to all project files
5 years ago
Maksim
bb8065a1fd
tests MRF filters
5 years ago
Sachin Joshi
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
5 years ago
Ivan Tashkinov
8a41d34673
[ #878 ] Tests improvements per code review.
5 years ago
Ivan Tashkinov
6fc0c27be3
[ #878 ] Uncommented test statement.
5 years ago
Ivan Tashkinov
829e997223
[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
...
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
5 years ago
Roman Chvanikov
371d39e160
Merge develop
5 years ago
kaniini
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
5 years ago
Alexander Strizhakov
d6b0fce6e9
Fix/1019 correct count remote users
5 years ago
kaniini
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
5 years ago
Alexander Strizhakov
4e6e5d8042
reverse proxy tests
5 years ago
kaniini
1179a13533
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
...
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
5 years ago
feld
167f810ff1
Merge branch 'proxy-error' into 'develop'
...
make sure the url used by proxy is same as original url
See merge request pleroma/pleroma!1383
5 years ago
Mark Felder
e143747445
Add test for URLs with Unicode characters too
5 years ago
Haelwenn
95c085174d
Merge branch 'test-speedup' into 'develop'
...
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
5 years ago
Mark Felder
ce3ffad13a
Remove duplicated test. New one is more comprehensive.
5 years ago
Mark Felder
31a59d6f23
Merge branch 'develop' into proxy-error
5 years ago
Mark Felder
98f13eac9e
Capitalize
5 years ago
Mark Felder
4213a4e2aa
Test that all ASCII encoded characters are preserved
5 years ago
rinpatch
376a55c97f
Merge branch '161-incoming-replies-depth-limit' into 'develop'
...
[#161 ] Limited replies depth on incoming federation (memory leaks fix)
Closes #161
See merge request pleroma/pleroma!1361
5 years ago
Alexander Strizhakov
23d4781e73
change for local user search
5 years ago
lain
abe2e8881f
Testing: Don't federate in testing.
5 years ago
Ivan Tashkinov
46cf81a544
[ #878 ] Formatting fix.
5 years ago
Ivan Tashkinov
daff85a985
[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
5 years ago
rinpatch
72b88c82bc
Mastodon API: Fix embedded relationships not being rendered inside of statuses
5 years ago
Sachin Joshi
f5ad430974
make sure the url used by proxy is same as origin url
...
encoding or decoding it breaks some of the signed url
5 years ago
Haelwenn (lanodan) Monnier
b5ba41a725
mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header
5 years ago
Ivan Tashkinov
ad8d86e7c6
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
5 years ago
Maksim
6dadf5d6f4
[ #1043 ] fix search accounts.
5 years ago
Egor Kislitsyn
11143c542a
Remove `httpoison` from dependencies
5 years ago
Eugenij
ab50c6b3ca
Add fallback value to the admin report view.
...
This is to avoid 500 error when the reported user no longer exists
in the database.
5 years ago
Roman Chvanikov
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
5 years ago
Ivan Tashkinov
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
5 years ago
Ivan Tashkinov
2b9d914089
[ #161 ] Refactoring, documentation.
5 years ago
Eugenij
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
5 years ago
Maksim
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
5 years ago
rinpatch
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
5 years ago
Ivan Tashkinov
5b7b1040b3
[ #161 ] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
5 years ago
kaniini
d1549a6375
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
...
Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346
5 years ago
William Pitcock
c22f0bfb80
test: add tests for mediaproxy warming policy
5 years ago
Roman Chvanikov
657277ffc0
Resolve conflicts
5 years ago
Maxim Filippov
90927e6a9a
Kowalski, analysis!
5 years ago
Maxim Filippov
452ca5250d
Merge admin and mastodon user views for reports
5 years ago
kaniini
0369a5db16
Merge branch 'idempotency-plug' into 'develop'
...
Add IdempotencyPlug and use it in all of the api
Closes #1003
See merge request pleroma/pleroma!1339
5 years ago
Alexander Strizhakov
c6705144a2
don't delete config settings on admin update
5 years ago
Egor Kislitsyn
889a9c3a3f
Polish IdempotencyPlug
5 years ago
Egor Kislitsyn
825077a5b0
Add Idempotency plug
5 years ago
Sergey Suprunenko
d53fb55bb7
Return correct response when reply to a direct message is not direct itself
5 years ago
Maksim Pechnikov
4ad15ad2a9
add ignore hosts and TLDs for rich_media
5 years ago
Maksim Pechnikov
0cb8e710fb
add test
5 years ago
Maksim
a0c4ebb4d7
[ #184 ] small refactoring reset password
5 years ago
Sergey Suprunenko
2c63c67512
Rework user deletion
5 years ago
Eugenij
f2c03425b0
Broadcast conversation update when DM is deleted
5 years ago
kaniini
27b9605de0
Merge branch 'rich_media_titles_two' into 'develop'
...
Rich media titles two
See merge request pleroma/pleroma!1325
5 years ago
Alex S
b37ede5df3
log capturing
5 years ago
Alex S
982cad0268
support for config groups
5 years ago
Sachin Joshi
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Alex S
410add1c30
support for tuples with more than 2 values
5 years ago
lain
0e415921cd
Rich Media Parser: Do not return just a title if nothing else is there.
5 years ago
lain
58c4d5312b
Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
...
This reverts commit b6af80f769
.
5 years ago
Alex S
f0fccb7578
fix for int and modules
5 years ago
kaniini
55742d978d
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
...
implement anti link spam MRF
See merge request pleroma/pleroma!1307
5 years ago
kaniini
e3534f5b3c
Merge branch 'oauth_secure_redirect' into 'develop'
...
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
5 years ago
kaniini
720412bf24
Merge branch 'revert-6f5a0cc1' into 'develop'
...
Revert "Merge branch 'fix/ogp-title' into 'develop'"
See merge request pleroma/pleroma!1317
5 years ago
feld
b6af80f769
Revert "Merge branch 'fix/ogp-title' into 'develop'"
...
This reverts merge request !1277
5 years ago
Egor Kislitsyn
fc6e661672
Fix rate limiter tests
5 years ago
Alexander Strizhakov
32320c1ee9
Fixes for dynamic configuration
5 years ago
William Pitcock
21dacd4b15
unbreak polls
5 years ago
William Pitcock
736d8ad6be
implement anti link spam MRF
5 years ago
Alexander Strizhakov
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
5 years ago
lain
5c6c4ce634
Merge branch 'fix/rich-media-hashtags-again' into 'develop'
...
Rich Media: Skip Microformats hashtags
See merge request pleroma/pleroma!1304
5 years ago
rinpatch
035368d363
Rich Media: Skip Microformats hashtags
...
When fixing this problem I incorrectly assumed a.hashtag is
the proper way for detecting hashtags, but it is just something Pleroma and
Mastodon add. Per microformats it should be detected by the presense of rel=tag.
This MR adds a check for rel=tag, but I still left a.hashtag just in case
5 years ago
Ivan Tashkinov
9f45f93949
Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
5 years ago
rinpatch
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
5 years ago
rinpatch
49a49d3763
Merge branch 'removing-test-errors' into 'develop'
...
Removing test errors
See merge request pleroma/pleroma!1296
5 years ago
Haelwenn
c34327b22e
Merge branch 'fix/sanitize-report-content' into 'develop'
...
Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293
5 years ago
Alex S
2e2edcb461
capturing errors
5 years ago
Alex S
0f59265a50
salmon fix
...
removed some ownership sandbox error
5 years ago
Maksim
a04bf131e0
[ #570 ] add user:notification stream
5 years ago
rinpatch
bf6aa6f1a8
Fix report content stopping to be nullable
5 years ago
rinpatch
44de34d170
Credo fixes
5 years ago
rinpatch
e943905bd7
Add tests for report view
5 years ago
kaniini
52b1b0e45d
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
...
[#963 ] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276
5 years ago
lain
a440cf856d
Mastodon API: Return the token needed for the chat.
5 years ago
rinpatch
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
5 years ago
Alexander Strizhakov
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
lain
7f48b90bfb
Merge branch 'fix/hashtag-rich-media' into 'develop'
...
Fix hashtags being picked up by rich media parser
Closes #989
See merge request pleroma/pleroma!1288
5 years ago
Maksim
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
5 years ago
rinpatch
d0ebc0edf3
Fix hashtags being picked up by rich media parser
...
Closes #989
5 years ago
lain
eac298083f
MastodonAPI: Add a way to update the background image.
5 years ago
lain
5965efb216
AccountView: Add user background.
5 years ago
lain
6f5a0cc14e
Merge branch 'fix/ogp-title' into 'develop'
...
Rich Media Parser: Attempt to use <title> from HTML as a fallback
Closes #979
See merge request pleroma/pleroma!1277
5 years ago
Egor Kislitsyn
30e54fd7e2
Handle HTTP 404 response
5 years ago
Egor Kislitsyn
afae3ada22
Handle HTTP "410 Gone" response
5 years ago
Egor Kislitsyn
a12f8e13c8
Improve <title> fallback; Add a test
5 years ago
Ivan Tashkinov
4b2c29016c
[ #963 ] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
5 years ago
Egor Kislitsyn
6f29865d43
Add option to restrict all users to local content
5 years ago
lain
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
5 years ago
Egor Kislitsyn
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
5 years ago
Egor Kislitsyn
2e5affce61
Add RateLimiter
5 years ago
kaniini
f2d72b1fe4
Merge branch 'preload-changes' into 'develop'
...
Conversations: Fetch users in one query.
See merge request pleroma/pleroma!1258
5 years ago
Sergey Suprunenko
365268d522
Add more tests for using media_proxy and whitelists
5 years ago
rinpatch
dffc9f060a
replace missing mock with a 404
5 years ago
rinpatch
d020f68e87
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
5 years ago
lain
970f71e222
Conversations: Fetch users in one query.
5 years ago
Roman Chvanikov
01fe5abad1
Resolve conflicts
5 years ago
lain
cb2bcee842
User Search: Boost friends more strongly.
5 years ago
lain
7e9f7ea0c2
MastodonAPI: Add test for user search.
5 years ago
Egor
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
5 years ago
kaniini
3f6da9c45a
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
...
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
5 years ago
kaniini
a511d2f900
Merge branch 'improve-search' into 'develop'
...
[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
5 years ago
lain
ad19bfc7fe
Utils: Split update_follow_state and update_follow_state_for_all.
5 years ago
lain
827a51e777
CommonAPI: Add test for accept_follow_request.
5 years ago
lain
076c9ae40e
User: Remove superfluous `maybe_follow`.
5 years ago
lain
3115b64cfe
Transmogrifier: Add tests for incoming follows to locked accounts.
5 years ago
Egor Kislitsyn
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain
024dfdc39c
Typo + Linting.
5 years ago
lain
8b9a0dd4a7
User: Don't error out when following a user that's already followed.
...
This leads to a few situations where it is impossible to follow a user.
5 years ago
Egor Kislitsyn
5b04f07a1e
Limit search for unauthenticated users to local users only
5 years ago
Egor Kislitsyn
17a6f81f7b
Fix tests with enabled RUM
5 years ago
Egor Kislitsyn
93397fce3d
Contain search for unauthenticated users
5 years ago
kaniini
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
5 years ago
Egor Kislitsyn
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Roman Chvanikov
b1b1a270e8
Fix conflict
5 years ago
Haelwenn
ab4915edcb
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
...
Participations: Filter out participations without activities.
Closes #956 and #953
See merge request pleroma/pleroma!1246
5 years ago
Maksim Pechnikov
d3d1704e84
Merge branch 'develop' into issue/941
5 years ago
lain
a3a7178b60
Participations: Filter out participations without activities.
5 years ago
rinpatch
bbff7554de
Add tests for get_existing_votes
5 years ago
Egor Kislitsyn
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain
4cab98b7bf
Merge remote-tracking branch 'origin/develop' into explicit-addressing
5 years ago
Maksim Pechnikov
4f2e359687
Merge branch 'develop' into issue/941
5 years ago
kaniini
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
5 years ago
Sergey Suprunenko
84cc131b59
Add missing HTTP Request mocks
5 years ago
kaniini
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
5 years ago
Roman Chvanikov
f6036ce3b9
Fix tests
5 years ago
Roman Chvanikov
bd325132ca
Fix tests
5 years ago
Roman Chvanikov
3e17610587
Add task to test emails
5 years ago
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
Maksim Pechnikov
64ada7f960
fix tests
5 years ago
Maksim Pechnikov
f13d6c7f78
update api to set skip_thread_containment
5 years ago
lain
804b6a4d8f
CommonAPI.Utils: Add tests.
5 years ago
lain
80d4d83aac
CommonAPI: Add explicit addressing.
5 years ago
lain
2b664b048e
User: Add function to get AP ids from nicknames.
5 years ago
Maksim Pechnikov
080e1aa70e
add option skip_thread_containment
5 years ago
rinpatch
dc91bcc0af
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
lambda
314758c25b
Merge branch 'align-mastodon-conversations' into 'develop'
...
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
5 years ago
rinpatch
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
rinpatch
2fe3a20638
Make error message about author's inability to vote more sensible
5 years ago
rinpatch
c47da0e65d
Add tests for poll view
5 years ago
William Pitcock
38a275b31f
test: add tests for subchain policy
5 years ago
kaniini
5402d04e3c
Merge branch 'feature/notification-control-part-2' into 'develop'
...
notification controls, part 2
See merge request pleroma/pleroma!1204
5 years ago
Sachin Joshi
e394fc2eef
fix the flaky test for users creation by admin
5 years ago
rinpatch
cfa588e357
Fix Credo issues
5 years ago
rinpatch
65db5e9f52
Resolve merge conflicts
5 years ago
rinpatch
300d94c628
Add poll votes
...
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
5 years ago
Sachin Joshi
ad5263c647
Merge remote-tracking branch 'upstream/develop' into admin-create-users
5 years ago
Sachin Joshi
5534d4c676
make bulk user creation from admin works as a transaction
5 years ago
kaniini
e706b42f51
Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
...
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
See merge request pleroma/pleroma!1230
5 years ago
Sergey Suprunenko
2bbc2a801f
Remove all follower collections but actor's from "cc"
5 years ago
kaniini
d46cc7896e
Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'
...
Bugfix: remove vanilla flavour
See merge request pleroma/pleroma!1228
5 years ago
William Pitcock
f2efe24cf8
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
5 years ago
Sachin Joshi
d4304a3945
add the missing mock file
5 years ago
Haelwenn (lanodan) Monnier
5d3ece2861
Remove now useless flavours switching
5 years ago
lambda
2993361075
Merge branch 'hotfix/leaking-lists' into 'develop'
...
Mastodon API: Fix lists leaking private posts
See merge request pleroma/pleroma!1222
5 years ago
lain
7861974ab2
MastodonAPI: Add extension to set and get pleroma_settings_store.
5 years ago
lain
aaad85c4d9
AccountView: settings -> settings_store
5 years ago
lain
eb2963bc43
User: Add settings store to Info, AccountView
...
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
5 years ago
rinpatch
d9c0650ff9
Mastodon API: Fix lists leaking private posts
...
Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).
Reported by @kurisu@iscute.moe via a DM
5 years ago
rinpatch
a9eaa55885
Fix fix_explicit_addressing moving follower collection to cc and add tests for it
5 years ago
lain
97fb50d9fa
Mastodon Conversation API: Don't return own account in 'accounts'.
5 years ago
Sergey Suprunenko
1690be991e
Replace missing non-nullable Card attributes with empty strings
5 years ago
lambda
91ac8b075b
Merge branch 'use-pleroma-config' into 'develop'
...
Use Pleroma.Config everywhere
See merge request pleroma/pleroma!1214
5 years ago
Egor Kislitsyn
99f70c7e20
Use Pleroma.Config everywhere
5 years ago
Roman Chvanikov
ce47017c89
Merge develop
5 years ago
Maksim
db94294dfb
[ #936 ] fix tests
5 years ago
Sachin Joshi
1452a96ad6
ability to set and reset avatar, profile banner and backgroud in Mastodon API
5 years ago
lambda
5bb843ceec
Merge branch 'refactor/die-httpoison-die' into 'develop'
...
remove @httpoison, @ostatus and @websub compile-time constants
See merge request pleroma/pleroma!1203
5 years ago
William Pitcock
79503ce90f
mrf: simple policy: fix matching imported activitypub and ostatus statuses
5 years ago
William Pitcock
45e4642a58
tests: chase remote/local removal
5 years ago
William Pitcock
59a703fcbe
twitter api: user view: expose user notification settings under pleroma object
5 years ago
William Pitcock
0f7eeb0943
tests: add tests for non-follows/non-followers settings
5 years ago
William Pitcock
1542cccbbc
tests: chase notification setting changes
5 years ago
William Pitcock
56fd7dbdd7
remove @websub and @ostatus module-level constants
5 years ago
William Pitcock
80d55d428f
tests: websub: check only that signature validation succeeds or fails
5 years ago
Aaron Tinio
9415932af5
Keep nodeinfo available when not federating
5 years ago
Sergey Suprunenko
bbea5691da
Mention all people in the beginning of DM
5 years ago
feld
f916e4cdd9
Move the Cache Control header test to its own file
...
We can consolidate our cache control header tests here
5 years ago
Egor Kislitsyn
a7affbdd6d
Fix tests
5 years ago
Egor Kislitsyn
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Sachin Joshi
0c53d91f3b
fix merge conflict
5 years ago
William Pitcock
8086c7aed6
tests: add tests for banner and avatar removal
5 years ago
rinpatch
19c90d47c4
Normalize poll votes to Answer objects
5 years ago
Maksim
620908a2db
[ #699 ] add worker to clean expired oauth tokens
5 years ago
lambda
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
5 years ago
lambda
ff363f70b5
Merge branch 'refactor/keys' into 'develop'
...
move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186
5 years ago
rinpatch
cdac5efd10
Merge branch 'bugfix/account_view_source.note' into 'develop'
...
MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189
5 years ago
Haelwenn (lanodan) Monnier
0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
5 years ago
Sachin Joshi
17bfd000d7
Ability to reset avatar, profile banner and backgroud
5 years ago
kaniini
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
5 years ago
kaniini
ab6e15622b
Merge branch 'fix/api-fallback' into 'develop'
...
Do not fallback to index.html for /api/* routes
Closes #920
See merge request pleroma/pleroma!1182
5 years ago
Sergey Suprunenko
9134848170
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
5 years ago
William Pitcock
045803346d
move key generation functions into Pleroma.Keys module
5 years ago
Aaron Tinio
f76268135c
Fix failing test
5 years ago
Aaron Tinio
3ab9255eda
Respond with a 404 Not implemented JSON error message
...
when requested API is not implemented
5 years ago
Aaron Tinio
a13d449b24
Add tests for fallback routes
5 years ago
William Pitcock
73df9d690d
object: fetcher: add support for reinjecting pruned objects
5 years ago
rinpatch
63b0b7190c
MastoAPI: Add GET /api/v1/polls/:id
5 years ago
rinpatch
0407ffe75f
Change validation error status codes to be more appropriate
5 years ago
rinpatch
aafe30d94e
Handle poll votes
5 years ago
rinpatch
3f96b3e4b8
Enforce poll limits and add error handling for MastodonAPI's post endpoint
5 years ago
rinpatch
76a7429bef
Add poll limits to /api/v1/instance and initial state
5 years ago
kaniini
d4847b17ca
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
...
Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178
5 years ago
Aaron Tinio
eb02edcad9
Add virtual :thread_muted? field
...
that may be set when fetching activities
5 years ago
Sadposter
dc916ba15f
Format mascot tests
5 years ago
Sadposter
e81f0fc6d4
Add mascot get/set tests
5 years ago
Aaron Tinio
2375e9a95b
Add report filtering to MRF.SimplePolicy
5 years ago
rinpatch
5ece901af3
Resolve merge conflicts and remove IO.inspects
5 years ago
rinpatch
fd920c8973
Mastodon API: Add support for posting polls
5 years ago
William Pitcock
dc08159538
also suppress link previews from posts marked #nsfw
5 years ago
William Pitcock
0da1233e8e
rich media: suppress link previews if post is marked as sensitive
5 years ago
lain
f959bf7aa6
MongooseIM: Add basic integration endpoints.
5 years ago
Egor Kislitsyn
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn
f2936e0a07
Add `ap_id` to List
5 years ago
lain
249b31ffe5
Fix specs.
5 years ago
Alexander Strizhakov
7ed682213f
Fix/902 random compile failing
5 years ago
Sachin Joshi
5c028b8f92
user creation admin api will create multiple users
5 years ago
Aaron Tinio
443cd68a4c
Add tests for MRF.SimplePolicy
5 years ago
kaniini
bf84d50c76
Merge branch 'feature/890-add-report-uri' into 'develop'
...
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
5 years ago
Sergey Suprunenko
2c303afc8b
Remove duplicated entries in users' following lists
5 years ago
Sergey Suprunenko
e2b3a27204
Add Reports to Admin API
5 years ago
feld
e190b3022b
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
...
Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157
5 years ago
Mark Felder
ebb0482116
Merge branch 'develop' into conversations-import
5 years ago
lambda
fde30aee43
Merge branch 'feature/sql-thread-sat' into 'develop'
...
SQL thread visibility solver
See merge request pleroma/pleroma!971
5 years ago
Alexander Strizhakov
73ae58fdfa
Feature/896 toggling confirmation
5 years ago
Egor Kislitsyn
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Alex S
4711d8151c
try this
5 years ago
Alex S
aa11fa4864
add report uri and report to
5 years ago
Aaron Tinio
2b6119dfbf
Restrict reblogs of activities from blocked domains
5 years ago
Aaron Tinio
64495b96e9
Add test for blocked domains
5 years ago
rinpatch
62e42b03ab
Handle incoming Question objects
5 years ago
William Pitcock
f09c3afdf5
chase test failures
5 years ago
William Pitcock
c7644313e7
test: update obsolete test
5 years ago
lain
f168a1cbdc
Merge remote-tracking branch 'origin/develop' into conversations-import
5 years ago
kaniini
62516be9c4
Merge branch 'fix/public-option-not-working' into 'develop'
...
Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143
5 years ago
lambda
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
5 years ago
William Pitcock
4429c1b7da
tests: fixup
5 years ago
lain
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
5 years ago
Sachin Joshi
ee22fff5ac
remove deprecated PleromaFE configuration
5 years ago
Egor Kislitsyn
a7a8f3bc2c
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Aaron Tinio
70c81b95d0
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
5 years ago
Aaron Tinio
7b8dc99ef1
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
5 years ago
William Pitcock
071f78733a
switch to pleroma/http_signatures library
5 years ago
kaniini
dfd031c26a
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
...
Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148
5 years ago
Maksim
52297920e7
Refactoring oauth response.
5 years ago
Egor Kislitsyn
d474995efa
Add Tests
5 years ago
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Aaron Tinio
a18b2c0b12
Fix Pleroma.Config.get!/1 raising an error when value is false
5 years ago
lambda
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
5 years ago
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
Sachin Joshi
7701a4c841
Make irreversible field default to false in filters
5 years ago
rinpatch
15cda998f3
Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type
5 years ago
William Pitcock
582bd9d170
tests: fix AP test failures
5 years ago
William Pitcock
d823eb921b
tests: fix salmon tests
5 years ago
William Pitcock
2b847d4add
tests: chase federator publish_single_foo removals
5 years ago
kaniini
131f883207
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
...
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129
5 years ago
Sachin Joshi
f01f995816
make url uniform in admin api
5 years ago
Roman Chvanikov
f1f7a11222
Merge develop
5 years ago
Francis Dinh
2a54e8c1f5
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
...
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
5 years ago
rinpatch
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
5 years ago
lain
a33bec7d58
Conversations: Import order, import as read.
5 years ago
lain
a4598b5e8b
Visibility: Make it more resilient.
5 years ago
lain
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
5 years ago
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
5 years ago
Roman Chvanikov
b6b5b16ba4
Merge develop
5 years ago
rinpatch
4c5125dedc
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
rinpatch
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
5 years ago
rinpatch
f841eb7cdb
Preload bookmarks wherever the object is preloaded
5 years ago
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
5 years ago
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
lain
eb0fb73ddb
BBS: Credo fixes.
5 years ago
lain
c58fd4c038
BBS: Fix tests.
5 years ago
lain
4c76f49e60
BBS: small fixes.
5 years ago
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
Haelwenn (lanodan) Monnier
b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier
2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
Haelwenn (lanodan) Monnier
d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
Haelwenn (lanodan) Monnier
85b5c60694
Pleroma.Formatter: width/height to class=emoji
5 years ago
lain
81d1aa424d
Streamer: Stream out Conversations/Participations.
5 years ago
lambda
497d34b825
Merge branch 'iss-849' into 'develop'
...
Parse access_token from body parameters and URL parameters
See merge request pleroma/pleroma!1103
5 years ago
AkiraFukushima
a53a6c9d64
Add oauth plug tests for url and body parameters
5 years ago
Roman Chvanikov
8af55728e4
Fix tests
5 years ago
lain
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Maksim
c854bff8f5
Refactored Pleroma.Web.Auth.Authenticator
5 years ago
lambda
0bcdaf378e
Merge branch 'bugfix/web-notification-special-char' into 'develop'
...
fix the web push notification with special char for status created
See merge request pleroma/pleroma!1092
5 years ago
Alex S
f11e7037c2
test fixes
5 years ago
Sachin Joshi
cd6da3606b
Merge branch 'develop' into bugfix/web-notification-special-char
5 years ago
Roman Chvanikov
0f0cc2703b
Merge develop
5 years ago
lain
b0951a8849
WebPush: Use Object.normalize, rewrite tests so they test reality.
5 years ago
rinpatch
0fd176b990
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
...
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
5 years ago
kaniini
292c69481b
Merge branch 'regression/rights-only-for-admin' into 'develop'
...
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
5 years ago
rinpatch
61ca2f7a4e
Fix `rights` in TwitterAPI's user entity being present only for
...
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
5 years ago
rinpatch
ce3789e39a
Add default_scope to /api/v1/update_credentials
5 years ago
rinpatch
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
5 years ago
kaniini
002ea343f8
Merge branch 'feature/bbcode' into 'develop'
...
BBCode support (backend)
See merge request pleroma/pleroma!1097
5 years ago
William Pitcock
ef52aa0e66
tests: fix up for changed bbcode library output and verify html is properly escaped
5 years ago
William Pitcock
501af917b5
add support for bbcode
5 years ago
lambda
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
5 years ago
kaniini
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
5 years ago
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
5 years ago
rinpatch
dfc8425659
Move settings to Source subentity
5 years ago
Alex S
85953c0836
fixes for tests
5 years ago
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
Alex S
73d01857e3
bookmarks in separate table
5 years ago
William Pitcock
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
5 years ago
rinpatch
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
6 years ago
Sachin Joshi
963d5774af
fix the status notification with special char
6 years ago
kaniini
030a7876b4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
...
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
6 years ago
William Pitcock
f5535e5743
html: lock down allowed class attributes to only those related to microformats
6 years ago
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
6 years ago
rinpatch
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
6 years ago
Egor
b9cdf6d3b9
Use `User.get_cached*` everywhere
6 years ago
Alexander Strizhakov
88f0be9693
Feature/826 healthcheck endpoint
6 years ago
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
kaniini
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
6 years ago
Roman Chvanikov
2662bea4e0
Add accounts and last_status to conversation read response
6 years ago
Ivan Tashkinov
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
6 years ago
eugenijm
375fd21055
Set correct values in the MastoAPI reblog status view
6 years ago
Roman Chvanikov
724311e151
Fix Credo warnings
6 years ago
Roman Chvanikov
60f213bb1a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Ekaterina Vaartis
aef3a3ca46
Fix tests that used finmoji
6 years ago
Ekaterina Vaartis
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
eugenijm
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
6 years ago
kaniini
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
6 years ago
Roman Chvanikov
73407f4eea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov
bc7862106d
Fix tests
6 years ago
Roman Chvanikov
8add119444
Add User.list_inactive_users_query/1
6 years ago
Roman Chvanikov
aeafa0b2ef
Add Notification.for_user_since/2
6 years ago
Alexander Strizhakov
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
lambda
218d96a26b
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
...
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
6 years ago
rinpatch
4ef237f26a
Fix my incorrect search test fix
6 years ago
rinpatch
83589ca6a5
Merge branch 'develop' into feature/database-compaction
6 years ago
rinpatch
6069d0fd36
Fix object search depending on embeded object
6 years ago
rinpatch
2abc09570f
Use the preloaded object in tag queries
6 years ago
William Pitcock
36f78c6dcd
activitypub: fix filtering of boosts from blocked users
6 years ago
William Pitcock
2140e164d7
activitypub: properly filter out transitive activities concerning blocked users
6 years ago
rinpatch
35ac672b8d
Remove containment tests from transmogrifier and fix thread visibility solver
6 years ago
rinpatch
d1eb578a57
Refactor tests that used ActivityPub.fetch_object_from_id
6 years ago
rinpatch
8e4d950f31
Remove updating reply count for embeded objects
6 years ago
rinpatch
ff8d76c670
Refactor all tests that acessed the embeded object
6 years ago
rinpatch
54b82f236b
Fix note count test
6 years ago
rinpatch
ad681877df
Make credo happy
6 years ago
rinpatch
e7c3c36766
Update functions in object fetcher for tesla and set up a proper mock for tests
6 years ago
rinpatch
b09ae02c04
Added some more normalization calls all in mastodon api controller
6 years ago
Roman Chvanikov
2f0203a4a1
Resolve conflicts
6 years ago
Roman Chvanikov
87013f8438
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
rinpatch
dda4e0e2a8
Fix warnings in object tests
6 years ago
rinpatch
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
kaniini
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
6 years ago
Haelwenn
cde7711b12
Merge branch 'bugfix/relax-spam-protection' into 'develop'
...
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
6 years ago
Normandy
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
6 years ago
William Pitcock
750b369d04
activitypub: allow indirect messages from users being followed at a personal inbox
6 years ago
lain
76999c73a7
Conversation: Add accounts to output.
6 years ago
lain
0da985182f
Conversation: Return full status object, id is a string.
6 years ago
lain
c1ebb38d3a
Conversation: Also create participations for remote users.
...
Needed to get the participating user list.
6 years ago
lambda
56956de6fa
Merge branch 'fix/status-reblogged' into 'develop'
...
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
6 years ago
lambda
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
6 years ago
eugenijm
27d78dc526
Use User.get_cached_by*
6 years ago
rinpatch
fd2e31af86
oops
6 years ago
rinpatch
5d73dca064
Remove inReplyToStatusId
6 years ago
eugenijm
507e7821e3
Handle follow/unfollow directed to themselves
6 years ago
Roman Chvanikov
dc21181f65
Update updated_at field on notification read
6 years ago
eugenijm
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
Roman Chvanikov
0cd4b6024d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Roman Chvanikov
371a4aed2c
Add User.Info.email_notifications
6 years ago
Alex S
c5d0fffeaf
naming fix
6 years ago
Alex S
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
6 years ago
lambda
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
6 years ago
Egor Kislitsyn
d0304b4f92
more tests
6 years ago
Egor Kislitsyn
dd097a406b
add tests
6 years ago
lambda
0a09692c7d
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
...
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
6 years ago
Alexander Strizhakov
711ade961e
adding destroy multiple for mastofe
6 years ago
Alexander Strizhakov
e03d24af96
in_reply_to_id - null
6 years ago
lain
6f880b1627
Conversation: Fix tests.
6 years ago
lain
36ec8d9694
ActivityPub: Fix specs.
6 years ago
Ivan Tashkinov
c3f12cf3c3
[ #923 ] OAuth consumer params handling refactoring.
...
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
6 years ago
lain
c352a0aba6
Conversations: Make tests run.
6 years ago
lain
cf353514fe
Participations: Add last activity.
6 years ago
lain
20d9b90760
Participation: Get for a user.
6 years ago
lain
280172f6f6
Conversations: Create or bump on inserting a dm.
6 years ago
lain
64c1c3a407
Participations: Add marking as read and unread.
6 years ago
lain
d1da6b155a
Conversation: Add Conversations and Participations.
6 years ago
Alex S
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
6 years ago
Alex S
fe13a1d78c
adding notify_email setting for trigger emails
6 years ago
lambda
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
6 years ago
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
lain
b5cecebbc1
Conversations: Fix specs.
6 years ago
lambda
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
6 years ago
Haelwenn (lanodan) Monnier
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
6 years ago
kaniini
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
rinpatch
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
rinpatch
144648de92
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
...
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
6 years ago
lambda
0a02ed7a2f
Merge branch 'bugfix/follower_count' into 'develop'
...
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
6 years ago
Sachin Joshi
07afb9b537
update the follower count when a follower is blocked
6 years ago
Alex S
fee50636d0
removing not needed invite update
6 years ago
lain
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
6 years ago
Egor Kislitsyn
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
Sadposter
13ff312c48
Sever subscription in case of block
6 years ago
lambda
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
lambda
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
6 years ago
Alexander Strizhakov
36c0a10fdf
adding language tag
6 years ago
Alex S
f0ca0696c8
test for valid_invite?
6 years ago
lambda
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
Egor Kislitsyn
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
Ivan Tashkinov
44829d9181
AdminApiControllerTest unused variables fix.
6 years ago
Egor Kislitsyn
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
6 years ago
Ivan Tashkinov
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
lambda
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
6 years ago
lambda
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
6 years ago
Alex S
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
Sadposter
76fdfd1c7f
Add check on activity visibility in sub notification
6 years ago
Alex S
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
6 years ago
feld
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
6 years ago
eugenijm
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
eugenijm
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
eugenijm
b3870df51f
Handle `scheduled_at` on status creation.
6 years ago
eugenijm
7bf622ce73
Add scheduled activities
6 years ago
eugenijm
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
6 years ago
feld
876965a7e7
Merge branch 'fix/failed-legacy-test' into 'develop'
...
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS
See merge request pleroma/pleroma!1030
6 years ago
Alex S
ce8d457132
little channges
6 years ago
Alex S
76d8928cf1
fix for field name
6 years ago
Alex S
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
Alex S
dcc54f8cfa
admin api endpoints for invites
6 years ago
Alex S
47b07cec49
token -> invite renaming
6 years ago
Alex S
be54e40890
twitter api registration
...
fix for twitter api tests
6 years ago
Alex S
0484f3a8b1
generating tokens with mix
6 years ago
Sergey Suprunenko
325a268017
Redirect to the referer url after mastofe authorization
6 years ago
Sergey Suprunenko
e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS
6 years ago
Mark Felder
fac76bfa35
We actually want the user id not nickname in the test...
6 years ago
Mark Felder
c746087f57
Also remove Repo functions in the tests
6 years ago
Roger Braun
7895ee37fa
Add user following / unfollowing to the admin api.
6 years ago
Sadposter
a270e7a191
Mix format everything
6 years ago
Sadposter
f6e131eeb9
Don't use twitterAPI for subscription tests
6 years ago
Sadposter
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
Sadposter
73afd13c21
Add subscription key to one test I forgot about
6 years ago
Sadposter
06cd547fc6
Format subscriptions related stuff
6 years ago
Sadposter
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
6 years ago
Sadposter
75c4ceb4a2
Add tests for subscriptions
6 years ago
Egor Kislitsyn
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
Ivan Tashkinov
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
Ivan Tashkinov
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
6 years ago
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Ivan Tashkinov
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
6 years ago
Egor Kislitsyn
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
Haelwenn
0cb94cfa94
Merge branch 'fix-slow-relationships' into 'develop'
...
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
6 years ago
lambda
256b492a58
Merge branch 'bugfix/wrong-date-format' into 'develop'
...
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
6 years ago
lambda
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
6 years ago
lain
39bcf93007
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
6 years ago
lain
fd07745d1b
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
6 years ago
Alex S
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
6 years ago
lambda
180b87257c
Merge branch 'bugfix/share-mastodon' into 'develop'
...
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
6 years ago
lambda
ce9284b36f
Merge branch 'remove-user-activities' into 'develop'
...
[#757 ] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
6 years ago
lambda
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
6 years ago
Alex S
9e0567ec52
Merge develop into feature/770-add-emoji-tags
6 years ago
rinpatch
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
6 years ago
Egor Kislitsyn
20c619f85f
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests
6 years ago
lambda
091baf9316
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
...
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
6 years ago
lambda
26d509cc86
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
6 years ago
cascode
95c92c49c9
Fix account lookup for nicknames beginning with numbers
6 years ago
Egor Kislitsyn
9a59c26619
replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
6 years ago
Ivan Tashkinov
15ce710460
Added "GET /oauth/authorize" tests.
6 years ago
Egor Kislitsyn
11c2d6bdc4
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
6 years ago
Egor Kislitsyn
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
6 years ago
Sergey Suprunenko
3db9235150
Ignore dates in wrong formats
6 years ago
Egor Kislitsyn
a14742f495
add `user delete_activities` mix task
6 years ago
Alex S
484162c187
test fix
6 years ago
Alex S
9b2188da7c
refactoring of emoji tags config to use groups
6 years ago
Ivan Tashkinov
aac48d0cc6
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
6 years ago
Sachin Joshi
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
6 years ago
Sergey Suprunenko
b6f9f7b8aa
Handle dates in the Unix timestamp format ( Fixes #763 )
6 years ago
Sachin Joshi
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
6 years ago
Alex S
17d3d05a71
code style
...
little fix
6 years ago
Alex S
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
lain
e3bf6655ba
Add replying.
6 years ago
lain
10fdc080a0
BBS: Tests and formatting.
6 years ago
rinpatch
1bb4d5d65b
Implement fake status submit
6 years ago
Egor
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
Haelwenn (lanodan) Monnier
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
6 years ago
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
eugenijm
55d086b520
Notification controls
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
6 years ago
eugenijm
10c81fc902
Add user show endpoint for Pleroma admin API
6 years ago
lambda
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
6 years ago
rinpatch
776bb5137f
Fix muting reblogs tests
6 years ago
Maxim Filippov
3cf7539bca
Add more user filters + move search to its own module
6 years ago
eugenijm
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
6 years ago
eugenijm
691d1208b5
Add GET /api/v1/apps/verify_credentials
6 years ago
lambda
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
6 years ago
lambda
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
6 years ago
lain
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
6 years ago
Ivan Tashkinov
47b49ab1a1
Test for MastoAPI /api/v1/instance response structure (formatting fix).
6 years ago
lambda
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
6 years ago
Ivan Tashkinov
caf0e9cf33
Test for MastoAPI /api/v1/instance response structure.
6 years ago
lambda
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
6 years ago
rinpatch
aacdcac1be
Credo is upset about me not remembering the alphabet
6 years ago
rinpatch
087662d4fb
Fix formatting
6 years ago
rinpatch
406d19331f
Remove ActivityRepresenter
6 years ago
eugenijm
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
Ivan Tashkinov
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
6 years ago
William Pitcock
26b0c802c3
fix up missing announcements with preloads
6 years ago
rinpatch
a32bcab04b
Merge branch 'fix/eldap-warnings' into 'develop'
...
Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956
6 years ago
William Pitcock
4a3dd86a55
tests: fix up activity collision test
6 years ago
William Pitcock
aaec91b9a1
relay test: don't do preloading (since follow objects are activities, it's a mess)
6 years ago
William Pitcock
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
6 years ago
lambda
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
6 years ago
lain
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
6 years ago
rinpatch
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
6 years ago
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
William Pitcock
a223e65f35
tests: fixup
6 years ago
William Pitcock
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
6 years ago
William Pitcock
fea3696799
common api: move context functions from twitterapi
6 years ago
lain
bf27190f7f
UtilController: Return state of safe dm mentions.
6 years ago
link0ff
f858df819b
Skip tests in LDAPAuthorizationTest if :eldap module is unavailable
6 years ago
kaniini
b68fb3dc17
Merge branch 'imageoptim' into 'develop'
...
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
6 years ago
lain
8468f3f6d4
Add safe dm mode option.
6 years ago
Maxim Filippov
ed8a2935f5
Use ILIKE to search users
6 years ago
William Pitcock
455bb526f6
test: add test for list sanitization
6 years ago
William Pitcock
fd0aa58ee0
tests: add test for as:Public issues
6 years ago
optikfluffel
00c5d7248f
fix UploadTest to use new image_tmp.jpg
6 years ago
optikfluffel
a907522690
used imageOptim to reduce size of image files
6 years ago
kaniini
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
6 years ago
eugenijm
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
6 years ago
Haelwenn (lanodan) Monnier
42d034505a
Add test for conversation API beforehand
6 years ago
Fong-Wan Chau
4ed2618f6c
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
6 years ago
Maxim Filippov
76a13bc5a2
Fix test
6 years ago
Maxim Filippov
93291c3d7a
Order users by nickname
6 years ago
kaniini
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
6 years ago
lambda
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
6 years ago
kaniini
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
6 years ago
William Pitcock
40134598a8
test: fix defective ldap setup/teardown
6 years ago
William Pitcock
e0edc706cf
oauth: add me property to token responses
6 years ago
eugenijm
43fb03be5a
Allow to mark a single notification as read
6 years ago
kaniini
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
6 years ago
link0ff
a070dd4a83
Add tests for LDAP authorization
6 years ago
Karen Konou
ebfc10c834
Fix streamer test
6 years ago
Karen Konou
da53c079db
Refactor to store user ap_id, add tests
6 years ago
Karen Konou
13c298d354
Fix tests to assume reblogs shown by default
6 years ago
Haelwenn
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
6 years ago
rinpatch
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
6 years ago
kaniini
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
6 years ago
eugenijm
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
rinpatch
cbdd11c381
Merge develop to bump elixir version in the CI so I don't get failing formatting
6 years ago
rinpatch
355f285a86
Fix uploaded media plug test
6 years ago
William Pitcock
414d4b8088
test: add a test for accepting inbound Flag activities
6 years ago
rinpatch
e2fe796c63
Add some tests
6 years ago
Maxim Filippov
257d8e78e5
Add tags
6 years ago
Maxim Filippov
4872914d32
Add test when local is false
6 years ago
Maxim Filippov
d5edff6ce6
Fix test
6 years ago
Maxim Filippov
490d9cf7b1
Add "local" to users admin API
6 years ago
Haelwenn (lanodan) Monnier
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
6 years ago
Haelwenn (lanodan) Monnier
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
6 years ago
Haelwenn (lanodan) Monnier
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
Haelwenn (lanodan) Monnier
6c8743d0c0
[Credo] Fix the warnings
6 years ago
Maxim Filippov
25eb6cf1cb
Add "roles" to users admin API
6 years ago
kaniini
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
6 years ago
eugenijm
984b5f8adf
MastoAPI followers/following endpoints
6 years ago
rinpatch
faf238c1b0
Fix upload tests
6 years ago
lain
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
6 years ago
lambda
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
6 years ago
lain
4811eefa6e
MastoAPI StatusView: Add locality indicator.
6 years ago
eugenijm
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
6 years ago
kaniini
735f40047a
Merge branch 'delete-status' into 'develop'
...
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
6 years ago
kaniini
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
6 years ago
eugenijm
2827dfea50
Allow an admin to delete a user status
6 years ago
Ekaterina Vaartis
b775fded10
Add tests for fetch_ordered_collection
6 years ago
William Pitcock
3c5926fe91
tests: add regression test
6 years ago
rinpatch
992145e64c
Merge branch 'bugfix/delete-activity-audience' into 'develop'
...
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
6 years ago
eugenijm
7342b5a45f
Preserve parameters in link headers (Mastodon API)
6 years ago
kaniini
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
6 years ago
kaniini
07f8c79a69
Merge branch 'bugfix/rel-me_list' into 'develop'
...
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
6 years ago
Maksim
bc7570c282
[ #647 ] tests for web push
6 years ago
Haelwenn
96901b6554
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
...
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
6 years ago
Karen Konou
28d5b40d0a
Add handling of objects not in database
6 years ago
rinpatch
40ff8f5964
Add tests for reserved char escaping in upload
6 years ago
rinpatch
bcd8ef65e0
Merge branch 'add-admin-to-node-info' into 'develop'
...
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
6 years ago
Haelwenn (lanodan) Monnier
788a354ce0
Web.RelMe: Fix having other values in rel attr
...
One example of this is Github which puts a rel="nofollow me" on the
profile link.
6 years ago
eugenijm
d1de0a30cc
Include admins in nodeinfo
6 years ago
Maxim Filippov
e34710b988
Format & update docs
6 years ago