85953c0836
fixes for tests
5 years ago
3c2ae80008
unused
5 years ago
1258128f4f
favourites add bookmark display
5 years ago
73d01857e3
bookmarks in separate table
5 years ago
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
5 years ago
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 years ago
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
5 years ago
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
5 years ago
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
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
5 years ago
4908e0eeee
Fix Credo warning
5 years ago
eeb093631c
Fix Credo warning
5 years ago
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
5 years ago
2662bea4e0
Add accounts and last_status to conversation read response
5 years ago
375fd21055
Set correct values in the MastoAPI reblog status view
6 years ago
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
6 years ago
6069d0fd36
Fix object search depending on embeded object
6 years ago
ad681877df
Make credo happy
6 years ago
e641651e2b
Fix unbookmarking
6 years ago
b09ae02c04
Added some more normalization calls all in mastodon api controller
6 years ago
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
76999c73a7
Conversation: Add accounts to output.
6 years ago
0da985182f
Conversation: Return full status object, id is a string.
6 years ago
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
27d78dc526
Use User.get_cached_by*
6 years ago
507e7821e3
Handle follow/unfollow directed to themselves
6 years ago
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
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
711ade961e
adding destroy multiple for mastofe
6 years ago
e03d24af96
in_reply_to_id - null
6 years ago
c352a0aba6
Conversations: Make tests run.
6 years ago
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
589629cf3e
Used cached user resources in subscriptions
6 years ago
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
b3870df51f
Handle `scheduled_at` on status creation.
6 years ago
7bf622ce73
Add scheduled activities
6 years ago
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
6 years ago
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
325a268017
Redirect to the referer url after mastofe authorization
6 years ago
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
f0f30019e1
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
6 years ago
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state
6 years ago
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
6 years ago
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
6 years ago
9e0567ec52
Merge develop into feature/770-add-emoji-tags
6 years ago
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
88d3cb44c3
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
6 years ago
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
6 years ago
4212527928
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
6 years ago
6910fb371b
Fixed local MastoFE authentication / `force_login` option.
6 years ago
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
6 years ago
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
6 years ago
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
6 years ago
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
6 years ago
691d1208b5
Add GET /api/v1/apps/verify_credentials
6 years ago
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
eef1042b16
Mastodon 2.7.2 instance attributes (registrations, languages).
6 years ago
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
a7f58b3c13
Serve non-public activities in /api/v1/favourites
...
Fixes #648
6 years ago
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
6 years ago
a2e03d4f3c
Initial attempt at updating return type
6 years ago
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
6 years ago
da53c079db
Refactor to store user ap_id, add tests
6 years ago
15b21d1983
refactor filtering mechanism
6 years ago
c8f31e0bc2
Implement mastodon's reblog hiding feature
6 years ago
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
6 years ago
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
6 years ago
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
59333f2d56
Merge branch 'admin-api-account-view-namespace' into 'develop'
...
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
6 years ago
86871c8a04
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'
...
Add "local" & "tags" to users admin API
See merge request pleroma/pleroma!932
6 years ago
f3964f4024
Ensure empty array is returned for tags
6 years ago
257d8e78e5
Add tags
6 years ago
4e72762322
Merge branch 'mastofe-content-types' into 'develop'
...
Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894
6 years ago
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
6 years ago
490d9cf7b1
Add "local" to users admin API
6 years ago
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
6 years ago
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
25eb6cf1cb
Add "roles" to users admin API
6 years ago
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
6 years ago
984b5f8adf
MastoAPI followers/following endpoints
6 years ago
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
4811eefa6e
MastoAPI StatusView: Add locality indicator.
6 years ago
19afd9f81f
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
6 years ago
7342b5a45f
Preserve parameters in link headers (Mastodon API)
6 years ago
bc7570c282
[ #647 ] tests for web push
6 years ago
10248d86a2
Merge branch 'unify-follow' into 'develop'
...
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
6 years ago
bf43f055dd
Set content types settings on mastofe endpoint.
6 years ago
86e4b48a5e
Fix DM visibility for blocking users
6 years ago
594694607c
Unify Mastodon and Twitter follow implementations using CommonAPI
6 years ago
6c6a2dbfdd
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
...
Add pagination and search to users
See merge request pleroma/pleroma!873
6 years ago
5b08b470f6
Add "local" params to users search
6 years ago
28b4093233
mastodon websocket: return errors using ok, not stop
6 years ago
388a3f4ca2
mastodon websocket: bring back infinity timeout
6 years ago
f1d37a5e23
mastodon websocket: use pattern match to get query data, robustly handle errors
6 years ago
bc53dff5b6
mastodon api: websocket: update code for cowboy 2.x
6 years ago
72b7a0797e
Use Mastodon API views in Admin API
6 years ago
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
6 years ago
c1ae495878
Add user muted status info to MastodonAPI.
6 years ago
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
6 years ago
9e0686efa6
Move visibility into own module.
6 years ago
62296f5a25
Fix private post card handling.
6 years ago
bff9eb5ef7
Reports
6 years ago
59c27f29c8
Add some nicer urls in status view.
6 years ago
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
6 years ago
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
6 years ago
5a46d37af9
Update the mute implementation to the current codebase
...
Make it part of the info thing (and do a migration to ensure it's there)
6 years ago
da64ea4a55
Implement mastodon mutes endpoint
...
Aparently i forgot to add it, it gets a list of muted users
6 years ago
f41f017bbc
Implement muting, add it to the mastodon API
6 years ago
c0ecbf6669
[ #468 ] Merged `upstream/develop`.
6 years ago
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
6 years ago
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
6 years ago
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
6 years ago
4df455f69b
[MastoAPI] Add switching of frontend flavours
6 years ago
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
6 years ago
2a4a4f3342
[ #468 ] Defined OAuth restrictions for all applicable routes.
...
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
6 years ago
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the `follow`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
6 years ago
027adbc9e5
[ #468 ] Refactored OAuth scopes parsing / defaults handling.
6 years ago
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
ac72b578da
Merge branch 'develop' into feature/thread-muting
6 years ago
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
6 years ago
cc21fc5f53
refactor, status view updating, error handling
6 years ago
6a6a5b3251
de-group alias/es
6 years ago
8bcfac93a8
Make credo happy
6 years ago
98ec578f4d
Merge branch 'develop' into feature/thread-muting
6 years ago
2c68cf7e9e
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.
...
(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).
6 years ago
f4ff4ffba2
Migration and some boilerplate stuff
6 years ago
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
6 years ago
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
6 years ago
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
6 years ago
1d94b67e40
mastodon api: fix rendering of cards without image URLs ( closes #597 )
6 years ago
00835bf678
Merge branch 'fix/rich-media-relative-path' into 'develop'
...
Fix rich media relative path
Closes #588
See merge request pleroma/pleroma!759
6 years ago
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
68d461b3a9
Check if rich media uri is relative
6 years ago
833404f0f5
Use with instead of if in the card
6 years ago
e4d18f328b
merge only if page_url is an absolute path
6 years ago
cbadf9d333
Fix rich media relative path
6 years ago
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
6 years ago
d747bd9870
Use String.replace_leading instead of String.replace for getting websocket streaming api url.
...
Extract the login responsible for obtaining websocket URL into the corresponding
Endpoint function.
6 years ago
74c6119f28
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list
6 years ago
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
6 years ago
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
Alex S