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.
3 years ago
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
0114754db2
MastodonAPI: Support poll notification
3 years ago
5d279a22b1
Merge develop branch upstream
3 years ago
6ef8e1776d
fix the fucking list timelines on mastofe/soapbox-fe
3 years ago
45b7325b9e
Refactor skipped plugs into Pleroma.Web functions
...
Speeds up recompilation by reducing compile cycles
3 years ago
b99f60615c
Fix order of Pleroma.Web.Utils.Params aliases
3 years ago
ec65b7ae29
Pleroma.Web.Params --> Pleroma.Web.Utils.Params
3 years ago
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
3 years ago
2e310b3ec8
Fix more build errors
3 years ago
dc4814f0cd
Fix merge conflicts with upstream
3 years ago
2743c66693
Add "chat" back as a feature for backwards compat.
...
Legacy PleromaFE uses this to identify if ShoutBox is available.
3 years ago
d6432a65da
Move shout configuration from :instance, update docs and changelog
3 years ago
ff00b354fa
Rename the non-federating Chat feature to Shout
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
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
3 years ago
5d40ffe429
Merge branch 'cycles-views' into 'develop'
...
Recompilation speedup: Create real Views for all Controllers
See merge request pleroma/pleroma!3425
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
7c96c82b5b
Merge remote-tracking branch 'pleroma/develop' into cycles-views
3 years ago
c9e4200ed2
Create real Views for all Controllers
...
This makes views depend on each other at runtime instead of compile-time
3 years ago
edcdd15e01
Merge branch 'alias-router-helpers' into 'develop'
...
Switch to aliasing `Router.Helpers` instead of importing
See merge request pleroma/pleroma!3409
3 years ago
05d678c070
Expose user email address to user/owner; not publicly.
3 years ago
ad7d4ff8bc
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
3 years ago
07fed0fda2
Switch to aliasing `Router.Helpers` instead of importing
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
79376b4afb
Merge branch 'feature/521-pinned-post-federation' into 'develop'
...
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
3 years ago
8afa3f2d1b
Remove no longer necessary unit tests for MastoFE
3 years ago
4f55d5123b
Remove MastoFE-related backend code and frontend pieces
3 years ago
0feafcc20c
Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE
4 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
a2aa309496
Merge branch 'update_open_api_spex' into 'develop'
...
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
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
7f8785fd9b
[ #3213 ] Performance optimization of filtering by hashtags ("any" condition).
4 years ago
92ab72dbbb
Update OpenApiSpex dependency
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
7dac83eb6e
Linting.
4 years ago
024c11c18d
StatusController: Deactivate application support for now.
...
Some more things to discuss about, so we'll remove it from 2.3.0
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
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
4 years ago
d35b6254b4
Store the client application data in ActivityStreams format
4 years ago
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
4 years ago
63739c5a58
Tests to validate client disclosure obeys user setting
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
1e6c27181e
expires_in in scheduled status params
4 years ago
158f9f18ee
Merge branch 'remove-conversation-api' into 'develop'
...
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
4 years ago
cf6d3db58f
Add API endpoint to remove a conversation
4 years ago
9b61df1fb6
App is already preloaded into the token, so avoid an extra query
4 years ago
c1d78328ee
Consistency
4 years ago
6dc0b13cf8
Revert to original formatting for these function defs
4 years ago
7c508319a5
Prefer naming this put_application because we're putting it into the params map
4 years ago
09b8378646
%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.
4 years ago
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
4 years ago
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
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
3dc7e89c54
Ensure we capture the application details into the object
4 years ago
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
4 years ago
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
4 years ago
f1f773f2c7
Merge branch 'email-stub-in-verify-credentials' into 'develop'
...
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
4 years ago
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
4 years ago
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
4 years ago
2cb6dc5a3a
list timeline filtration by params
4 years ago
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
4 years ago
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
4 years ago
380d0cce6b
[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
4 years ago
60b4654038
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
...
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 .
4 years ago
793fc77b16
Add active user count
4 years ago
875fbaae35
support for expires_in/expires_at in filters
4 years ago
250e202098
Merge branch 'fix/missing-own_votes' into 'develop'
...
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
4 years ago
2cb5c16723
Credo
4 years ago
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
4 years ago
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
6bfd497f4a
Include own_votes in the poll data
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
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
4 years ago
d36182c088
Change user.confirmation_pending field to user.is_confirmed
4 years ago
860b5c7804
Change user.deactivated field to user.is_active
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
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
4 years ago
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
4 years ago
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
4 years ago
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
4 years ago
18b536c176
Pleroma.Object/1: take %Object{} as argument instead
4 years ago
Ilja