980b5288ed
update copyright years to 2019
6 years ago
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
6 years ago
dec23500d8
Resolve merge conflict
6 years ago
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
6 years ago
19f9889fbe
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
6 years ago
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
6 years ago
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
6 years ago
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
6 years ago
ea72ac549b
fix case when tags is invalid
6 years ago
d3ec09bb38
fix tags
6 years ago
658edb166f
fix and improve web push; add configuration docs
6 years ago
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
6 years ago
074fa790ba
fix compile warnings
6 years ago
068353ac0b
formatting
6 years ago
9442588ae9
fix hashtags in api response
6 years ago
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
7bcb6a183a
[ #394 ] Refactoring.
6 years ago
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
3d492795b7
clean up
6 years ago
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
6 years ago
3b8e5bcbeb
fix most tests
6 years ago
e9b718cea2
mastodon api: status view: use Object.normalize()
6 years ago
0896cf4c0f
Fix most mastodon api bugs.
6 years ago
3e50bb667f
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
6 years ago
4d8f076125
mastodon api: add support for rendering Page objects
6 years ago
755f166406
Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string
6 years ago
5c6ec2d9fc
twitter/mastodon api: always use mediaproxy URLs in attachments
...
if using local media, the mediaproxy will not replace the URL anyway.
6 years ago
b0a940d5a2
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments
6 years ago
0c10be8731
[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json
6 years ago
3b0e9287a5
[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views
6 years ago
7f530f6f80
mastodon api: relationship view: better handle no pre-existing follow activity
6 years ago
3e751496e3
mastodon api: account view: fetch follow state and use it to populate `requested` field
6 years ago
d94ee5cd50
Mastodon API: Support push subscription CRUD
6 years ago
958e085acb
mastodon api: add support for user-supplied html policy
6 years ago
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
6 years ago
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
6 years ago
0cac493fdc
mastodon api: default attachment type to image if one is not present
6 years ago
c2650f0ffb
Merge branch 'feature/html-scrub-policy' into 'develop'
...
html scrub policy
See merge request pleroma/pleroma!339
6 years ago
39aed5348a
Add visible_in_picker to status emojis
6 years ago
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
619f67768a
Mastodon API: Add unsupported attributes to relationship responses
...
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
6 years ago
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
6 years ago
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
6 years ago
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
6 years ago
0c2a0e3551
Specify default scope in verify_credentials
...
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value.
6 years ago
ddc6f32b75
Fix Mastodon API when actor's nickname is null
6 years ago
6973b77e94
[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable
6 years ago
9bddb39ff0
[Pleroma.Web.MastodonAPI.FilterView]: expires_at should be null when N/A
6 years ago
6e030129fb
[MastodonAPI] Add filters
6 years ago
a5adb251ab
[Pleroma.Web.MastodonAPI.AccountView]: Add fields support
6 years ago
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
6 years ago
5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
6 years ago
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
6 years ago
046741c60d
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
6 years ago
3b8ef24532
Fix attachement rendering
6 years ago
a6b021a52b
Render peertube videos in mastodon.
6 years ago
175f0bebbc
mastodon api: sanitize the bio HTML
6 years ago
c2d1a5e9c4
MastoAPI AccountView: render profile emoji.
6 years ago
cd19d37a90
mastodon api: use object name as alt text
6 years ago
4a922305af
Merge branch 'feature/article-support' into 'develop'
...
article support (plume, etc)
See merge request pleroma/pleroma!240
6 years ago
7a351cb36f
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/231
6 years ago
971bb4f2bd
activity interpretation: formatting
6 years ago
ea982e7503
mastodon api: add interpreter for Article activity types
6 years ago
359093d73b
Fake 2.4.0 API
6 years ago
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
6 years ago
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
6 years ago
c0ca9f82b9
mastodon api: properly track if an account is locked or not
6 years ago
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
6 years ago
a8369db4f2
MastoAPI: add lists.
6 years ago
2ce48c1a42
Formatting
6 years ago
9aabff4883
Fix tests.
6 years ago
31ea9cbcd8
Group def renders together to fix warning
6 years ago
aaacebd906
Fix unused variables, imports, and aliases
6 years ago
5e4bb4ad92
masto api: run emojis through mediaproxy
...
fixes #107
7 years ago
4afbef39f4
Format the code.
7 years ago
37e5014d3e
Reduce OP fetching queries.
7 years ago
ff7afe46b9
Don't try to fetch OP if none is there.
7 years ago
09de76ad5a
Return "audio" info in mastodon api.
7 years ago
fbe9aa3506
Strip html from emoji stuff.
7 years ago
000b3f1837
mastodon api: fix rendering the mentions JSON
...
Signed-off-by: lain <lain@soykaf.club>
7 years ago
95e6e82138
Correctly display accounts without name.
7 years ago
486e205810
Remove some noise.
7 years ago
d4b08dd838
MastodonAPI: Post with visibility settings
7 years ago
539340d914
Handle sensitive property.
7 years ago
912ca56e59
Mastodon StatusView: Return correct visibility.
7 years ago
14b086eec2
Add a default profile picture and banner.
...
This removes the placehold.it dependency.
7 years ago
5f35fdcf5d
media proxy: good enough wip
7 years ago
fa19de97ba
MastoAPI: no more than 4 attachments.
7 years ago
59770c3f5c
Fix all compilation warnings
7 years ago
ced0d64d75
MastoAPI: Make attachment ids strings.
7 years ago
d293ceb1b5
Add Mastodon frontend.
7 years ago
a1923d20e8
MastoAPI: Fix reblog emojis.
7 years ago
6e9c22c0af
MastoAPI: Use string ids everywhere.
7 years ago
33beb51da4
MastoAPI: Add blocking to AccountView.
7 years ago
44295dd49a
MastoAPI: Include CW.
7 years ago
968a546d4a
MastoAPI: Return id as string instead of integer.
7 years ago
ce7f9f527c
MastoAPI: Always return an url for statuses.
...
External url if available, id if not.
7 years ago
64bc38e009
MastoAPI: Add emoji output.
7 years ago
ae38b72e24
MastoAPI: Fix reblog view.
7 years ago
6000f61727
MastoAPI: Add repeats to statusview.
7 years ago
0872f5f394
Add undocumented default user default settings.
7 years ago
d659fcc195
MastoAPI: Fix date in account view.
7 years ago
3aaf6608c6
MastoAPI: Set user id on replies.
7 years ago
b0363e8055
MastoAPI: Add favourited_by/reblogged_by.
7 years ago
a8701282d4
MastoAPI: fake out 'application' property.
7 years ago
6258c6b6b3
MastoAPI: Also return text_url in attachments.
7 years ago
3184939055
Ensure non-null bio.
7 years ago
ad5001828e
Oh no! More datetime fixes!
7 years ago
14b4029b1d
Reparse time to ensure correct format.
7 years ago
94be93aad0
Allign datetime format with mastodon.
7 years ago
e6286152b9
Fix logic.
7 years ago
49929321c7
Add relationships to masto api.
7 years ago
1bc58230ee
Remove milliseconds from mastodon api response.
7 years ago
7331733d30
Use signed integer as attachment id.
7 years ago
b58b35bf56
Use hash of attachment url as id.
...
Pretty hacky, let's see if we can get away with this.
7 years ago
44a650235b
MastoAPI: Remove domain ending from account name.
7 years ago
fc10875895
Add attachments to mastoapi statuses.
7 years ago
e8975d06be
Add header image to masto api.
7 years ago
454dc18570
Add favoriting to Mastodon API.
7 years ago
66e4c710d4
Add reblogging to MastodonAPI.
7 years ago
2b7efff71b
Add Mastodon StatusView.
7 years ago
c6bdc5960c
Test for Mastodon AccountView
...
Handles users and mentions.
7 years ago
2652d9e4ed
Slight cleanup.
7 years ago
4a6855d9ee
Provide plaintext representations of content/cw in MastoAPI
8 years ago
William Pitcock