Mike Verdone
2c83eb0b15
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
...
This reverts commit 2981821db8
2019-07-24 17:09:59 +02:00
Mike Verdone
2981821db8
squash! Expose expires_at datetime in mastoAPI only for the activity actor
...
NOTE: rewrite the commit msg
2019-07-24 16:51:09 +02:00
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.
2019-07-24 14:47:22 +02:00
Sadposter
a5d6287ba8
Hide blocked users from interactions
2019-07-22 02:42:29 +00:00
Mark Felder
9169f331b6
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-19 16:55:10 -05:00
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.
2019-07-17 18:09:31 +00:00
Alexander Strizhakov
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
2019-07-16 21:44:50 +00:00
Ivan Tashkinov
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
2019-07-16 19:18:30 +03:00
Eugenij
520ee6c591
Add pleroma.deactivated to the Account entity (Mastodon API)
2019-07-16 11:14:46 +00:00
Eugenij
c4ca142e14
Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships)
2019-07-16 11:04:11 +00:00
rinpatch
996fd58ac4
Merge branch 'bugfix/poll-id-as-string' into 'develop'
...
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
2019-07-16 06:06:22 +00:00
lain
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
2019-07-16 12:47:40 +09:00
Mark Felder
ffb4eb9779
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-15 17:10:27 -05:00
Sergey Suprunenko
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
2019-07-15 19:47:23 +00:00
Alexander Strizhakov
e7c39b7ac8
Feature/1072 muting notifications
2019-07-14 13:29:31 +00:00
Ivan Tashkinov
d72876c57d
[ #1041 ] Minor refactoring.
2019-07-13 15:21:50 +03:00
Ivan Tashkinov
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
2019-07-13 14:49:39 +03:00
Eugenij
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
2019-07-11 13:55:31 +00:00
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.
2019-07-10 17:02:37 +02:00
Sergey Suprunenko
ff55e3c16f
Create mentions only for explicitly mentioned users
2019-07-10 13:29:50 +00:00
Egor Kislitsyn
5104f65b69
Wrap error messages into gettext helpers
2019-07-10 18:10:09 +07:00
Maksim
008c55e4e9
add test for search_controller/ 100% coverage
2019-07-10 08:28:03 +00:00
feld
93a0eeab16
Add license/copyright to all project files
2019-07-10 05:13:23 +00:00
kaniini
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
2019-07-09 17:51:41 +00:00
kaniini
1179a13533
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
...
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
2019-07-09 16:52:22 +00:00
rinpatch
72b88c82bc
Mastodon API: Fix embedded relationships not being rendered inside of statuses
2019-07-08 12:07:08 +03:00
Haelwenn (lanodan) Monnier
e174614eb9
MastoAPI Streaming: Keep compatibility with access_token
2019-07-07 08:49:29 +02:00
KokaKiwi
a7885748c7
MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol
2019-07-06 20:29:17 +02:00
Eugenij
5184b0f41a
Use fallback values for search queries
...
This is to make sure the entire request doesn't return a 500 error if
user or status search times out.
2019-07-03 10:19:51 +00:00
Eugenij
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
2019-06-30 09:08:46 +00:00
Egor Kislitsyn
889a9c3a3f
Polish IdempotencyPlug
2019-06-27 01:53:58 +07:00
Egor Kislitsyn
0b8aeac0f3
Remove previous idempotency implementation from post_status
2019-06-26 18:49:14 +07:00
Roman Chvanikov
a7a54068f9
Fix Controller.render/4 deprecation
2019-06-26 03:28:02 +03:00
Sachin Joshi
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
2019-06-23 03:25:50 +00:00
rinpatch
df2dab69a7
Merge branch 'begone-the-dot-hack' into 'develop'
...
Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits
See merge request pleroma/pleroma!1298
2019-06-19 10:22:23 +00:00
rinpatch
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
2019-06-18 14:12:11 +03:00
rinpatch
dce27de733
Mastodon API: Remove the dot hack
2019-06-18 05:04:41 +03:00
Maksim
a04bf131e0
[ #570 ] add user:notification stream
2019-06-16 10:33:25 +00:00
lain
135c196769
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
...
MastodonAPI Controller: Band-Aid double vote problem.
See merge request pleroma/pleroma!1275
2019-06-15 15:13:48 +00:00
lain
a440cf856d
Mastodon API: Return the token needed for the chat.
2019-06-15 10:59:35 +02:00
rinpatch
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
2019-06-14 16:49:28 +00:00
Maksim
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
2019-06-14 11:39:57 +00:00
lain
eac298083f
MastodonAPI: Add a way to update the background image.
2019-06-14 11:19:22 +02:00
lain
5965efb216
AccountView: Add user background.
2019-06-13 19:08:05 +02:00
lain
966543379d
MastodonAPI Controller: Band-Aid double vote problem.
2019-06-12 16:36:23 +02:00
Egor Kislitsyn
ad04d12de6
Replace MastodonAPIController.account_register/2 rate limiter
2019-06-11 16:06:03 +07:00
Egor Kislitsyn
bc8f059367
Add rate limiting for search endpoints
2019-06-11 14:28:39 +07:00
Egor Kislitsyn
93397fce3d
Contain search for unauthenticated users
2019-06-05 16:37:43 +07:00
Maksim Pechnikov
4f2e359687
Merge branch 'develop' into issue/941
2019-06-04 09:49:08 +03:00
kaniini
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
2019-06-04 05:43:43 +00:00
