b7bbf42acd
Streamer: fix crash in MastodonAPI.StatusView
3 years ago
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
3 years ago
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
3 years ago
1a69f59221
Merge remote-tracking branch 'pleroma/develop' into cycles-html
3 years ago
3ff9c5e2a6
Break out activity-specific HTML functions into Pleroma.Activity.HTML
...
Fixes cycles in lib/pleroma/ecto_type/activity_pub/object_validators/safe_text.ex
3 years ago
ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta
3 years ago
02b9436494
Don't render media `meta` if nil
3 years ago
ab9eabdf20
Add SetMeta filter to store uploaded image sizes
3 years ago
3adb43cc20
refetch user on incoming add/remove activity
...
if featured_address is nil
4 years ago
3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
4 years ago
72143dd732
Merge branch 'richmedia-workaround' into 'develop'
...
Workaround for RichMedia preview image breakage edge case
See merge request pleroma/pleroma!3363
4 years ago
b80f868c6b
Prefer naming this function build_image_url/2
4 years ago
029ff65389
Leverage function pattern matching instead
4 years ago
8246db2a96
Workaround for URI.merge/2 bug https://github.com/elixir-lang/elixir/issues/10771
...
If we avoid URI.merge unless we know we need it we reduce the edge cases we could encounter.
The site would need to both have "//" in the %URI{:path} and the image needs to be a relative URL.
4 years ago
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
8d601d3b23
Make the object reference in both render("show.json", _) functions consistently named
4 years ago
85b2387f66
Fix build_application/1 match
4 years ago
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
b1e1db82bc
Store application details in the object under the generator key, not application key
4 years ago
d35b6254b4
Store the client application data in ActivityStreams format
4 years ago
d5ef02c7a7
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
4 years ago
4540e08a6a
Rendering fallback for when we don't have valid data available
4 years ago
981349f21d
Enable rendering of the client application data details
4 years ago
218c519606
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
4 years ago
80ccdb56f6
Make tag urls absolute
4 years ago
e350898828
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
4 years ago
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
4 years ago
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
4 years ago
18b536c176
Pleroma.Object/1: take %Object{} as argument instead
4 years ago
87b13c5430
Create Object.hashtags/1 wrapper
4 years ago
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
4 years ago
ee221277b0
Encapsulation of tags / hashtags fetching from objects.
4 years ago
fb41bd1a85
Hide reactions from muted and blocked users
4 years ago
2254e5e595
Render blurhashes in Mastodon API
4 years ago
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
4 years ago
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
4 years ago
0bda85857e
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
...
# Conflicts:
# lib/pleroma/instances/instance.ex
4 years ago
9bf1065a06
schedule activity expiration in Oban
4 years ago
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
4 years ago
85446cc30c
Merge branch 'develop' into media-preview-proxy
4 years ago
d48fc90978
StatusView: Start fetching rich media cards as soon as possible
4 years ago
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
4 years ago
36c125a071
Pipeline Ingestion: Event
4 years ago
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
4 years ago
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
4 years ago
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
4 years ago
d3efb50262
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
4 years ago
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
4 years ago
Alex Gleason