kaniini [Wed, 30 Jan 2019 10:38:41 +0000 (10:38 +0000)]
Merge branch 'docs/fix-frontend_config' into 'develop'
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
See merge request pleroma/pleroma!737
Haelwenn (lanodan) Monnier [Wed, 30 Jan 2019 10:33:06 +0000 (11:33 +0100)]
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
[ci skip]
lambda [Tue, 29 Jan 2019 19:24:30 +0000 (19:24 +0000)]
Merge branch 'docs/fix-pleroma-api-title' into 'develop'
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
See merge request pleroma/pleroma!736
Haelwenn (lanodan) Monnier [Tue, 29 Jan 2019 18:11:34 +0000 (19:11 +0100)]
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
[ci skip]
kaniini [Tue, 29 Jan 2019 14:47:36 +0000 (14:47 +0000)]
Merge branch 'bugfix/fix-rejects' into 'develop'
follow request fixups
Closes #537
See merge request pleroma/pleroma!734
kaniini [Tue, 29 Jan 2019 13:54:10 +0000 (13:54 +0000)]
Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
William Pitcock [Tue, 29 Jan 2019 12:21:02 +0000 (12:21 +0000)]
activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
William Pitcock [Tue, 29 Jan 2019 11:57:46 +0000 (11:57 +0000)]
activitypub: transmogrifier: fix follow request rejections
Haelwenn [Tue, 29 Jan 2019 05:11:08 +0000 (05:11 +0000)]
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
Rich Media support, part 2.
See merge request pleroma/pleroma!719
William Pitcock [Mon, 28 Jan 2019 21:07:36 +0000 (21:07 +0000)]
rich media: oembed: return data in the same format as the other parsers
William Pitcock [Mon, 28 Jan 2019 20:55:33 +0000 (20:55 +0000)]
rich media: kill some testsuite noise
William Pitcock [Mon, 28 Jan 2019 20:31:43 +0000 (20:31 +0000)]
rich media: parser: add some basic sanity checks on the returned data with pattern matching
William Pitcock [Mon, 28 Jan 2019 20:19:07 +0000 (20:19 +0000)]
rich media: parser: cache negatives
William Pitcock [Mon, 28 Jan 2019 19:59:36 +0000 (19:59 +0000)]
rich media: parser: add copyright header
kaniini [Mon, 28 Jan 2019 14:31:03 +0000 (14:31 +0000)]
Merge branch 'app-list-changes' into 'develop'
App list changes: Separate into two categories, and drop Subway Tooter.
See merge request pleroma/pleroma!731
scarlett [Mon, 28 Jan 2019 14:24:49 +0000 (14:24 +0000)]
App list changes: Separate into two categories, and drop Subway Tooter.
lain [Mon, 28 Jan 2019 13:39:54 +0000 (14:39 +0100)]
Put deprecation warnings undre Pleroma.Config.
lain [Mon, 28 Jan 2019 12:07:12 +0000 (13:07 +0100)]
Return new-style config if old-style config is set to false.
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
lain [Mon, 28 Jan 2019 12:06:28 +0000 (13:06 +0100)]
Update config.md
lain [Mon, 28 Jan 2019 12:05:17 +0000 (13:05 +0100)]
Don't run warnings in a task.
lain [Mon, 28 Jan 2019 12:04:51 +0000 (13:04 +0100)]
Change default bg image in new config.
Haelwenn [Mon, 28 Jan 2019 11:48:03 +0000 (11:48 +0000)]
Merge branch 'safe-render-activities' into 'develop'
remove unnecessary filter (re !723)
See merge request pleroma/pleroma!729
href [Mon, 28 Jan 2019 11:24:14 +0000 (12:24 +0100)]
re
f83bae7c: remove unnecessary filter
lain [Mon, 28 Jan 2019 11:09:41 +0000 (12:09 +0100)]
Add deprecation warning mechanism.
href [Mon, 28 Jan 2019 10:49:03 +0000 (10:49 +0000)]
Merge branch 'oauth-login-failure-bug' into 'develop'
Correctly handle invalid credentials on auth login.
Closes #407
See merge request pleroma/pleroma!728
lain [Mon, 28 Jan 2019 10:41:47 +0000 (11:41 +0100)]
Correctly handle invalid credentials on auth login.
Closes #407
Haelwenn [Mon, 28 Jan 2019 08:23:21 +0000 (08:23 +0000)]
Merge branch 'patch-2' into 'develop'
Update the openrc service's retry with the correct format
See merge request pleroma/pleroma!727
vaartis [Mon, 28 Jan 2019 08:18:11 +0000 (08:18 +0000)]
Update the openrc service's retry with the correct format
William Pitcock [Mon, 28 Jan 2019 06:42:27 +0000 (06:42 +0000)]
mastodon api: card: force OGP images through mediaproxy
William Pitcock [Mon, 28 Jan 2019 06:19:00 +0000 (06:19 +0000)]
test: add status posting with OGP link preview test
William Pitcock [Mon, 28 Jan 2019 06:10:25 +0000 (06:10 +0000)]
rich media: helpers: clean up unused aliases
William Pitcock [Mon, 28 Jan 2019 06:07:18 +0000 (06:07 +0000)]
activitypub: prime OGP crawler cache when new messages are inserted into the database
William Pitcock [Mon, 28 Jan 2019 06:04:54 +0000 (06:04 +0000)]
rich media: add helpers module, use instead of MastodonAPI module
William Pitcock [Sun, 27 Jan 2019 12:39:20 +0000 (12:39 +0000)]
mastodon api: formatting
William Pitcock [Sun, 27 Jan 2019 12:34:49 +0000 (12:34 +0000)]
API: kill /api/rich_media/parse endpoint
William Pitcock [Sun, 27 Jan 2019 12:27:46 +0000 (12:27 +0000)]
test: update twitterapi tests
William Pitcock [Sun, 27 Jan 2019 12:27:37 +0000 (12:27 +0000)]
twitter api: fix up activity representer
William Pitcock [Sun, 27 Jan 2019 12:21:51 +0000 (12:21 +0000)]
test: update mastodon status view tests
William Pitcock [Sun, 27 Jan 2019 12:21:05 +0000 (12:21 +0000)]
rich media: add try/rescue to ensure we catch parsing and fetching failures
William Pitcock [Sun, 27 Jan 2019 12:16:08 +0000 (12:16 +0000)]
twitter api: embed card in twitterapi posts
William Pitcock [Sun, 27 Jan 2019 12:15:41 +0000 (12:15 +0000)]
mastodon api: embed card in status object
William Pitcock [Sun, 27 Jan 2019 09:37:11 +0000 (09:37 +0000)]
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
rinpatch [Sun, 27 Jan 2019 22:01:20 +0000 (22:01 +0000)]
Merge branch 'notice-404-to-fe' into 'develop'
/notice/:id - send the FE index even if 404
See merge request pleroma/pleroma!725
href [Sun, 27 Jan 2019 21:51:50 +0000 (22:51 +0100)]
/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
lambda [Sun, 27 Jan 2019 20:10:09 +0000 (20:10 +0000)]
Merge branch 'safe-render-activities' into 'develop'
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
kaniini [Sun, 27 Jan 2019 19:10:15 +0000 (19:10 +0000)]
Merge branch 'discard-invalid-likes' into 'develop'
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
href [Sun, 27 Jan 2019 18:27:16 +0000 (19:27 +0100)]
Transmogrifier: fix incoming objects with invalid likes
href [Sun, 27 Jan 2019 18:15:35 +0000 (19:15 +0100)]
Views: wrap activity rendering in a rescue
this avoids complete timeline breakage when an activity fucks up
rendering.
kaniini [Sun, 27 Jan 2019 15:22:08 +0000 (15:22 +0000)]
Merge branch 'hotfix/favorites-index' into 'develop'
add activities likes index, fixes favorites API call
See merge request pleroma/pleroma!722
kaniini [Sun, 27 Jan 2019 15:16:06 +0000 (15:16 +0000)]
Merge branch 'flake-random-worker-id' into 'develop'
Flake: random worker id
See merge request pleroma/pleroma!721
William Pitcock [Sun, 27 Jan 2019 15:15:33 +0000 (15:15 +0000)]
add activities likes index, fixes favorites API call
href [Sun, 27 Jan 2019 15:04:36 +0000 (16:04 +0100)]
Flake: random worker id
rinpatch [Sun, 27 Jan 2019 14:28:51 +0000 (14:28 +0000)]
Merge branch 'docs/emoji-endpoint-similarities' into 'develop'
docs/Pleroma-API.md: Add note about emoji endpoints similarities
See merge request pleroma/pleroma!720
Haelwenn (lanodan) Monnier [Sun, 27 Jan 2019 13:30:21 +0000 (14:30 +0100)]
docs/Pleroma-API.md: Add note about emoji endpoints similarities
[ci skip]
kaniini [Sun, 27 Jan 2019 12:45:50 +0000 (12:45 +0000)]
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
Haelwenn [Sun, 27 Jan 2019 09:45:51 +0000 (09:45 +0000)]
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
Haelwenn (lanodan) Monnier [Sun, 27 Jan 2019 09:21:13 +0000 (10:21 +0100)]
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
Haelwenn [Sat, 26 Jan 2019 17:30:51 +0000 (17:30 +0000)]
Merge branch 'hardening/mastodon-rich-media' into 'develop'
rich media: minor hardening
See merge request pleroma/pleroma!717
kaniini [Sat, 26 Jan 2019 17:27:14 +0000 (17:27 +0000)]
Merge branch 'webpush-endpoint-size' into 'develop'
Change webpush endpoint to unlimited varchar
Closes #552
See merge request pleroma/pleroma!716
William Pitcock [Sat, 26 Jan 2019 16:26:11 +0000 (16:26 +0000)]
rich media: gracefully handle fetching nil URIs
href [Sat, 26 Jan 2019 16:17:37 +0000 (17:17 +0100)]
Change webpush endpoint to unlimited varchar
Fixes #552
kaniini [Sat, 26 Jan 2019 16:17:50 +0000 (16:17 +0000)]
Merge branch 'flake-from-int' into 'develop'
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
href [Sat, 26 Jan 2019 15:58:23 +0000 (16:58 +0100)]
Flake: support integers in from_string/1
Some previously issued stateless tokens have integer ids in them.
kaniini [Sat, 26 Jan 2019 15:57:02 +0000 (15:57 +0000)]
Merge branch 'join-in-preloads' into 'develop'
Join on preloads to avoid N+1 queries
See merge request pleroma/pleroma!714
kaniini [Sat, 26 Jan 2019 15:47:52 +0000 (15:47 +0000)]
Merge branch 'features/mastoapi-cards' into 'develop'
MastoAPI: Add Rich-Media support
See merge request pleroma/pleroma!664
Haelwenn (lanodan) Monnier [Sat, 26 Jan 2019 15:46:20 +0000 (16:46 +0100)]
Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it
William Pitcock [Sat, 26 Jan 2019 15:20:27 +0000 (15:20 +0000)]
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
William Pitcock [Sat, 26 Jan 2019 14:56:14 +0000 (14:56 +0000)]
mastodon api: use HTML.extract_first_external_url()
href [Sat, 26 Jan 2019 14:55:53 +0000 (15:55 +0100)]
Join on preloads to avoid N+1 queries
William Pitcock [Sat, 26 Jan 2019 14:55:12 +0000 (14:55 +0000)]
html: add utility function to extract first URL from an object and cache the result
William Pitcock [Sat, 26 Jan 2019 14:47:32 +0000 (14:47 +0000)]
mastodon api: provider_name setting is required too on the card
Haelwenn (lanodan) Monnier [Sun, 20 Jan 2019 23:53:41 +0000 (00:53 +0100)]
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.
Haelwenn (lanodan) Monnier [Sun, 13 Jan 2019 23:06:55 +0000 (00:06 +0100)]
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
Haelwenn (lanodan) Monnier [Sun, 13 Jan 2019 23:05:45 +0000 (00:05 +0100)]
Move definitions of RichMedia fixtures to test/support/http_request_mock.ex
kaniini [Sat, 26 Jan 2019 14:10:42 +0000 (14:10 +0000)]
Merge branch 'documentation/mastalab' into 'develop'
README: Mastalab officially supports Pleroma.
See merge request pleroma/pleroma!713
William Pitcock [Sat, 26 Jan 2019 14:10:26 +0000 (14:10 +0000)]
README: Mastalab officially supports Pleroma.
kaniini [Sat, 26 Jan 2019 13:41:18 +0000 (13:41 +0000)]
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
Haelwenn (lanodan) Monnier [Tue, 22 Jan 2019 14:42:46 +0000 (15:42 +0100)]
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters
Haelwenn (lanodan) Monnier [Thu, 10 Jan 2019 15:44:28 +0000 (16:44 +0100)]
Fix the logic in multi-hashtag TLs
Haelwenn (lanodan) Monnier [Thu, 10 Jan 2019 15:07:32 +0000 (16:07 +0100)]
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
Haelwenn (lanodan) Monnier [Fri, 21 Dec 2018 18:34:08 +0000 (19:34 +0100)]
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline
Haelwenn (lanodan) Monnier [Fri, 21 Dec 2018 17:24:13 +0000 (18:24 +0100)]
[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
Haelwenn (lanodan) Monnier [Wed, 19 Dec 2018 16:21:35 +0000 (17:21 +0100)]
[WIP,MastoAPI] Multi-tag timelines
Haelwenn (lanodan) Monnier [Sat, 26 Jan 2019 03:23:52 +0000 (04:23 +0100)]
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null
Haelwenn (lanodan) Monnier [Sat, 26 Jan 2019 02:50:49 +0000 (03:50 +0100)]
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
kaniini [Fri, 25 Jan 2019 15:16:12 +0000 (15:16 +0000)]
Merge branch 'oembed_provider' into 'develop'
Opengraph/TwitterCard::summary for statuses and user profiles
See merge request pleroma/pleroma!533
lambda [Fri, 25 Jan 2019 10:23:43 +0000 (10:23 +0000)]
Merge branch 'update/pleroma-fe-
20190125-hotfix' into 'develop'
update pleroma frontend (summary_html hotfix)
See merge request pleroma/pleroma!710
William Pitcock [Fri, 25 Jan 2019 10:17:00 +0000 (10:17 +0000)]
update pleroma frontend (summary_html hotfix)
rinpatch [Fri, 25 Jan 2019 07:51:06 +0000 (10:51 +0300)]
Fix OGP provider tests
rinpatch [Fri, 25 Jan 2019 07:40:51 +0000 (10:40 +0300)]
Merge remote-tracking branch 'pl/develop' into oembed_provider
kaniini [Fri, 25 Jan 2019 05:19:32 +0000 (05:19 +0000)]
Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
kaniini [Fri, 25 Jan 2019 05:00:47 +0000 (05:00 +0000)]
Merge branch 'develop' into 'oembed_provider'
# Conflicts:
# lib/pleroma/activity.ex
kaniini [Fri, 25 Jan 2019 04:59:06 +0000 (04:59 +0000)]
Merge branch 'classic-flakeids' into 'develop'
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
kaniini [Fri, 25 Jan 2019 04:57:05 +0000 (04:57 +0000)]
Merge branch 'update/pleroma-fe-
20190125' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!709
William Pitcock [Fri, 25 Jan 2019 04:49:35 +0000 (04:49 +0000)]
update pleroma frontend
Maxim Filippov [Thu, 24 Jan 2019 20:30:43 +0000 (23:30 +0300)]
Use correct logic to determine "attentions" list
href [Thu, 24 Jan 2019 15:15:13 +0000 (16:15 +0100)]
Fix clippy with one/five lines
kaniini [Thu, 24 Jan 2019 13:22:34 +0000 (13:22 +0000)]
Merge branch 'fix-activity_visibility-autovacuum' into 'develop'
Fix postgres activity_visibility when running in autovacuum
See merge request pleroma/pleroma!708
href [Thu, 24 Jan 2019 13:13:20 +0000 (14:13 +0100)]
Fix postgres activity_visibility when running in autovacuum
href [Thu, 24 Jan 2019 12:08:27 +0000 (13:08 +0100)]
FlakeId: ignore null mac for workerid, use first mac
projects / akkoma / log