fda148a9a2
Merge branch 'documentation/copy-pleroma-api' into 'develop'
...
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571
2018-12-20 04:01:54 +00:00
652f49d176
Remove extra bracket
2018-12-19 23:06:10 +04:00
7fb3780431
Merge branch 'develop' into oembed_provider
2018-12-19 22:39:44 +04:00
b520d44b58
[ #114 ] `mix format`
2018-12-19 19:03:39 +03:00
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
2018-12-19 18:56:52 +03:00
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
2018-12-19 16:31:03 +03:00
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
2018-12-19 16:27:16 +03:00
f3eb414e28
Add a way to use the admin api without a user.
2018-12-18 21:08:52 +01:00
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
2018-12-18 17:05:36 +01:00
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
2018-12-18 15:34:27 +01:00
3371a45884
[ #114 ] Formatting fix.
2018-12-18 17:30:30 +03:00
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
2018-12-18 17:22:46 +03:00
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
2018-12-18 17:22:45 +03:00
b86057cc7f
[ #114 ] Refactored User.register_changeset to init confirmation data.
...
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
2018-12-18 17:22:42 +03:00
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
2018-12-18 17:21:05 +03:00
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
2018-12-18 17:18:53 +03:00
a300336459
Merge branch 'develop' into oembed_provider
2018-12-18 14:59:32 +01:00
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
2018-12-17 22:50:59 +01:00
3d980daa49
Merge branch '459_fix_user_profile_crash' into 'develop'
...
Fix update_profile failing due to OAuth token record in assigns instead of string
Closes #459
See merge request pleroma/pleroma!561
2018-12-17 20:16:15 +00:00
92a5133c42
fix text field
2018-12-17 22:53:16 +03:00
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
2018-12-17 19:45:14 +00:00
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
2018-12-17 19:30:05 +00:00
77b5154c82
Cowboy handler for Mastodon WebSocket
2018-12-17 17:06:18 +01:00
cc87880488
Support both OAuth token record and token string in UserView
2018-12-17 16:02:26 +01:00
567359790e
Merge branch 'testfix/webfinger-jrd' into 'develop'
...
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554
2018-12-17 09:19:27 +00:00
5dcb7aecea
More put_view.
2018-12-16 17:51:22 +01:00
f672555ad3
Upgrade to Phoenix 1.4
2018-12-16 17:15:07 +01:00
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
2018-12-16 11:21:26 +00:00
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
2018-12-16 13:15:34 +02:00
23549d3952
Formatting fixes
2018-12-15 22:08:26 +03:00
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
2018-12-15 17:56:12 +01:00
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
2018-12-15 15:23:51 +00:00
28c43a417e
Add an ability to disabled captcha
2018-12-15 03:12:47 +03:00
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
2018-12-15 03:12:44 +03:00
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
2018-12-14 20:30:35 +00:00
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
2018-12-14 20:22:24 +00:00
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
ea72ac549b
fix case when tags is invalid
2018-12-14 23:16:12 +03:00
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
2018-12-14 21:07:06 +01:00
90b00701ff
Merge branch 'develop' into oembed_provider
2018-12-14 20:28:35 +01:00
d3ec09bb38
fix tags
2018-12-14 22:09:04 +03:00
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
2018-12-14 19:55:40 +01:00
980131b4db
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
...
Improve web push
Closes #393 , #422 , and #452
See merge request pleroma/pleroma!524
2018-12-14 18:50:44 +00:00
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
2018-12-14 18:09:59 +01:00
412df2cd38
Warn if push is disabled..
2018-12-14 16:19:28 +01:00
baead4ea4b
fix markdown formatting
2018-12-14 16:03:58 +03:00
91236c60c7
Merge branch 'feature/file-size-checking' into 'develop'
...
[#36 ] Add warnings when file upload fails
See merge request pleroma/pleroma!523
2018-12-14 13:00:24 +00:00
0b4c61e8d5
Fix warning
2018-12-14 13:56:42 +01:00
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
2018-12-14 13:22:10 +01:00
331396cbcd
Properly disable Web Push if no VAPID key is set
2018-12-14 13:05:51 +01:00
6822916183
Typos
2018-12-14 13:05:51 +01:00
b1bcd97a0f
Push: respect alerts settings
2018-12-14 13:05:49 +01:00
d8984b7bf8
Push: add missing notification_type field
2018-12-14 13:05:48 +01:00
7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe
2018-12-14 13:05:47 +01:00
324933a0ac
improve push message format (compatibility with mastodon)
2018-12-14 13:05:46 +01:00
658edb166f
fix and improve web push; add configuration docs
2018-12-14 13:05:29 +01:00
69fd63e248
[ #114 ] Added `invitesEnabled` to `metadata` of nodeinfo.
2018-12-14 14:13:13 +03:00
66380b0641
[ #114 ] Removed `confirm_email` action stub (to be addressed in a separate MR).
2018-12-14 14:01:00 +03:00
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
2018-12-14 12:37:06 +03:00
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
2018-12-14 12:28:23 +03:00
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
2018-12-14 12:28:22 +03:00
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
2018-12-14 12:28:14 +03:00
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
2018-12-14 09:16:03 +00:00
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
2018-12-14 12:09:55 +03:00
262cc6d44b
Merge branch 'fix/double-rt-or-fav' into 'develop'
...
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
2018-12-14 08:26:08 +00:00
61ad2ce422
TwitterAPI: Include favorited post in json
2018-12-14 08:24:18 +02:00
1ca080c862
Prevent accidental double RTs or favorites
2018-12-14 07:56:49 +02:00
c5c3ad90d0
Fix tests. Remove oembed template
2018-12-14 03:00:50 +01:00
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
2018-12-13 22:34:15 +01:00
018516d3f3
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
2018-12-13 22:21:14 +01:00
9b3a6cdb07
Extract opengraph/oembed into separate module
2018-12-13 22:17:53 +01:00
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
2018-12-13 22:17:53 +01:00
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
2018-12-13 22:17:53 +01:00
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
2018-12-13 22:17:53 +01:00
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
2018-12-13 16:22:42 +03:00
00744c6b03
[ #114 ] Initial implementation of user email invitations.
2018-12-13 14:30:48 +03:00
908943352f
[ #114 ] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
2018-12-13 13:17:49 +03:00
bfff2399ff
[ #114 ] Routes and config for `confirm_email` and `email_invite` (Twitter API).
2018-12-12 20:15:43 +03:00
e3a21bcd45
[ #114 ] Addressed warnings. Fix of `with` statement clause in `password_reset`.
2018-12-12 17:14:31 +03:00
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
2018-12-12 17:04:39 +03:00
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
2018-12-12 17:02:41 +03:00
89b3729afa
fix warnings
2018-12-12 09:09:19 +03:00
213176c3c3
Add new frontend options to server-side config.
2018-12-10 23:15:01 +00:00
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
c81c74d847
Treat warnings as errors outside of tests.
2018-12-10 19:13:53 +01:00
e94c3442f4
updates
2018-12-10 13:27:37 +03:00
074fa790ba
fix compile warnings
2018-12-09 20:50:08 +03:00
068353ac0b
formatting
2018-12-09 11:24:46 +03:00
9442588ae9
fix hashtags in api response
2018-12-09 11:24:46 +03:00
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
2018-12-08 21:48:49 +01:00
beadeaffa1
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
...
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
2018-12-08 09:12:06 +00:00
bdc8112e40
Media proxy: fix url encoding
2018-12-07 21:57:59 +01:00
578051809f
Add uploadlimit to Twitter API config
2018-12-07 20:03:30 +01:00
94ac0075bf
Merge branch 'media-proxy-follow-redirect' into 'develop'
...
Media proxy: follow HTTP redirects by default
Closes #421
See merge request pleroma/pleroma!519
2018-12-07 18:48:26 +00:00
134cc94cbd
Nodeinfo: remove null features; relay feature.
2018-12-07 19:44:45 +01:00
d8fcf7c5cf
Media proxy: follow HTTP redirects by default
2018-12-07 19:36:44 +01:00
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
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
2018-12-07 11:04:39 +03:00
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
2018-12-06 22:26:25 +03:00
7bcb6a183a
[ #394 ] Refactoring.
2018-12-06 20:23:16 +03:00
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
2018-12-06 20:06:50 +03:00
1d531fd2f3
Merge branch 'fix/mastodon-api-settings' into 'develop'
...
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
2018-12-06 16:01:58 +00:00
abead01ab6
Merge branch 'correct-and-improve-http-options' into 'develop'
...
Correct and improve http options
See merge request pleroma/pleroma!505
2018-12-06 15:57:56 +00:00
b0adea30b3
Merge branch 're-mrf' into 'develop'
...
Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499
2018-12-06 15:36:41 +00:00
2ae1128d9f
MastoAPI: Fix put_settings
2018-12-06 17:42:07 +03:00
d27e3f269f
Rename regular expression 'have_re' to 'reply_prefix'.
2018-12-06 14:00:41 +00:00
6f36e903b0
use `User.avatar_url`
2018-12-06 20:55:46 +07:00
79668c08fc
cleanup
2018-12-06 20:50:20 +07:00
3dff61ebec
Harden re: detection.
2018-12-06 13:48:12 +00:00
3d492795b7
clean up
2018-12-06 20:42:00 +07:00
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
bac58b1524
show warning if VAPID is not set
2018-12-06 19:56:56 +07:00
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
04a48286e6
Add web push support
2018-12-06 19:29:04 +07:00
6a6aaa0e1a
Use object.normalize.
2018-12-06 11:37:29 +00:00
a09ed0f5af
avoid mix format bug
2018-12-06 18:41:29 +09:00
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
2018-12-06 07:36:21 +00:00
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
2018-12-06 10:26:17 +03:00
96ba95df2e
remove follow_redirect options
2018-12-06 11:38:33 +09:00
27792b2d77
remove pool and timeout options which duplicate with the default
2018-12-06 11:23:15 +09:00
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
2018-12-06 10:48:05 +09:00
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
2018-12-05 21:27:56 +01:00
3ea4476445
MastodonAPI: Show users their own network.
2018-12-05 21:25:06 +01:00
fdac215091
TwitterAPI: Show users their own network.
2018-12-05 21:14:06 +01:00
3b5be09f45
[ #210 ] Stylistic change.
2018-12-05 21:48:21 +03:00
839526a913
TwitterAPI: Add network hiding.
2018-12-05 19:22:40 +01:00
c4f3c5e939
[ #210 ] Stylistic change.
2018-12-05 20:23:28 +03:00
848151f7cb
[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check
...
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
2018-12-05 13:37:06 +03:00
be187f82f7
[ #210 ] Further refactoring.
2018-12-05 11:48:50 +03:00
a418547bdf
debug /api/v1/suggestions
2018-12-05 16:08:34 +09:00
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
2018-12-04 23:35:07 +00:00
ec1ec32f20
Merge branch 'optional-retry-queue' into 'develop'
...
Make retry queue optional.
See merge request pleroma/pleroma!498
2018-12-04 19:00:18 +00:00
925b05054f
Make retry queue optional.
...
At the moment, it can use a lot of memory really fast.
2018-12-04 19:54:42 +01:00
114b95cee2
Merge branch 'feature/integration_tesla' into 'develop'
...
[#354 ] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
2018-12-04 18:41:00 +00:00
b57d83e3c9
MRF: simple policy: fix media removal
2018-12-04 18:30:01 +00:00
48e6193bf2
[ #210 ] Refactoring.
2018-12-04 19:24:41 +03:00
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
2018-12-04 18:35:57 +03:00
87109482f3
status_code -> status
2018-12-04 14:04:06 +03:00
97252a27d9
fix http request in Salmon
2018-12-04 14:04:06 +03:00
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
2018-12-04 14:03:32 +03:00
88b05aeabb
Merge branch 'fix/parse-user-bio' into 'develop'
...
Parse user's bio on register
See merge request pleroma/pleroma!492
2018-12-03 16:31:00 +00:00
42ef7cd227
Merge branch 'fix-media-proxy-defaults' into 'develop'
...
Fix media proxy config defaults
See merge request pleroma/pleroma!495
2018-12-03 16:14:58 +00:00
4b70e5eae9
Parse bio for MastodonAPI
2018-12-03 18:59:50 +03:00
ce98d5eb9b
Parse user's bio on register
2018-12-02 22:03:53 +03:00
8c9a4e8b40
TwitterAPI: Implement hide_network.
2018-12-02 18:14:13 +01:00
2a639de9b3
MastodonApi: Implement hide_network.
2018-12-02 17:48:00 +01:00
6be0ab1e55
Hide network in ap.
2018-12-02 17:35:32 +01:00
43d5e4f7fa
Fix media proxy config defaults
2018-12-02 11:24:02 +01:00
f18b86fd5f
More fixes for Info schema.
2018-12-01 12:46:08 +01:00
93f2dc19d9
TwitterAPI: Fix banner and background update.
2018-12-01 12:01:22 +01:00
347df6421d
Fix masto api user updating.
2018-12-01 10:40:01 +01:00
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-12-01 09:55:46 +01:00
1c67277c80
Fix admin api.
2018-12-01 09:03:16 +01:00
680716b3c9
Config docs
2018-11-30 18:02:51 +01:00
02d3dc6869
Uploads fun, part. 2
2018-11-30 18:02:37 +01:00
b19597f602
reverse proxy / uploads
2018-11-30 18:00:47 +01:00
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
2018-11-30 17:34:20 +01:00
8f1fffebc6
Fix transmogrifier test.
2018-11-30 17:31:05 +01:00
d088ac6286
Fix OStatus user updates.
...
Breaks banner updating.
2018-11-30 17:21:58 +01:00
48b95a9b95
Assorted fixes.
2018-11-30 17:08:02 +01:00
d407f662af
Fix TwitterApiController.
2018-11-30 17:07:37 +01:00
a6812bc9df
Remove "most recent notification" endpoint.
2018-11-30 16:47:37 +01:00
87098d1676
Streamer: Don't send unwanted DMs to list streams
2018-11-27 20:50:19 +01:00
3c61df6b9e
Webfinger fixes.
2018-11-27 18:31:44 +01:00
ec464ef20a
HTTP sig fixes.
2018-11-27 17:42:45 +01:00
5ae6088d37
Merge branch 'feature/mrf-user-allowlist' into 'develop'
...
MRF: user allowlist module
See merge request pleroma/pleroma!477
2018-11-27 00:12:03 +00:00
271f9f1335
nodeinfo: add mrf_user_allowlist data
2018-11-26 23:52:19 +00:00
8c05d19c7f
MRF: add user allowlist module
2018-11-26 23:51:58 +00:00
6cc94404d7
Replace this hardcoded <title>
2018-11-26 22:51:25 +00:00
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation
2018-11-24 08:45:45 +01:00
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
2018-11-24 06:43:03 +01:00
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
...
reported by soka on CRTNet
2018-11-24 06:13:36 +01:00
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
2018-11-22 00:28:04 +00:00
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
2018-11-21 16:53:38 +00:00
a591a044a9
Merge branch 'runtime-fixes' into 'develop'
...
Various runtime configuration fixes
See merge request pleroma/pleroma!468
2018-11-20 22:25:35 +00:00
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-11-20 20:16:16 +01:00
0896cf4c0f
Fix most mastodon api bugs.
2018-11-20 20:12:39 +01:00
c7d08bc1cf
Merge branch 'feature/retry-queue' into 'develop'
...
Federator: add retry queue.
See merge request pleroma/pleroma!323
2018-11-20 19:04:52 +00:00
3456948cd1
mastodon api: fix up quite a few test failures
2018-11-20 19:02:23 +00:00
ef6c64a5d2
activitypub: fix restrict_blocked()
2018-11-20 18:58:08 +00:00
c196754b4d
mastodon api: account view: fix tests
2018-11-20 18:54:48 +00:00
ece8656733
streamer: fix fetching the user's block list
2018-11-20 18:47:12 +00:00
4ac849cb4a
common api: fix moderator check when deleting posts
2018-11-20 18:42:28 +00:00
6f0b9a5163
Fix Notification tests.
2018-11-20 19:15:28 +01:00
bc5cf2c192
Improved version string
2018-11-20 17:55:03 +01:00
7f4c3a1e99
mediaproxy: fix empty url & add some tests
2018-11-20 17:50:03 +01:00
689b46efc8
RetryQueue: tiny refractor, add tests
2018-11-19 18:08:41 +02:00
bcecdc3ab1
Various runtime configuration fixes
2018-11-19 10:09:24 +01:00
fbb70d25fe
Several twitter api fixes.
2018-11-18 22:36:47 +01:00
40d9d2098c
Fix user updating from AP.
2018-11-18 22:15:03 +01:00
cafa15131a
Mix format.
2018-11-18 21:41:35 +01:00
4c918392c6
Fix most User tests.
2018-11-18 21:40:52 +01:00
e7cd6e9739
Fix setting of keys.
2018-11-18 19:33:43 +01:00
62299be094
Federator: add retry queue.
2018-11-18 17:46:29 +02:00
f6be980f4f
activitypub: object view: avoid leaking private details
2018-11-17 22:30:53 +00:00
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
2018-11-17 22:10:15 +00:00
dfcfb184b1
activitypub: transmogrifier: make deletes secure
2018-11-17 21:22:57 +00:00
0ca00b3a07
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit
2018-11-17 22:12:14 +01:00
12ccf0c4f8
Change Relay from `status` to `{status, message}`
2018-11-17 22:12:13 +01:00
4634d99d0d
Web.Router: Change right to permission group (except for function names)
2018-11-17 22:12:13 +01:00
0d1375f274
federator: return :ok or :error depending on if an AP doc was accepted or not
2018-11-17 21:00:37 +00:00
3d9266a8cb
federator: do origin containment when processing inbound messages
2018-11-17 20:43:43 +00:00
c88533209c
activitypub: user fetching: use fetch_and_contain_remote_object_from_id()
2018-11-17 20:16:03 +00:00
daa8ec3d62
activitypub: factor out AP object fetching to it's own function and add ID-based containment
2018-11-17 20:15:59 +00:00
e0b0fde713
Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names)
2018-11-17 20:25:57 +01:00
ccd6b1956d
lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow
2018-11-17 20:25:56 +01:00
265c8c5209
Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t
2018-11-17 20:25:56 +01:00
f9d05902fe
lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves
2018-11-17 20:25:56 +01:00
a87ed2fad6
Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format
2018-11-17 20:25:55 +01:00
f48062488e
Add get endpoints for rights [AdminAPI]
2018-11-17 20:25:55 +01:00
59ce7fedce
Fix connection returns make generic right endpoint [AdminAPI]
2018-11-17 20:25:55 +01:00
c5a2bd6a65
admin_api_controller.ex: fix remaining params at once
2018-11-17 20:25:54 +01:00
95b107b6cc
admin_api_controller.ex: Add documentation, fix get_invite_token
2018-11-17 20:25:54 +01:00
578a911737
admin_api_controller.ex: get_password_reset: fix params and response
2018-11-17 20:25:54 +01:00
5732eef16b
lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController
2018-11-17 20:25:53 +01:00
77d2fd54dd
admin_api_controller: Have some basic code
2018-11-17 20:25:52 +01:00
ee2e1328ad
admin_api_controller.ex: Create
2018-11-17 20:25:52 +01:00
603fccf175
activitypub: fetch_object_from_id(): prefer `actor` over `attributedTo` to avoid spoofing
2018-11-17 18:17:17 +00:00
f87b315618
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
2018-11-16 19:47:36 +01:00
2f639ea129
Merge branch 'feature/pleromafe-usersearch' into 'develop'
...
Add Twitter / Pleroma API user search
See merge request pleroma/pleroma!452
2018-11-16 18:13:47 +00:00
27aa136aac
Format.
2018-11-14 20:41:12 +01:00
7b170cd616
Add Pleroma user search api for PleromaFE.
2018-11-14 20:33:23 +01:00
cc45797f4e
Merge branch 'fix-media-proxy-filename' into 'develop'
...
media_proxy: use path only to retrieve filename
See merge request pleroma/pleroma!450
2018-11-14 18:17:10 +00:00
69d557e86d
Merge branch 'twitter-api-direct-messages' into 'develop'
...
Twitter api direct messages
See merge request pleroma/pleroma!449
2018-11-14 08:52:08 +00:00
f52a1d1ec5
media_proxy: use path only to retrieve filename
2018-11-13 23:41:33 +01:00
ea9a776d7b
TwitterApi: Add direct message endpoint
2018-11-13 20:08:50 +01:00
2cf40237ff
MastodonAPI: Add pagination to private messages.
2018-11-13 19:46:34 +01:00
9b553a1087
media_proxy: CSP, content-disposition
...
* Adds CSP headers to the media proxy endpoint
* Sends `content-disposition: attachment; …` for non-image/video/audio
content types
The default list can be overwritten with `:media_proxy,
:safe_content_types` in the configuration.
* Also now appends the filename to the proxy URL (fixes some mobile apps,
it was requested a while ago)
2018-11-13 15:58:02 +01:00
87c76a9a2f
Add __Host- prefix when secure flag is enabled
2018-11-13 00:32:38 +01:00
0ce5623134
Merge branch 'twitter-api-null-display-name' into 'develop'
...
Twitter API: Fall back to user.nickname if user has no name
Closes #375
See merge request pleroma/pleroma!444
2018-11-12 17:08:54 +00:00
cb6fd73861
Twitter API: Fall back to user.nickname if user has no name
2018-11-12 15:52:13 +00:00
54923c2e55
Merge branch 'feature/csp-plug' into 'develop'
...
migrate CSP management to CSPPlug
See merge request pleroma/pleroma!441
2018-11-12 15:30:42 +00:00
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
2018-11-12 15:08:02 +00:00
1592fa2bea
Mastodon API: Fix list streaming
2018-11-11 14:18:15 +01:00
f516e317ea
plugs: add CSPPlug
2018-11-11 06:10:21 +00:00
419ed3a0ca
oauth: fix token decode regression
2018-11-11 05:26:39 +00:00
97e50f3191
activitypub: transmogrifier: sanitize internal representation details from outgoing objects
...
this causes JSON-LD parsers to get upset and has also lead to developer confusion from outside
projects which tried to parse our internal data. accordingly, it seems better to just remove
it.
2018-11-10 12:24:20 +00:00
f8310114a6
activitypub: object view: sanitize both the activity and the object when an activity is given for rendering
2018-11-10 12:04:09 +00:00
c9c1f9dee2
Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'
...
ostatus: only federate activities concerning note objects
See merge request pleroma/pleroma!437
2018-11-10 11:50:02 +00:00
7daa102fa4
Merge branch 'bugfix/local-jsonld-context' into 'develop'
...
Host LitePub JSON-LD context locally
See merge request pleroma/pleroma!435
2018-11-10 11:37:44 +00:00
4f87b8362b
endpoint: move CORSPlug in front of Plug.Static
2018-11-10 11:23:50 +00:00
03a9990baf
endpoint: fix formatting
2018-11-10 11:18:25 +00:00
e6d246882d
federator: don't federate anything other than Note objects to OStatus
2018-11-10 10:06:10 +00:00
e4971553c7
activitypub: utils: use same object type list for mention extraction as insertion
2018-11-09 13:40:39 +00:00
b9871e7e5a
activitypub: utils: wrap Note objects in a Create when extracting mentions
2018-11-09 09:01:40 +00:00
6cadfcb21e
activitypub: utils: switch to using new Notification.get_notified_from_activity().
2018-11-09 09:01:40 +00:00
6b4064fa5d
activitypub: transmogrifier: unify mention extraction
2018-11-08 19:41:36 +00:00
2fab32ab61
Pleroma.Web.Endpoint: Whitelist schemas directory
2018-11-08 20:22:12 +01:00
934125695d
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld
2018-11-08 20:21:45 +01:00
4e93d6ae14
common api: utils: flip to/cc for mentions
2018-11-08 19:17:01 +00:00
3e33479c05
activitypub: transmogrifier: only consider `to` users as mention targets
2018-11-08 18:58:27 +00:00
abcacec97d
Pleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead of Github-hosted one
2018-11-08 19:38:38 +01:00
da16ada424
utils: use litepub @context instead of that huge mess
2018-11-08 16:52:14 +00:00
f733470037
user view: unify a @context entry that was missed
2018-11-08 16:51:48 +00:00
59cf7cf235
Merge branch 'small-jsonld-refactor' into 'develop'
...
Small jsonld refactor
See merge request pleroma/pleroma!433
2018-11-08 16:23:58 +00:00
34bd411781
Unify json ld header handling.
2018-11-08 16:39:38 +01:00
3b02fd9fb7
Small refactor.
2018-11-08 16:05:28 +01:00
4d627a5117
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'
...
qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431
2018-11-07 22:33:06 +00:00
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
2018-11-07 22:32:34 +00:00
e42f2efae4
/api/v1/accounts/relationships Return an empty array if no id in params
...
This copies Mastodon API behaviour & fixes Mastalab app.
2018-11-07 16:32:57 +01:00
9070588493
Runtime config: MRF changes
2018-11-07 10:40:24 +01:00
b2105a3131
twitterapi: add notification read endpoint
2018-11-06 23:25:07 +00:00
5bb88fd174
Runtime configuration
...
Related to #85
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
2018-11-06 19:41:15 +01:00
a68c18f0ad
Merge branch 'unify-mastodon-oauth' into 'develop'
...
Unify Mastodon Login with OAuth login.
See merge request pleroma/pleroma!429
2018-11-06 16:18:12 +00:00
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
2018-11-06 15:35:19 +00:00
a8f1e30cb8
Formatting.
2018-11-06 16:05:58 +01:00
4f640c43ed
Unify Mastodon Login with OAuth login.
...
This removes duplication in the login code.
2018-11-06 15:19:11 +01:00
2bc924ba45
Get rid of Pleroma.Config in favor of Application
...
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
2018-11-06 15:12:53 +01:00
013f7ba8c1
Add federating plug & public tests
2018-11-06 14:45:04 +01:00
6fe23c5458
Runtime configured router
2018-11-05 15:19:03 +01:00
763fc7b44f
Runtime configured emojis
...
The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.
This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.
2018-11-05 13:24:00 +01:00
007f1c73b1
Merge branch 'feature/cors-again' into 'develop'
...
Add CORSPlug to make web-based OAuth easier.
See merge request pleroma/pleroma!420
2018-11-03 15:36:23 +00:00
3e50bb667f
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
2018-11-03 14:42:47 +01:00
e954cfcc2c
Add CORSPlug to make web-based OAuth easier.
2018-11-03 13:38:01 +01:00
4bcdbb12a4
Merge branch 'fix_hashtag_search' into 'develop'
...
Fix hashtag search
See merge request pleroma/pleroma!418
2018-11-02 20:05:56 +00:00
0cca7edbe0
Fix hashtag search
...
When we lowercase the search it will succesfully do a case insenstive
match. Now #Linux will match #linux and #LINUX whereas previously it
would only match the exact case.
2018-11-02 19:38:57 +00:00
45ebc8dd9a
Check for empty string in_reply_to ids.
2018-11-02 17:33:51 +01:00
3c7d4ff271
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
2018-11-01 15:07:27 +01:00
24ba08de13
twitter api: add support for rendering Page objects
2018-11-01 10:01:35 +00:00
4d8f076125
mastodon api: add support for rendering Page objects
2018-11-01 10:00:16 +00:00
9f03b5c4f7
activitypub: transmogrifier: add support for Page objects
2018-11-01 09:59:43 +00:00
eba9a62024
Merge branch 'feature/relay-tests' into 'develop'
...
relay tests
See merge request pleroma/pleroma!411
2018-11-01 09:10:51 +00:00
40676d7683
Merge branch 'bugfix/prismo.news_article_url' into 'develop'
...
Bugfix/prismo.news article url
Closes #352
See merge request pleroma/pleroma!410
2018-11-01 09:05:16 +00:00
1e9ced5af4
Test Relay, switch to runtime configuration.
2018-11-01 09:01:43 +00:00
b2da5262ea
Pleroma.Web.ActivityPub.Transmogrifier: fix_url when not a string/empty
...
Thanks prismo.news, I hate it
2018-11-01 09:56:37 +01:00
755f166406
Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string
2018-11-01 09:55:38 +01:00
10f3958468
object: return the deleted object as well
2018-11-01 07:47:50 +00:00
2bf358d7b4
activitypub: use Object.delete() instead of mutating the database and cache directly
2018-11-01 07:29:12 +00:00
558e6a84d6
[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/346
2018-11-01 06:52:01 +01:00
47f76bf4b1
common api: allow self-liking objects
...
mastodon allows this, for whatever reason.
closes #347 .
2018-10-31 22:29:49 +00:00
b92e38d2d4
Add user reactivation task.
2018-10-29 23:13:15 +00:00
a880e0a527
Merge branch 'feature/upload-limits' into 'develop'
...
configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401
2018-10-29 20:14:10 +00:00
676c97b8c7
nodeinfo: expose configured upload limits
2018-10-29 20:07:52 +00:00
f407831120
common api: prefer formatting attachments using the attachment's name instead of URI
2018-10-29 17:59:24 +00:00
784b3a615d
utils: fix another possible leak with private S3 backends using mediaproxy
...
same rationale as the other mediaproxy changes
2018-10-29 17:26:15 +00:00
181f3bb56a
mastodon api: enforce upload limits for avatars and banners
2018-10-29 16:43:05 +00:00
e12489e2fe
twitter api: enforce upload limits for avatars, banners and backgrounds
2018-10-29 16:43:05 +00:00
167d3789a5
activitypub: upload: pass through an upload limit if one is provided
2018-10-29 16:43:05 +00:00
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
72ea54de6e
activitypub: fix possible false positives with broken thread filtering
2018-10-28 05:45:33 +00:00
kaniini