Sean King
eab6291094
Require follow and read OAuth scopes for GET /api/v1/apps
2021-08-28 11:13:25 -06:00
Sean King
6519732045
GET /api/v1/apps endpoint
2021-08-25 21:01:04 -06:00
Haelwenn
61ba54897e
Merge branch 'streamer-crash-fix' into 'develop'
...
Streamer crash fix
See merge request pleroma/pleroma!3508
2021-08-13 15:42:12 +00:00
Alex Gleason
b7bbf42acd
Streamer: fix crash in MastodonAPI.StatusView
2021-08-13 10:25:42 -05:00
Haelwenn
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
2021-08-09 10:02:37 +00:00
Egor Kislitsyn
ad09bdb376
Improve readability
2021-08-06 07:59:54 +02:00
Ilja
f4028c908c
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
...
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility)
2021-08-06 07:59:53 +02:00
Ilja
03030b47c2
quarantine instances info
...
Added a new field in the nodeinfo called quarantined_instances_info
This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}`
2021-08-06 07:59:53 +02:00
Ilja
7fdc3cde06
Return maps in node_info
...
It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE,
but for FE maps like %{"instance": "instance", "reason", "reason"} are better.
I changed it so that node_info returns maps now for simple_policy and quarantined instances.
2021-08-06 07:59:53 +02:00
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
2021-07-18 11:49:22 -05:00
Alex Gleason
0114754db2
MastodonAPI: Support poll notification
2021-07-17 22:19:38 -05:00
marcin mikołajczak
6ef8e1776d
fix the fucking list timelines on mastofe/soapbox-fe
2021-07-02 13:03:41 +00:00
Alex Gleason
45b7325b9e
Refactor skipped plugs into Pleroma.Web functions
...
Speeds up recompilation by reducing compile cycles
2021-06-08 19:15:04 -05:00
Alex Gleason
b99f60615c
Fix order of Pleroma.Web.Utils.Params aliases
2021-06-08 12:50:47 -05:00
Alex Gleason
ec65b7ae29
Pleroma.Web.Params --> Pleroma.Web.Utils.Params
2021-06-08 12:50:47 -05:00
Alex Gleason
0877b120c3
Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
...
Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.ex
2021-06-08 12:50:47 -05:00
2743c66693
Add "chat" back as a feature for backwards compat.
...
Legacy PleromaFE uses this to identify if ShoutBox is available.
2021-06-01 13:17:50 -05:00
Mark Felder
d6432a65da
Move shout configuration from :instance, update docs and changelog
2021-06-01 11:49:46 -05:00
Mark Felder
ff00b354fa
Rename the non-federating Chat feature to Shout
2021-06-01 11:49:14 -05:00
Alex Gleason
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
2021-05-31 16:49:46 -05:00
Alex Gleason
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
Alex Gleason
2e682788a3
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1
2021-05-30 12:58:24 -05:00
5d40ffe429
Merge branch 'cycles-views' into 'develop'
...
Recompilation speedup: Create real Views for all Controllers
See merge request pleroma/pleroma!3425
2021-05-29 21:50:07 +00:00
Alex Gleason
1a69f59221
Merge remote-tracking branch 'pleroma/develop' into cycles-html
2021-05-29 12:29:58 -05:00
Alex Gleason
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
Alex Gleason
7c96c82b5b
Merge remote-tracking branch 'pleroma/develop' into cycles-views
2021-05-29 12:17:24 -05:00
Alex Gleason
c9e4200ed2
Create real Views for all Controllers
...
This makes views depend on each other at runtime instead of compile-time
2021-05-29 12:15:57 -05:00
edcdd15e01
Merge branch 'alias-router-helpers' into 'develop'
...
Switch to aliasing `Router.Helpers` instead of importing
See merge request pleroma/pleroma!3409
2021-05-28 19:01:47 +00:00
05d678c070
Expose user email address to user/owner; not publicly.
2021-05-20 12:50:43 -05:00
Alex Gleason
ad7d4ff8bc
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
2021-05-19 12:49:00 -05:00
Alex Gleason
07fed0fda2
Switch to aliasing Router.Helpers instead of importing
2021-05-18 17:45:30 -05:00
Alex Gleason
ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta
2021-05-12 20:10:52 -05:00
Alex Gleason
02b9436494
Don't render media meta if nil
2021-05-12 16:16:10 -05:00
Alex Gleason
ab9eabdf20
Add SetMeta filter to store uploaded image sizes
2021-05-12 15:07:31 -05:00
rinpatch
79376b4afb
Merge branch 'feature/521-pinned-post-federation' into 'develop'
...
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
2021-04-16 09:53:47 +00:00
0feafcc20c
Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE
2021-04-09 10:30:27 -05:00
Alexander Strizhakov
3adb43cc20
refetch user on incoming add/remove activity
...
if featured_address is nil
2021-03-25 13:03:41 +03:00
Alexander Strizhakov
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
rinpatch
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
Haelwenn
a2aa309496
Merge branch 'update_open_api_spex' into 'develop'
...
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
2021-03-16 01:54:43 +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
Ivan Tashkinov
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-07 11:34:39 +03:00
Ivan Tashkinov
7f8785fd9b
[ #3213 ] Performance optimization of filtering by hashtags ("any" condition).
2021-03-07 11:33:21 +03:00
Egor Kislitsyn
92ab72dbbb
Update OpenApiSpex dependency
2021-03-05 15:51:29 +04: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
lain
7dac83eb6e
Linting.
2021-03-02 15:03:16 +01:00
lain
024c11c18d
StatusController: Deactivate application support for now.
...
Some more things to discuss about, so we'll remove it from 2.3.0
2021-03-02 14:40:47 +01:00
