moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,131 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

4131 Commits

Author SHA1 Message Date
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
Haelwenn (lanodan) Monnier 499a4591a4
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null 2019-01-26 04:23:52 +01:00
Haelwenn (lanodan) Monnier 15aa45ae8a
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil 2019-01-26 03:50:49 +01:00
Ivan Tashkinov d99650270b [#534] Federation reachability filtering tests. 2019-01-25 20:38:54 +03:00
Ivan Tashkinov 060d280e64 [#534] Made Salmon.send_to_user calls be handled through Federator.enqueue. 2019-01-25 20:38:13 +03:00
lain aa8ddfdbe2 SPC fixes: Fix activities. 2019-01-25 18:14:48 +01:00
Ivan Tashkinov 465adedb7c [#534] Websub fix: made SQL use UTC time zone when comparing with `valid_until` (instead of postgresql-server default time zone). 2019-01-25 18:29:43 +03:00
kaniini 6383fa3a5d Merge branch 'oembed_provider' into 'develop' 
Opengraph/TwitterCard::summary for statuses and user profiles

See merge request pleroma/pleroma!533
 2019-01-25 15:16:12 +00:00
Ivan Tashkinov 656ed7c84a [#534] Configurable outgoing federation reachability timeout. 2019-01-25 15:10:21 +03:00
lambda b9cd5117a1 Merge branch 'update/pleroma-fe-20190125-hotfix' into 'develop' 
update pleroma frontend (summary_html hotfix)

See merge request pleroma/pleroma!710
 2019-01-25 10:23:43 +00:00
William Pitcock 57c3f8214c update pleroma frontend (summary_html hotfix) 2019-01-25 10:17:00 +00:00
rinpatch a45a903480 Fix OGP provider tests 2019-01-25 10:51:06 +03:00
rinpatch 3a5b3c5a3a Merge remote-tracking branch 'pl/develop' into oembed_provider 2019-01-25 10:40:51 +03:00
kaniini 4c99b6d35a Merge branch 'fix/tusky-dm' into 'develop' 
Add actor to recipients list

Closes #390

See merge request pleroma/pleroma!683
 2019-01-25 05:19:32 +00:00
kaniini c9b418e547 Merge branch 'develop' into 'oembed_provider' 
# Conflicts:
#   lib/pleroma/activity.ex
 2019-01-25 05:00:47 +00:00
kaniini 4df71cd88b Merge branch 'classic-flakeids' into 'develop' 
Flake Ids for Users and Activities

Closes #450

See merge request pleroma/pleroma!645
 2019-01-25 04:59:06 +00:00
kaniini 9bf1a4234d Merge branch 'update/pleroma-fe-20190125' into 'develop' 
update pleroma frontend

See merge request pleroma/pleroma!709
 2019-01-25 04:57:05 +00:00
William Pitcock 4b76f14da1 update pleroma frontend 2019-01-25 04:49:35 +00:00
Maxim Filippov 9274cabe01 Use correct logic to determine "attentions" list 2019-01-24 23:30:43 +03:00
Ivan Tashkinov 3e9399ec0b [#534] Optimized bulk publish ops to filter on reachability early. `Instance` refactoring. 2019-01-24 19:15:23 +03:00
href a3ba72d978
Fix clippy with one/five lines 2019-01-24 16:53:14 +01:00
Ivan Tashkinov 8654a591f0 [#534] Updating external instances reachability on incoming federation. 2019-01-24 17:37:23 +03:00
kaniini 2ebabaeb9c Merge branch 'fix-activity_visibility-autovacuum' into 'develop' 
Fix postgres activity_visibility when running in autovacuum

See merge request pleroma/pleroma!708
 2019-01-24 13:22:34 +00:00
href e02b19d1d7
Fix postgres activity_visibility when running in autovacuum 2019-01-24 14:13:20 +01:00
href be43aa2875
FlakeId: ignore null mac for workerid, use first mac 2019-01-24 13:08:27 +01:00