William Pitcock
e69faf550c
user: add wait_and_refresh() for async three-way handshake case
6 years ago
William Pitcock
3e751496e3
mastodon api: account view: fetch follow state and use it to populate `requested` field
6 years ago
William Pitcock
a71b822013
activitypub: always track following state for async reasons
6 years ago
William Pitcock
8ce217776d
activitypub transmogrifier: better manage follow state
6 years ago
William Pitcock
4f7a468659
user: only pre-create follow relationships on OStatus
...
closes #306
6 years ago
kaniini
614e47aa7c
Merge branch 'revert-d31bbb1c' into 'develop'
...
Rich Text Redo Branch
See merge request pleroma/pleroma!314
6 years ago
William Pitcock
497814cbbb
test: update test for new html scrub policy
6 years ago
William Pitcock
bd76d9cee6
nodeinfo: add accepted post formats to metadata
6 years ago
William Pitcock
285ac80c36
config: allow for accepted post formats to be configured
6 years ago
William Pitcock
52b05137c5
formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
William Pitcock
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
6 years ago
William Pitcock
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe
, reversing
changes made to 340ab3cb90
.
6 years ago
kaniini
f7ba393bb9
Merge branch 'feature/nodeinfo_federation_info' into 'develop'
...
Nodeinfo federation info
See merge request pleroma/pleroma!367
6 years ago
Haelwenn (lanodan) Monnier
f2efc8dcfb
nodeinfo_controller: Fix JSON rendering
...
This is the last noedinfo difference from my own branch
6 years ago
Haelwenn (lanodan) Monnier
28651df478
MRF Transparency
6 years ago
Haelwenn (lanodan) Monnier
56d31db130
Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one
6 years ago
Haelwenn (lanodan) Monnier
8226953f1d
[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple
6 years ago
kaniini
4f03bb2299
Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'
...
activitypub: fix error condition match
See merge request pleroma/pleroma!365
6 years ago
William Pitcock
4db1bc2c0e
activitypub: fix error condition match
6 years ago
barrucadu
a32e013909
Relax form-action content security policy
...
'self' only allows forms submitted to the same origin, which
breaks the "remote follow" form. To allow remote following,
we want to allow forms to be submitted to any host.
6 years ago
Haelwenn
ab2e5ba989
Merge branch 'bugfix/magnet-links' into 'develop'
...
formatter: Stop using phoenix HTML and format it ourselves
Closes #307
See merge request pleroma/pleroma!363
6 years ago
Haelwenn (lanodan) Monnier
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
Haelwenn
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
Haelwenn (lanodan) Monnier
a74daabfae
[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields
6 years ago
Haelwenn (lanodan) Monnier
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
6 years ago
kaniini
dbc9feecbf
Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'
...
activitypub: don't fall back to OStatus fetching when MRF rejects an object
See merge request pleroma/pleroma!362
6 years ago
William Pitcock
707077edde
activitypub: don't fall back to OStatus fetching when MRF rejects an object
6 years ago
kaniini
db989d1fa4
Merge branch 'security/ap-unsigned-create' into 'develop'
...
activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else
See merge request pleroma/pleroma!361
6 years ago
William Pitcock
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
kaniini
6258ddaa60
Merge branch 'bugfix/kroeg' into 'develop'
...
More kroeg bugfixes
See merge request pleroma/pleroma!353
6 years ago
Haelwenn (lanodan) Monnier
c739737998
transmogrifier: get_actor called without casting attributedTo in actor and actor is nil
6 years ago
Haelwenn (lanodan) Monnier
9446b02bdf
transmogrifier: Just make attachement maps into a list and reroll
6 years ago
Haelwenn (lanodan) Monnier
e53da692fb
transmogrifier: Use the correct variable and prefer inspect in case of a bad type being passed on
6 years ago
William Pitcock
d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs
6 years ago
Haelwenn (lanodan) Monnier
4c3a80de96
transmogrifier: Use oneliners when applicable
6 years ago
William Pitcock
ed8dfa3029
transmogrifier: reformat `cond` block by hand
6 years ago
Haelwenn (lanodan) Monnier
eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor
6 years ago
Haelwenn (lanodan) Monnier
f3291acc91
transmogrifier: pro-actively add support for Hashtag without array in tag
6 years ago
Haelwenn (lanodan) Monnier
2c820e10b8
transmogrifier_test: incoming notices with tag not being an array (kroeg)
6 years ago
Haelwenn (lanodan) Monnier
22927f3a34
transmogrifier: Use a cond, add proactive support for arrays
6 years ago
Haelwenn (lanodan) Monnier
0aac72f1d3
[Pleroma.Web.ActivityPub.Transmogrifier]: quick fix when tag is a Map
6 years ago
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
f8a0cb9c0b
[Pleroma.Web.ActivityPub.Transmogrifier]: fix when attachment contain is just a Map [kroeg]
6 years ago
Haelwenn (lanodan) Monnier
a4abb124ea
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix when inReplyTo is a inlined post [kroeg]
6 years ago
Haelwenn (lanodan) Monnier
523757be52
[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]
6 years ago
kaniini
3de12c194f
Merge branch 'fix/s3/filenames-with-spaces' into 'develop'
...
Uploaders.S3: Replace unsafe characters in object key
See merge request pleroma/pleroma!359
6 years ago
Martin Kühl
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
kaniini
7252055078
Merge branch 'update/pleroma-fe-20180922' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!357
6 years ago
William Pitcock
bb213a85c5
update pleroma frontend
6 years ago
Martin Kühl
d94ee5cd50
Mastodon API: Support push subscription CRUD
6 years ago