Mark Felder
85446cc30c
Merge branch 'develop' into media-preview-proxy
2020-09-03 10:34:06 -05:00
rinpatch
d48fc90978
StatusView: Start fetching rich media cards as soon as possible
2020-09-02 16:45:54 +03:00
Mark Felder
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-25 11:57:23 -05:00
Haelwenn (lanodan) Monnier
36c125a071
Pipeline Ingestion: Event
2020-08-20 21:49:26 +02:00
Ivan Tashkinov
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-08-07 09:38:05 +03:00
Lain Soykaf
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
2020-07-22 14:44:06 +02:00
Ivan Tashkinov
bdf57b8ef4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
2020-07-19 20:05:37 +03:00
lain
d3efb50262
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
2020-07-03 16:44:31 +02:00
Ivan Tashkinov
61180ab6f4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
2020-07-02 16:36:54 +03:00
Haelwenn (lanodan) Monnier
244655e884
MastoAPI: Show source field when deleting
2020-06-26 19:52:20 +02:00
lain
35f6770436
StatusView: Add pleroma.parent_visible
2020-06-24 13:29:08 +02:00
Egor Kislitsyn
520367d6fd
Fix atom leak in Rich Media Parser
2020-06-13 12:08:46 +03:00
Ivan Tashkinov
6fd4f58ead
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-05-20 20:27:03 +03:00
Egor Kislitsyn
6609714d66
Move Scrobble views to ScrobbleView
2020-05-19 16:26:06 +04:00
Ivan Tashkinov
63a1a82f38
[ #2456 ] Added support for embed_relationships param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.
2020-05-12 19:14:35 +03:00
Ivan Tashkinov
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
2020-05-10 09:16:48 +03:00
Ivan Tashkinov
14a49a0483
[ #2456 ] Dropped support for embedded pleroma/account/relationship in statuses and notifications.
2020-05-09 18:05:44 +03:00
Ivan Tashkinov
bbdad85568
Initial implementation of image preview proxy. Media proxy tests refactoring.
2020-05-08 23:06:47 +03:00
Ivan Tashkinov
d5cdc907e3
Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
...
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
2020-05-01 18:45:24 +03:00
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account
2020-04-27 14:33:00 +04:00
Ivan Tashkinov
e16437ff19
[ #1706 ] Formatting fix.
2020-04-25 18:42:08 +03:00
Ivan Tashkinov
0d05e1fe39
[ #1706 ] Prevented error on unresolved activity actors for timeline actions.
2020-04-25 18:24:10 +03:00
Egor Kislitsyn
03124c96cc
Add spec for AccountController.statuses
2020-04-13 18:17:07 +04:00
Ivan Tashkinov
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
2020-04-02 19:38:39 +03:00
Ivan Tashkinov
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
2020-04-02 19:23:30 +03:00
Ivan Tashkinov
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
Haelwenn
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-03-29 19:18:22 +00:00
Ivan Tashkinov
dfbc05d496
Misc refactoring / tweaks (ThreadMute.exists?/2).
2020-03-27 08:01:03 +03:00
Ivan Tashkinov
6b793d3f83
Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
2020-03-26 21:54:01 +03:00
Ivan Tashkinov
460e41585c
Further preloading (more endpoints), refactoring, tests.
2020-03-25 20:33:34 +03:00
Ivan Tashkinov
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
2020-03-24 22:14:26 +03:00
Ivan Tashkinov
3c78e5f327
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
2020-03-23 12:01:11 +03:00
Ivan Tashkinov
c2e415143b
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
2020-03-22 21:51:44 +03:00
Haelwenn (lanodan) Monnier
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-11 13:46:42 +01:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
Egor Kislitsyn
2ef70b55f5
Fix status.expires_at type
2020-02-18 14:52:11 +04:00
Haelwenn (lanodan) Monnier
1257331291
MastodonAPI.StatusView: Do not use site_name
...
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg " />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/ ">
2020-02-15 00:36:09 +01:00
Lain Soykaf
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
2020-02-07 14:52:13 +01:00
df0b00b32d
Merge branch 'mastoapi-non-html-strings' into 'develop'
...
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
2020-02-06 16:08:23 +00:00
rinpatch
983a87175e
mastodon API: do not sanitize html in non-html fields
2020-02-02 14:46:32 +03:00
lain
a802e07241
Emoji Reactions: Add reacted field to emoji reactions
2020-01-29 11:39:06 +01:00
lain
347f3ed2c6
Emoji reactions: Change api format once more
2020-01-24 10:52:24 +01:00
lain
dd3fc50ea4
Emoji reactions: Change cache and reply format
2020-01-22 13:57:42 +01:00
lain
4c5b5f14dc
StatusView: Add emoji_reactions
2020-01-20 16:24:20 +01:00
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17 16:16:21 +01:00
Egor Kislitsyn
80ededc04f
Add direct_conversation_id to web push payload
2019-11-26 19:53:43 +07:00
eugenijm
ed29be24cb
Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.
2019-11-04 18:36:16 +03:00
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
Thibaut Girka
43e3db0951
Fix returned visibility of announces in MastodonAPI
2019-10-01 20:38:29 +02:00
Egor Kislitsyn
36a34c36fe
Extract poll actions from MastodonAPIController to PollController
2019-10-01 11:44:34 +07:00
