f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
2021-05-31 16:49:46 -05:00
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
2021-05-31 16:48:03 -05:00
1a69f59221
Merge remote-tracking branch 'pleroma/develop' into cycles-html
2021-05-29 12:29:58 -05:00
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
2021-05-29 12:29:11 -05:00
ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta
2021-05-12 20:10:52 -05:00
02b9436494
Don't render media `meta` if nil
2021-05-12 16:16:10 -05:00
ab9eabdf20
Add SetMeta filter to store uploaded image sizes
2021-05-12 15:07:31 -05:00
3adb43cc20
refetch user on incoming add/remove activity
...
if featured_address is nil
2021-03-25 13:03:41 +03:00
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
2021-03-25 13:03:40 +03:00
72143dd732
Merge branch 'richmedia-workaround' into 'develop'
...
Workaround for RichMedia preview image breakage edge case
See merge request pleroma/pleroma!3363
2021-03-21 08:19:42 +00:00
b80f868c6b
Prefer naming this function build_image_url/2
2021-03-13 12:27:15 -06:00
029ff65389
Leverage function pattern matching instead
2021-03-11 09:20:29 -06:00
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.
2021-03-10 17:15:31 -06:00
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-07 11:34:39 +03:00
8d601d3b23
Make the object reference in both render("show.json", _) functions consistently named
2021-03-02 14:14:38 -06:00
85b2387f66
Fix build_application/1 match
2021-03-02 11:37:37 -06:00
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-02 08:26:30 +03:00
b1e1db82bc
Store application details in the object under the generator key, not application key
2021-03-01 11:29:10 -06:00
d35b6254b4
Store the client application data in ActivityStreams format
2021-02-26 18:14:57 -06:00
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
2021-02-18 16:35:03 -06:00
4540e08a6a
Rendering fallback for when we don't have valid data available
2021-02-09 18:52:22 -06:00
981349f21d
Enable rendering of the client application data details
2021-02-09 18:22:41 -06:00
218c519606
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
2021-01-22 10:05:28 +03:00
80ccdb56f6
Make tag urls absolute
2021-01-21 16:49:19 -06:00
e350898828
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-13 22:11:16 +03:00
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
2021-01-13 07:49:50 +01:00
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
2021-01-04 13:38:31 +01:00
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
2020-12-28 12:02:16 +00:00
18b536c176
Pleroma.Object/1: take %Object{} as argument instead
2020-12-28 11:05:24 +01:00
87b13c5430
Create Object.hashtags/1 wrapper
2020-12-22 05:15:34 +01:00
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-22 05:15:34 +01:00
ee221277b0
Encapsulation of tags / hashtags fetching from objects.
2020-12-21 22:54:26 +03:00
fb41bd1a85
Hide reactions from muted and blocked users
2020-11-16 22:50:14 +04:00
2254e5e595
Render blurhashes in Mastodon API
2020-11-11 12:51:13 -06:00
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-17 17:14:20 +03:00
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
2020-09-11 14:13:38 -05:00
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
2020-09-11 14:09:50 -05:00
0bda85857e
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
...
# Conflicts:
# lib/pleroma/instances/instance.ex
2020-09-11 17:19:58 +03:00
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
2020-09-08 13:00:49 +03:00
85446cc30c
Merge branch 'develop' into media-preview-proxy
2020-09-03 10:34:06 -05:00
d48fc90978
StatusView: Start fetching rich media cards as soon as possible
2020-09-02 16:45:54 +03:00
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-25 11:57:23 -05:00
36c125a071
Pipeline Ingestion: Event
2020-08-20 21:49:26 +02:00
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-08-07 09:38:05 +03:00
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
2020-07-22 14:44:06 +02:00
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
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
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
244655e884
MastoAPI: Show source field when deleting
2020-06-26 19:52:20 +02:00
Alex Gleason