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
rinpatch
e6b175ed6c
Fix credo issues
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
rinpatch
f28747858b
Actual vote count in poll view
5 years ago
Aaron Tinio
eb02edcad9
Add virtual :thread_muted? field
...
that may be set when fetching activities
5 years ago
rinpatch
1d90f9b969
Remove tags/mentions/rich text from poll options because Mastodon and
...
add custom emoji
5 years ago
rinpatch
5ece901af3
Resolve merge conflicts and remove IO.inspects
5 years ago
lambda
46684db84d
Update account_view.ex
5 years ago
rinpatch
642a67dd44
Render polls in statuses
5 years ago
Haelwenn (lanodan) Monnier
68c75a08e8
MastoAPI account_view.ex: requested is false when following is true
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
5 years ago
lain
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
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
lain
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
rinpatch
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
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
6 years ago
rinpatch
dfc8425659
Move settings to Source subentity
6 years ago
Alex S
85953c0836
fixes for tests
6 years ago
Alex S
73d01857e3
bookmarks in separate table
6 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
kaniini
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
6 years ago
rinpatch
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
6 years ago
rinpatch
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
6 years ago
Egor
b9cdf6d3b9
Use `User.get_cached*` everywhere
6 years ago
Roman Chvanikov
4908e0eeee
Fix Credo warning
6 years ago
Roman Chvanikov
eeb093631c
Fix Credo warning
6 years ago
Roman Chvanikov
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
6 years ago
eugenijm
375fd21055
Set correct values in the MastoAPI reblog status view
6 years ago
rinpatch
ad681877df
Make credo happy
6 years ago
rinpatch
b09ae02c04
Added some more normalization calls all in mastodon api controller
6 years ago
rinpatch
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
eugenijm
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
Alexander Strizhakov
e03d24af96
in_reply_to_id - null
6 years ago
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
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
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
7bf622ce73
Add scheduled activities
6 years ago
Sadposter
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
rinpatch
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
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
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
eugenijm
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
William Pitcock
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
6 years ago
Karen Konou
c8f31e0bc2
Implement mastodon's reblog hiding feature
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
eugenijm
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
6 years ago
Haelwenn (lanodan) Monnier
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
6 years ago
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
Maxim Filippov
25eb6cf1cb
Add "roles" to users admin API
6 years ago
lain
4811eefa6e
MastoAPI StatusView: Add locality indicator.
6 years ago
Maksim
bc7570c282
[ #647 ] tests for web push
6 years ago
kaniini
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
Maxim Filippov
72b7a0797e
Use Mastodon API views in Admin API
6 years ago
kaniini
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
6 years ago
lain
c1ae495878
Add user muted status info to MastodonAPI.
6 years ago
William Pitcock
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
6 years ago
Egor
bff9eb5ef7
Reports
6 years ago
lain
59c27f29c8
Add some nicer urls in status view.
6 years ago
Ekaterina Vaartis
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
Ekaterina Vaartis
f41f017bbc
Implement muting, add it to the mastodon API
6 years ago
rinpatch
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
6 years ago
Karen Konou
ac72b578da
Merge branch 'develop' into feature/thread-muting
6 years ago
Karen Konou
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
6 years ago
Karen Konou
cc21fc5f53
refactor, status view updating, error handling
6 years ago
Haelwenn (lanodan) Monnier
6a6a5b3251
de-group alias/es
6 years ago
Haelwenn (lanodan) Monnier
8bcfac93a8
Make credo happy
6 years ago
William Pitcock
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
6 years ago
William Pitcock
1d94b67e40
mastodon api: fix rendering of cards without image URLs ( closes #597 )
6 years ago
rinpatch
68d461b3a9
Check if rich media uri is relative
6 years ago
rinpatch
833404f0f5
Use with instead of if in the card
6 years ago
rinpatch
e4d18f328b
merge only if page_url is an absolute path
6 years ago
rinpatch
cbadf9d333
Fix rich media relative path
6 years ago
Haelwenn
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
Haelwenn
ebb3496386
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
6 years ago
Haelwenn
de0fb88a9c
Merge branch 'safe-render-activities' into 'develop'
...
remove unnecessary filter (re !723 )
See merge request pleroma/pleroma!729
6 years ago
href
df2f7b39dd
re f83bae7c: remove unnecessary filter
6 years ago
William Pitcock
ddc7ae2c1a
mastodon api: card: force OGP images through mediaproxy
6 years ago
William Pitcock
8e42251e06
rich media: add helpers module, use instead of MastodonAPI module
6 years ago
William Pitcock
5a37ddc2dc
mastodon api: embed card in status object
6 years ago
William Pitcock
132d815f1f
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
6 years ago
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
lambda
16ab1437d6
Merge branch 'safe-render-activities' into 'develop'
...
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
6 years ago
href
f83bae7c22
Views: wrap activity rendering in a rescue
...
this avoids complete timeline breakage when an activity fucks up
rendering.
6 years ago
Haelwenn (lanodan) Monnier
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
6 years ago
lain
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
6 years ago
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier
2fdbd4d137
Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list
6 years ago
William Pitcock
75dfa1f0b0
mastodon api: get_visibility(): DMs never have a cc list.
6 years ago
lain
943324b661
MastoAPI: Don't break on missing users.
6 years ago
Egor Kislitsyn
e679da4c34
add `pinned` property to `StatusView`
6 years ago
Rin Toshaka
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
6 years ago
William Pitcock
980b5288ed
update copyright years to 2019
6 years ago
Rin Toshaka
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
6 years ago
Rin Toshaka
dec23500d8
Resolve merge conflict
6 years ago
Rin Toshaka
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
6 years ago
Rin Toshaka
19f9889fbe
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
6 years ago
Ivan Tashkinov
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
Ivan Tashkinov
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
6 years ago
Ivan Tashkinov
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
William Pitcock
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
William Pitcock
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
6 years ago
Ivan Tashkinov
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
href
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
6 years ago
Maksim Pechnikov
ea72ac549b
fix case when tags is invalid
6 years ago
Maksim Pechnikov
d3ec09bb38
fix tags
6 years ago
Egor Kislitsyn
658edb166f
fix and improve web push; add configuration docs
6 years ago
lambda
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
6 years ago
Maksim Pechnikov
074fa790ba
fix compile warnings
6 years ago
Maksim Pechnikov
068353ac0b
formatting
6 years ago
Maksim Pechnikov
9442588ae9
fix hashtags in api response
6 years ago
lambda
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago
Ivan Tashkinov
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
Ivan Tashkinov
7bcb6a183a
[ #394 ] Refactoring.
6 years ago
Ivan Tashkinov
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
Egor Kislitsyn
3d492795b7
clean up
6 years ago
Egor Kislitsyn
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
Egor Kislitsyn
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
6 years ago
William Pitcock
3b8e5bcbeb
fix most tests
6 years ago
William Pitcock
e9b718cea2
mastodon api: status view: use Object.normalize()
6 years ago
lain
0896cf4c0f
Fix most mastodon api bugs.
6 years ago
Haelwenn (lanodan) Monnier
3e50bb667f
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
6 years ago
William Pitcock
4d8f076125
mastodon api: add support for rendering Page objects
6 years ago
Haelwenn (lanodan) Monnier
755f166406
Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string
6 years ago
William Pitcock
5c6ec2d9fc
twitter/mastodon api: always use mediaproxy URLs in attachments
...
if using local media, the mediaproxy will not replace the URL anyway.
6 years ago
Haelwenn (lanodan) Monnier
b0a940d5a2
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments
6 years ago
Haelwenn (lanodan) Monnier
0c10be8731
[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json
6 years ago
Haelwenn (lanodan) Monnier
3b0e9287a5
[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views
6 years ago
William Pitcock
7f530f6f80
mastodon api: relationship view: better handle no pre-existing follow activity
6 years ago
William Pitcock
3e751496e3
mastodon api: account view: fetch follow state and use it to populate `requested` field
6 years ago
Martin Kühl
d94ee5cd50
Mastodon API: Support push subscription CRUD
6 years ago
William Pitcock
958e085acb
mastodon api: add support for user-supplied html policy
6 years ago
Haelwenn (lanodan) Monnier
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
6 years ago
Haelwenn (lanodan) Monnier
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
6 years ago
William Pitcock
0cac493fdc
mastodon api: default attachment type to image if one is not present
6 years ago
kaniini
c2650f0ffb
Merge branch 'feature/html-scrub-policy' into 'develop'
...
html scrub policy
See merge request pleroma/pleroma!339
6 years ago
shadowfacts
39aed5348a
Add visible_in_picker to status emojis
6 years ago
William Pitcock
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
Martin Kühl
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.
6 years ago
Haelwenn
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
6 years ago
kaniini
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
6 years ago
Martin Kühl
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
6 years ago
Will Pearson
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.
6 years ago
href
ddc6f32b75
Fix Mastodon API when actor's nickname is null
6 years ago
Haelwenn (lanodan) Monnier
6973b77e94
[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable
6 years ago