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
26f8697400
Update mastodon_api_controller.ex
6 years ago
2b2bd0e047
Render notification IDs as strings, not numbers
6 years ago
4257f784bc
sloop around get_emoji/1 to check is_binary and have a fallthrough
...
default that returns empty
6 years ago
754deb26dd
[Pleroma.Uploaders.Local]: Add configuration for custom url path
...
One use-case being an external caching proxy
6 years ago
b7923aa304
Merge branch 'hotfix_broken_likes' into 'develop'
...
hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284
6 years ago
834515fb51
formatter: don't add XSS emoji
6 years ago
3c7280934e
Merge branch 'security/activitypub-spoofing' into 'develop'
...
security: activitypub spoofing
See merge request pleroma/pleroma!321
6 years ago
03e92977cb
transmogrifier: fix peertube/plume actor handling
6 years ago
0b2c051a04
activitypub: fix possibility of spoofing by containing remote objects to the same domain as their actor
6 years ago
e2ce0e9e05
run `mix format`.
6 years ago
84d84e4ca4
OAuth: Support /revoke endpoint for revoking tokens
...
(for compatibility with Mastodon)
6 years ago
ad2a7972e7
OAuth: Set `created_at` in token exchange response
...
(for compatibility with Mastodon)
6 years ago
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
6 years ago
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
6 years ago
2e2f458705
Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'
...
Clean code duplication in MastoAPI search(v1/v2)
See merge request pleroma/pleroma!316
6 years ago
0c2a0e3551
Specify default scope in verify_credentials
...
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value.
6 years ago
8885d16e1b
[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication
6 years ago
a9c0f395cb
add nil clause for Formatter.get_emoji/1 to return an empty result
6 years ago
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
6 years ago
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
6 years ago
a26d5e6b2a
Merge branch 'feature/rich-text' into 'develop'
...
rich text support
See merge request pleroma/pleroma!309
6 years ago
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
6 years ago
e838969495
Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'
...
use media proxy for the suggestions api
See merge request pleroma/pleroma!305
6 years ago
65e8d47cfb
Merge branch 'backendhack' into 'develop'
...
Flexible Storage Backends
See merge request pleroma/pleroma!304
6 years ago
adffad5502
increase uploader behaviour documentation accuracy.
6 years ago
af01f0196a
Add backend failure handling with :ok | :error so the uploader can handle it.
...
defaulting to :ok, since that's the currently level of error handling.
6 years ago
29b5e30c46
activity: drop recipients_to/recipients_cc fields
6 years ago
de9acebbf3
activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.
6 years ago
ddc6f32b75
Fix Mastodon API when actor's nickname is null
6 years ago
cce9d008f9
streamer: contain list updates in the same way as we do with the database query
6 years ago
ded9091206
mastodon api: use bounded AP object graph query to enforce containment of private statuses
6 years ago
643fae6e36
activitypub: allow querying the activity/object graph bounded to a specific to/cc set
6 years ago
81673b8136
activity: add recipients_to and recipients_cc fields
6 years ago
d424e9fa5f
fix S3 ref in sample config to generate proper path.
6 years ago
ab9e5d64d6
add a sample swift config
6 years ago
2ff25ac0ce
A hobbldey-working swift client.
...
apparently, all elixir openstack libraries are trash
luckily, the APIs are stupid easy.
6 years ago
9fc20ed572
works now, tested with profile photo upload on local backend.
6 years ago
dad39b24a1
add the behaviour, work on actually making it work.
6 years ago
18ad8aaecf
Explicitly set 'http_only' to true
6 years ago
8d2d7a8859
Implement uploader behaviour
...
run formatter <#
6 years ago
4656a07e9e
Set SameSite flag to 'Strict'
6 years ago
6cbfb5ab5d
use media proxy for suggestions api
6 years ago
0df558a6a5
cleaning up a bit.
6 years ago
709816a0f8
example of flexible storage backends
6 years ago
d22f66655b
upload: formatting
6 years ago
1596185ac6
upload: add the S3 support itself
6 years ago
03c35e579b
sample config: add S3 public endpoint option
6 years ago
86c007ddd2
upload: strip exif data before finalizing the file path
6 years ago
e95d958b52
sample config: show how amazon s3 support is activated, including third-party clones like wasabi
6 years ago
0c4493f144
Fix formatting
6 years ago
b9a642da1e
Add Secure and SameSite cookie flags
6 years ago
0f1c629d65
better solution, added test.
6 years ago
6973b77e94
[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable
6 years ago
9bddb39ff0
[Pleroma.Web.MastodonAPI.FilterView]: expires_at should be null when N/A
6 years ago
d571a571fe
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3
6 years ago
6e030129fb
[MastodonAPI] Add filters
6 years ago
a5adb251ab
[Pleroma.Web.MastodonAPI.AccountView]: Add fields support
6 years ago
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
6 years ago
97e20d2932
[MastodonAPI] the tag field isn’t fixed to a static type in pleroma
6 years ago
83efaa3af6
[MastodonAPI] Add streaming of hashtags
6 years ago
5dd6542db5
formatting
6 years ago
1089d3658e
user: fix up notification last calculation [NOT related to upstream]
6 years ago
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
6 years ago
440b459cd1
Merge branch 'bugfix/announce-timeline-flooding' into 'develop'
...
activitypub: filter destination list for announce activities differently than normal (closes #164 )
Closes #164
See merge request pleroma/pleroma!227
6 years ago
63094cfd3e
Merge branch 'feature/emoji-in-local-users' into 'develop'
...
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
6 years ago
bc3c30430e
fix formatting
6 years ago
1ad5cbed51
Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'
...
common api: properly handle replying to orphaned threads
See merge request pleroma/pleroma!299
6 years ago
741c6ad671
common api: handle replying to orphaned threads
6 years ago
c9e4c45e0e
Merge branch 'login-with-email' into 'develop'
...
When logging in, try treating the login as an email
Closes #245
See merge request pleroma/pleroma!295
6 years ago
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
946a0769c4
remove unused settings from /api/statusnet/config
6 years ago
540cce5d10
When logging in, try treating the login as an email
...
Closes #245
6 years ago
ffa552f1a4
Merge branch 'feature/twitterapi-object-description' into 'develop'
...
twitter api: provide object descriptions as attachment description field
See merge request pleroma/pleroma!293
6 years ago
aab2bdddf4
twitter api: provide object descriptions as attachment description field
6 years ago
290798b821
http: fix TLS server name indication
...
by default, hackney only sent TLS server name indication if TLS was locked
to TLS 1.2.
since there are many instances out there not speaking TLS 1.2, it is not
acceptable to lock SNI to TLS 1.2.
closes #261
6 years ago
be7a6db1f5
Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'
...
formatter: fix single char local nicknames
Closes #163
See merge request pleroma/pleroma!290
6 years ago
9ded0ee1a5
Merge branch 'config/fe-collapse-subject' into 'develop'
...
fe config: add collapse_message_with_subject fe option
See merge request pleroma/pleroma!289
6 years ago
3e10d13909
formatter: adjust regexp captures to match local users with single character nicknames ( closes #163 )
6 years ago
09cb402203
fe config: add collapse_message_with_subject fe option
6 years ago
bf9f68b681
debug
6 years ago
a909fe45a6
formatting
6 years ago
52b44184b4
transmogrifier: reject activities lacking a valid ID
6 years ago
9b046d2a84
fixed notifications API completely breaking if there's a like for
...
missing (deleted) post.
6 years ago
d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
6 years ago
5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
6 years ago
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
6 years ago
a6d4cc8917
Merge branch 'sanitize-bio' into 'develop'
...
mastodon api: sanitize the bio HTML
See merge request pleroma/pleroma!282
6 years ago
046741c60d
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
6 years ago
f5b056e3ce
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes
6 years ago
3b8ef24532
Fix attachement rendering
6 years ago
a6b021a52b
Render peertube videos in mastodon.
6 years ago
c381d0b577
Use activitypub to fetch posts.
...
This falls back to ostatus.
6 years ago
74c74decf5
Basic peertube support.
6 years ago
ef4f982e2c
Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)
6 years ago
1495d04789
fix test for converting bio \r\n to <br>.
6 years ago
cdb3dd48ab
Format
6 years ago
5debd7b5cc
Twitter API: Support Mastodon-style bios
...
(multi-line, with links, and user mentions)
6 years ago
175f0bebbc
mastodon api: sanitize the bio HTML
6 years ago
c1b8a6a73b
Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'
...
formatter: consistent presentation of hashtags and mentions
See merge request pleroma/pleroma!280
6 years ago
c033d2004b
formatting
6 years ago
145546e52a
common api: format hashtags in the same way as we format mentions
6 years ago
f1c407e777
Merge branch 'fix/redirect-on-user-fetch' into 'develop'
...
ActivityPub: follow redirects when fetching user
See merge request pleroma/pleroma!278
6 years ago
51a21284c6
ActivityPub: follow redirects when fetching user
6 years ago
6698749073
Fix typo in app creation response
...
Mastodon sends redirect_uri (singular), so should Pleroma.
6 years ago
a3ef2ebb35
mastodon api controller: client_name, not name
6 years ago
b5a92b1199
mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does
6 years ago
183ccd1812
Merge branch 'dev-lanodan-url-regex' into 'develop'
...
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
6 years ago
c004b6ea0a
Merge branch 'mastofe/system-font' into 'develop'
...
Mastodon frontend: Use system font
See merge request pleroma/pleroma!247
6 years ago
5fbb14f5ec
Merge branch 'bugfix/federation-kroeg' into 'develop'
...
fix federation with kroeg
See merge request pleroma/pleroma!272
6 years ago
38361e7b5e
Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
...
Fix: Output repeats at ActivityPub outbox
Closes #191
See merge request pleroma/pleroma!175
6 years ago
8dc715b30b
Merge branch 'fix/normalize-file-extension' into 'develop'
...
Normalize file extension for uploaded files
Closes #218
See merge request pleroma/pleroma!233
6 years ago
9908cf8fda
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
...
Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254
6 years ago
f446e75577
activitypub: transmogrifier: add necessary translations for kroeg
6 years ago
92caa2632b
Use Image type for emoji icons.
6 years ago
1ed1ff17a4
ActivityPub user view: include tag if present.
6 years ago
f9d13558c8
CommonAPI: add emoji to user source data on update
6 years ago
8c0c930041
formatting
6 years ago
ffd9ad1f0c
Fix for elixir 1.7.
6 years ago
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
6 years ago
1e9d152d60
Update generate_invite_token.ex
6 years ago
9de6145737
Merge branch 'fix/remote-follow-errormessage' into 'develop'
...
Remote follow: don't show confusing error if already following
See merge request pleroma/pleroma!267
6 years ago
ae9c4983d7
Merge branch 'bugfix/gopher-empty-lines' into 'develop'
...
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
See merge request pleroma/pleroma!270
6 years ago
e81f788cb8
Merge branch 'emoji-in-account-view' into 'develop'
...
Render emoji in user profiles
See merge request pleroma/pleroma!265
6 years ago
af30f3f648
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
6 years ago
e7b00f202f
fix gopher server informational messages
...
some gopher clients did not accept those lines due to a missing tab
6 years ago
db5cdfa333
Remote follow: don't show confusing error if already following
6 years ago
37b802682c
HTML-sanitize usernames before emojifying.
6 years ago
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
6 years ago
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
6 years ago
c2d1a5e9c4
MastoAPI AccountView: render profile emoji.
6 years ago
59b42531a3
Merge branch 'bugfix/duplicate-follow-requests' into 'develop'
...
user: filter out duplicate follow requests
Closes #228
See merge request pleroma/pleroma!263
6 years ago
d91fd48edf
user: do not leak virtuals in account search
6 years ago
ecfd4b2106
user: hide virtual actors from statistics queries
6 years ago
de6be63b1b
activitypub: do not show observable effects of non-public boosts
6 years ago
5202d4ce10
relay: do not relay in test mode
6 years ago
0ca9b9ff96
run mix format
6 years ago
5abf9ad602
relay: reintroduce @allow_relay
6 years ago
1e1a29f084
activitypub: relay: fix up AS2 actor object
6 years ago
e49131bb72
relay: move to /relay endpoint from / due to webapp issues
6 years ago
2b628f2341
relay: only relay create activities
6 years ago
ae3cb652b6
user: set up a valid followers address to use
6 years ago
56dc8db582
activitypub: relay: add relay following/followers collection URLs
6 years ago
1c40a631e8
federator: actually relay the public activities
6 years ago
f9b0fc4ddb
relay: remove @allow_relay for the moment
6 years ago
266b314051
relay: fix invoking federator, use a timer to sleep the mix task to force a context switch
6 years ago
99be3d3dcc
relay: add relay follow/unfollow tasks
6 years ago
1c90f88393
user: remote actors can have no nickname if they are virtual services
6 years ago
7bed350a23
config: allow relaying to be disabled
6 years ago
b7ca7f282a
activitypub: refactor relay concerns into new relay module
6 years ago
00e890264c
activitypub: represent relay actor at instance root
6 years ago
4807a52284
user: support creating an actor which represents the instance itself
6 years ago
275c42e438
user: filter out duplicate follow requests
6 years ago
0ee29994a5
formatter: preserve case of hashtags
...
when generating hashtag links, we used the casefolded version that we use in
the link URLs, instead of the original version.
accordingly, adjust the formatter to use the original text for the links, while
keeping the casefolded version for the URLs.
6 years ago
f72cfada1a
add suggestions/web config
6 years ago
3be58ad34e
activitypub: actually send digest header when federating
...
this is needed for backwards compatibility with non-digest pleroma instances
6 years ago
d5091c3175
Allow additionnal schemes in the config
6 years ago
8da406afa2
activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header
6 years ago
William Pitcock