5c6ec2d9fc
twitter/mastodon api: always use mediaproxy URLs in attachments
...
if using local media, the mediaproxy will not replace the URL anyway.
2018-10-29 15:19:32 +00:00
26eb11c172
activitypub: add support for filtering broken threads out of timelines
2018-10-26 06:16:51 +00:00
b386888a0e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4
...
Better be sure than sorry
2018-10-25 06:21:11 +02:00
b112112c11
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4
2018-10-25 05:52:45 +02:00
b0a940d5a2
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments
2018-10-25 05:24:03 +02:00
2da0ffeb28
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil
2018-10-25 05:24:03 +02:00
0c10be8731
[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json
2018-10-25 05:24:03 +02:00
3b0e9287a5
[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views
2018-10-25 05:24:01 +02:00
e8c698af41
Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs
2018-10-19 01:46:26 +09:00
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
2018-10-07 01:05:59 +00:00
7f530f6f80
mastodon api: relationship view: better handle no pre-existing follow activity
2018-10-05 23:50:13 +00:00
e69faf550c
user: add wait_and_refresh() for async three-way handshake case
2018-10-05 23:40:49 +00:00
3e751496e3
mastodon api: account view: fetch follow state and use it to populate `requested` field
2018-10-05 23:31:49 +00:00
d94ee5cd50
Mastodon API: Support push subscription CRUD
2018-09-22 07:04:01 +02:00
df00a364fb
mastodon api: formatting
2018-09-22 02:53:04 +00:00
958e085acb
mastodon api: add support for user-supplied html policy
2018-09-22 02:53:02 +00:00
40c51f118f
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
2018-09-20 16:48:12 +02:00
f74725df41
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
2018-09-20 16:37:18 +02:00
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
2018-09-20 16:24:29 +02:00
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
2018-09-20 16:10:46 +02:00
0cac493fdc
mastodon api: default attachment type to image if one is not present
2018-09-19 04:59:25 +00:00
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e16e030129fb
2018-09-18 11:59:10 +02:00
c2650f0ffb
Merge branch 'feature/html-scrub-policy' into 'develop'
...
html scrub policy
See merge request pleroma/pleroma!339
2018-09-16 01:05:09 +00:00
39aed5348a
Add visible_in_picker to status emojis
2018-09-10 23:32:19 +00:00
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
2018-09-10 00:14:47 +00:00
4e1bb7bccb
make limit for /api/v1/suggestions
2018-09-09 13:57:23 +09:00
c1d07da4e1
Mastodon API: Fake support for loading filters
2018-09-07 16:12:44 +02:00
619f67768a
Mastodon API: Add unsupported attributes to relationship responses
...
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
2018-09-07 16:12:44 +02:00
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
2018-09-05 18:20:26 +00:00
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
2018-09-03 12:33:36 +00:00
35515cfa66
Update mastodon_api_controller.ex
2018-09-03 01:58:55 +00:00
26f8697400
Update mastodon_api_controller.ex
2018-09-03 01:52:02 +00:00
2b2bd0e047
Render notification IDs as strings, not numbers
2018-09-03 01:40:05 +00:00
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
2018-09-01 23:10:48 +02:00
2e2f458705
Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'
...
Clean code duplication in MastoAPI search(v1/v2)
See merge request pleroma/pleroma!316
2018-09-01 09:12:59 +00:00
0c2a0e3551
Specify default scope in verify_credentials
...
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value.
2018-08-31 21:04:46 -07:00
8885d16e1b
[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication
2018-09-01 03:11:58 +02:00
e838969495
Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'
...
use media proxy for the suggestions api
See merge request pleroma/pleroma!305
2018-08-30 23:06:30 +00:00
ddc6f32b75
Fix Mastodon API when actor's nickname is null
2018-08-29 16:32:50 +02:00
ded9091206
mastodon api: use bounded AP object graph query to enforce containment of private statuses
2018-08-29 08:51:51 +00:00
6cbfb5ab5d
use media proxy for suggestions api
2018-08-28 17:01:17 +09:00
6973b77e94
[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable
2018-08-27 15:09:06 +02:00
9bddb39ff0
[Pleroma.Web.MastodonAPI.FilterView]: expires_at should be null when N/A
2018-08-27 15:09:06 +02:00
d571a571fe
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3
2018-08-27 15:09:06 +02:00
6e030129fb
[MastodonAPI] Add filters
2018-08-27 15:09:05 +02:00
a5adb251ab
[Pleroma.Web.MastodonAPI.AccountView]: Add fields support
2018-08-27 15:09:05 +02:00
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
2018-08-27 15:09:04 +02:00
83efaa3af6
[MastodonAPI] Add streaming of hashtags
2018-08-27 15:08:25 +02:00
bf9f68b681
debug
2018-08-23 11:52:18 +09:00
5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
2018-08-22 01:46:26 +02:00
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
2018-08-21 16:58:44 +00:00
046741c60d
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
2018-08-21 18:34:56 +02:00
3b8ef24532
Fix attachement rendering
2018-08-21 18:24:10 +02:00
a6b021a52b
Render peertube videos in mastodon.
2018-08-21 18:24:10 +02:00
c381d0b577
Use activitypub to fetch posts.
...
This falls back to ostatus.
2018-08-21 18:24:09 +02:00
175f0bebbc
mastodon api: sanitize the bio HTML
2018-08-21 10:53:53 +01:00
6698749073
Fix typo in app creation response
...
Mastodon sends redirect_uri (singular), so should Pleroma.
2018-08-17 12:48:24 +00:00
a3ef2ebb35
mastodon api controller: client_name, not name
2018-08-16 23:50:49 +00:00
b5a92b1199
mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does
2018-08-16 23:40:42 +00:00
9908cf8fda
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
...
Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254
2018-08-15 07:47:33 +00:00
c2d1a5e9c4
MastoAPI AccountView: render profile emoji.
2018-08-07 21:56:50 +03:00
cc9c062b55
merge
2018-07-19 17:42:00 +09:00
6f23fb53d3
Merge branch 'feature/fe-configuration' into 'develop'
...
serverside frontend configuration
See merge request pleroma/pleroma!256
2018-07-19 07:31:10 +00:00
b12d17d2ce
configurable timeout
2018-07-18 13:36:20 +09:00
e4dd58307a
better configuration
2018-07-18 09:58:59 +09:00
cf219b6add
config: make instance description configurable
2018-07-17 15:46:23 +00:00
5b4a21317d
correct error message
2018-07-17 17:29:18 +09:00
d76f0d87be
do nothing if configuration is skipped
2018-07-17 16:45:18 +09:00
df3233e7e7
improve getting host name
2018-07-17 13:20:58 +09:00
99c0252314
mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload
2018-07-17 03:40:47 +00:00
cd19d37a90
mastodon api: use object name as alt text
2018-07-17 03:40:46 +00:00
e7c580828c
format
2018-07-15 20:36:26 +09:00
2eeaf01627
id field
2018-07-14 14:03:30 +09:00
127882a5d5
configurable
2018-07-14 11:41:09 +09:00
eb0afda3a7
http access to third party user recommendation
2018-07-14 10:04:37 +09:00
3812b627ca
better mock /api/v1/suggestions
2018-07-14 00:52:23 +09:00
4a21c1b343
mock /api/v1/suggestions
2018-07-14 00:44:18 +09:00
f944f8157a
/api/v1/suggestions endpoint
2018-07-14 00:21:38 +09:00
fe4387077a
Merge branch 'feature/default-scope' into 'develop'
...
default scope setting
See merge request pleroma/pleroma!239
2018-07-12 05:59:12 +00:00
4a922305af
Merge branch 'feature/article-support' into 'develop'
...
article support (plume, etc)
See merge request pleroma/pleroma!240
2018-07-12 05:58:39 +00:00
7a351cb36f
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/231
2018-07-12 01:57:25 +02:00
971bb4f2bd
activity interpretation: formatting
2018-06-27 13:38:19 +00:00
ea982e7503
mastodon api: add interpreter for Article activity types
2018-06-27 13:38:00 +00:00
4f6de34f4f
mastodon api: use info["default_scope"] if available for post scope
2018-06-27 13:15:42 +00:00
beb940a57e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
...
Related to https://git.pleroma.social/pleroma/mastofe/issues/20
2018-06-26 20:48:35 +02:00
5a4a45b875
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
2018-06-23 16:22:49 +02:00
a05c0ff61d
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
2018-06-23 16:22:47 +02:00
359093d73b
Fake 2.4.0 API
2018-06-23 16:12:57 +02:00
b670d4d683
MastodonAPI: Add streaming to media tabs of federated and local TLs
2018-06-17 16:17:15 +02:00
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
2018-06-15 22:14:17 +02:00
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
2018-06-14 07:19:36 +00:00
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
2018-06-13 21:33:36 -04:00
564c73ab24
Merge branch 'feature/list-streaming' into 'develop'
...
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
2018-06-12 07:19:45 +00:00
1452b2823f
user: add a workaround for situations where Pleroma may believe a followee is followed
...
this was caused by lack of Undo follows in the early days, and can likely be eventually removed
2018-06-11 22:15:53 +00:00
a2c4a5a75b
mastodon api: allow setting an account locked or not
2018-06-11 22:15:53 +00:00
760eb72a38
add a bunch of stuff
2018-06-11 22:15:53 +00:00
6f89d2d583
stash api controller
2018-06-11 22:15:53 +00:00
9c88933422
implement tracking of follow requests
2018-06-11 22:15:53 +00:00
7f79b467b1
Merge branch 'feature/domain-blocks' into 'develop'
...
Domain blocks
See merge request pleroma/pleroma!190
2018-06-11 11:19:45 +00:00
b4292295d7
Allow posting images without text in mastofe
2018-06-06 11:29:49 -07:00
f9719b064c
Merge branch 'fix/emoji-picker' into 'develop'
...
set visible_in_picker to true in custom_emojis
Closes #177 and mastofe#16
See merge request pleroma/pleroma!188
2018-06-05 21:18:25 +00:00
4856962434
MastoAPI: add domain blocking.
2018-06-03 22:21:23 +03:00
4856ba596f
Better error handling for MastodonApiController.
2018-06-03 19:28:11 +02:00
b143694b98
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picker to true in custom_emojis
...
Fixes: https://github.com/ilianaw/emojos.in/issues/4
Closes: https://git.pleroma.social/pleroma/pleroma/issues/177
Closes: https://git.pleroma.social/pleroma/mastofe/issues/16
2018-06-03 18:41:18 +02:00
8c609ee3f9
MastoAPI user timelines: render statuses for the logged in user.
2018-06-01 12:30:11 +03:00
5d3fdbc082
MastoAPI: Add streaming for lists.
2018-05-30 16:48:59 +03:00
7cb2e2971e
MastoAPI: fix dm_timeline getting non-create activities.
2018-05-30 15:02:22 +03:00
35cb8969c4
MastoAPI: Fix link headers with restrictive params.
2018-05-29 13:31:36 +03:00
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
2018-05-26 16:00:59 +02:00
e80d91c64a
introduce User.maybe_direct_follow() and use it where we used to call User.follow()
2018-05-25 09:40:10 +00:00
502ba33d01
activitypub: fix up accept/reject semantics for following
...
fixes #175
2018-05-25 06:14:18 +00:00
c0ca9f82b9
mastodon api: properly track if an account is locked or not
2018-05-25 06:14:09 +00:00
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
2018-05-24 20:22:43 +00:00
c2dcd767cf
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
...
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
2018-05-24 19:52:24 +00:00
3dbd9809d4
MastoAPI: add lists.
2018-05-24 15:34:39 +03:00
a8369db4f2
MastoAPI: add lists.
2018-05-24 13:18:39 +03:00
b2c6ae7d82
Hook up unfollow and (un)block to MastoAPI + tests
2018-05-22 04:27:40 -04:00
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
2018-05-21 20:19:37 -04:00
e55c6f311b
Migrate to comeonin 4 and Cachex 3
...
Also fix some warning in the code and add a missing alias
2018-05-20 20:08:40 +02:00
434601a5c3
Return private / direct posts on user timelines, too.
2018-05-20 16:15:18 +02:00
6f39ecc41b
Support Undo like activities ( Fix #139 )
2018-05-19 22:14:15 +02:00
2ce48c1a42
Formatting
2018-05-13 15:36:41 -04:00
9aabff4883
Fix tests.
2018-05-13 15:33:59 -04:00
aeff2d6474
Merge branch 'feature/unrepeats' into 'develop'
...
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
2018-05-13 09:32:29 +00:00
c8d418acdd
api/v1/timelines/direct implementation
2018-05-12 21:50:59 -04:00
c60a5405db
Detect and try to stream incoming "direct" messages
2018-05-12 17:40:59 -04:00
6c2903d9a1
Merge branch 'feld-warnings' into 'develop'
...
Clean up warnings
See merge request pleroma/pleroma!144
2018-05-06 18:42:31 +00:00
bfad57c7c9
Get rid of unsafe variables.
2018-05-06 09:58:59 +03:00
96add86b50
Unify wss uri generation.
2018-05-05 13:40:31 +02:00
c464355d1a
Idempotency: Use special cache, keep for 6 hours.
2018-05-05 11:15:57 +02:00
31ea9cbcd8
Group def renders together to fix warning
2018-05-04 22:28:13 +00:00
aaacebd906
Fix unused variables, imports, and aliases
2018-05-04 21:42:20 +00:00
90c4bed0af
Don't expire idempotency cache for five minutes.
2018-05-04 21:15:39 +02:00
fcd3eca167
MastodonAPI: Support idempotency key.
2018-05-04 20:30:29 +02:00
9e0dd21ed6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-25 00:46:28 -04:00
ff5e957476
Make search use id index too.
...
Seems to be faster in general, query planner chooses well.
2018-04-21 09:22:31 +02:00
c5dc7e6e31
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-20 16:48:18 -04:00
a61e8ac154
Formatting.
2018-04-20 13:10:57 +02:00
947431e9aa
MastoAPI and OAuth: allow login with either email or username.
2018-04-18 13:13:57 +03:00
7b4f55238e
Handle unrepeats via the TwitterAPI
2018-04-18 06:00:40 -04:00
687db1bc3a
Expose unannounce activity so that it can be tested
2018-04-18 03:39:42 -04:00
42279f54cf
Return target status in MastoAPI endpoint instead of reblog activity
2018-04-16 23:30:52 -04:00
b949577472
Add unrepeat functionality
2018-04-14 20:19:48 -04:00
907df9b8ed
Fix issue #124
2018-04-11 14:55:49 -04:00
1dd2c8163f
Order masto searches by date.
2018-04-10 18:38:52 +02:00
9998b4519d
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
...
mastodon api emulation improvements for tootstream
Closes #101
See merge request pleroma/pleroma!100
2018-04-08 06:02:11 +00:00
9a2d3705c6
Merge branch 'fix/persisted-mastofe-settings' into 'develop'
...
MastoAPI: Persist frontend timelines and settings.
Closes #113
See merge request pleroma/pleroma!98
2018-04-08 06:01:06 +00:00
1857f403be
mastodon api: report version as the Mastodon API version supported with the real version in parenthesis
2018-04-07 17:29:28 -05:00
70bcdf32bd
Only search in public data for now.
...
This should be the data the user is allowed to see later, but this
will stop accidental private message leaks.
2018-04-07 16:40:45 +02:00
7c47534970
MastoAPI: Persist frontend timelines and settings.
2018-04-07 17:26:56 +03:00
William Pitcock