3f9da55adc
Fix formating. Aparently my pre-commit hook broke.
6 years ago
62af23bd26
Revert some changes in html.ex
6 years ago
c119ea3a57
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
6 years ago
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
6 years ago
bce152aba0
Tidy up the code. Rename key to signature
6 years ago
66d1c31461
Fix some stupid typos
6 years ago
f40562b4e1
Respond with full activity to outbox post
6 years ago
1e781715c8
Limit activity types accepted to outbox to only 'Create'
6 years ago
569bad8210
Create activity when client posts to outbox
6 years ago
26dc2dddab
Implement ActivityPub inbox view
...
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
6 years ago
a32e23905a
Use Object.change instead of Ecto.Changeset.change
6 years ago
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
6 years ago
9a0163db53
use Kernel.put_in instead of Map.merge
6 years ago
816db3f494
Remove the debugging IO.inspect
6 years ago
f5d7b0003e
Merge branch 'fix_485' into 'develop'
...
Change 'name' to 'instance_name' so option is used when running non-interactive
See merge request pleroma/pleroma!607
6 years ago
19f9889fbe
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
6 years ago
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
ab9cda315f
Change 'name' to 'instance_name' so option is used when running non-interactive
6 years ago
dd8f2196f6
Merge branch '483_blocks_import_export' into 'develop'
...
[#483 ] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
6 years ago
523848d1fd
Salmon# fixed publish an activity to remote accounts
6 years ago
7bd49a3222
[ #483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
6 years ago
b3574dccbb
[ #483 ] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
...
(<nick>@<our_instance_host>).
6 years ago
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
49cf5f9ce0
Merge branch '471_invalid_accounts_rendering' into 'develop'
...
[#471 ] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
6 years ago
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
6 years ago
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
68f483ef4c
Merge branch 'fix/no-attachment-links' into 'develop'
...
Treat any present value in "no_attachment_links" as true
Closes pleroma-fe#175
See merge request pleroma/pleroma!597
6 years ago
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
6 years ago
d8cc96cb1f
Fix Twitter timelines for private instances
6 years ago
bee6acd51d
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
...
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
6 years ago
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
6 years ago
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
be70272ab0
Treat only true and "true" as true
6 years ago
708a228919
Set ttl_interval to the seconds_valid time
6 years ago
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
838c024231
Treat any present value in "no_attachment_links" as true
6 years ago
448af3601a
Up captcha timer to 60 secs again, save used captchas in cachex
6 years ago
551d80cc01
Expose restricted names in nodeinfo.
6 years ago
5811e65e67
Add some hard limits on inserted activities.
6 years ago
91724d160a
Reserve a few user names
...
These are all names that are used for domain.com/:route routes or projected to be.
6 years ago
ca2e9ce9cc
Revert unneeded changes
6 years ago
f75f707f6c
Revert Activity tombstones, add ObjectTombstone struct
6 years ago
2bbec33c71
Fix failing tests
6 years ago
18a4cbb244
Capitalize "tombstone"
6 years ago
0f412cf6e6
Create tombstone instead of object deletion
6 years ago
69ad1039ba
mix tasks: add legal boilerplate
6 years ago
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
005b4194ff
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
...
Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459
6 years ago
34a4ed22c4
twitter api: add "Video" to supported activity types list
6 years ago
79b51a97fe
twitter api: activity representer: remove peertube hack
6 years ago
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
6 years ago
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
a3e33fa177
Merge branch 'hotfix/activity-without-content' into 'develop'
...
Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572
6 years ago
3aff8067e4
transmogrifier: When it’s a Video move "url" to "attachment"
6 years ago
a7f07bb6e5
Implement kaniini's tweaks
6 years ago
c76179419d
Renamed the things
6 years ago
409ff60bf8
Fix formatting
6 years ago
92362e1e22
Implement large thread filter
6 years ago
b386e560ba
Move the encryption out of kocaptcha into general captcha module
...
That way there won't be a need to reimplement it for other captcha services
6 years ago
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
6 years ago
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
6 years ago
7cab7de9ff
[ #114 ] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
...
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
6 years ago
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
6 years ago
501ce34d7f
[ #114 ] Stylistic adjustments.
6 years ago
f1b93b5be7
[ #413 ] fix parse mentions
6 years ago
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
6 years ago
652f49d176
Remove extra bracket
6 years ago
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
b520d44b58
[ #114 ] `mix format`
6 years ago
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
6 years ago
a532ad5d72
[ #114 ] User.register/1 tweak.
6 years ago
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
f98ee9402f
Merge branch 'userless-admin' into 'develop'
...
Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576
6 years ago
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
ef318fb8a9
Merge branch 'develop' into fix/formatter-ignore-html-chars
6 years ago
059dd6f681
Ignore HTML characters in formatter.ex
6 years ago
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
3371a45884
[ #114 ] Formatting fix.
6 years ago
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
6 years ago
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
b86057cc7f
[ #114 ] Refactored User.register_changeset to init confirmation data.
...
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
6 years ago
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
6 years ago
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
6 years ago
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
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.
6 years ago
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
6 years ago
92a5133c42
fix text field
6 years ago
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
6 years ago
98c31deaa9
Merge branch 'test-mix-tasks' into 'develop'
...
Add tests for Mix tasks
See merge request pleroma/pleroma!555
6 years ago
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
6 years ago
e4763cd459
Fix tagging problems for existing instances.
6 years ago
35522fef09
Use :ets.match_delete to delete old captchas
6 years ago
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
cc87880488
Support both OAuth token record and token string in UserView
6 years ago
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
6 years ago
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
6 years ago
3a31fdaf06
Change minutes_retained config to seconds_retained
6 years ago
6062885df6
Add a configurable auto-cleanup for captchas
6 years ago
5dcb7aecea
More put_view.
6 years ago
22d483d4f7
Use bindings dbuser and dbname in sample_psql.eex
6 years ago
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
6 years ago
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
8d55a549e6
Replace HTTPoison with Tesla for kocaptha
6 years ago
23549d3952
Formatting fixes
6 years ago
b5518da904
Separate captcha implementation into a behaviour and use it
6 years ago
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
6 years ago
4a895a46d1
Allow port specification in instance.ex
6 years ago
28c43a417e
Add an ability to disabled captcha
6 years ago
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
6 years ago
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
6 years ago
ea72ac549b
fix case when tags is invalid
6 years ago
30812f8451
Remove domain from sample_config template
6 years ago
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
6 years ago
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
d3ec09bb38
fix tags
6 years ago
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
6 years ago
980131b4db
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
...
Improve web push
Closes #393 , #422 , and #452
See merge request pleroma/pleroma!524
6 years ago
bc6262d250
fixed typo
6 years ago
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
6 years ago
412df2cd38
Warn if push is disabled..
6 years ago
baead4ea4b
fix markdown formatting
6 years ago
91236c60c7
Merge branch 'feature/file-size-checking' into 'develop'
...
[#36 ] Add warnings when file upload fails
See merge request pleroma/pleroma!523
6 years ago
0b4c61e8d5
Fix warning
6 years ago
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
6 years ago
331396cbcd
Properly disable Web Push if no VAPID key is set
6 years ago
6822916183
Typos
6 years ago
b1bcd97a0f
Push: respect alerts settings
6 years ago
d8984b7bf8
Push: add missing notification_type field
6 years ago
7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe
6 years ago
324933a0ac
improve push message format (compatibility with mastodon)
6 years ago
658edb166f
fix and improve web push; add configuration docs
6 years ago
69fd63e248
[ #114 ] Added `invitesEnabled` to `metadata` of nodeinfo.
6 years ago
66380b0641
[ #114 ] Removed `confirm_email` action stub (to be addressed in a separate MR).
6 years ago
07e93f9940
[ #114 ] Improved tests.
6 years ago
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
6 years ago
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
6 years ago
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
6 years ago
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
6 years ago
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
6 years ago
262cc6d44b
Merge branch 'fix/double-rt-or-fav' into 'develop'
...
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
6 years ago
61ad2ce422
TwitterAPI: Include favorited post in json
6 years ago
1ca080c862
Prevent accidental double RTs or favorites
6 years ago
c5c3ad90d0
Fix tests. Remove oembed template
6 years ago
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
018516d3f3
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
6 years ago
49c4f7d604
Set Pleroma.instance.domain when config is generated
6 years ago
9b3a6cdb07
Extract opengraph/oembed into separate module
6 years ago
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
6 years ago
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
6 years ago
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
6 years ago
b19ee62252
Merge branch 'username-underscores' into 'develop'
...
Allow underscores/dashes in usernames.
Closes #429
See merge request pleroma/pleroma!537
6 years ago
9e689de063
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
00744c6b03
[ #114 ] Initial implementation of user email invitations.
6 years ago
908943352f
[ #114 ] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
6 years ago
7214d57463
Extended nicknames: allow dashes.
6 years ago
51dd294c48
Allow to set both admin and moderator at the same time in mix task User
6 years ago
a40ba3ba57
Fix toggle_activated in mix task User
6 years ago
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
6 years ago
bfff2399ff
[ #114 ] Routes and config for `confirm_email` and `email_invite` (Twitter API).
6 years ago
e3a21bcd45
[ #114 ] Addressed warnings. Fix of `with` statement clause in `password_reset`.
6 years ago
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
6 years ago
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
6 years ago
10c156d98f
[ #114 ] SMTP deps and config.
6 years ago
89b3729afa
fix warnings
6 years ago
213176c3c3
Add new frontend options to server-side config.
6 years ago
d6bf06ab4f
Fix warnings.
6 years ago
0863ec2737
Merge branch 'fix_empty_bio_crash' into 'develop'
...
Fixes #415 . Do not crash during registration when hasn't filled bio field
Closes #415
See merge request pleroma/pleroma!529
6 years ago
8aa646ca31
Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'
...
Mix tasks: improve uploads.ex moduledoc
See merge request pleroma/pleroma!528
6 years ago
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
6 years ago
6786ad3d98
Merge branch 'fix/theora-detection-read-bytes' into 'develop'
...
Fix Theora detection in mime.ex
See merge request pleroma/pleroma!493
6 years ago
0554d91dcd
Merge branch 'anonymize-filter-text' into 'develop'
...
AnonymizeFilename: allow for a pre-defined text instead of random string
See merge request pleroma/pleroma!516
6 years ago
bda25b999b
Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
...
# Conflicts:
# lib/mix/tasks/pleroma/uploads.ex
6 years ago
c81c74d847
Treat warnings as errors outside of tests.
6 years ago
e94c3442f4
updates
6 years ago
993c8c8bd4
Keep the shortdoc descriptive
6 years ago
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
6 years ago
cbe048bb3f
Mix tasks: improve uploads.ex moduledoc
6 years ago
074fa790ba
fix compile warnings
6 years ago
068353ac0b
formatting
6 years ago
9442588ae9
fix hashtags in api response
6 years ago
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
6 years ago
5436aaad4f
Merge branch 'fix/add-upload.ex' into 'develop'
...
Mix Tasks: Add task uploads.ex for migrating local uploads.
See merge request pleroma/pleroma!517
6 years ago
beadeaffa1
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
...
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
6 years ago
8fa5c66eab
Merge branch 'fix/media-proxy-url-encoded' into 'develop'
...
Media proxy: fix url encoding
See merge request pleroma/pleroma!521
6 years ago
4976a8b05f
Merge branch 'fix/typo-relay-ex' into 'develop'
...
[#283 ] Mix Tasks: Fix a typo in relay.ex
See merge request pleroma/pleroma!522
6 years ago
6c73136aec
[ #283 ] Mix Tasks: Fix a typo in relay.ex
6 years ago
bdc8112e40
Media proxy: fix url encoding
6 years ago
578051809f
Add uploadlimit to Twitter API config
6 years ago
7d86c0c53f
Merge branch 'fix/gopher-respect-ip' into 'develop'
...
[#155 ] Fix Gopher server binding only to default value
See merge request pleroma/pleroma!518
6 years ago
94ac0075bf
Merge branch 'media-proxy-follow-redirect' into 'develop'
...
Media proxy: follow HTTP redirects by default
Closes #421
See merge request pleroma/pleroma!519
6 years ago
134cc94cbd
Nodeinfo: remove null features; relay feature.
6 years ago
d8fcf7c5cf
Media proxy: follow HTTP redirects by default
6 years ago
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago
09f20de0d7
Make gopher respect ip
6 years ago
fd5c7b445f
Fix a typo
6 years ago
a02e0c18bc
Mix Tasks: Add task uploads.ex for migrating local uploads.
6 years ago
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
6 years ago
3c925e9d88
Emojis: Alphabetical ordering
6 years ago
1cea97df64
[ #394 ] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
6 years ago
8764f64690
Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'
...
Add mix pleroma.user unsubscribe to mix doc
See merge request pleroma/pleroma!512
6 years ago
4e2250b1dd
Fix a typo in relay.ex moduledoc
6 years ago
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
f7e23aee90
Oops
6 years ago
f661813807
Add mix pleroma.user unsubscribe to mix doc
6 years ago
08e10a70ec
Rename def to defval
6 years ago
1d11c4cf11
add common.ex
6 years ago
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
71d5cf9ed8
Remove unused vars from user.ex
6 years ago
7bcb6a183a
[ #394 ] Refactoring.
6 years ago
66313cda02
Update instance.ex for web push
6 years ago
88f92693f2
Merge develop
6 years ago
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
ca7b46fb3b
Refactor common functions to common.ex
6 years ago
4a2a7ce636
Refactor common functions to common.ex
6 years ago
3a84511df1
remove migrate_local_uploads.ex
6 years ago
1d531fd2f3
Merge branch 'fix/mastodon-api-settings' into 'develop'
...
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
6 years ago
abead01ab6
Merge branch 'correct-and-improve-http-options' into 'develop'
...
Correct and improve http options
See merge request pleroma/pleroma!505
6 years ago
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
6 years ago
2ae1128d9f
MastoAPI: Fix put_settings
6 years ago
d27e3f269f
Rename regular expression 'have_re' to 'reply_prefix'.
6 years ago
6f36e903b0
use `User.avatar_url`
6 years ago
79668c08fc
cleanup
6 years ago
3dff61ebec
Harden re: detection.
6 years ago
3d492795b7
clean up
6 years ago
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
bac58b1524
show warning if VAPID is not set
6 years ago
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
6 years ago
04a48286e6
Add web push support
6 years ago
6a6aaa0e1a
Use object.normalize.
6 years ago
a09ed0f5af
avoid mix format bug
6 years ago
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
6 years ago
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
96ba95df2e
remove follow_redirect options
6 years ago
27792b2d77
remove pool and timeout options which duplicate with the default
6 years ago
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
6 years ago
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
6 years ago
194869c7db
added data attrs to twitter scrubber
6 years ago
7d5720f2e4
Fix merge.
6 years ago
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
6 years ago
3ea4476445
MastodonAPI: Show users their own network.
6 years ago
fdac215091
TwitterAPI: Show users their own network.
6 years ago
3ccfe226c0
added data attrs for user and tag
6 years ago
3b5be09f45
[ #210 ] Stylistic change.
6 years ago
839526a913
TwitterAPI: Add network hiding.
6 years ago
dfc9c08796
formating
6 years ago
ffec96d8cc
Everything should use Mix.Task.Run
6 years ago
5f0c2372bc
Merge branch 'support/oauth_fetch_token' into 'develop'
...
[#273 ] bugfix/273
See merge request pleroma/pleroma!502
6 years ago
c4f3c5e939
[ #210 ] Stylistic change.
6 years ago
facfd03bc1
Move relay tasks to relay.ex
6 years ago
e8ba579efe
Switch from User.info_changeset because it is deprecated
6 years ago
c3519132df
Sorry
6 years ago
5427d2af3a
Update mix tasks since User.info.info_changeset is deprecated
6 years ago
c524c50509
fix/273
6 years ago
9938fa3293
Merge develop to refactor/mix-tasks
6 years ago
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.
6 years ago
be187f82f7
[ #210 ] Further refactoring.
6 years ago
a418547bdf
debug /api/v1/suggestions
6 years ago
956f3c75ca
user: put default user info when registering a user
6 years ago
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
6 years ago
ec1ec32f20
Merge branch 'optional-retry-queue' into 'develop'
...
Make retry queue optional.
See merge request pleroma/pleroma!498
6 years ago
925b05054f
Make retry queue optional.
...
At the moment, it can use a lot of memory really fast.
6 years ago
114b95cee2
Merge branch 'feature/integration_tesla' into 'develop'
...
[#354 ] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
6 years ago
b57d83e3c9
MRF: simple policy: fix media removal
6 years ago
6396f1b58f
change new to gen in instance.ex . Refactor user.ex
6 years ago
48e6193bf2
[ #210 ] Refactoring.
6 years ago
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
6 years ago
50e72f6c48
remove httpoison_mock
6 years ago
dd8aee332c
formatting the code
6 years ago
a9e4a97586
update test
6 years ago
87109482f3
status_code -> status
6 years ago
97252a27d9
fix http request in Salmon
6 years ago
ec34de0c1f
WebSub fix test
6 years ago
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
6 years ago
88b05aeabb
Merge branch 'fix/parse-user-bio' into 'develop'
...
Parse user's bio on register
See merge request pleroma/pleroma!492
6 years ago
42ef7cd227
Merge branch 'fix-media-proxy-defaults' into 'develop'
...
Fix media proxy config defaults
See merge request pleroma/pleroma!495
6 years ago
4b70e5eae9
Parse bio for MastodonAPI
6 years ago
343b0adfa6
Merge branch 'develop' into fix/theora-detection-read-bytes
6 years ago
a3953ca37a
Change @read_bytes to 35
6 years ago
03b2d1016d
F O R M A T I N G
6 years ago
57c71f8468
Move generate_invite to user.ex
6 years ago
d924b6cd3d
Refactor copypasta to a private function in instance.ex
6 years ago
ce98d5eb9b
Parse user's bio on register
6 years ago
cbe22deb51
Lint fix
6 years ago
faf1f2b304
Move gen.instance to instance.ex
6 years ago
8c9a4e8b40
TwitterAPI: Implement hide_network.
6 years ago
7983b0bdfe
Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix pleroma.user toggle_activated to work not only on local users.
6 years ago
2a639de9b3
MastodonApi: Implement hide_network.
6 years ago
6be0ab1e55
Hide network in ap.
6 years ago
43d5e4f7fa
Fix media proxy config defaults
6 years ago
e3f3d13d99
Add uuid generation extension to sample_psql.eex.
6 years ago
91065e1968
Fix background updating / handling.
6 years ago
31b3ac05ac
Lint fix
6 years ago
a8ef6b1190
Add admin option to pleroma.user new. Add user existence checking to toggle_activated
6 years ago
ae82852330
Move set_admin task to lib/mix/tasks/pleroma/user.ex
6 years ago
6f174cbb71
Delete reactivate user task
6 years ago
5f91d6b859
Fix toggle_deactivated to reactivate a deactivated user
6 years ago
fe2759bc9f
Attempt to resolve merge conflict
6 years ago
f18b86fd5f
More fixes for Info schema.
6 years ago
93f2dc19d9
TwitterAPI: Fix banner and background update.
6 years ago
347df6421d
Fix masto api user updating.
6 years ago
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
1c67277c80
Fix admin api.
6 years ago
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
6 years ago
ca24ad2a2b
Merge branch 'feature/reverse-proxy' into 'develop'
...
reverse proxy / uploads
See merge request pleroma/pleroma!470
6 years ago
8e0e20631c
Reverse proxy: default max read duration at 30 secs.
6 years ago
e99bab8f27
Merge branch 'config-delete' into 'develop'
...
Add Pleroma.Config.delete/1
See merge request pleroma/pleroma!484
6 years ago
1d94c8f0f0
Fix supervisor order
...
This starts `Pleroma.Web.Endpoint` after all other processes and may
avoid some weird bugs (especially at start/restart).
Also properly ignores starting the gopher's gen_server if disabled.
6 years ago
253da275bd
Pleroma.Config.delete/1
6 years ago
7282937f33
MIME: video/audio ogg detection
6 years ago
680716b3c9
Config docs
6 years ago
65e7307d68
Upload: bring back base_url
6 years ago
5d92431350
Fix deprecation warnings
6 years ago
02d3dc6869
Uploads fun, part. 2
6 years ago
97b00d366f
reverse_proxy: more headers
6 years ago
a2640c8088
Parse correctly content-type & do not forward content-length
6 years ago
b19597f602
reverse proxy / uploads
6 years ago
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
8f1fffebc6
Fix transmogrifier test.
6 years ago
d088ac6286
Fix OStatus user updates.
...
Breaks banner updating.
6 years ago
48b95a9b95
Assorted fixes.
6 years ago
d407f662af
Fix TwitterApiController.
6 years ago
a6812bc9df
Remove "most recent notification" endpoint.
6 years ago
87098d1676
Streamer: Don't send unwanted DMs to list streams
6 years ago
e002858071
Fix ostatus test.
6 years ago
3c61df6b9e
Webfinger fixes.
6 years ago
badbe2656c
More fixes.
6 years ago
b9bc83097d
Merge branch 'ogg-theora-detection' into 'develop'
...
Add Theora detection to upload.ex
See merge request pleroma/pleroma!479
6 years ago
ec464ef20a
HTTP sig fixes.
6 years ago
0d229613df
Fix lint error
6 years ago
7f20a3cf1f
Add Theora detection to upload.ex
6 years ago
5ae6088d37
Merge branch 'feature/mrf-user-allowlist' into 'develop'
...
MRF: user allowlist module
See merge request pleroma/pleroma!477
6 years ago
a76058fc1d
Merge branch 'fix/pleromafe-title' into 'develop'
...
Replace hardcoded <title>
See merge request pleroma/pleroma!476
6 years ago
271f9f1335
nodeinfo: add mrf_user_allowlist data
6 years ago
8c05d19c7f
MRF: add user allowlist module
6 years ago
6cc94404d7
Replace this hardcoded <title>
6 years ago
04daa0fa44
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
...
This fixes running mastofe with MIX_ENV=dev
6 years ago
591b11eafc
Add manifest-src to allow manifest.json
6 years ago
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation
6 years ago
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
6 years ago
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
...
reported by soka on CRTNet
6 years ago
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
6 years ago
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
6 years ago
a591a044a9
Merge branch 'runtime-fixes' into 'develop'
...
Various runtime configuration fixes
See merge request pleroma/pleroma!468
6 years ago
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
d3180e0ccc
Raise on usage of old function.
6 years ago
0896cf4c0f
Fix most mastodon api bugs.
6 years ago
c7d08bc1cf
Merge branch 'feature/retry-queue' into 'develop'
...
Federator: add retry queue.
See merge request pleroma/pleroma!323
6 years ago
3456948cd1
mastodon api: fix up quite a few test failures
6 years ago
ef6c64a5d2
activitypub: fix restrict_blocked()
6 years ago
c196754b4d
mastodon api: account view: fix tests
6 years ago
ece8656733
streamer: fix fetching the user's block list
6 years ago
3356c7d1e9
oauth plug: fix deactivated check
6 years ago
4ac849cb4a
common api: fix moderator check when deleting posts
6 years ago
312676f711
user: fix user.info lookup in User.locked?()
6 years ago
6f0b9a5163
Fix Notification tests.
6 years ago
2887f4ff1d
Fix formatter tests.
6 years ago
bc5cf2c192
Improved version string
6 years ago
7f4c3a1e99
mediaproxy: fix empty url & add some tests
6 years ago
689b46efc8
RetryQueue: tiny refractor, add tests
6 years ago
bcecdc3ab1
Various runtime configuration fixes
6 years ago
fbb70d25fe
Several twitter api fixes.
6 years ago
40d9d2098c
Fix user updating from AP.
6 years ago
cafa15131a
Mix format.
6 years ago
4c918392c6
Fix most User tests.
6 years ago
e7cd6e9739
Fix setting of keys.
6 years ago
fc3bcf335e
Fix following locked users.
6 years ago
d5af41b577
Fix note count update.
6 years ago
6f90ceb2ed
Fix follower count test.
6 years ago
812f5b058a
Fix blocking.
6 years ago
756764266c
Formatting.
6 years ago
b396dba425
Fix follower count setting.
6 years ago
5c8f07f0a8
Fix note counting.
6 years ago
47d883d3ab
Fix User deactivation.
6 years ago
50585d051b
Add User.Info module
...
To validate and mutate the user.info field.
6 years ago
62299be094
Federator: add retry queue.
6 years ago
f6be980f4f
activitypub: object view: avoid leaking private details
6 years ago
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
6 years ago
dfcfb184b1
activitypub: transmogrifier: make deletes secure
6 years ago
0ca00b3a07
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit
6 years ago
44b6200103
lib/mix/tasks/relay*: Use a with block
6 years ago
12ccf0c4f8
Change Relay from `status` to `{status, message}`
6 years ago
4634d99d0d
Web.Router: Change right to permission group (except for function names)
6 years ago
0d1375f274
federator: return :ok or :error depending on if an AP doc was accepted or not
6 years ago
3d9266a8cb
federator: do origin containment when processing inbound messages
6 years ago
c88533209c
activitypub: user fetching: use fetch_and_contain_remote_object_from_id()
6 years ago
daa8ec3d62
activitypub: factor out AP object fetching to it's own function and add ID-based containment
6 years ago
e0b0fde713
Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names)
6 years ago
1a31d71187
lib/mix/tasks/relay_{un,}follow.ex: Use a with block
6 years ago
ccd6b1956d
lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow
6 years ago
7fbfd2db96
lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow
6 years ago
265c8c5209
Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t
6 years ago
4a79b89dba
lib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not admin.”
6 years ago
f9d05902fe
lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves
6 years ago
a87ed2fad6
Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format
6 years ago
f48062488e
Add get endpoints for rights [AdminAPI]
6 years ago
59ce7fedce
Fix connection returns make generic right endpoint [AdminAPI]
6 years ago
c5a2bd6a65
admin_api_controller.ex: fix remaining params at once
6 years ago
95b107b6cc
admin_api_controller.ex: Add documentation, fix get_invite_token
6 years ago
578a911737
admin_api_controller.ex: get_password_reset: fix params and response
6 years ago
5732eef16b
lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController
6 years ago
c8b8f1d32c
[Pleroma.Plugs.UserIsAdminPlug]: Check if admin is true instead of false, fix error reporting
6 years ago
011a2e36b1
lib/mix/tasks/make_admin.ex: New task
6 years ago
7076d45cb6
lib/pleroma/plugs/user_is_admin_plug.ex: Create
6 years ago
77d2fd54dd
admin_api_controller: Have some basic code
6 years ago
ee2e1328ad
admin_api_controller.ex: Create
6 years ago
603fccf175
activitypub: fetch_object_from_id(): prefer `actor` over `attributedTo` to avoid spoofing
6 years ago
05967472f2
Merge branch 'feature/uploader-mdii' into 'develop'
...
Feature / MDII Uploader
See merge request pleroma/pleroma!454
6 years ago
59e079f641
fallbacking into local uploader
6 years ago
8fd0556c78
better config reading
6 years ago
f87b315618
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
6 years ago
2f639ea129
Merge branch 'feature/pleromafe-usersearch' into 'develop'
...
Add Twitter / Pleroma API user search
See merge request pleroma/pleroma!452
6 years ago
c07464607d
http security: remove form-action from CSP definitions
6 years ago
e8d8c84f79
Add better test for user search functionlity.
6 years ago
55abd8482e
better config
6 years ago
52224de39f
better extension detection
6 years ago
4fbfacf5e1
debug
6 years ago
8e707aba29
format
6 years ago
ebe658c169
debuf
6 years ago
698cb3587c
omplement mdii uploader
6 years ago
58af0787be
add mdii uploader
6 years ago
27aa136aac
Format.
6 years ago
7b170cd616
Add Pleroma user search api for PleromaFE.
6 years ago
cc45797f4e
Merge branch 'fix-media-proxy-filename' into 'develop'
...
media_proxy: use path only to retrieve filename
See merge request pleroma/pleroma!450
6 years ago
69d557e86d
Merge branch 'twitter-api-direct-messages' into 'develop'
...
Twitter api direct messages
See merge request pleroma/pleroma!449
6 years ago
f52a1d1ec5
media_proxy: use path only to retrieve filename
6 years ago
ea9a776d7b
TwitterApi: Add direct message endpoint
6 years ago
2cf40237ff
MastodonAPI: Add pagination to private messages.
6 years ago
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)
6 years ago
87c76a9a2f
Add __Host- prefix when secure flag is enabled
6 years ago
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
6 years ago
cb6fd73861
Twitter API: Fall back to user.nickname if user has no name
6 years ago
54923c2e55
Merge branch 'feature/csp-plug' into 'develop'
...
migrate CSP management to CSPPlug
See merge request pleroma/pleroma!441
6 years ago
2829fa4183
sample config: chase http_security change
6 years ago
ee5932a504
http security: allow referrer-policy to be configured
6 years ago
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
6 years ago
1592fa2bea
Mastodon API: Fix list streaming
6 years ago
df72978dce
csp plug: add support for certificate transparency
6 years ago
331cf6ada1
csp plug: add sts support
6 years ago
a2bf5426cb
sample config: document how to make CSPPlug send STS headers (off by default to allow for SSL debugging)
6 years ago
f516e317ea
plugs: add CSPPlug
6 years ago
419ed3a0ca
oauth: fix token decode regression
6 years ago
f745e823f0
Merge branch 'bugfix/json-ld-object-sanitization' into 'develop'
...
JSON-LD: object sanitization
See merge request pleroma/pleroma!438
6 years ago
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.
6 years ago
5ecb5629f6
lib/mix/tasks: s/@doc/@moduledoc/
6 years ago
5e3207045e
lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy
6 years ago
64c0289893
lib/mix/tasks: Add remaining documentation for mix tasks
6 years ago
8b2541e4e7
Document the mix tasks in ex_doc instead
6 years ago
e1814bb322
Document mix tasks
6 years ago
f8310114a6
activitypub: object view: sanitize both the activity and the object when an activity is given for rendering
6 years ago
c9c1f9dee2
Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'
...
ostatus: only federate activities concerning note objects
See merge request pleroma/pleroma!437
6 years ago
7daa102fa4
Merge branch 'bugfix/local-jsonld-context' into 'develop'
...
Host LitePub JSON-LD context locally
See merge request pleroma/pleroma!435
6 years ago
4f87b8362b
endpoint: move CORSPlug in front of Plug.Static
6 years ago
03a9990baf
endpoint: fix formatting
6 years ago
e6d246882d
federator: don't federate anything other than Note objects to OStatus
6 years ago
e4971553c7
activitypub: utils: use same object type list for mention extraction as insertion
6 years ago
b3c360ce2c
notification: add fallback get_notified_from_activity()
6 years ago
b9871e7e5a
activitypub: utils: wrap Note objects in a Create when extracting mentions
6 years ago
8c805ada32
user: remove obsolete User.get_notified_from_activity().
6 years ago
6cadfcb21e
activitypub: utils: switch to using new Notification.get_notified_from_activity().
6 years ago
cdfdd77e30
notification: implement new Notification.get_notified_from_activity()
6 years ago
d26cd6c1bf
user: factor out user set fetching from User.get_notified_from_activity()
6 years ago
81d6ca1783
user: implement AS2 mention extraction + unify Announce handling
6 years ago
6b4064fa5d
activitypub: transmogrifier: unify mention extraction
6 years ago
0a2c1a3419
user: add optional local_only param to get_notified_from_activity()
6 years ago
2fab32ab61
Pleroma.Web.Endpoint: Whitelist schemas directory
6 years ago
934125695d
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld
6 years ago
4e93d6ae14
common api: utils: flip to/cc for mentions
6 years ago
3e33479c05
activitypub: transmogrifier: only consider `to` users as mention targets
6 years ago
144dc048b8
user: only consider `to` recipients as mention targets
6 years ago
abcacec97d
Pleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead of Github-hosted one
6 years ago
da16ada424
utils: use litepub @context instead of that huge mess
6 years ago
f733470037
user view: unify a @context entry that was missed
6 years ago
59cf7cf235
Merge branch 'small-jsonld-refactor' into 'develop'
...
Small jsonld refactor
See merge request pleroma/pleroma!433
6 years ago
34bd411781
Unify json ld header handling.
6 years ago
3b02fd9fb7
Small refactor.
6 years ago
4d627a5117
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'
...
qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431
6 years ago
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
6 years ago
e42f2efae4
/api/v1/accounts/relationships Return an empty array if no id in params
...
This copies Mastodon API behaviour & fixes Mastalab app.
6 years ago
9070588493
Runtime config: MRF changes
6 years ago
b2105a3131
twitterapi: add notification read endpoint
6 years ago
f16c2e0b1b
notification: add Notification.set_read_up_to()
6 years ago
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.
6 years ago
a68c18f0ad
Merge branch 'unify-mastodon-oauth' into 'develop'
...
Unify Mastodon Login with OAuth login.
See merge request pleroma/pleroma!429
6 years ago
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
6 years ago
a8f1e30cb8
Formatting.
6 years ago
7d328c658d
Small wrapper module around Application.get_env/put_env
...
Same API as the old Pleroma.Config
6 years ago
4f640c43ed
Unify Mastodon Login with OAuth login.
...
This removes duplication in the login code.
6 years ago
2bc924ba45
Get rid of Pleroma.Config in favor of Application
...
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
6 years ago
013f7ba8c1
Add federating plug & public tests
6 years ago
83911b1443
Fix wrong return when finmoji is disabled
6 years ago
fd0e7d18d9
handle_continue is OTP21+
6 years ago
6fe23c5458
Runtime configured router
6 years ago
d096bc17bf
revert endpoint position in supervision tree
6 years ago
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()`.
6 years ago
007f1c73b1
Merge branch 'feature/cors-again' into 'develop'
...
Add CORSPlug to make web-based OAuth easier.
See merge request pleroma/pleroma!420
6 years ago
3e50bb667f
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
6 years ago
e954cfcc2c
Add CORSPlug to make web-based OAuth easier.
6 years ago
4bcdbb12a4
Merge branch 'fix_hashtag_search' into 'develop'
...
Fix hashtag search
See merge request pleroma/pleroma!418
6 years ago
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.
6 years ago
45ebc8dd9a
Check for empty string in_reply_to ids.
6 years ago
3c7d4ff271
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
6 years ago
24ba08de13
twitter api: add support for rendering Page objects
6 years ago
4d8f076125
mastodon api: add support for rendering Page objects
6 years ago
9f03b5c4f7
activitypub: transmogrifier: add support for Page objects
6 years ago
585b29337c
Ensure filters have a filter_id
6 years ago
eba9a62024
Merge branch 'feature/relay-tests' into 'develop'
...
relay tests
See merge request pleroma/pleroma!411
6 years ago
40676d7683
Merge branch 'bugfix/prismo.news_article_url' into 'develop'
...
Bugfix/prismo.news article url
Closes #352
See merge request pleroma/pleroma!410
6 years ago
1e9ced5af4
Test Relay, switch to runtime configuration.
6 years ago
e6ec01afb6
Start configuration manager.
6 years ago
9b77030d3c
Add basic configuration management module.
6 years ago
b2da5262ea
Pleroma.Web.ActivityPub.Transmogrifier: fix_url when not a string/empty
...
Thanks prismo.news, I hate it
6 years ago
755f166406
Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string
6 years ago
2b3a40d038
object: split object_cache from user_cache
6 years ago
f584a603f9
user: make User.delete() return data consistent with Object.delete()
6 years ago
2c3bfd7f76
user: delete user_info data in User.invalidate_cache()
6 years ago
10f3958468
object: return the deleted object as well
6 years ago
2bf358d7b4
activitypub: use Object.delete() instead of mutating the database and cache directly
6 years ago
c4e43da63e
object: add safe object deletion function
6 years ago
558e6a84d6
[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/346
6 years ago
47f76bf4b1
common api: allow self-liking objects
...
mastodon allows this, for whatever reason.
closes #347 .
6 years ago
5fea3d9eca
Merge branch 'allow-abbr' into 'develop'
...
Allow use of the `abbr` HTML tag.
See merge request pleroma/pleroma!405
6 years ago
795634c90f
Allow use of the `abbr` HTML tag.
6 years ago
b92e38d2d4
Add user reactivation task.
6 years ago
a880e0a527
Merge branch 'feature/upload-limits' into 'develop'
...
configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401
6 years ago
676c97b8c7
nodeinfo: expose configured upload limits
6 years ago
36825932eb
s3 uploader: add new feature to force public attachment URIs to go through media proxy
6 years ago
f407831120
common api: prefer formatting attachments using the attachment's name instead of URI
6 years ago
784b3a615d
utils: fix another possible leak with private S3 backends using mediaproxy
...
same rationale as the other mediaproxy changes
6 years ago
181f3bb56a
mastodon api: enforce upload limits for avatars and banners
6 years ago
e12489e2fe
twitter api: enforce upload limits for avatars, banners and backgrounds
6 years ago
167d3789a5
activitypub: upload: pass through an upload limit if one is provided
6 years ago
fa483cd7c2
upload: add new optional argument designating an upload size limit
6 years ago
5c6ec2d9fc
twitter/mastodon api: always use mediaproxy URLs in attachments
...
if using local media, the mediaproxy will not replace the URL anyway.
6 years ago
69192f36ff
mix tasks: add new task to unsubscribe all users from, and then ban a remote user (e.g. followbots)
6 years ago
39103a91be
Merge branch 'bugfix/broken-thread-filtering-false-positive' into 'develop'
...
activitypub: fix possible false positives with broken thread filtering
See merge request pleroma/pleroma!398
6 years ago
72ea54de6e
activitypub: fix possible false positives with broken thread filtering
6 years ago
a494508320
Cleanup postgresql setup script
...
Drop unused CREATEDB privilege.
Do not try to handle multiple run.
6 years ago
44762daf51
Merge branch 'feature/broken-thread-filtering' into 'develop'
...
broken thread filtering, part 1
See merge request pleroma/pleroma!394
6 years ago
c302c619b9
http: fix mediaproxy
6 years ago
26eb11c172
activitypub: add support for filtering broken threads out of timelines
6 years ago
7338368ad9
http: enable keepalive / connection pooling ( closes #336 )
6 years ago
f6cb963df2
activitypub utils: fix recipient check when the message is unaddressed (mastodon)
6 years ago
7906dfe5a0
[Pleroma.Web.Nodeinfo.NodeinfoController]: Simplify features strings
6 years ago
57330dd91b
[Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features
6 years ago
9fe9c09883
Merge branch 'finmoji-optional' into 'develop'
...
Make finmoji optional
See merge request pleroma/pleroma!391
6 years ago
ae5beb7b64
Make finmoji optional
6 years ago
ce70eb8c00
activitypub utils: fix user splicing
6 years ago
2f1f1a4f30
activitypub: splice users into recipient lists when they receive messages at their personal inbox
...
closes #343
6 years ago
9e9b1bd5ea
Merge branch 'bugfix/ap-uri-user-search' into 'develop'
...
transmogrifier: do not try to contain origin of something which doesn't have one
Closes #340
See merge request pleroma/pleroma!389
6 years ago
79b1e4465f
Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop'
...
[Pleroma.Web.MastodonAPI.StatusView]: Add fallback on missing handler for status.json
Closes #233
See merge request pleroma/pleroma!257
6 years ago
5383887bd4
transmogrifier: do not try to contain origin of something which doesn't have one
6 years ago
b386888a0e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4
...
Better be sure than sorry
6 years ago
1ed25c963a
twitterapi: activity view: add the other in_reply_to fields
6 years ago
1b480e3514
user: add helper for fetching profile url (which may be different than ap id)
6 years ago
b112112c11
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4
6 years ago
b0a940d5a2
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments
6 years ago
2da0ffeb28
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil
6 years ago
0c10be8731
[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json
6 years ago
3b0e9287a5
[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views
6 years ago
fee43ae5e7
twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper
6 years ago
f3f736afc4
activity: add helper to fetch an activity's parent
6 years ago
945ce9910d
Merge branch 'bugfix/html-scrub-comments' into 'develop'
...
html: ensure comments are correctly scrubbed
See merge request pleroma/pleroma!384
6 years ago
8613db0e3b
html: ensure comments are correctly scrubbed
6 years ago
a253c1466e
New frontend options
6 years ago
a249cbf187
Add a test for List.get_lists_account_belongs
6 years ago
e8c698af41
Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs
6 years ago
ad3181895c
Merge branch 'bugfix/html-scrub-schemes' into 'develop'
...
lib/pleroma/html.ex: Fix scheme lists
See merge request pleroma/pleroma!377
6 years ago
595d855f0e
html scrubbing policies: restrict img tags to http/https only for mediaproxy compatibility
6 years ago
2154c5dcd8
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
6 years ago
582dbe5c8d
formatter: fix matching osada users
6 years ago
7562912f6a
Use maybe_direct_follow for follow imports
6 years ago
d7654c77de
lib/pleroma/html.ex: Use a function as a variable (broken for some reason)
6 years ago
50e0a9ae56
lib/pleroma/html.ex: Fix scheme lists
...
Gosh please don’t break ourselves…
Also this is copy-paste of the list in lib/pleroma/formatter.ex,
I think this should be put in a common variable, but where?
6 years ago
30efa86c05
common api: enable tag linking in markdown mode
6 years ago
eacab0fb05
Delete Tokens and Authorizations on password change
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
6 years ago
51eaece3ea
user: break out local cases for maybe_direct_follow
6 years ago
2c29329d39
user: local users are always AP-enabled ( closes #316 )
6 years ago
111841ad34
common api: take the combination of the subject and content for length limit enforcement
...
closes #315
6 years ago
08d5ad71b6
nodeinfo: allow opting out of MRF transparency
6 years ago
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
6 years ago
7f530f6f80
mastodon api: relationship view: better handle no pre-existing follow activity
6 years ago
e69faf550c
user: add wait_and_refresh() for async three-way handshake case
6 years ago
3e751496e3
mastodon api: account view: fetch follow state and use it to populate `requested` field
6 years ago
a71b822013
activitypub: always track following state for async reasons
6 years ago
8ce217776d
activitypub transmogrifier: better manage follow state
6 years ago
4f7a468659
user: only pre-create follow relationships on OStatus
...
closes #306
6 years ago
bd76d9cee6
nodeinfo: add accepted post formats to metadata
6 years ago
285ac80c36
config: allow for accepted post formats to be configured
6 years ago
52b05137c5
formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
6 years ago
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
6 years ago
f2efc8dcfb
nodeinfo_controller: Fix JSON rendering
...
This is the last noedinfo difference from my own branch
6 years ago
28651df478
MRF Transparency
6 years ago
56d31db130
Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one
6 years ago
8226953f1d
[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple
6 years ago
4f03bb2299
Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'
...
activitypub: fix error condition match
See merge request pleroma/pleroma!365
6 years ago
4db1bc2c0e
activitypub: fix error condition match
6 years ago
a3cffd3566
formatter: Stop using phoenix HTML and format it ourselves
...
* Pheonix has an extra scheme whitelist conflicting with ours
* Pheonix doesn’t seems to do URL encoding, just HTML encoding
Closes: https://git.pleroma.social/pleroma/pleroma/issues/307
6 years ago
34b6d444d6
Merge branch 'feature/twitter_api/fields' into 'develop'
...
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
See merge request pleroma/pleroma!360
6 years ago
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
6 years ago
707077edde
activitypub: don't fall back to OStatus fetching when MRF rejects an object
6 years ago
5c312ad677
activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else
...
although the previous handling assumed any unsigned/invalid signature message was a Create,
lets make it more explicit
6 years ago
c739737998
transmogrifier: get_actor called without casting attributedTo in actor and actor is nil
6 years ago
9446b02bdf
transmogrifier: Just make attachement maps into a list and reroll
6 years ago
e53da692fb
transmogrifier: Use the correct variable and prefer inspect in case of a bad type being passed on
6 years ago
d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs
6 years ago
4c3a80de96
transmogrifier: Use oneliners when applicable
6 years ago
ed8dfa3029
transmogrifier: reformat `cond` block by hand
6 years ago
eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor
6 years ago
f3291acc91
transmogrifier: pro-actively add support for Hashtag without array in tag
6 years ago
22927f3a34
transmogrifier: Use a cond, add proactive support for arrays
6 years ago
0aac72f1d3
[Pleroma.Web.ActivityPub.Transmogrifier]: quick fix when tag is a Map
6 years ago
28e8a8ab36
[Pleroma.Web.ActivityPub.Transmogrifier]: fix emoji in tag when it’s not in a array [kroeg]
...
Also simplified the code for name trimming.
And not copying the Map.merge part as it looks buggy.
See: https://queer.hacktivis.me/objects/a9f21ebc-9a12-4a6c-89d5-3d46955c6ee8
6 years ago
f8a0cb9c0b
[Pleroma.Web.ActivityPub.Transmogrifier]: fix when attachment contain is just a Map [kroeg]
6 years ago
a4abb124ea
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix when inReplyTo is a inlined post [kroeg]
6 years ago
523757be52
[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]
6 years ago
f77ec96707
Uploaders.S3: Replace unsafe characters in object key
...
According to [the S3 docs][s3], the characters safe for use in object keys are:
* 0-9
* a-z
* A-Z
* !
* -
* _
* .
* *
* '
* (
* )
(The / character is not listed but mentioned being safe outside of the list.)
Several characters that are valid in filenames can cause problems, for example
spaces are not valid in URLs and need to be escaped,
sequences of spaces can become squeezed by S3,
some characters like \ are documented to require “significant special handling”.
To avoid these problems, this change encodes the filename
before using it as part of the S3 object name
by replacing all characters except those documented as “safe” with dashes.
[s3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html
6 years ago
d94ee5cd50
Mastodon API: Support push subscription CRUD
6 years ago
c2d592c9c5
Assign token to connection
6 years ago
7f0e291483
html: twittertext: add missing catchall scrub function
6 years ago
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
6 years ago
df00a364fb
mastodon api: formatting
6 years ago
c2b69798dd
twitter api: add support for disabling rich text
6 years ago
958e085acb
mastodon api: add support for user-supplied html policy
6 years ago
2f5b026548
twitter api: add support for user-specified html policy
6 years ago
735cdfb848
user: add User.html_filter_policy()
6 years ago
8ae9424edb
html: default to using normal scrub policy if provided scrub policy is nil
6 years ago
4cb6331843
Merge branch 'feature/dynamic-user-refresh' into 'develop'
...
user: implement dynamic refresh of profiles
See merge request pleroma/pleroma!350
6 years ago
0fe165165f
Merge branch 'task-204-on-options-request' into 'develop'
...
Return 204 response on options request
See merge request pleroma/pleroma!347
6 years ago
8e28e8a18f
mix: remove fix_ap_users task, now obsolete
6 years ago
c9f6eb9a41
user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)
6 years ago
40c51f118f
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
6 years ago
f74725df41
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
6 years ago
33a1e92584
[Pleroma.Web.Router]: Fake /api/v1/endorsements
6 years ago
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
6 years ago
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
6 years ago
c9585ec007
twitter api: fix mimetype fallback when attachments use a URI instead of a URL object
6 years ago
0cac493fdc
mastodon api: default attachment type to image if one is not present
6 years ago
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e16e030129fb
6 years ago
9b0f2d572b
Return 204 response on options request
6 years ago
a7d0ecdc7c
html: add policy which transforms inline images to pass through the media proxy
6 years ago
cd13fa17fd
html: allow scrubbing policies to be stackable
6 years ago
342ed84446
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
6 years ago
95376ac1fe
html: add the ability to override the default scrub policy
6 years ago
c2650f0ffb
Merge branch 'feature/html-scrub-policy' into 'develop'
...
html scrub policy
See merge request pleroma/pleroma!339
6 years ago
39aed5348a
Add visible_in_picker to status emojis
6 years ago
d3248e13e3
activitypub: transmogrifier: allow profile updates from bots
6 years ago
e0b8c0ccba
MRF: reject non-public: use pattern match to remove unnecessary if block
6 years ago
88094c266d
MRF: simple policy: refactor module to use guards and pattern matching
6 years ago
97253df3ee
MRF: simple policy: contain media removal/nsfw ops to create activities only
6 years ago
e82ce2a4b3
formatting
6 years ago
358f88e10a
html: allow inline images by default (because of custom emoji)
6 years ago
40e2f6e500
html: add default scrubbing profile and configuration knobs
6 years ago
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
255f46d7ab
html: new module providing a configurable markup scrubbing policy
6 years ago
801d645c6b
TASK: Fix formatting
6 years ago
b79c126ee0
Add missing URL encoding in create authorization redirect
6 years ago
4e1bb7bccb
make limit for /api/v1/suggestions
6 years ago
045953225e
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
...
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
6 years ago
530561a091
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
...
Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302
6 years ago
3e4f39116b
Merge branch 'feature/custom_media_url' into 'develop'
...
[Pleroma.Uploaders.Local]: Add configuration for custom url path
See merge request pleroma/pleroma!318
6 years ago
c1d07da4e1
Mastodon API: Fake support for loading filters
6 years ago
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.
6 years ago
70163aec9b
Add LegacyAuthenticationPlug to router.
6 years ago
44b094908c
Update legacy passwords automatically.
6 years ago
3aba585e7a
Add Plugs to router.
6 years ago
e601165426
Add UserEnabledPlug.
6 years ago
5ce1ebb179
Add SetUserSessionIdPlug.
6 years ago
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
6 years ago
636ad3e155
Add new plugs to router.
6 years ago
12bc73dd28
Add EnsureUserKeyPlug, smaller fixes
6 years ago
32465b9939
Simplify AuthenticationPlug
6 years ago
9a96c93be7
Add SessionAuthenticationPlug.
6 years ago
a3f54fca4d
Add LegacyAuthenticationPlug
6 years ago
3cf17dc402
Add EnsureAuthenticatedPlug
6 years ago
faf5347748
Add UserFetcherPlug.
6 years ago
42bd985e66
Add BasicAuthDecoderPlug
6 years ago
8b020e03a6
change cond to if else
6 years ago
1a8bc26e52
auth against sha512-crypt password hashes, upgrade to pbkdf2
6 years ago
76c67a41c1
Merge branch 'develop' into 'feature/staff-discovery-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
6 years ago
9a21ff5f61
nodeinfo: add staffAccounts field to metadata
6 years ago
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
6 years ago
b1124f1605
report chat and gopher support at /nodeinfo/2.0.json
6 years ago
b61430163b
user: add moderator_user_query()
6 years ago
7ca2a2ddea
Merge branch 'nil-bio-emojis' into 'develop'
...
add nil clause for Formatter.get_emoji/1 to return an empty result
Closes #274
See merge request pleroma/pleroma!315
6 years ago
35515cfa66
Update mastodon_api_controller.ex
6 years ago
Rin Toshaka