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