Commit Graph

4155 Commits

Author SHA1 Message Date
William Pitcock 07a9a891ad twitter api: fix up activity representer 2019-01-28 05:53:17 +00:00
William Pitcock 364cf5369b test: update mastodon status view tests 2019-01-28 05:53:17 +00:00
William Pitcock de42646634 rich media: add try/rescue to ensure we catch parsing and fetching failures 2019-01-28 05:53:17 +00:00
William Pitcock 5d895093fd twitter api: embed card in twitterapi posts 2019-01-28 05:53:17 +00:00
William Pitcock 5a37ddc2dc mastodon api: embed card in status object 2019-01-28 05:53:17 +00:00
William Pitcock 132d815f1f mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data 2019-01-28 05:53:17 +00:00
Haelwenn (lanodan) Monnier cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks 2019-01-28 04:47:32 +01:00
Haelwenn (lanodan) Monnier 872241d7c5
/web/index template: Modify for glitch-soc 2019-01-28 04:43:36 +01:00
rinpatch 6db792124b Merge branch 'notice-404-to-fe' into 'develop'
/notice/:id - send the FE index even if 404

See merge request pleroma/pleroma!725
2019-01-27 22:01:20 +00:00
href 71bb90073b
/notice/:id - send the FE index even if 404
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
2019-01-27 22:51:50 +01:00
lambda 16ab1437d6 Merge branch 'safe-render-activities' into 'develop'
Views: wrap activity rendering in a rescue

See merge request pleroma/pleroma!723
2019-01-27 20:10:09 +00:00
lain 2e277dd4ad Fix objects. 2019-01-27 21:03:15 +01:00
kaniini ea12371a01 Merge branch 'discard-invalid-likes' into 'develop'
Transmogrifier: fix incoming objects with invalid likes

See merge request pleroma/pleroma!724
2019-01-27 19:10:15 +00:00
href 77f2137383
Transmogrifier: fix incoming objects with invalid likes 2019-01-27 19:33:21 +01:00
href f83bae7c22
Views: wrap activity rendering in a rescue
this avoids complete timeline breakage when an activity fucks up
rendering.
2019-01-27 19:16:20 +01:00
kaniini 00fd9c9e5c Merge branch 'hotfix/favorites-index' into 'develop'
add activities likes index, fixes favorites API call

See merge request pleroma/pleroma!722
2019-01-27 15:22:08 +00:00
kaniini 9af798ad40 Merge branch 'flake-random-worker-id' into 'develop'
Flake: random worker id

See merge request pleroma/pleroma!721
2019-01-27 15:16:06 +00:00
William Pitcock 15d12a69a4 add activities likes index, fixes favorites API call 2019-01-27 15:15:33 +00:00
href e0e0cc5ab0
Flake: random worker id 2019-01-27 16:04:36 +01:00
rinpatch 6c41c54d1b Merge branch 'docs/emoji-endpoint-similarities' into 'develop'
docs/Pleroma-API.md: Add note about emoji endpoints similarities

See merge request pleroma/pleroma!720
2019-01-27 14:28:51 +00:00
Haelwenn (lanodan) Monnier 37520e1e79
docs/Pleroma-API.md: Add note about emoji endpoints similarities
[ci skip]
2019-01-27 14:31:07 +01:00
kaniini 5eb81d2c72 Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
MastodonAPI multi-hashtag

See merge request pleroma/pleroma!652
2019-01-27 12:45:50 +00:00
Haelwenn b58e4ddb10 Merge branch 'features/masto-account-view-rights' into 'develop'
Web.MastodonAPI.AccountView: Add is_moderator and is_admin

Closes #557

See merge request pleroma/pleroma!718
2019-01-27 09:45:51 +00:00
Haelwenn (lanodan) Monnier a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
2019-01-27 10:33:22 +01:00
Haelwenn 7175793304 Merge branch 'hardening/mastodon-rich-media' into 'develop'
rich media: minor hardening

See merge request pleroma/pleroma!717
2019-01-26 17:30:51 +00:00
kaniini c410fe960c Merge branch 'webpush-endpoint-size' into 'develop'
Change webpush endpoint to unlimited varchar

Closes #552

See merge request pleroma/pleroma!716
2019-01-26 17:27:14 +00:00
William Pitcock 8f2f471e94 rich media: gracefully handle fetching nil URIs 2019-01-26 16:36:17 +00:00
href 4a13bb75bd
Change webpush endpoint to unlimited varchar
Fixes #552
2019-01-26 17:18:34 +01:00
kaniini 155a884300 Merge branch 'flake-from-int' into 'develop'
Flake: support integers in from_string/1

See merge request pleroma/pleroma!715
2019-01-26 16:17:50 +00:00
href d6015338c8
Flake: support integers in from_string/1
Some previously issued stateless tokens have integer ids in them.
2019-01-26 16:58:23 +01:00
kaniini 3e66723f7e Merge branch 'join-in-preloads' into 'develop'
Join on preloads to avoid N+1 queries

See merge request pleroma/pleroma!714
2019-01-26 15:57:02 +00:00
kaniini e91f867cc9 Merge branch 'features/mastoapi-cards' into 'develop'
MastoAPI: Add Rich-Media support

See merge request pleroma/pleroma!664
2019-01-26 15:47:52 +00:00
Haelwenn (lanodan) Monnier de956b9e04
Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it 2019-01-26 16:46:20 +01:00
William Pitcock 1f7843b9b8 mastodon api: use OGP uri instead of page_url for deducing domain name, fix test 2019-01-26 15:24:16 +00:00
William Pitcock 86037e9c39 mastodon api: use HTML.extract_first_external_url() 2019-01-26 15:13:27 +00:00
href 8018ae7ae5
Join on preloads to avoid N+1 queries 2019-01-26 15:55:53 +01:00
William Pitcock be9abb2cc5 html: add utility function to extract first URL from an object and cache the result 2019-01-26 14:55:12 +00:00
William Pitcock 78047d57bf mastodon api: provider_name setting is required too on the card 2019-01-26 14:47:32 +00:00
Haelwenn (lanodan) Monnier 39863236eb Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x
Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.
2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier 3f64379b13 Web.MastodonAPI.MastodonAPIController: Add Rich-Media support 2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier d9f3af477d Move definitions of RichMedia fixtures to test/support/http_request_mock.ex 2019-01-26 14:18:23 +00:00
kaniini c00fba4f7d Merge branch 'documentation/mastalab' into 'develop'
README: Mastalab officially supports Pleroma.

See merge request pleroma/pleroma!713
2019-01-26 14:10:42 +00:00
William Pitcock 18b80be5ee README: Mastalab officially supports Pleroma. 2019-01-26 14:10:26 +00:00
kaniini b050d27c2d Merge branch 'bugfix/content_nil_lenght_check' into 'develop'
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil

See merge request pleroma/pleroma!711
2019-01-26 13:41:18 +00:00
Haelwenn (lanodan) Monnier 22f2687f17
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters 2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier 5a84def6a6
Fix the logic in multi-hashtag TLs 2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier 4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests 2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier d8f446f438
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline 2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier 1a9bb4daa0
[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier f9cae0d04f
[WIP,MastoAPI] Multi-tag timelines 2019-01-26 04:45:36 +01:00