lambda
044616292b
Merge branch 'feature/rich-media-limits' into 'develop'
...
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
6 years ago
Karen Konou
ac72b578da
Merge branch 'develop' into feature/thread-muting
6 years ago
Karen Konou
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
6 years ago
lambda
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
6 years ago
Egor Kislitsyn
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
6 years ago
William Pitcock
45e57dd187
rich media: tighten fetching timeouts and size limits
6 years ago
kaniini
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
6 years ago
Karen Konou
cc21fc5f53
refactor, status view updating, error handling
6 years ago
rinpatch
e0de0fcf22
Merge branch 'object-creation' into 'develop'
...
Do object insertion through Cachex
See merge request pleroma/pleroma!802
6 years ago
kaniini
d5fe05c37e
Merge branch 'follow-enhancements' into 'develop'
...
Respect blocks in mass follow.
See merge request pleroma/pleroma!797
6 years ago
lain
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
6 years ago
Karen Konou
6a150de3bd
Add unique index and unique constraint check, uniqueness test fails
6 years ago
Karen Konou
638456ce8f
elixir too new for CI's mix format lol
6 years ago
Karen Konou
a0d732ec55
it works!!
6 years ago
Haelwenn (lanodan) Monnier
d924dc73ba
de-group import/s
6 years ago
Haelwenn (lanodan) Monnier
6a6a5b3251
de-group alias/es
6 years ago
Ivan Tashkinov
a337bd114c
[ #468 ] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.
6 years ago
Ivan Tashkinov
4ad843fb9d
[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
6 years ago
Haelwenn (lanodan) Monnier
381fe44172
HTML.Scrubber.Default: Consistency
6 years ago
Haelwenn (lanodan) Monnier
2272934a5e
Stash
6 years ago
Haelwenn (lanodan) Monnier
d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
6 years ago
Haelwenn (lanodan) Monnier
473095faf2
Web.Federator: Fix unused variable
6 years ago
Haelwenn (lanodan) Monnier
60ea29dfe6
Credo fixes: alias grouping/ordering
6 years ago
Haelwenn (lanodan) Monnier
106f4e7a0f
Credo fixes: parameter consistency
6 years ago
Haelwenn (lanodan) Monnier
8bcfac93a8
Make credo happy
6 years ago
lain
563f04e81b
Do autofollow first.
6 years ago
lain
bbd0049fae
Respect blocks in mass follow.
6 years ago
lambda
1eecbc1cd1
Merge branch 'feature/keyword-policy' into 'develop'
...
Add keyword policy
See merge request pleroma/pleroma!794
6 years ago
Karen Konou
7e47a810a2
help i am not good with git
6 years ago
Karen Konou
5c5b228f21
Added thread unmuting (still a bit buggy maybe)
6 years ago
Karen Konou
a44e532fb1
Added thread unmuting (still a bit buggy maybe)
6 years ago
rinpatch
7356659273
wow
6 years ago
Karen Konou
98ec578f4d
Merge branch 'develop' into feature/thread-muting
6 years ago
rinpatch
f88dec8b33
What idiot did that? (me)
6 years ago
rinpatch
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
6 years ago
rinpatch
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
rinpatch
2174f6eb4f
Add default config for keyword policy
6 years ago
rinpatch
46aa8c18a2
Add keyword policy
6 years ago
Karen Konou
c43f414a79
Somehow fixed the repo insert [skip-ci]
6 years ago
Karen Konou
7e3ec93ed0
made a silly oopsie
6 years ago
Karen Konou
77448de492
ugghhhh
6 years ago
Ivan Tashkinov
2c68cf7e9e
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.
...
(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).
6 years ago
Karen Konou
f4ff4ffba2
Migration and some boilerplate stuff
6 years ago
Mark Felder
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
6 years ago
Haelwenn
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
6 years ago
kaniini
18e783bcb2
Merge branch 'add-admin-and-moderator-fields' into 'develop'
...
Add admin and moderator badges to user view and make their visibility configurable
See merge request pleroma/pleroma!767
6 years ago
William Pitcock
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
6 years ago
rinpatch
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
6 years ago
href
f753043ce0
Fix if clause in activity_pub user_view
6 years ago
Egor Kislitsyn
6f05f448f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
eugenijm
035eaeb9b8
Allow to configure visibility for admin and moderator badges
6 years ago
eugenijm
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
6 years ago
William Pitcock
d83dbd9070
rich media: parser: reject any data which cannot be explicitly encoded into JSON
6 years ago
kaniini
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
6 years ago
kaniini
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
6 years ago
kaniini
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
6 years ago
kaniini
ecdb0b7f57
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
...
mastodon api: fix rendering of cards without image URLs (closes #597 )
Closes #597
See merge request pleroma/pleroma!777
6 years ago
William Pitcock
1d94b67e40
mastodon api: fix rendering of cards without image URLs ( closes #597 )
6 years ago
lambda
f8b831ecfd
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
...
activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774
6 years ago
William Pitcock
a2bb5d890d
html: don't attempt to parse nil content
6 years ago
William Pitcock
e71ab5a10f
activitypub: transmogrifier: fix bare tags
6 years ago
William Pitcock
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
6 years ago
lain
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
6 years ago
Haelwenn
03991e7bc5
Merge branch 'feature/mrf-tag' into 'develop'
...
MRF TagPolicy engine
See merge request pleroma/pleroma!768
6 years ago
William Pitcock
7d110be119
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
6 years ago
William Pitcock
64a3993425
activitypub: mrf: tag policy: add support for subscription control
6 years ago
Egor Kislitsyn
14d967f515
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
rinpatch
3ae11835a9
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'
...
fix hellthread threshold deprecation warning
See merge request pleroma/pleroma!770
6 years ago
Karen Konou
4031c94a59
fix hellthread threshold deprecation warning
6 years ago
William Pitcock
ff2c28fd6d
activitypub: mrf: tag policy: refactor the filtering hook a bit
6 years ago
William Pitcock
9a69f08e86
activitypub: mrf: tag policy: add support for processing follow requests
6 years ago
William Pitcock
084bb8ccd5
activitypub: mrf: tag policy: implement force-unlisted and sandbox
6 years ago
William Pitcock
88e32a32ce
mrf: add initial MRF.TagPolicy engine
6 years ago
kaniini
25a659d2dc
Merge branch 'mime-riff' into 'develop'
...
Mime: detect RIFF formats (wave, webp, avi)
See merge request pleroma/pleroma!769
6 years ago
href
127f99ae18
Mime: detect RIFF formats (wave, webp, avi)
6 years ago
rinpatch
00835bf678
Merge branch 'fix/rich-media-relative-path' into 'develop'
...
Fix rich media relative path
Closes #588
See merge request pleroma/pleroma!759
6 years ago
Egor Kislitsyn
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
6 years ago
rinpatch
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
6 years ago
Karen Konou
58262a8b8a
removed a debug thingy
6 years ago
Karen Konou
4430641349
squished a bug
6 years ago
Karen Konou
3cf046babb
actually commited the changes
6 years ago
Karen Konou
63a4f4b7be
fixed Map,put arguments, updated nomenclature
6 years ago
Karen Konou
583c4e0f17
more tweaks, fixed silly mistakes...
6 years ago
Karen Konou
e10cda7541
implemented tweaks
6 years ago
kaniini
c57f37bd36
Merge branch 'mogrify-orient' into 'develop'
...
Update Mogrify docs and warning for deprecated syntax
See merge request pleroma/pleroma!763
6 years ago
Karen Konou
531507a635
fixed things
6 years ago
Karen Konou
10130fa7d6
made toggleable, added docs
6 years ago
Karen Konou
0ef0ae35ab
added optional delist feature
6 years ago
Maxim Filippov
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
lambda
69a38644bc
Merge branch '589-fix-cache' into 'develop'
...
Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764
6 years ago
lain
505a084058
Still do caching in tests.
6 years ago
Mark Felder
0c08bd4181
Update Mogrify docs and warning for deprecated syntax to encourage
...
users to enable both strip and auto-orient
6 years ago
Ivan Tashkinov
3913b0196e
[ #582 ] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
...
Added tests.
6 years ago
Ivan Tashkinov
b40b4bc4e5
[ #582 ] Optimized federation retirement by reducing the number of SQL calls
...
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
6 years ago
Maxim Filippov
2c59eb3cfc
Add responsive features to layout
6 years ago
rinpatch
68d461b3a9
Check if rich media uri is relative
6 years ago
rinpatch
833404f0f5
Use with instead of if in the card
6 years ago
rinpatch
e4d18f328b
merge only if page_url is an absolute path
6 years ago
rinpatch
cbadf9d333
Fix rich media relative path
6 years ago
kaniini
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
6 years ago
href
28bfb09b01
Merge branch 'hotfix/object-normalize-cache' into 'develop'
...
object: use cached accesses when possible in Object.normalize()
See merge request pleroma/pleroma!757
6 years ago
href
ffbf306c9a
Merge branch 'streaming-api-url-fix' into 'develop'
...
Fix WebSocket streaming API URL.
See merge request pleroma/pleroma!756
6 years ago
William Pitcock
af10ef8d4e
object: use cached accesses when possible in Object.normalize()
6 years ago
eugenijm
a184811a60
Use url() instead of static_url in Endpoint.websocket_url()
6 years ago
href
7e384a2425
Merge branch 'develop' into 'develop'
...
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
6 years ago
Luna
9cac8729af
update nodeinfo version when requesting 2.1
6 years ago
eugenijm
d747bd9870
Use String.replace_leading instead of String.replace for getting websocket streaming api url.
...
Extract the login responsible for obtaining websocket URL into the corresponding
Endpoint function.
6 years ago
Luna
1cdcee89da
mix format pass
6 years ago
Luna
23b1c64a19
downcase software name in nodeinfo
6 years ago
Luna
b17ce875cf
keep compatibility with nodeinfo 2.0
...
splits actual nodeinfo generation into raw_nodeinfo, the 2.0 handler
gives the same result, while the 2.1 handler inserts the
software.repository field. requested by @href
6 years ago
Haelwenn (lanodan) Monnier
74c6119f28
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list
6 years ago
Luna
cd6db6abe4
use Mix.Project.Config for some Application functions
6 years ago
kaniini
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
6 years ago
lambda
fc7644798d
Merge branch 'serve-sw-pleroma.js' into 'develop'
...
Serve sw-pleroma.js properly
See merge request pleroma/pleroma!754
6 years ago
href
fa5ec765d9
Serve sw-pleroma.js properly
6 years ago
lain
01d483f9c7
Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle
6 years ago
href
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
Luna
b0c4c082c4
mix format pass
6 years ago
Luna
c05928dbda
use nodeinfo 2.1, add repository field
...
that is the only change from nodeinfo 2.0 to 2.1
also this makes the nodeinfo tests use 2.1.json instead of 2.0.json
6 years ago
lain
b19b4f8537
Remove default value for rich media.
...
Setting it to true will actually override a 'false' set before.
6 years ago
href
308b35ebe2
User.follow_all: ensure its stays unique
6 years ago
lambda
44913c1019
Merge branch 'bugfix/rich-media-non-unicode' into 'develop'
...
rich media non-unicode bugfix
See merge request pleroma/pleroma!749
6 years ago
William Pitcock
46dba03098
rich media: parser: only try to validate strings, not numbers (OEmbed)
6 years ago
William Pitcock
dafb6f0b5e
rich media: parser: reject OGP fields we cannot safely process
6 years ago
rinpatch
7057891db6
Make rich media support toggleable
6 years ago
lambda
a43a1c6d4e
Revert "Merge branch 'spc-fix-3' into 'develop'"
...
This reverts merge request !682
6 years ago
kaniini
4d3655c479
Merge branch 'spc-fix-3' into 'develop'
...
Spc fix 3
See merge request pleroma/pleroma!682
6 years ago
Haelwenn
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
Egor Kislitsyn
58e250d9d2
fix merge
6 years ago
Egor Kislitsyn
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
lambda
6b54a3ec0b
Merge branch 'multiple-hackney-pools' into 'develop'
...
Fix 4aff4efa
typos
See merge request pleroma/pleroma!743
6 years ago
href
5ea0397e2d
Fix 4aff4efa
typos
6 years ago
kaniini
bd5086731e
Merge branch 'multiple-hackney-pools' into 'develop'
...
Use multiple hackney pools
See merge request pleroma/pleroma!739
6 years ago
lain
47ec690c54
Use race-condition free mass follow.
6 years ago
lain
935e65e261
Use race-condition free following method.
6 years ago
Egor Kislitsyn
ab31adf15b
tiny improve
6 years ago
href
4aff4efa8d
Use multiple hackney pools
...
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)
Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.
splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
6 years ago
kaniini
7a2c4f984b
Merge branch 'bugfix/fix-rejects' into 'develop'
...
follow request fixups
Closes #537
See merge request pleroma/pleroma!734
6 years ago
kaniini
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
William Pitcock
57549f6043
activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
6 years ago
William Pitcock
cbb2b709de
activitypub: transmogrifier: fix follow request rejections
6 years ago
Ivan Tashkinov
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
6 years ago
Haelwenn
ebb3496386
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
6 years ago
William Pitcock
61d6715714
rich media: oembed: return data in the same format as the other parsers
6 years ago
William Pitcock
ddb5545202
rich media: kill some testsuite noise
6 years ago
William Pitcock
0f11254a06
rich media: parser: add some basic sanity checks on the returned data with pattern matching
6 years ago
William Pitcock
83b7062634
rich media: parser: cache negatives
6 years ago
William Pitcock
8fb16e9f0f
rich media: parser: add copyright header
6 years ago
Maxim Filippov
50d6183893
Split hide_network into hide_followers & hide_followings
6 years ago
Egor Kislitsyn
1724a6b34b
add spec back
6 years ago
Egor Kislitsyn
56533495b5
fix defaults
6 years ago
Egor Kislitsyn
b2e9700785
cleanup
6 years ago
Egor Kislitsyn
55affbca7f
add a job queue
6 years ago
lain
f53d464db0
Put deprecation warnings undre Pleroma.Config.
6 years ago
Ivan Tashkinov
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
Ivan Tashkinov
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
lain
8e8a1e1ba8
Return new-style config if old-style config is set to false.
...
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
6 years ago
lain
f1d58c5c49
Don't run warnings in a task.
6 years ago
Haelwenn
de0fb88a9c
Merge branch 'safe-render-activities' into 'develop'
...
remove unnecessary filter (re !723 )
See merge request pleroma/pleroma!729
6 years ago
href
df2f7b39dd
re f83bae7c: remove unnecessary filter
6 years ago
lain
f231313b70
Add deprecation warning mechanism.
6 years ago
lain
1825118fd4
Correctly handle invalid credentials on auth login.
...
Closes #407
6 years ago
Ivan Tashkinov
9560abea10
[ #534 ] Refactoring / tweaks per MR review.
6 years ago
William Pitcock
ddc7ae2c1a
mastodon api: card: force OGP images through mediaproxy
6 years ago
William Pitcock
ebeabdcc72
rich media: helpers: clean up unused aliases
6 years ago
William Pitcock
91ef64a1ec
activitypub: prime OGP crawler cache when new messages are inserted into the database
6 years ago
William Pitcock
8e42251e06
rich media: add helpers module, use instead of MastodonAPI module
6 years ago
William Pitcock
24a103a1fe
mastodon api: formatting
6 years ago
William Pitcock
6096846f5f
API: kill /api/rich_media/parse endpoint
6 years ago
William Pitcock
07a9a891ad
twitter api: fix up activity representer
6 years ago
William Pitcock
de42646634
rich media: add try/rescue to ensure we catch parsing and fetching failures
6 years ago
William Pitcock
5d895093fd
twitter api: embed card in twitterapi posts
6 years ago
William Pitcock
5a37ddc2dc
mastodon api: embed card in status object
6 years ago
William Pitcock
132d815f1f
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
6 years ago
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
Haelwenn (lanodan) Monnier
872241d7c5
/web/index template: Modify for glitch-soc
6 years ago
href
71bb90073b
/notice/:id - send the FE index even if 404
...
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
6 years ago
lambda
16ab1437d6
Merge branch 'safe-render-activities' into 'develop'
...
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
6 years ago
lain
2e277dd4ad
Fix objects.
6 years ago
kaniini
ea12371a01
Merge branch 'discard-invalid-likes' into 'develop'
...
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
6 years ago
href
77f2137383
Transmogrifier: fix incoming objects with invalid likes
6 years ago
href
f83bae7c22
Views: wrap activity rendering in a rescue
...
this avoids complete timeline breakage when an activity fucks up
rendering.
6 years ago
kaniini
9af798ad40
Merge branch 'flake-random-worker-id' into 'develop'
...
Flake: random worker id
See merge request pleroma/pleroma!721
6 years ago
href
e0e0cc5ab0
Flake: random worker id
6 years ago
kaniini
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
6 years ago
Haelwenn (lanodan) Monnier
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
6 years ago
William Pitcock
8f2f471e94
rich media: gracefully handle fetching nil URIs
6 years ago
kaniini
155a884300
Merge branch 'flake-from-int' into 'develop'
...
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
6 years ago
href
d6015338c8
Flake: support integers in from_string/1
...
Some previously issued stateless tokens have integer ids in them.
6 years ago
kaniini
3e66723f7e
Merge branch 'join-in-preloads' into 'develop'
...
Join on preloads to avoid N+1 queries
See merge request pleroma/pleroma!714
6 years ago
Haelwenn (lanodan) Monnier
de956b9e04
Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it
6 years ago
William Pitcock
1f7843b9b8
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
6 years ago
William Pitcock
86037e9c39
mastodon api: use HTML.extract_first_external_url()
6 years ago
href
8018ae7ae5
Join on preloads to avoid N+1 queries
6 years ago
William Pitcock
be9abb2cc5
html: add utility function to extract first URL from an object and cache the result
6 years ago
William Pitcock
78047d57bf
mastodon api: provider_name setting is required too on the card
6 years ago
Haelwenn (lanodan) Monnier
39863236eb
Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x
...
Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.
6 years ago
Haelwenn (lanodan) Monnier
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
6 years ago
Haelwenn (lanodan) Monnier
5a84def6a6
Fix the logic in multi-hashtag TLs
6 years ago
Haelwenn (lanodan) Monnier
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
6 years ago
Haelwenn (lanodan) Monnier
1a9bb4daa0
[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
...
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
6 years ago
Haelwenn (lanodan) Monnier
f9cae0d04f
[WIP,MastoAPI] Multi-tag timelines
6 years ago
Haelwenn (lanodan) Monnier
15aa45ae8a
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
6 years ago
Ivan Tashkinov
060d280e64
[ #534 ] Made Salmon.send_to_user calls be handled through Federator.enqueue.
6 years ago
lain
aa8ddfdbe2
SPC fixes: Fix activities.
6 years ago
Ivan Tashkinov
465adedb7c
[ #534 ] Websub fix: made SQL use UTC time zone when comparing with `valid_until` (instead of postgresql-server default time zone).
6 years ago
Ivan Tashkinov
656ed7c84a
[ #534 ] Configurable outgoing federation reachability timeout.
6 years ago
rinpatch
3a5b3c5a3a
Merge remote-tracking branch 'pl/develop' into oembed_provider
6 years ago
kaniini
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
6 years ago
kaniini
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
6 years ago
kaniini
4df71cd88b
Merge branch 'classic-flakeids' into 'develop'
...
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
6 years ago
Maxim Filippov
9274cabe01
Use correct logic to determine "attentions" list
6 years ago
Ivan Tashkinov
3e9399ec0b
[ #534 ] Optimized bulk publish ops to filter on reachability early. `Instance` refactoring.
6 years ago
href
a3ba72d978
Fix clippy with one/five lines
6 years ago
Ivan Tashkinov
8654a591f0
[ #534 ] Updating external instances reachability on incoming federation.
6 years ago
href
be43aa2875
FlakeId: ignore null mac for workerid, use first mac
6 years ago
William Pitcock
54ec6d09b0
mrf: add anti-followbot policy
6 years ago
Ivan Tashkinov
20b54366ee
[ #534 ] Federation publish requests status control (enforced 2xx response code check).
6 years ago
Maxim Filippov
4333fea1dc
Send "hide_network" in user_view
6 years ago
Ivan Tashkinov
f161a92cb1
[ #534 ] Initial implementation of unreachable federation targets retirement.
6 years ago
kaniini
4a278cd80a
Merge branch 's3-namespace' into 'develop'
...
S3 uploader: support for namespaced bucket
Closes #532
See merge request pleroma/pleroma!699
6 years ago
lain
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
6 years ago
lain
e221c681dc
New frontend configuration mechanism.
6 years ago
href
a92c43bc4b
Clippy!
6 years ago
href
973c9eed18
Treat User.Info pinned ids as strings
6 years ago
href
e36a434b99
FlakeId.from_string/1: remove old, un-needed conversion
6 years ago
href
422e60ad76
2019
6 years ago
href
cdc5e6ff5c
ActivityPub: restrict_since/restrict_max: ignore empty param
6 years ago
href
9d63b27dcd
Test FlakeID old id compat & Ecto type
6 years ago
href
28d77e373c
Flake Ids for Users and Activities
6 years ago
Haelwenn
707cd9389c
Merge branch 'fix/activity_get_by_id' into 'develop'
...
Add get_by_id to activity.ex
See merge request pleroma/pleroma!695
6 years ago
Ivan Tashkinov
34d59e4008
[ #502 ] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
6 years ago
rinpatch
e460820fcf
Add get_by_id to activity.ex
6 years ago
href
f9a3269099
Uploader callback controller
6 years ago
href
99763999c1
reverse_proxy - always override plug's cache-control
6 years ago
href
97412d9f94
S3 Namespace
6 years ago
lambda
8cd853ce0c
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
...
[#530 ] Prevents user `info` from being overwritten because of race conditions
Closes #530
See merge request pleroma/pleroma!691
6 years ago
lambda
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
6 years ago
Ivan Tashkinov
a4d3fec8a7
[ #502 ] Code comments update.
6 years ago
Ivan Tashkinov
aa480f4a8b
[ #530 ] Prevents user `info` from being overwritten because of race conditions
...
and non-partial update of embed (in WebFinger.ensure_keys_present and other places).
6 years ago
Haelwenn (lanodan) Monnier
7390192c03
Activity: mix format (2 empty lines)
6 years ago
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier
2fdbd4d137
Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list
6 years ago
Haelwenn (lanodan) Monnier
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier
4ad5a0abb9
Activity: all_by_object_ap_id_q/1 → create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier
75e4c8f0b2
Activity: all_non_create_by_object_ap_id_q → by_object_ap_id
6 years ago
Haelwenn (lanodan) Monnier
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
6 years ago
lain
cf1f35a93a
Send delete event over Mastodon streaming api
...
Closes #116
6 years ago
lambda
f3045a179e
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
...
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
6 years ago
lain
5834b08fe7
Set custom similarity limit.
6 years ago
William Pitcock
aa37313416
activitypub: short-circuit is_public?() with directMessage flag check
6 years ago
William Pitcock
7c9749f793
transmogrifier: slightly clean up fix_explicit_addressing pipeline
6 years ago
William Pitcock
420651157b
transmogrifier: don't apply heuristics against messages which have `directMessage` set true
6 years ago
William Pitcock
ddae43eb43
activitypub: add is_private?/is_direct? helpers
6 years ago
William Pitcock
9adc80afff
common api: set directMessage flag on our own posts
6 years ago
William Pitcock
75dfa1f0b0
mastodon api: get_visibility(): DMs never have a cc list.
6 years ago
William Pitcock
681f40ee5c
activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs
6 years ago
William Pitcock
8d06be35e0
activitypub: utils: add determine_explicit_mentions() and tests
6 years ago
kaniini
42612b1c8d
Merge branch 'bugfix/improve-boost-targeting' into 'develop'
...
improve handling of non-public Announces
See merge request pleroma/pleroma!681
6 years ago
lain
b108aeee08
Make use of the indices.
...
Indices in postgresql rely on operators, so they won't be used if you use only functions.
6 years ago
rinpatch
44693fbf6e
Formating
6 years ago
rinpatch
afd83db0d7
Provide local og:url for remote activities
6 years ago
kaniini
651ce1c97b
Merge branch '491_full_mentions_in_user_bio' into 'develop'
...
[#491 ] Made user bio preserve full nicknames (nick@host)
Closes #491
See merge request pleroma/pleroma!676
6 years ago
Maxim Filippov
651a1d64b5
Add current user to mentioned
6 years ago
Maxim Filippov
e116e55cab
Add actor to recipients
6 years ago
lain
bd6c12592e
Add migration to fix spc users.
6 years ago
lain
5d4d51e6dc
Add fixes for SPC users.
6 years ago
rinpatch
74346a7035
Fix merge conflict
6 years ago
Ivan Tashkinov
79e44042bc
[ #477 ] User trigram index adjustment.
6 years ago
Ivan Tashkinov
ed8f55ab8e
[ #477 ] User: FTS and trigram search results mixing (to handle misspelled requests).
6 years ago
rinpatch
997f4a5e09
Remove custom emojis and trailing whitespaces from previews
6 years ago
rinpatch
1b1af4798a
Use object instead of activity for metadata
6 years ago
Ivan Tashkinov
65bb9b2fba
[ #491 ] Made full nicknames be preserved in user links text only in Bio.
6 years ago
William Pitcock
75a9b2a851
activitypub: add a match clause for objects, not just activities
6 years ago
William Pitcock
dbc4e92509
activitypub: transmogrifier: do not clobber the addressing on relayed announcements
6 years ago
William Pitcock
33b473cc02
activitypub: allow is_public?() to work on any type of map representing an AS2 object
6 years ago
William Pitcock
8e9f1d5587
activitypub: relay: chase selective public announce changes
6 years ago
William Pitcock
2479e88815
activitypub: announce: add new public parameter
6 years ago
kaniini
98d9dcd509
Merge branch '502_instance_stats_active_users_count_fix' into 'develop'
...
[#502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users
Closes #502
See merge request pleroma/pleroma!678
6 years ago
kaniini
ae8a5942cf
Merge branch 'bad-copy-paste' into 'develop'
...
Fix bad link in likes collection
See merge request pleroma/pleroma!679
6 years ago
sxsdv1
948fba6f76
Fix bad link in likes collection
...
Don't copy and paste, mkay
6 years ago
rinpatch
a95d5da607
Don't show content if empty or zero width space
6 years ago
Ivan Tashkinov
954dc4a4ad
[ #502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users.
6 years ago
Mark Felder
849c83ed46
formatting
6 years ago
Mark Felder
6bc9a641ba
Default to disabled in the code in case the setting is absent from config.exs
6 years ago
rinpatch
388ceb6a7d
Fix the issue with get_by_nickname never being called
6 years ago
Mark Felder
8c368d42a2
Make attachment links configurable
...
Thanks @href!
6 years ago
Ivan Tashkinov
2bfae25a1f
[ #491 ] Made user bio preserve full nicknames (nick@host).
6 years ago
rinpatch
4d5f15cd42
Introduce optional unfurling of nsfw content
6 years ago
rinpatch
0256bd2f1d
Use object url instead of a hack
6 years ago
rinpatch
fd3a558230
Apply feld's patch
6 years ago
rinpatch
5fa508cc2b
Remove @providers and call Pleroma.config on runtime
6 years ago
rinpatch
bb43f4cee9
Remove useless with in opengraph.ex
6 years ago
rinpatch
9a90b5d91a
oof
6 years ago
rinpatch
8a9f089812
remove id cast
6 years ago
rinpatch
5a08dee379
cache ap_id in id instead of caching user two times
6 years ago
rinpatch
82cf9b9751
forgot to remove this thing
6 years ago
rinpatch
293f6a8b71
join us now and share the software~. Also tests
6 years ago
lain
943324b661
MastoAPI: Don't break on missing users.
6 years ago
rinpatch
b44995866b
Replace map with reduce to remove nils
6 years ago
lambda
608cc65d43
Merge branch 'feature/improve-microformats' into 'develop'
...
improve microformats support
See merge request pleroma/pleroma!672
6 years ago
lambda
da4b670451
Merge branch '518_instance_stats_fix' into 'develop'
...
[#518 ] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers
Closes #518
See merge request pleroma/pleroma!673
6 years ago
rinpatch
ff01fd3c4f
Remove caching because it does not affect performance and may be even worse in some cases
6 years ago
Ivan Tashkinov
90433b988e
[ #518 ] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.
6 years ago
rinpatch
bfe2a11a6b
Add config doc
6 years ago
Ivan Tashkinov
0bc6d30f7d
[ #477 ] Minor refactoring (user search query).
6 years ago
rinpatch
a9c27e137d
Add a fallback function to handle generic params, just in case
6 years ago
rinpatch
a76793006b
Thanks you rinpatch, very cool
6 years ago
rinpatch
0039d45b5b
No need to use activity in the key
6 years ago
rinpatch
70b2bb6ede
add caching
6 years ago
rinpatch
dd1432d695
Disable previews for any activity, but create
6 years ago
William Pitcock
461ab9489d
formatter: improve microformats markup
6 years ago
William Pitcock
1ddab78247
html: allow microformats-related markup through the html filter
6 years ago
rinpatch
565caff3f4
cache HTML in OGP
6 years ago
rinpatch
9aa69e12b8
Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate
6 years ago
lambda
9a444c0d22
Merge branch 'bugfix/websub-hardening' into 'develop'
...
websub: improve error handling
See merge request pleroma/pleroma!670
6 years ago
rinpatch
2e630bea0d
Add twitter card, filter nsfw
6 years ago
William Pitcock
2d3241753f
http: add support for query parameters, use Jason for JSON encoding instead of Poison like everywhere else
6 years ago
rinpatch
70f140681f
Add space between name and nickname
6 years ago
rinpatch
e8eecd61b4
Formating
6 years ago
rinpatch
410fd9d774
Attach attachments
6 years ago
William Pitcock
17da432dbb
websub: improve error handling
6 years ago
rinpatch
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
6 years ago
rinpatch
850912b06b
refactor opengraph to a different module with a behaviour
6 years ago
rinpatch
8745c8c990
remove useless newlines after every tag. Make domain.com/username provide opengraph too
6 years ago
Ivan Tashkinov
5b8f9ff8c1
[ #477 ] User search tests. Normalized search rank in User.search.
6 years ago
rinpatch
2858fd2da2
add a fallback function
6 years ago
rinpatch
6f23139864
please don't bully me for this
6 years ago
rinpatch
4587a5712a
cringe
6 years ago
rinpatch
ce15e0659e
Fix some edge cases [nervous laughter]
6 years ago
lambda
646bb87816
Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'
...
Fix Elixir 1.8 type annotation issue
Closes #523
See merge request pleroma/pleroma!668
6 years ago
rinpatch
4656f433f9
Move metadata.ex out of ostatus
6 years ago
Haelwenn (lanodan) Monnier
9fcdca1bdc
Upload: Fix uploading with a : in the filename
6 years ago
Haelwenn (lanodan) Monnier
e3eb75bd23
Upload: Fix uploading with a ? in the filename
6 years ago
Maxim Filippov
e8eff9fe03
Fix Elixir 1.8 type annotation issue
6 years ago
rinpatch
f20bfc9ea5
Merge branch 'media-url-escape' into 'develop'
...
URI escape file upload URLs
See merge request pleroma/pleroma!665
6 years ago
lambda
fd2f1258fb
Merge branch 'load-all-dms' into 'develop'
...
Remove recent activity restriction.
See merge request pleroma/pleroma!644
6 years ago
Ivan Tashkinov
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
6 years ago
Shadowfacts
42b7584068
URI escape file upload URLs
6 years ago
kaniini
de1da7b3d1
Merge branch 'feature/add-oembed-parser' into 'develop'
...
Add OEmbed parser
See merge request pleroma/pleroma!661
6 years ago
kaniini
fa0392e49c
Merge branch 'activitypub-likes' into 'develop'
...
Activitypub c2s likes
See merge request pleroma/pleroma!658
6 years ago
rinpatch
5f9786288d
Prefer ids to usernames
6 years ago
William Pitcock
6e5b0406b9
mrf: add no placeholder-text policy, strips pointless "." content from posts with images
6 years ago
rinpatch
e4dc3f71ae
Resolve merge conflict
6 years ago
Maxim Filippov
b8a77c5d70
Add OEmbed parser
6 years ago
sxsdv1
868034375c
Add likes to activitypub object representation
...
Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.
6 years ago
sxsdv1
581edd5a91
Add route to get object like activities
6 years ago
sxsdv1
36711e1c83
Handle client submitted activitypub like activity
6 years ago
sxsdv1
1eb7318831
Prepare all types objects before serialising
...
Activities returned from inbox can include other types of objects like
Article
6 years ago
Sadposter
9daf162461
Honour parameters on MastoAPI /favourites
6 years ago
Sadposter
144b48da95
Add link headers to MastoAPI /favourites
...
As documented at https://docs.joinmastodon.org/api/rest/favourites/
6 years ago
Egor Kislitsyn
b594a54d0c
unpin when deleting a status
6 years ago
kaniini
e4afe1359b
Merge branch 'activitypub-dereference-activity-id' into 'develop'
...
Support activity+json request for activity
See merge request pleroma/pleroma!641
6 years ago
Maxim Filippov
1f851a0723
Add Twitter Card parser
6 years ago
kaniini
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
6 years ago
Haelwenn
ab4c5f5bf7
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
...
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
6 years ago
William Pitcock
0bdbd4f968
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
...
ok @lanodan
6 years ago
William Pitcock
2ecf81f10c
common api: fix newlines in markdown code blocks
6 years ago
kaniini
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
6 years ago
kaniini
f85d108c41
Merge branch 'mass-follow' into 'develop'
...
Mass follow
See merge request pleroma/pleroma!642
6 years ago
kaniini
d203b0b4d3
Merge branch 'dm-optimizations' into 'develop'
...
Add activity visibility index.
See merge request pleroma/pleroma!646
6 years ago
rinpatch
b57db828c7
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
...
Rich media: Remove :commit since a tuple is already returned
See merge request pleroma/pleroma!649
6 years ago
rinpatch
a2d7f0e0e9
Remove :commit since a tuple is already returned
6 years ago
lain
a99e156f2c
Add integer casts.
6 years ago
lain
7ac152ed38
TwitterAPI: Add follower/following pagination.
6 years ago
lambda
1881680e28
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
6 years ago
lain
5027f82cde
Add activity visibility index.
6 years ago
Egor Kislitsyn
44a1e69484
Add Twitter API for the pinned statuses
...
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
```
6 years ago
lain
9854978b8b
Remove recent activity restriction.
...
This should be fine now, everything should be covered by indices.
6 years ago
Egor Kislitsyn
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
6 years ago
lain
65fc2df7cc
Use follow_all in autofollow.
6 years ago
lain
26938d65fd
Add User mass following function.
6 years ago
Egor Kislitsyn
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
6 years ago
sxsdv1
20c0dd1e24
Support activity+json request for activity
6 years ago
kaniini
5c5c8508c2
Merge branch 'hotfix/media-proxy-uri' into 'develop'
...
user: fix local vs remote determination in remote_or_auth_active?/1
See merge request pleroma/pleroma!640
6 years ago
William Pitcock
f15183178c
user: fix auth_active?/1 for remote users
6 years ago
William Pitcock
0015d43e13
user: factor out illogical User.Info.superuser?/1.
...
any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching.
6 years ago
William Pitcock
74f48beec3
user: remove entirely redundant remote_or_auth_active?/1.
...
auth_active?/1 can check remote users and return true directly.
6 years ago
William Pitcock
2af67353c5
user: harden auth_active?/1, superuser?/1, visible_for?/1
6 years ago
William Pitcock
595a970493
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
6 years ago
Egor Kislitsyn
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
lain
0fae04c4e3
Add a setting for users to autofollow on sign up.
6 years ago
Egor Kislitsyn
e679da4c34
add `pinned` property to `StatusView`
6 years ago
Egor Kislitsyn
63dbd87568
rename `post` to `status`
6 years ago
lain
a16b17cc61
Actually put some onformation in the error user, make it actually properly parse
...
in conversations.
6 years ago
kaniini
74e1093732
Merge branch 'resilient-user-view' into 'develop'
...
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
6 years ago
Egor Kislitsyn
f24087f96e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn
380e9fba21
add pinned posts
6 years ago
lain
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
6 years ago
scarlett
36fa5e8802
Check visible_for_user when performing a search using a direct link.
6 years ago
scarlett
52493467ac
Twitter API: Add a summary_html field.
...
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
6 years ago
Sadposter
042852ecf3
Add check to prevent multiple follow notifications from the same user
6 years ago
kaniini
8d047c7a72
Merge branch 'fix/user-search-null-name' into 'develop'
...
fix user search results for users with unset display name
Closes #499
See merge request pleroma/pleroma!625
6 years ago
kaniini
576368237c
Merge branch 'activitypub-tombstone-fix' into 'develop'
...
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
6 years ago
scarlett
145d6fe6e9
Merge branch 'emoji-in-summary' into 'develop'
...
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
6 years ago
scarlett
6556be344d
Resolve some test failures.
6 years ago
scarlett
3c86d907d4
add some brakets to the emoji list.
6 years ago
scarlett
0787f0dfbe
Strip HTML in and allow emoji in summaries.
6 years ago
sxsdv1
2d7da5f437
Don't crash on AP request for tombstone
...
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
6 years ago
cascode
a81307251c
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
6 years ago
rinpatch
ba17518a0a
Merge branch 'feature/rich-media-cachex' into 'develop'
...
rich media: use cachex to avoid flooding remote servers
See merge request pleroma/pleroma!629
6 years ago
William Pitcock
487c00d36d
rich media: disable cachex in test mode
6 years ago
kaniini
bf5aaefbb5
Merge branch 'fix/html-cache-content-collision' into 'develop'
...
Different caches based on the module. Remove scrubber version since it is not relevant anymore
See merge request pleroma/pleroma!628
6 years ago
William Pitcock
0964c207eb
rich media: use cachex to avoid flooding remote servers
6 years ago
Rin Toshaka
1e2d58982e
oopsies
6 years ago
Rin Toshaka
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
6 years ago
kaniini
4258dd8633
Merge branch 'feature/rich-media' into 'develop'
...
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
6 years ago
kaniini
ffea81b84f
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
...
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
6 years ago
Wim Vanderbauwhede
ba93396649
Patch to support image descriptions in Pleroma FE
6 years ago
Wim Vanderbauwhede
4c95545d19
Patch to support image descriptions in Pleroma FE
6 years ago
Wim Vanderbauwhede
fe2dceb66d
Patch to support image descriptions in Pleroma FE
6 years ago
cascode
5b23dfa1c5
handle null
6 years ago
kaniini
d9d62a110c
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
...
rewrites List.foldl to Enum.each in RetryQueue
See merge request pleroma/pleroma!621
6 years ago
kaniini
eaaf701319
Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'
...
user: check that the follow request actually has an active account associated with it
See merge request pleroma/pleroma!623
6 years ago
rinpatch
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
William Pitcock
eb1a18d22f
user: check that the follow request actually has an active account associated with it
...
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
6 years ago
Michael Loftis
943211b035
rewrites List.foldl to Enum.each
6 years ago
Maxim Filippov
48e81d3d40
Add RichMediaController and tests
6 years ago
sxsdv1
4e1cc2bab6
Implement delete activity
6 years ago
sxsdv1
551c3d9391
Split create activity specifics from update_outbox
6 years ago
Maxim Filippov
917d48d09b
Better variable name
6 years ago
Maxim Filippov
2aab4e03c3
Add OGP parser
6 years ago
kaniini
32bed66471
Merge branch 'pool-usage' into 'develop'
...
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
6 years ago
rinpatch
34fa709015
Merge branch 'configurable-federator' into 'develop'
...
Make Federator options configurable.
See merge request pleroma/pleroma!615
6 years ago
lambda
32541172cd
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
...
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
See merge request pleroma/pleroma!612
6 years ago
lain
400337b0a7
Make Federator options configurable.
6 years ago
lain
096a927805
Merge remote-tracking branch 'origin/develop' into pool-usage
6 years ago
lain
d4799e0dc2
Remove default pool, it's used automatically anyway.
6 years ago
Haelwenn (lanodan) Monnier
1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
6 years ago
kaniini
90e157ef80
Merge branch 'features/admin-api-user-views' into 'develop'
...
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
6 years ago
William Pitcock
980b5288ed
update copyright years to 2019
6 years ago
lambda
33e3a7ba7d
Merge branch 'fix/scrubber-cache' into 'develop'
...
[#481 ] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
6 years ago
Rin Toshaka
6ed9b31a5f
Eh?
6 years ago
Rin Toshaka
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
6 years ago
kaniini
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
6 years ago
Rin Toshaka
dec23500d8
Resolve merge conflict
6 years ago
Rin Toshaka
ab3089d6a7
Fix comment in object.ex
6 years ago
Rin Toshaka
c50353e6ae
shame on me for not testing after revert
6 years ago
Rin Toshaka
3f9da55adc
Fix formating. Aparently my pre-commit hook broke.
6 years ago
Rin Toshaka
62af23bd26
Revert some changes in html.ex
6 years ago
Rin Toshaka
c119ea3a57
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
6 years ago
Michael Loftis
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
6 years ago
Rin Toshaka
bce152aba0
Tidy up the code. Rename key to signature
6 years ago
Rin Toshaka
66d1c31461
Fix some stupid typos
6 years ago
sxsdv1
f40562b4e1
Respond with full activity to outbox post
6 years ago
sxsdv1
1e781715c8
Limit activity types accepted to outbox to only 'Create'
6 years ago
sxsdv1
569bad8210
Create activity when client posts to outbox
6 years ago
sxsdv1
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
Rin Toshaka
a32e23905a
Use Object.change instead of Ecto.Changeset.change
6 years ago
sxsdv1
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
6 years ago
Rin Toshaka
9a0163db53
use Kernel.put_in instead of Map.merge
6 years ago
vaartis
816db3f494
Remove the debugging IO.inspect
6 years ago
Rin Toshaka
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
kaniini
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
kaniini
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
Maksim Pechnikov
523848d1fd
Salmon# fixed publish an activity to remote accounts
6 years ago
Ivan Tashkinov
7bd49a3222
[ #483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
6 years ago
Ivan Tashkinov
b3574dccbb
[ #483 ] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
...
(<nick>@<our_instance_host>).
6 years ago
Ivan Tashkinov
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
kaniini
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
Ivan Tashkinov
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
6 years ago
Ivan Tashkinov
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
kaniini
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
Ivan Tashkinov
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
Haelwenn (lanodan) Monnier
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
Ivan Tashkinov
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
6 years ago
Vyr Cossont
d8cc96cb1f
Fix Twitter timelines for private instances
6 years ago
kaniini
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
kaniini
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
6 years ago
Ivan Tashkinov
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
Maxim Filippov
be70272ab0
Treat only true and "true" as true
6 years ago
vaartis
708a228919
Set ttl_interval to the seconds_valid time
6 years ago
Vyr Cossont
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
Maxim Filippov
838c024231
Treat any present value in "no_attachment_links" as true
6 years ago
Ekaterina Vaartis
448af3601a
Up captcha timer to 60 secs again, save used captchas in cachex
6 years ago
lain
551d80cc01
Expose restricted names in nodeinfo.
6 years ago
lain
5811e65e67
Add some hard limits on inserted activities.
6 years ago
lain
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
Maxim Filippov
ca2e9ce9cc
Revert unneeded changes
6 years ago
Maxim Filippov
f75f707f6c
Revert Activity tombstones, add ObjectTombstone struct
6 years ago
Maxim Filippov
2bbec33c71
Fix failing tests
6 years ago
Maxim Filippov
18a4cbb244
Capitalize "tombstone"
6 years ago
Maxim Filippov
0f412cf6e6
Create tombstone instead of object deletion
6 years ago
William Pitcock
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
lambda
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
William Pitcock
34a4ed22c4
twitter api: add "Video" to supported activity types list
6 years ago
William Pitcock
79b51a97fe
twitter api: activity representer: remove peertube hack
6 years ago
William Pitcock
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
6 years ago
William Pitcock
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
lambda
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
Haelwenn (lanodan) Monnier
3aff8067e4
transmogrifier: When it’s a Video move "url" to "attachment"
6 years ago
Karen Konou
a7f07bb6e5
Implement kaniini's tweaks
6 years ago
Karen Konou
c76179419d
Renamed the things
6 years ago
Karen Konou
409ff60bf8
Fix formatting
6 years ago
Karen Konou
92362e1e22
Implement large thread filter
6 years ago
Ekaterina Vaartis
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
Ekaterina Vaartis
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
kaniini
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
6 years ago
Ivan Tashkinov
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
Ivan Tashkinov
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
Ivan Tashkinov
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
6 years ago
Ivan Tashkinov
501ce34d7f
[ #114 ] Stylistic adjustments.
6 years ago
Maksim
f1b93b5be7
[ #413 ] fix parse mentions
6 years ago
kaniini
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
raeno
652f49d176
Remove extra bracket
6 years ago
raeno
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
Ivan Tashkinov
b520d44b58
[ #114 ] `mix format`
6 years ago
Ivan Tashkinov
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
6 years ago
Ivan Tashkinov
a532ad5d72
[ #114 ] User.register/1 tweak.
6 years ago
Ivan Tashkinov
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
Ivan Tashkinov
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
kaniini
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
lain
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
rinpatch
ef318fb8a9
Merge branch 'develop' into fix/formatter-ignore-html-chars
6 years ago
rinpatch
059dd6f681
Ignore HTML characters in formatter.ex
6 years ago
Haelwenn (lanodan) Monnier
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
href
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
Ivan Tashkinov
3371a45884
[ #114 ] Formatting fix.
6 years ago
Ivan Tashkinov
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
Ivan Tashkinov
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
Ivan Tashkinov
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
Ivan Tashkinov
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
6 years ago
Ivan Tashkinov
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
6 years ago
raeno
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
href
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
lambda
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
Maksim Pechnikov
92a5133c42
fix text field
6 years ago
lambda
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
lambda
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
6 years ago
lambda
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
6 years ago
lain
e4763cd459
Fix tagging problems for existing instances.
6 years ago
vaartis
35522fef09
Use :ets.match_delete to delete old captchas
6 years ago
href
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
raeno
cc87880488
Support both OAuth token record and token string in UserView
6 years ago
lambda
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
Ekaterina Vaartis
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
6 years ago
Ekaterina Vaartis
3a31fdaf06
Change minutes_retained config to seconds_retained
6 years ago
Ekaterina Vaartis
6062885df6
Add a configurable auto-cleanup for captchas
6 years ago
href
5dcb7aecea
More put_view.
6 years ago
href
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
eal
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
eal
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
Ekaterina Vaartis
8d55a549e6
Replace HTTPoison with Tesla for kocaptha
6 years ago
Ekaterina Vaartis
23549d3952
Formatting fixes
6 years ago
Ekaterina Vaartis
b5518da904
Separate captcha implementation into a behaviour and use it
6 years ago
Haelwenn (lanodan) Monnier
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
lambda
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
6 years ago
Ekaterina Vaartis
28c43a417e
Add an ability to disabled captcha
6 years ago
Ekaterina Vaartis
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
href
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
6 years ago
href
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
href
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
6 years ago
Maksim Pechnikov
ea72ac549b
fix case when tags is invalid
6 years ago
raeno
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
6 years ago
raeno
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
Maksim Pechnikov
d3ec09bb38
fix tags
6 years ago
raeno
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
6 years ago
href
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
Maksim Pechnikov
bc6262d250
fixed typo
6 years ago
href
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
6 years ago
href
412df2cd38
Warn if push is disabled..
6 years ago
Maksim Pechnikov
baead4ea4b
fix markdown formatting
6 years ago
href
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
href
0b4c61e8d5
Fix warning
6 years ago
href
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
6 years ago
href
331396cbcd
Properly disable Web Push if no VAPID key is set
6 years ago
href
6822916183
Typos
6 years ago
href
b1bcd97a0f
Push: respect alerts settings
6 years ago
href
d8984b7bf8
Push: add missing notification_type field
6 years ago
href
7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe
6 years ago
Egor Kislitsyn
324933a0ac
improve push message format (compatibility with mastodon)
6 years ago
Egor Kislitsyn
658edb166f
fix and improve web push; add configuration docs
6 years ago
Ivan Tashkinov
69fd63e248
[ #114 ] Added `invitesEnabled` to `metadata` of nodeinfo.
6 years ago
Ivan Tashkinov
66380b0641
[ #114 ] Removed `confirm_email` action stub (to be addressed in a separate MR).
6 years ago
Ivan Tashkinov
07e93f9940
[ #114 ] Improved tests.
6 years ago
Ivan Tashkinov
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
6 years ago
Ivan Tashkinov
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
6 years ago
Ivan Tashkinov
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
6 years ago
Ivan Tashkinov
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
6 years ago
href
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
Ivan Tashkinov
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
6 years ago
lambda
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
eal
61ad2ce422
TwitterAPI: Include favorited post in json
6 years ago
eal
1ca080c862
Prevent accidental double RTs or favorites
6 years ago
raeno
c5c3ad90d0
Fix tests. Remove oembed template
6 years ago
raeno
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
raeno
018516d3f3
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
6 years ago
raeno
9b3a6cdb07
Extract opengraph/oembed into separate module
6 years ago
raeno
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
6 years ago
raeno
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
6 years ago
raeno
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
6 years ago
Ivan Tashkinov
9e689de063
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
Ivan Tashkinov
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
Ivan Tashkinov
00744c6b03
[ #114 ] Initial implementation of user email invitations.
6 years ago
Ivan Tashkinov
908943352f
[ #114 ] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
6 years ago
href
7214d57463
Extended nicknames: allow dashes.
6 years ago
href
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
6 years ago
Ivan Tashkinov
bfff2399ff
[ #114 ] Routes and config for `confirm_email` and `email_invite` (Twitter API).
6 years ago
Ivan Tashkinov
e3a21bcd45
[ #114 ] Addressed warnings. Fix of `with` statement clause in `password_reset`.
6 years ago
Ivan Tashkinov
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
6 years ago
Ivan Tashkinov
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
6 years ago
Ivan Tashkinov
10c156d98f
[ #114 ] SMTP deps and config.
6 years ago
Maksim Pechnikov
89b3729afa
fix warnings
6 years ago
scarlett
213176c3c3
Add new frontend options to server-side config.
6 years ago
lain
d6bf06ab4f
Fix warnings.
6 years ago
lambda
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
lambda
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
6 years ago
lambda
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
lambda
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
lain
c81c74d847
Treat warnings as errors outside of tests.
6 years ago
Maksim Pechnikov
e94c3442f4
updates
6 years ago
raeno
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
6 years ago
Maksim Pechnikov
074fa790ba
fix compile warnings
6 years ago
Maksim Pechnikov
068353ac0b
formatting
6 years ago
Maksim Pechnikov
9442588ae9
fix hashtags in api response
6 years ago
Rin Toshaka
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
6 years ago
lambda
beadeaffa1
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
...
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
6 years ago
href
bdc8112e40
Media proxy: fix url encoding
6 years ago
Rin Toshaka
578051809f
Add uploadlimit to Twitter API config
6 years ago
lambda
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
lambda
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
href
134cc94cbd
Nodeinfo: remove null features; relay feature.
6 years ago
href
d8fcf7c5cf
Media proxy: follow HTTP redirects by default
6 years ago
lambda
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago
Rin Toshaka
09f20de0d7
Make gopher respect ip
6 years ago
href
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
6 years ago
href
3c925e9d88
Emojis: Alphabetical ordering
6 years ago
Ivan Tashkinov
1cea97df64
[ #394 ] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
6 years ago
Ivan Tashkinov
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
Ivan Tashkinov
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
Ivan Tashkinov
7bcb6a183a
[ #394 ] Refactoring.
6 years ago
Ivan Tashkinov
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
kaniini
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
kaniini
abead01ab6
Merge branch 'correct-and-improve-http-options' into 'develop'
...
Correct and improve http options
See merge request pleroma/pleroma!505
6 years ago
kaniini
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
rinpatch
2ae1128d9f
MastoAPI: Fix put_settings
6 years ago
scarlett
d27e3f269f
Rename regular expression 'have_re' to 'reply_prefix'.
6 years ago
Egor Kislitsyn
6f36e903b0
use `User.avatar_url`
6 years ago
Egor Kislitsyn
79668c08fc
cleanup
6 years ago
scarlett
3dff61ebec
Harden re: detection.
6 years ago
Egor Kislitsyn
3d492795b7
clean up
6 years ago
Egor Kislitsyn
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
Egor Kislitsyn
bac58b1524
show warning if VAPID is not set
6 years ago
Egor Kislitsyn
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
Egor Kislitsyn
04a48286e6
Add web push support
6 years ago
scarlett
6a6aaa0e1a
Use object.normalize.
6 years ago
Hakaba Hitoyo
a09ed0f5af
avoid mix format bug
6 years ago
kaniini
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
Ivan Tashkinov
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
Hakaba Hitoyo
96ba95df2e
remove follow_redirect options
6 years ago
Hakaba Hitoyo
27792b2d77
remove pool and timeout options which duplicate with the default
6 years ago
Hakaba Hitoyo
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
6 years ago
kaniini
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
6 years ago
Vald
194869c7db
added data attrs to twitter scrubber
6 years ago
lain
7d5720f2e4
Fix merge.
6 years ago
lain
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
6 years ago
lain
3ea4476445
MastodonAPI: Show users their own network.
6 years ago
lain
fdac215091
TwitterAPI: Show users their own network.
6 years ago
Vald
3ccfe226c0
added data attrs for user and tag
6 years ago
Ivan Tashkinov
3b5be09f45
[ #210 ] Stylistic change.
6 years ago
lain
839526a913
TwitterAPI: Add network hiding.
6 years ago
Ivan Tashkinov
c4f3c5e939
[ #210 ] Stylistic change.
6 years ago
Maksim Pechnikov
c524c50509
fix/273
6 years ago
Ivan Tashkinov
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
Ivan Tashkinov
be187f82f7
[ #210 ] Further refactoring.
6 years ago
hakabahitoyo
a418547bdf
debug /api/v1/suggestions
6 years ago
William Pitcock
956f3c75ca
user: put default user info when registering a user
6 years ago
scarlett
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
6 years ago
kaniini
ec1ec32f20
Merge branch 'optional-retry-queue' into 'develop'
...
Make retry queue optional.
See merge request pleroma/pleroma!498
6 years ago
lain
925b05054f
Make retry queue optional.
...
At the moment, it can use a lot of memory really fast.
6 years ago
kaniini
114b95cee2
Merge branch 'feature/integration_tesla' into 'develop'
...
[#354 ] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
6 years ago
William Pitcock
b57d83e3c9
MRF: simple policy: fix media removal
6 years ago
Ivan Tashkinov
48e6193bf2
[ #210 ] Refactoring.
6 years ago
Ivan Tashkinov
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
6 years ago
Maksim Pechnikov
50e72f6c48
remove httpoison_mock
6 years ago
Maksim Pechnikov
dd8aee332c
formatting the code
6 years ago
Maksim Pechnikov
a9e4a97586
update test
6 years ago
Maksim Pechnikov
87109482f3
status_code -> status
6 years ago
Maksim Pechnikov
97252a27d9
fix http request in Salmon
6 years ago
Maksim Pechnikov
ec34de0c1f
WebSub fix test
6 years ago
Maksim Pechnikov
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
6 years ago
William Pitcock
d6ab701a14
formatting
6 years ago
William Pitcock
b3b52b58c3
activitypub: transmogrifier: remove obsolete fetch_obj_helper()
6 years ago
William Pitcock
fed9b5404c
object: rework Object.normalize() a bit to support transparent fetching
6 years ago
William Pitcock
02288b5f1c
twitterapi: fix bad rebase
6 years ago
William Pitcock
7a57db0d3a
federator: fix up contain_origin_from_id() call
6 years ago
William Pitcock
f85949cc69
object: factor out fetching functions into Pleroma.Object.Fetcher module
6 years ago
William Pitcock
e8caecb5c7
object: move object containment out of transmogrifier into it's own module
6 years ago
William Pitcock
5d753e1c7c
activity: add helpers for updating activities in the database
6 years ago
William Pitcock
6f90f2c3ac
activitypub: rework thread filtering for split object view
6 years ago
William Pitcock
f168a2add6
ostatus: fix representing external objects
6 years ago
William Pitcock
cf139e3eec
activitypub: transmogrifier: ensure we send nested object in Create
6 years ago
William Pitcock
d6e65f9304
common api: fix up improper Object.normalize() calls
6 years ago
William Pitcock
d13d953385
activitypub: implement activity flattening
6 years ago
William Pitcock
57d90e7afe
activitypub: relay: fix improper use of Object.normalize()
6 years ago
William Pitcock
5ea64f4bf9
activity: minor cleanups to normalization functions to align them with the object normalizers
6 years ago
William Pitcock
5ba5df1321
object: normalize(): use object cache
6 years ago
William Pitcock
e8570758f9
twitterapi: fix remaining test failures
6 years ago
William Pitcock
3b8e5bcbeb
fix most tests
6 years ago
William Pitcock
dd66cc2ca6
ostatus: use Object.normalize() where appropriate when representing activities
6 years ago
William Pitcock
5d4a71906a
mastodon api: use Object.normalize() in a few missing spots
6 years ago
William Pitcock
e9b718cea2
mastodon api: status view: use Object.normalize()
6 years ago
William Pitcock
95a458f392
twitterapi: more object normalization work
6 years ago
William Pitcock
4482ce7e2d
activitypub: normalize objects when streaming them out
6 years ago
William Pitcock
d3fde9b5f2
ostatus: note handler: appropriately use Object.normalize()
6 years ago
William Pitcock
67038ae15e
common api: utils: access inReplyTo object ID correctly
6 years ago
William Pitcock
d6b266163b
common api: fetch visibility from normalized object
6 years ago
William Pitcock
0522b26883
gopher: use Object.normalize()
6 years ago
William Pitcock
663007b42c
activity: clean up direct use of object data
6 years ago
lambda
88b05aeabb
Merge branch 'fix/parse-user-bio' into 'develop'
...
Parse user's bio on register
See merge request pleroma/pleroma!492
6 years ago
lambda
42ef7cd227
Merge branch 'fix-media-proxy-defaults' into 'develop'
...
Fix media proxy config defaults
See merge request pleroma/pleroma!495
6 years ago
Maxim Filippov
4b70e5eae9
Parse bio for MastodonAPI
6 years ago
rinpatch
343b0adfa6
Merge branch 'develop' into fix/theora-detection-read-bytes
6 years ago
rinpatch
a3953ca37a
Change @read_bytes to 35
6 years ago
Maxim Filippov
ce98d5eb9b
Parse user's bio on register
6 years ago
lain
8c9a4e8b40
TwitterAPI: Implement hide_network.
6 years ago
lain
2a639de9b3
MastodonApi: Implement hide_network.
6 years ago
lain
6be0ab1e55
Hide network in ap.
6 years ago
href
43d5e4f7fa
Fix media proxy config defaults
6 years ago
lain
91065e1968
Fix background updating / handling.
6 years ago
lain
f18b86fd5f
More fixes for Info schema.
6 years ago
lain
93f2dc19d9
TwitterAPI: Fix banner and background update.
6 years ago
lain
347df6421d
Fix masto api user updating.
6 years ago
lain
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
1c67277c80
Fix admin api.
6 years ago
href
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
6 years ago
kaniini
ca24ad2a2b
Merge branch 'feature/reverse-proxy' into 'develop'
...
reverse proxy / uploads
See merge request pleroma/pleroma!470
6 years ago
href
8e0e20631c
Reverse proxy: default max read duration at 30 secs.
6 years ago
lambda
e99bab8f27
Merge branch 'config-delete' into 'develop'
...
Add Pleroma.Config.delete/1
See merge request pleroma/pleroma!484
6 years ago
href
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
href
253da275bd
Pleroma.Config.delete/1
6 years ago
href
7282937f33
MIME: video/audio ogg detection
6 years ago
href
680716b3c9
Config docs
6 years ago
href
65e7307d68
Upload: bring back base_url
6 years ago
href
5d92431350
Fix deprecation warnings
6 years ago
href
02d3dc6869
Uploads fun, part. 2
6 years ago
href
97b00d366f
reverse_proxy: more headers
6 years ago
href
a2640c8088
Parse correctly content-type & do not forward content-length
6 years ago
href
b19597f602
reverse proxy / uploads
6 years ago
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
lain
8f1fffebc6
Fix transmogrifier test.
6 years ago
lain
d088ac6286
Fix OStatus user updates.
...
Breaks banner updating.
6 years ago
lain
48b95a9b95
Assorted fixes.
6 years ago
lain
d407f662af
Fix TwitterApiController.
6 years ago
lain
a6812bc9df
Remove "most recent notification" endpoint.
6 years ago
KokaKiwi
87098d1676
Streamer: Don't send unwanted DMs to list streams
6 years ago
lain
e002858071
Fix ostatus test.
6 years ago
lain
3c61df6b9e
Webfinger fixes.
6 years ago
lain
badbe2656c
More fixes.
6 years ago
kaniini
b9bc83097d
Merge branch 'ogg-theora-detection' into 'develop'
...
Add Theora detection to upload.ex
See merge request pleroma/pleroma!479
6 years ago
lain
ec464ef20a
HTTP sig fixes.
6 years ago
rinpatch
0d229613df
Fix lint error
6 years ago
rinpatch
7f20a3cf1f
Add Theora detection to upload.ex
6 years ago
Haelwenn
5ae6088d37
Merge branch 'feature/mrf-user-allowlist' into 'develop'
...
MRF: user allowlist module
See merge request pleroma/pleroma!477
6 years ago
kaniini
a76058fc1d
Merge branch 'fix/pleromafe-title' into 'develop'
...
Replace hardcoded <title>
See merge request pleroma/pleroma!476
6 years ago
William Pitcock
271f9f1335
nodeinfo: add mrf_user_allowlist data
6 years ago
William Pitcock
8c05d19c7f
MRF: add user allowlist module
6 years ago
Mark Felder
6cc94404d7
Replace this hardcoded <title>
6 years ago
Haelwenn (lanodan) Monnier
04daa0fa44
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
...
This fixes running mastofe with MIX_ENV=dev
6 years ago
shibayashi
591b11eafc
Add manifest-src to allow manifest.json
6 years ago
Haelwenn (lanodan) Monnier
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation
6 years ago
Haelwenn (lanodan) Monnier
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
6 years ago
Haelwenn (lanodan) Monnier
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
...
reported by soka on CRTNet
6 years ago
kaniini
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
6 years ago
kaniini
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
6 years ago
kaniini
a591a044a9
Merge branch 'runtime-fixes' into 'develop'
...
Various runtime configuration fixes
See merge request pleroma/pleroma!468
6 years ago
lain
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
d3180e0ccc
Raise on usage of old function.
6 years ago
lain
0896cf4c0f
Fix most mastodon api bugs.
6 years ago
Haelwenn
c7d08bc1cf
Merge branch 'feature/retry-queue' into 'develop'
...
Federator: add retry queue.
See merge request pleroma/pleroma!323
6 years ago
William Pitcock
3456948cd1
mastodon api: fix up quite a few test failures
6 years ago
William Pitcock
ef6c64a5d2
activitypub: fix restrict_blocked()
6 years ago
William Pitcock
c196754b4d
mastodon api: account view: fix tests
6 years ago
William Pitcock
ece8656733
streamer: fix fetching the user's block list
6 years ago
William Pitcock
3356c7d1e9
oauth plug: fix deactivated check
6 years ago
William Pitcock
4ac849cb4a
common api: fix moderator check when deleting posts
6 years ago
William Pitcock
312676f711
user: fix user.info lookup in User.locked?()
6 years ago
lain
6f0b9a5163
Fix Notification tests.
6 years ago
lain
2887f4ff1d
Fix formatter tests.
6 years ago
href
bc5cf2c192
Improved version string
6 years ago
href
7f4c3a1e99
mediaproxy: fix empty url & add some tests
6 years ago
eal
689b46efc8
RetryQueue: tiny refractor, add tests
6 years ago
href
bcecdc3ab1
Various runtime configuration fixes
6 years ago
lain
fbb70d25fe
Several twitter api fixes.
6 years ago
lain
40d9d2098c
Fix user updating from AP.
6 years ago
lain
cafa15131a
Mix format.
6 years ago
lain
4c918392c6
Fix most User tests.
6 years ago
lain
e7cd6e9739
Fix setting of keys.
6 years ago
lain
fc3bcf335e
Fix following locked users.
6 years ago
lain
d5af41b577
Fix note count update.
6 years ago
lain
6f90ceb2ed
Fix follower count test.
6 years ago
lain
812f5b058a
Fix blocking.
6 years ago
lain
756764266c
Formatting.
6 years ago
lain
b396dba425
Fix follower count setting.
6 years ago
lain
5c8f07f0a8
Fix note counting.
6 years ago
lain
47d883d3ab
Fix User deactivation.
6 years ago
lain
50585d051b
Add User.Info module
...
To validate and mutate the user.info field.
6 years ago
eal
62299be094
Federator: add retry queue.
6 years ago
William Pitcock
f6be980f4f
activitypub: object view: avoid leaking private details
6 years ago
William Pitcock
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
6 years ago
William Pitcock
dfcfb184b1
activitypub: transmogrifier: make deletes secure
6 years ago
Haelwenn (lanodan) Monnier
0ca00b3a07
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit
6 years ago
Haelwenn (lanodan) Monnier
12ccf0c4f8
Change Relay from `status` to `{status, message}`
6 years ago
Haelwenn (lanodan) Monnier
4634d99d0d
Web.Router: Change right to permission group (except for function names)
6 years ago
William Pitcock
0d1375f274
federator: return :ok or :error depending on if an AP doc was accepted or not
6 years ago
William Pitcock
3d9266a8cb
federator: do origin containment when processing inbound messages
6 years ago
William Pitcock
c88533209c
activitypub: user fetching: use fetch_and_contain_remote_object_from_id()
6 years ago
William Pitcock
daa8ec3d62
activitypub: factor out AP object fetching to it's own function and add ID-based containment
6 years ago
Haelwenn (lanodan) Monnier
e0b0fde713
Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names)
6 years ago
Haelwenn (lanodan) Monnier
ccd6b1956d
lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow
6 years ago
Haelwenn (lanodan) Monnier
265c8c5209
Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t
6 years ago
Haelwenn (lanodan) Monnier
4a79b89dba
lib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not admin.”
6 years ago
Haelwenn (lanodan) Monnier
f9d05902fe
lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves
6 years ago
Haelwenn (lanodan) Monnier
a87ed2fad6
Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format
6 years ago
Haelwenn (lanodan) Monnier
f48062488e
Add get endpoints for rights [AdminAPI]
6 years ago
Haelwenn (lanodan) Monnier
59ce7fedce
Fix connection returns make generic right endpoint [AdminAPI]
6 years ago
Haelwenn (lanodan) Monnier
c5a2bd6a65
admin_api_controller.ex: fix remaining params at once
6 years ago
Haelwenn (lanodan) Monnier
95b107b6cc
admin_api_controller.ex: Add documentation, fix get_invite_token
6 years ago
Haelwenn (lanodan) Monnier
578a911737
admin_api_controller.ex: get_password_reset: fix params and response
6 years ago
Haelwenn (lanodan) Monnier
5732eef16b
lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController
6 years ago
Haelwenn (lanodan) Monnier
c8b8f1d32c
[Pleroma.Plugs.UserIsAdminPlug]: Check if admin is true instead of false, fix error reporting
6 years ago
Haelwenn (lanodan) Monnier
7076d45cb6
lib/pleroma/plugs/user_is_admin_plug.ex: Create
6 years ago
Haelwenn (lanodan) Monnier
77d2fd54dd
admin_api_controller: Have some basic code
6 years ago
Haelwenn (lanodan) Monnier
ee2e1328ad
admin_api_controller.ex: Create
6 years ago
William Pitcock
603fccf175
activitypub: fetch_object_from_id(): prefer `actor` over `attributedTo` to avoid spoofing
6 years ago
kaniini
05967472f2
Merge branch 'feature/uploader-mdii' into 'develop'
...
Feature / MDII Uploader
See merge request pleroma/pleroma!454
6 years ago
hakabahitoyo
59e079f641
fallbacking into local uploader
6 years ago
hakabahitoyo
8fd0556c78
better config reading
6 years ago
lain
f87b315618
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
6 years ago
lambda
2f639ea129
Merge branch 'feature/pleromafe-usersearch' into 'develop'
...
Add Twitter / Pleroma API user search
See merge request pleroma/pleroma!452
6 years ago
William Pitcock
c07464607d
http security: remove form-action from CSP definitions
6 years ago
lain
e8d8c84f79
Add better test for user search functionlity.
6 years ago
hakabahitoyo
55abd8482e
better config
6 years ago
hakabahitoyo
52224de39f
better extension detection
6 years ago
hakabahitoyo
4fbfacf5e1
debug
6 years ago
hakabahitoyo
8e707aba29
format
6 years ago
Hakaba Hitoyo
ebe658c169
debuf
6 years ago
Hakaba Hitoyo
698cb3587c
omplement mdii uploader
6 years ago
Hakaba Hitoyo
58af0787be
add mdii uploader
6 years ago
lain
27aa136aac
Format.
6 years ago
lain
7b170cd616
Add Pleroma user search api for PleromaFE.
6 years ago
lambda
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
kaniini
69d557e86d
Merge branch 'twitter-api-direct-messages' into 'develop'
...
Twitter api direct messages
See merge request pleroma/pleroma!449
6 years ago
href
f52a1d1ec5
media_proxy: use path only to retrieve filename
6 years ago
lain
ea9a776d7b
TwitterApi: Add direct message endpoint
6 years ago
lain
2cf40237ff
MastodonAPI: Add pagination to private messages.
6 years ago
href
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
shibayashi
87c76a9a2f
Add __Host- prefix when secure flag is enabled
6 years ago
scarlett
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
scarlett
cb6fd73861
Twitter API: Fall back to user.nickname if user has no name
6 years ago
kaniini
54923c2e55
Merge branch 'feature/csp-plug' into 'develop'
...
migrate CSP management to CSPPlug
See merge request pleroma/pleroma!441
6 years ago
William Pitcock
ee5932a504
http security: allow referrer-policy to be configured
6 years ago
William Pitcock
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
6 years ago
KokaKiwi
1592fa2bea
Mastodon API: Fix list streaming
6 years ago
William Pitcock
df72978dce
csp plug: add support for certificate transparency
6 years ago
William Pitcock
331cf6ada1
csp plug: add sts support
6 years ago
William Pitcock
f516e317ea
plugs: add CSPPlug
6 years ago
William Pitcock
419ed3a0ca
oauth: fix token decode regression
6 years ago
William Pitcock
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
William Pitcock
f8310114a6
activitypub: object view: sanitize both the activity and the object when an activity is given for rendering
6 years ago
kaniini
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
kaniini
7daa102fa4
Merge branch 'bugfix/local-jsonld-context' into 'develop'
...
Host LitePub JSON-LD context locally
See merge request pleroma/pleroma!435
6 years ago
William Pitcock
4f87b8362b
endpoint: move CORSPlug in front of Plug.Static
6 years ago
William Pitcock
03a9990baf
endpoint: fix formatting
6 years ago
William Pitcock
e6d246882d
federator: don't federate anything other than Note objects to OStatus
6 years ago
William Pitcock
e4971553c7
activitypub: utils: use same object type list for mention extraction as insertion
6 years ago
William Pitcock
b3c360ce2c
notification: add fallback get_notified_from_activity()
6 years ago
William Pitcock
b9871e7e5a
activitypub: utils: wrap Note objects in a Create when extracting mentions
6 years ago
William Pitcock
8c805ada32
user: remove obsolete User.get_notified_from_activity().
6 years ago
William Pitcock
6cadfcb21e
activitypub: utils: switch to using new Notification.get_notified_from_activity().
6 years ago
William Pitcock
cdfdd77e30
notification: implement new Notification.get_notified_from_activity()
6 years ago
William Pitcock
d26cd6c1bf
user: factor out user set fetching from User.get_notified_from_activity()
6 years ago
William Pitcock
81d6ca1783
user: implement AS2 mention extraction + unify Announce handling
6 years ago
William Pitcock
6b4064fa5d
activitypub: transmogrifier: unify mention extraction
6 years ago
William Pitcock
0a2c1a3419
user: add optional local_only param to get_notified_from_activity()
6 years ago
Haelwenn (lanodan) Monnier
2fab32ab61
Pleroma.Web.Endpoint: Whitelist schemas directory
6 years ago
Haelwenn (lanodan) Monnier
934125695d
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld
6 years ago
William Pitcock
4e93d6ae14
common api: utils: flip to/cc for mentions
6 years ago
William Pitcock
3e33479c05
activitypub: transmogrifier: only consider `to` users as mention targets
6 years ago
William Pitcock
144dc048b8
user: only consider `to` recipients as mention targets
6 years ago
Haelwenn (lanodan) Monnier
abcacec97d
Pleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead of Github-hosted one
6 years ago
William Pitcock
da16ada424
utils: use litepub @context instead of that huge mess
6 years ago
William Pitcock
f733470037
user view: unify a @context entry that was missed
6 years ago
lambda
59cf7cf235
Merge branch 'small-jsonld-refactor' into 'develop'
...
Small jsonld refactor
See merge request pleroma/pleroma!433
6 years ago
lain
34bd411781
Unify json ld header handling.
6 years ago
lain
3b02fd9fb7
Small refactor.
6 years ago
kaniini
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
kaniini
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
6 years ago
href
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
href
9070588493
Runtime config: MRF changes
6 years ago
William Pitcock
b2105a3131
twitterapi: add notification read endpoint
6 years ago
William Pitcock
f16c2e0b1b
notification: add Notification.set_read_up_to()
6 years ago
href
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
kaniini
a68c18f0ad
Merge branch 'unify-mastodon-oauth' into 'develop'
...
Unify Mastodon Login with OAuth login.
See merge request pleroma/pleroma!429
6 years ago
kaniini
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
6 years ago
lain
a8f1e30cb8
Formatting.
6 years ago
href
7d328c658d
Small wrapper module around Application.get_env/put_env
...
Same API as the old Pleroma.Config
6 years ago
lain
4f640c43ed
Unify Mastodon Login with OAuth login.
...
This removes duplication in the login code.
6 years ago
href
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
href
013f7ba8c1
Add federating plug & public tests
6 years ago
href
83911b1443
Fix wrong return when finmoji is disabled
6 years ago
href
fd0e7d18d9
handle_continue is OTP21+
6 years ago
href
6fe23c5458
Runtime configured router
6 years ago
href
d096bc17bf
revert endpoint position in supervision tree
6 years ago
href
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
kaniini
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
Haelwenn (lanodan) Monnier
3e50bb667f
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
6 years ago
lain
e954cfcc2c
Add CORSPlug to make web-based OAuth easier.
6 years ago
lambda
4bcdbb12a4
Merge branch 'fix_hashtag_search' into 'develop'
...
Fix hashtag search
See merge request pleroma/pleroma!418
6 years ago
Mark Felder
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
lain
45ebc8dd9a
Check for empty string in_reply_to ids.
6 years ago
Haelwenn (lanodan) Monnier
3c7d4ff271
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
6 years ago
William Pitcock
24ba08de13
twitter api: add support for rendering Page objects
6 years ago
William Pitcock
4d8f076125
mastodon api: add support for rendering Page objects
6 years ago
William Pitcock
9f03b5c4f7
activitypub: transmogrifier: add support for Page objects
6 years ago
Lee Starnes
585b29337c
Ensure filters have a filter_id
6 years ago
kaniini
eba9a62024
Merge branch 'feature/relay-tests' into 'develop'
...
relay tests
See merge request pleroma/pleroma!411
6 years ago
Haelwenn
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
lain
1e9ced5af4
Test Relay, switch to runtime configuration.
6 years ago
lain
e6ec01afb6
Start configuration manager.
6 years ago
lain
9b77030d3c
Add basic configuration management module.
6 years ago
Haelwenn (lanodan) Monnier
b2da5262ea
Pleroma.Web.ActivityPub.Transmogrifier: fix_url when not a string/empty
...
Thanks prismo.news, I hate it
6 years ago
Haelwenn (lanodan) Monnier
755f166406
Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string
6 years ago
William Pitcock
2b3a40d038
object: split object_cache from user_cache
6 years ago
William Pitcock
f584a603f9
user: make User.delete() return data consistent with Object.delete()
6 years ago
William Pitcock
2c3bfd7f76
user: delete user_info data in User.invalidate_cache()
6 years ago
William Pitcock
10f3958468
object: return the deleted object as well
6 years ago
William Pitcock
2bf358d7b4
activitypub: use Object.delete() instead of mutating the database and cache directly
6 years ago
William Pitcock
c4e43da63e
object: add safe object deletion function
6 years ago
Haelwenn (lanodan) Monnier
558e6a84d6
[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/346
6 years ago
William Pitcock
47f76bf4b1
common api: allow self-liking objects
...
mastodon allows this, for whatever reason.
closes #347 .
6 years ago
kaniini
5fea3d9eca
Merge branch 'allow-abbr' into 'develop'
...
Allow use of the `abbr` HTML tag.
See merge request pleroma/pleroma!405
6 years ago
scarlett
795634c90f
Allow use of the `abbr` HTML tag.
6 years ago
scarlett
b92e38d2d4
Add user reactivation task.
6 years ago
kaniini
a880e0a527
Merge branch 'feature/upload-limits' into 'develop'
...
configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401
6 years ago
William Pitcock
676c97b8c7
nodeinfo: expose configured upload limits
6 years ago
William Pitcock
36825932eb
s3 uploader: add new feature to force public attachment URIs to go through media proxy
6 years ago
William Pitcock
f407831120
common api: prefer formatting attachments using the attachment's name instead of URI
6 years ago
William Pitcock
784b3a615d
utils: fix another possible leak with private S3 backends using mediaproxy
...
same rationale as the other mediaproxy changes
6 years ago
William Pitcock
181f3bb56a
mastodon api: enforce upload limits for avatars and banners
6 years ago
William Pitcock
e12489e2fe
twitter api: enforce upload limits for avatars, banners and backgrounds
6 years ago
William Pitcock
167d3789a5
activitypub: upload: pass through an upload limit if one is provided
6 years ago
William Pitcock
fa483cd7c2
upload: add new optional argument designating an upload size limit
6 years ago
William Pitcock
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
William Pitcock
72ea54de6e
activitypub: fix possible false positives with broken thread filtering
6 years ago
kaniini
44762daf51
Merge branch 'feature/broken-thread-filtering' into 'develop'
...
broken thread filtering, part 1
See merge request pleroma/pleroma!394
6 years ago
William Pitcock
c302c619b9
http: fix mediaproxy
6 years ago
William Pitcock
26eb11c172
activitypub: add support for filtering broken threads out of timelines
6 years ago
William Pitcock
7338368ad9
http: enable keepalive / connection pooling ( closes #336 )
6 years ago
William Pitcock
f6cb963df2
activitypub utils: fix recipient check when the message is unaddressed (mastodon)
6 years ago
Haelwenn (lanodan) Monnier
7906dfe5a0
[Pleroma.Web.Nodeinfo.NodeinfoController]: Simplify features strings
6 years ago
Haelwenn (lanodan) Monnier
57330dd91b
[Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features
6 years ago
kaniini
9fe9c09883
Merge branch 'finmoji-optional' into 'develop'
...
Make finmoji optional
See merge request pleroma/pleroma!391
6 years ago
scarlett
ae5beb7b64
Make finmoji optional
6 years ago
William Pitcock
ce70eb8c00
activitypub utils: fix user splicing
6 years ago
William Pitcock
2f1f1a4f30
activitypub: splice users into recipient lists when they receive messages at their personal inbox
...
closes #343
6 years ago
kaniini
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
Haelwenn
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
William Pitcock
5383887bd4
transmogrifier: do not try to contain origin of something which doesn't have one
6 years ago
Haelwenn (lanodan) Monnier
b386888a0e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4
...
Better be sure than sorry
6 years ago
William Pitcock
1ed25c963a
twitterapi: activity view: add the other in_reply_to fields
6 years ago
William Pitcock
1b480e3514
user: add helper for fetching profile url (which may be different than ap id)
6 years ago
Haelwenn (lanodan) Monnier
b112112c11
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4
6 years ago
Haelwenn (lanodan) Monnier
b0a940d5a2
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments
6 years ago
Haelwenn (lanodan) Monnier
2da0ffeb28
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil
6 years ago
Haelwenn (lanodan) Monnier
0c10be8731
[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json
6 years ago
Haelwenn (lanodan) Monnier
3b0e9287a5
[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views
6 years ago
William Pitcock
fee43ae5e7
twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper
6 years ago
William Pitcock
f3f736afc4
activity: add helper to fetch an activity's parent
6 years ago
kaniini
945ce9910d
Merge branch 'bugfix/html-scrub-comments' into 'develop'
...
html: ensure comments are correctly scrubbed
See merge request pleroma/pleroma!384
6 years ago
William Pitcock
8613db0e3b
html: ensure comments are correctly scrubbed
6 years ago
scarlett
a253c1466e
New frontend options
6 years ago
AkiraFukushima
a249cbf187
Add a test for List.get_lists_account_belongs
6 years ago
AkiraFukushima
e8c698af41
Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs
6 years ago
kaniini
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
William Pitcock
595d855f0e
html scrubbing policies: restrict img tags to http/https only for mediaproxy compatibility
6 years ago
Haelwenn (lanodan) Monnier
2154c5dcd8
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
6 years ago
William Pitcock
582dbe5c8d
formatter: fix matching osada users
6 years ago
scarlett
7562912f6a
Use maybe_direct_follow for follow imports
6 years ago
Haelwenn (lanodan) Monnier
d7654c77de
lib/pleroma/html.ex: Use a function as a variable (broken for some reason)
6 years ago
Haelwenn (lanodan) Monnier
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
William Pitcock
30efa86c05
common api: enable tag linking in markdown mode
6 years ago
Haelwenn (lanodan) Monnier
eacab0fb05
Delete Tokens and Authorizations on password change
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
6 years ago
William Pitcock
51eaece3ea
user: break out local cases for maybe_direct_follow
6 years ago
William Pitcock
2c29329d39
user: local users are always AP-enabled ( closes #316 )
6 years ago
William Pitcock
111841ad34
common api: take the combination of the subject and content for length limit enforcement
...
closes #315
6 years ago
William Pitcock
08d5ad71b6
nodeinfo: allow opting out of MRF transparency
6 years ago
William Pitcock
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
6 years ago
William Pitcock
7f530f6f80
mastodon api: relationship view: better handle no pre-existing follow activity
6 years ago
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
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
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
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
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
6 years ago
William Pitcock
707077edde
activitypub: don't fall back to OStatus fetching when MRF rejects an object
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
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
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
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
Martin Kühl
d94ee5cd50
Mastodon API: Support push subscription CRUD
6 years ago
Martin Kühl
c2d592c9c5
Assign token to connection
6 years ago
William Pitcock
7f0e291483
html: twittertext: add missing catchall scrub function
6 years ago
William Pitcock
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
6 years ago
William Pitcock
df00a364fb
mastodon api: formatting
6 years ago
William Pitcock
c2b69798dd
twitter api: add support for disabling rich text
6 years ago
William Pitcock
958e085acb
mastodon api: add support for user-supplied html policy
6 years ago
William Pitcock
2f5b026548
twitter api: add support for user-specified html policy
6 years ago
William Pitcock
735cdfb848
user: add User.html_filter_policy()
6 years ago
William Pitcock
8ae9424edb
html: default to using normal scrub policy if provided scrub policy is nil
6 years ago
kaniini
4cb6331843
Merge branch 'feature/dynamic-user-refresh' into 'develop'
...
user: implement dynamic refresh of profiles
See merge request pleroma/pleroma!350
6 years ago
kaniini
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
William Pitcock
c9f6eb9a41
user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)
6 years ago
Haelwenn (lanodan) Monnier
40c51f118f
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
6 years ago
Haelwenn (lanodan) Monnier
f74725df41
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
6 years ago
Haelwenn (lanodan) Monnier
33a1e92584
[Pleroma.Web.Router]: Fake /api/v1/endorsements
6 years ago
Haelwenn (lanodan) Monnier
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
6 years ago
Haelwenn (lanodan) Monnier
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
6 years ago
William Pitcock
c9585ec007
twitter api: fix mimetype fallback when attachments use a URI instead of a URL object
6 years ago
William Pitcock
0cac493fdc
mastodon api: default attachment type to image if one is not present
6 years ago
Martin Kühl
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e1
.
The fake support was superseded by 6e030129fb
which actually implements the faked filters API.
This change removes the fake support and ensures that the actual implementation is used.
6 years ago
Dominique Feyer
9b0f2d572b
Return 204 response on options request
6 years ago
William Pitcock
a7d0ecdc7c
html: add policy which transforms inline images to pass through the media proxy
6 years ago
William Pitcock
cd13fa17fd
html: allow scrubbing policies to be stackable
6 years ago
William Pitcock
342ed84446
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
6 years ago
William Pitcock
95376ac1fe
html: add the ability to override the default scrub policy
6 years ago
kaniini
c2650f0ffb
Merge branch 'feature/html-scrub-policy' into 'develop'
...
html scrub policy
See merge request pleroma/pleroma!339
6 years ago
shadowfacts
39aed5348a
Add visible_in_picker to status emojis
6 years ago
William Pitcock
d3248e13e3
activitypub: transmogrifier: allow profile updates from bots
6 years ago
William Pitcock
e0b8c0ccba
MRF: reject non-public: use pattern match to remove unnecessary if block
6 years ago
William Pitcock
88094c266d
MRF: simple policy: refactor module to use guards and pattern matching
6 years ago
William Pitcock
97253df3ee
MRF: simple policy: contain media removal/nsfw ops to create activities only
6 years ago
William Pitcock
e82ce2a4b3
formatting
6 years ago
William Pitcock
358f88e10a
html: allow inline images by default (because of custom emoji)
6 years ago
William Pitcock
40e2f6e500
html: add default scrubbing profile and configuration knobs
6 years ago
William Pitcock
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
William Pitcock
255f46d7ab
html: new module providing a configurable markup scrubbing policy
6 years ago
Dominique Feyer
801d645c6b
TASK: Fix formatting
6 years ago
Dominique Feyer
b79c126ee0
Add missing URL encoding in create authorization redirect
6 years ago
Hakaba Hitoyo
4e1bb7bccb
make limit for /api/v1/suggestions
6 years ago
lambda
045953225e
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
...
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
6 years ago
kaniini
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
kaniini
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
Martin Kühl
c1d07da4e1
Mastodon API: Fake support for loading filters
6 years ago
Martin Kühl
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
lain
70163aec9b
Add LegacyAuthenticationPlug to router.
6 years ago
lain
44b094908c
Update legacy passwords automatically.
6 years ago
lain
3aba585e7a
Add Plugs to router.
6 years ago
lain
e601165426
Add UserEnabledPlug.
6 years ago
lain
5ce1ebb179
Add SetUserSessionIdPlug.
6 years ago
Haelwenn
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
lain
636ad3e155
Add new plugs to router.
6 years ago
lain
12bc73dd28
Add EnsureUserKeyPlug, smaller fixes
6 years ago
lain
32465b9939
Simplify AuthenticationPlug
6 years ago
lain
9a96c93be7
Add SessionAuthenticationPlug.
6 years ago
lain
a3f54fca4d
Add LegacyAuthenticationPlug
6 years ago
lain
3cf17dc402
Add EnsureAuthenticatedPlug
6 years ago
lain
faf5347748
Add UserFetcherPlug.
6 years ago
lain
42bd985e66
Add BasicAuthDecoderPlug
6 years ago
Moon Man
8b020e03a6
change cond to if else
6 years ago
Moon Man
1a8bc26e52
auth against sha512-crypt password hashes, upgrade to pbkdf2
6 years ago
kaniini
76c67a41c1
Merge branch 'develop' into 'feature/staff-discovery-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
6 years ago
William Pitcock
9a21ff5f61
nodeinfo: add staffAccounts field to metadata
6 years ago
kaniini
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
Hakaba Hitoyo
b1124f1605
report chat and gopher support at /nodeinfo/2.0.json
6 years ago
William Pitcock
b61430163b
user: add moderator_user_query()
6 years ago
kaniini
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
shadowfacts
35515cfa66
Update mastodon_api_controller.ex
6 years ago
shadowfacts
26f8697400
Update mastodon_api_controller.ex
6 years ago
shadowfacts
2b2bd0e047
Render notification IDs as strings, not numbers
6 years ago
Thurloat
4257f784bc
sloop around get_emoji/1 to check is_binary and have a fallthrough
...
default that returns empty
6 years ago
Haelwenn (lanodan) Monnier
754deb26dd
[Pleroma.Uploaders.Local]: Add configuration for custom url path
...
One use-case being an external caching proxy
6 years ago
kaniini
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
William Pitcock
834515fb51
formatter: don't add XSS emoji
6 years ago
kaniini
3c7280934e
Merge branch 'security/activitypub-spoofing' into 'develop'
...
security: activitypub spoofing
See merge request pleroma/pleroma!321
6 years ago
William Pitcock
03e92977cb
transmogrifier: fix peertube/plume actor handling
6 years ago
William Pitcock
0b2c051a04
activitypub: fix possibility of spoofing by containing remote objects to the same domain as their actor
6 years ago
William Pitcock
e2ce0e9e05
run `mix format`.
6 years ago
Martin Kühl
84d84e4ca4
OAuth: Support /revoke endpoint for revoking tokens
...
(for compatibility with Mastodon)
6 years ago
Martin Kühl
ad2a7972e7
OAuth: Set `created_at` in token exchange response
...
(for compatibility with Mastodon)
6 years ago
Martin Kühl
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
6 years ago
William Pitcock
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
6 years ago
kaniini
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
Will Pearson
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
Haelwenn (lanodan) Monnier
8885d16e1b
[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication
6 years ago
Thurloat
a9c0f395cb
add nil clause for Formatter.get_emoji/1 to return an empty result
6 years ago
lambda
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
6 years ago
William Pitcock
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
6 years ago
kaniini
a26d5e6b2a
Merge branch 'feature/rich-text' into 'develop'
...
rich text support
See merge request pleroma/pleroma!309
6 years ago
William Pitcock
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
6 years ago
kaniini
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
kaniini
65e8d47cfb
Merge branch 'backendhack' into 'develop'
...
Flexible Storage Backends
See merge request pleroma/pleroma!304
6 years ago
Thurloat
adffad5502
increase uploader behaviour documentation accuracy.
6 years ago
Thurloat
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
William Pitcock
29b5e30c46
activity: drop recipients_to/recipients_cc fields
6 years ago
William Pitcock
de9acebbf3
activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.
6 years ago
href
ddc6f32b75
Fix Mastodon API when actor's nickname is null
6 years ago
William Pitcock
cce9d008f9
streamer: contain list updates in the same way as we do with the database query
6 years ago
William Pitcock
ded9091206
mastodon api: use bounded AP object graph query to enforce containment of private statuses
6 years ago
William Pitcock
643fae6e36
activitypub: allow querying the activity/object graph bounded to a specific to/cc set
6 years ago
William Pitcock
81673b8136
activity: add recipients_to and recipients_cc fields
6 years ago
Thurloat
2ff25ac0ce
A hobbldey-working swift client.
...
apparently, all elixir openstack libraries are trash
luckily, the APIs are stupid easy.
6 years ago
Thurloat
9fc20ed572
works now, tested with profile photo upload on local backend.
6 years ago
Thurloat
dad39b24a1
add the behaviour, work on actually making it work.
6 years ago
shibayashi
18ad8aaecf
Explicitly set 'http_only' to true
6 years ago
Thurloat
8d2d7a8859
Implement uploader behaviour
...
run formatter <#
6 years ago
shibayashi
4656a07e9e
Set SameSite flag to 'Strict'
6 years ago
Hakaba Hitoyo
6cbfb5ab5d
use media proxy for suggestions api
6 years ago
Thurloat
0df558a6a5
cleaning up a bit.
6 years ago
Thurloat
709816a0f8
example of flexible storage backends
6 years ago
William Pitcock
d22f66655b
upload: formatting
6 years ago
William Pitcock
1596185ac6
upload: add the S3 support itself
6 years ago
William Pitcock
86c007ddd2
upload: strip exif data before finalizing the file path
6 years ago
shibayashi
0c4493f144
Fix formatting
6 years ago
shibayashi
b9a642da1e
Add Secure and SameSite cookie flags
6 years ago
Henry Jameson
0f1c629d65
better solution, added test.
6 years ago
Haelwenn (lanodan) Monnier
6973b77e94
[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable
6 years ago
Haelwenn (lanodan) Monnier
9bddb39ff0
[Pleroma.Web.MastodonAPI.FilterView]: expires_at should be null when N/A
6 years ago
Haelwenn (lanodan) Monnier
d571a571fe
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3
6 years ago
Haelwenn (lanodan) Monnier
6e030129fb
[MastodonAPI] Add filters
6 years ago
Haelwenn (lanodan) Monnier
a5adb251ab
[Pleroma.Web.MastodonAPI.AccountView]: Add fields support
6 years ago
Haelwenn (lanodan) Monnier
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
6 years ago
Haelwenn (lanodan) Monnier
97e20d2932
[MastodonAPI] the tag field isn’t fixed to a static type in pleroma
6 years ago
Haelwenn (lanodan) Monnier
83efaa3af6
[MastodonAPI] Add streaming of hashtags
6 years ago
William Pitcock
5dd6542db5
formatting
6 years ago
William Pitcock
1089d3658e
user: fix up notification last calculation [NOT related to upstream]
6 years ago
lambda
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
6 years ago
lambda
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
kaniini
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
William Pitcock
bc3c30430e
fix formatting
6 years ago
kaniini
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
William Pitcock
741c6ad671
common api: handle replying to orphaned threads
6 years ago
kaniini
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
kaniini
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
hakabahitoyo
946a0769c4
remove unused settings from /api/statusnet/config
6 years ago
Ekaterina Vaartis
540cce5d10
When logging in, try treating the login as an email
...
Closes #245
6 years ago
kaniini
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
William Pitcock
aab2bdddf4
twitter api: provide object descriptions as attachment description field
6 years ago
William Pitcock
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
kaniini
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
kaniini
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
William Pitcock
3e10d13909
formatter: adjust regexp captures to match local users with single character nicknames ( closes #163 )
6 years ago
William Pitcock
09cb402203
fe config: add collapse_message_with_subject fe option
6 years ago
hakabahitoyo
bf9f68b681
debug
6 years ago
William Pitcock
a909fe45a6
formatting
6 years ago
William Pitcock
52b44184b4
transmogrifier: reject activities lacking a valid ID
6 years ago
Henry Jameson
9b046d2a84
fixed notifications API completely breaking if there's a like for
...
missing (deleted) post.
6 years ago
Haelwenn (lanodan) Monnier
d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
6 years ago
Haelwenn (lanodan) Monnier
5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
6 years ago
kaniini
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
6 years ago
kaniini
a6d4cc8917
Merge branch 'sanitize-bio' into 'develop'
...
mastodon api: sanitize the bio HTML
See merge request pleroma/pleroma!282
6 years ago
Haelwenn (lanodan) Monnier
046741c60d
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
6 years ago
Haelwenn (lanodan) Monnier
f5b056e3ce
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes
6 years ago
Haelwenn (lanodan) Monnier
3b8ef24532
Fix attachement rendering
6 years ago
lain
a6b021a52b
Render peertube videos in mastodon.
6 years ago
lain
c381d0b577
Use activitypub to fetch posts.
...
This falls back to ostatus.
6 years ago
Haelwenn (lanodan) Monnier
74c74decf5
Basic peertube support.
6 years ago
Haelwenn (lanodan) Monnier
ef4f982e2c
Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)
6 years ago
ensra
1495d04789
fix test for converting bio \r\n to <br>.
6 years ago
ensra
cdb3dd48ab
Format
6 years ago
ensra
5debd7b5cc
Twitter API: Support Mastodon-style bios
...
(multi-line, with links, and user mentions)
6 years ago
ensra
175f0bebbc
mastodon api: sanitize the bio HTML
6 years ago
kaniini
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
William Pitcock
c033d2004b
formatting
6 years ago
William Pitcock
145546e52a
common api: format hashtags in the same way as we format mentions
6 years ago
eal
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
eal
51a21284c6
ActivityPub: follow redirects when fetching user
6 years ago
shadowfacts
6698749073
Fix typo in app creation response
...
Mastodon sends redirect_uri (singular), so should Pleroma.
6 years ago
William Pitcock
a3ef2ebb35
mastodon api controller: client_name, not name
6 years ago
William Pitcock
b5a92b1199
mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does
6 years ago
kaniini
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
kaniini
c004b6ea0a
Merge branch 'mastofe/system-font' into 'develop'
...
Mastodon frontend: Use system font
See merge request pleroma/pleroma!247
6 years ago
kaniini
5fbb14f5ec
Merge branch 'bugfix/federation-kroeg' into 'develop'
...
fix federation with kroeg
See merge request pleroma/pleroma!272
6 years ago
kaniini
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
kaniini
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
lambda
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
William Pitcock
f446e75577
activitypub: transmogrifier: add necessary translations for kroeg
6 years ago
eal
92caa2632b
Use Image type for emoji icons.
6 years ago
eal
1ed1ff17a4
ActivityPub user view: include tag if present.
6 years ago
eal
f9d13558c8
CommonAPI: add emoji to user source data on update
6 years ago
lain
8c0c930041
formatting
6 years ago
lain
ffd9ad1f0c
Fix for elixir 1.7.
6 years ago
lambda
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
6 years ago
lambda
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
lambda
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
lambda
e81f788cb8
Merge branch 'emoji-in-account-view' into 'develop'
...
Render emoji in user profiles
See merge request pleroma/pleroma!265
6 years ago
Haelwenn (lanodan) Monnier
af30f3f648
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
6 years ago
trqx@goat.si
e7b00f202f
fix gopher server informational messages
...
some gopher clients did not accept those lines due to a missing tab
6 years ago
eal
db5cdfa333
Remote follow: don't show confusing error if already following
6 years ago
eal
37b802682c
HTML-sanitize usernames before emojifying.
6 years ago
eal
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
6 years ago
eal
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
6 years ago
eal
c2d1a5e9c4
MastoAPI AccountView: render profile emoji.
6 years ago
lambda
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
William Pitcock
d91fd48edf
user: do not leak virtuals in account search
6 years ago
William Pitcock
ecfd4b2106
user: hide virtual actors from statistics queries
6 years ago
William Pitcock
de6be63b1b
activitypub: do not show observable effects of non-public boosts
6 years ago
William Pitcock
5202d4ce10
relay: do not relay in test mode
6 years ago
William Pitcock
0ca9b9ff96
run mix format
6 years ago
William Pitcock
5abf9ad602
relay: reintroduce @allow_relay
6 years ago
William Pitcock
1e1a29f084
activitypub: relay: fix up AS2 actor object
6 years ago
William Pitcock
e49131bb72
relay: move to /relay endpoint from / due to webapp issues
6 years ago
William Pitcock
2b628f2341
relay: only relay create activities
6 years ago
William Pitcock
ae3cb652b6
user: set up a valid followers address to use
6 years ago
William Pitcock
56dc8db582
activitypub: relay: add relay following/followers collection URLs
6 years ago
William Pitcock
1c40a631e8
federator: actually relay the public activities
6 years ago
William Pitcock
f9b0fc4ddb
relay: remove @allow_relay for the moment
6 years ago
William Pitcock
266b314051
relay: fix invoking federator, use a timer to sleep the mix task to force a context switch
6 years ago
William Pitcock
99be3d3dcc
relay: add relay follow/unfollow tasks
6 years ago
William Pitcock
1c90f88393
user: remote actors can have no nickname if they are virtual services
6 years ago
William Pitcock
7bed350a23
config: allow relaying to be disabled
6 years ago
William Pitcock
b7ca7f282a
activitypub: refactor relay concerns into new relay module
6 years ago
William Pitcock
00e890264c
activitypub: represent relay actor at instance root
6 years ago
William Pitcock
4807a52284
user: support creating an actor which represents the instance itself
6 years ago
William Pitcock
275c42e438
user: filter out duplicate follow requests
6 years ago
William Pitcock
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
Hakaba Hitoyo
f72cfada1a
add suggestions/web config
6 years ago
William Pitcock
3be58ad34e
activitypub: actually send digest header when federating
...
this is needed for backwards compatibility with non-digest pleroma instances
6 years ago
Haelwenn (lanodan) Monnier
d5091c3175
Allow additionnal schemes in the config
6 years ago
William Pitcock
8da406afa2
activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header
6 years ago
William Pitcock
2890aef9e8
activitypub: add digest header to outbound messages and sign it
6 years ago
Haelwenn (lanodan) Monnier
3623504e5d
[Pleroma.Formatter]: Add support for non-HTTP schemes in URIs
...
The call to the regex in add_links is there just to be sure it’s a legal URI, it can be removed if you want to get more performance.
The URI Schemes list is sorted, but with http(s) at the start (in case it might make it faster for common links).
Closes: https://git.pleroma.social/pleroma/pleroma/issues/127
6 years ago
Tristan Mahé
bc2668bb63
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
Hakaba Hitoyo
cc9c062b55
merge
6 years ago
lambda
41b0ecef95
Merge branch 'tests/plume' into 'develop'
...
Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252
6 years ago
lambda
54963a6379
Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
...
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes #206
See merge request pleroma/pleroma!251
6 years ago
lambda
6f23fb53d3
Merge branch 'feature/fe-configuration' into 'develop'
...
serverside frontend configuration
See merge request pleroma/pleroma!256
6 years ago
Hakaba Hitoyo
b12d17d2ce
configurable timeout
6 years ago
Hakaba Hitoyo
e4dd58307a
better configuration
6 years ago
William Pitcock
b23630076f
TwitterAPI: present pleroma frontend config in API
6 years ago
William Pitcock
cf219b6add
config: make instance description configurable
6 years ago
Hakaba Hitoyo
5b4a21317d
correct error message
6 years ago
Hakaba Hitoyo
8ff336e02a
debug
6 years ago
Hakaba Hitoyo
2b7b1b3e6b
add suggestionsThirdPartyEngine into /nodeinfo/2.0.json
6 years ago
Hakaba Hitoyo
d76f0d87be
do nothing if configuration is skipped
6 years ago
Hakaba Hitoyo
df3233e7e7
improve getting host name
6 years ago
William Pitcock
99c0252314
mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload
6 years ago
William Pitcock
cd19d37a90
mastodon api: use object name as alt text
6 years ago
William Pitcock
f10291a1d3
upload: use generic Document object type instead of Image (mastodon compatibility)
...
Mastodon does not use the object name as alt text when the object is an Image.
6 years ago
hakabahitoyo
e7c580828c
format
6 years ago
hakabahitoyo
2eeaf01627
id field
6 years ago
hakabahitoyo
127882a5d5
configurable
6 years ago
hakabahitoyo
eb0afda3a7
http access to third party user recommendation
6 years ago
Tristan Mahé
5469fb9561
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
hakabahitoyo
3812b627ca
better mock /api/v1/suggestions
6 years ago
hakabahitoyo
4a21c1b343
mock /api/v1/suggestions
6 years ago
hakabahitoyo
f944f8157a
/api/v1/suggestions endpoint
6 years ago
Haelwenn (lanodan) Monnier
7501481db4
[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding
6 years ago
Haelwenn (lanodan) Monnier
8472fba2a7
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object
...
The code here is copied from feature/peertube by lain.
Co-authored-by: lain <lain@soykaf.club>
6 years ago
William Pitcock
0899588e4d
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
6 years ago
lambda
d93789dfde
Merge branch 'feature/object-normalization' into 'develop'
...
object normalization
See merge request pleroma/pleroma!238
6 years ago
lambda
ceffb91065
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
...
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Closes #229
See merge request pleroma/pleroma!235
6 years ago
lambda
b1fcfcfae1
Merge branch 'bugfix/activitypub-object-actor' into 'develop'
...
activitypub: more robustly handle object-to-actor associations
See merge request pleroma/pleroma!250
6 years ago
William Pitcock
590d4df77c
activitypub: more robustly handle object-to-actor associations
6 years ago
William Pitcock
b832df1e15
formatting
6 years ago
William Pitcock
f03e57f764
twitter api: activity representer: add summary field for testsuite
6 years ago
William Pitcock
152a526237
twitter api: refactor activity html generation, add support for Articles
6 years ago
William Pitcock
3b799f22b7
twitterapi: activity view: expose message summary text
6 years ago
lambda
b806aa36c8
Update nodeinfo_controller.ex
6 years ago
lambda
fe4387077a
Merge branch 'feature/default-scope' into 'develop'
...
default scope setting
See merge request pleroma/pleroma!239
6 years ago
lambda
4a922305af
Merge branch 'feature/article-support' into 'develop'
...
article support (plume, etc)
See merge request pleroma/pleroma!240
6 years ago
lambda
14054dd582
Merge branch 'feature/auto-shortcodes' into 'develop'
...
Feature: automatic shortcodes for emoji
See merge request pleroma/pleroma!245
6 years ago
lambda
33b0334216
Merge branch 'bugfix/status-url-field' into 'develop'
...
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
Closes #231
See merge request pleroma/pleroma!246
6 years ago
William Pitcock
8546551257
activitypub: switch to using x509 representation for public keys instead of pkcs#1
6 years ago
Haelwenn (lanodan) Monnier
4326cb9920
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/229
6 years ago
Haelwenn (lanodan) Monnier
7a351cb36f
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/231
6 years ago
Haelwenn (lanodan) Monnier
835345754d
/web/* template: Add class system-font
6 years ago
Jorty
748fff6544
Fix auto-shortcode emoji
...
Emoji were broken due to `Pleroma.Formatter` not knowing about the
auto-shortcode emoji. This moves that logic from
`Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`.
Additionally, it's now possible to specify multiple shortcode globs, and
the default globs were changed to `["/emoji/custom/**/*.png"]`, since
that's in the .gitignore and the files there would have to be shortcode
emoji anyway.
6 years ago
Jorty
c171f9790b
Move emoji glob setting to config.exs
...
Also, a bit of formatting, and the glob includes an "/emoji/" prefix to
make it more intuitive to users
6 years ago
Jorty
0bfbf15b37
Allow emojis to be added automatically
6 years ago
William Pitcock
971bb4f2bd
activity interpretation: formatting
6 years ago
William Pitcock
66819ea784
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
6 years ago
William Pitcock
ea982e7503
mastodon api: add interpreter for Article activity types
6 years ago
William Pitcock
121c1f6230
twitter api: refactor activity html generation, add support for Articles
6 years ago
William Pitcock
bd479606ba
utils: make_create_data: add support for Article objects
6 years ago
William Pitcock
c42f28b82c
transmogrifier: accept Article activities
6 years ago
William Pitcock
2f14996d9a
twitter api: allow setting default_scope
6 years ago
William Pitcock
dcdf7b6686
twitter api: user view: show default message scope if known
6 years ago
William Pitcock
4f6de34f4f
mastodon api: use info["default_scope"] if available for post scope
6 years ago
William Pitcock
7c63e70de1
activitypub: use Activity.normalize() in several places instead of using Activity.get_by_ap_id() directly.
6 years ago
William Pitcock
6f4ca7ddf7
ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
6 years ago
William Pitcock
5b240c3b18
federator: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
6 years ago
William Pitcock
bc05548370
ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
William Pitcock
49da04c509
common api: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
William Pitcock
15d624e077
activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
William Pitcock
fb04fecfb4
streamer: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
William Pitcock
47189531c5
user: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
William Pitcock
b036a19c21
activity: add normalize() to find a complete activity given either URI or partial structure
6 years ago
William Pitcock
a200943240
object: add helper functions to handle various forms of a given object and return a normalized one
6 years ago
Tristan Mahé
dc8ace29d1
use the correct end file
6 years ago
Tristan Mahé
ca63585a32
maybe I should learn proper elixir ;D
6 years ago
Tristan Mahé
d8d43f1173
do the filtering
6 years ago
Tristan Mahé
c67cf8e9af
format...
6 years ago
Tristan Mahé
cb21bf5fc2
filter exif data #187
6 years ago
Haelwenn (lanodan) Monnier
beb940a57e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
...
Related to https://git.pleroma.social/pleroma/mastofe/issues/20
6 years ago
lambda
fc012491a5
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
...
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
6 years ago
lambda
dfc96f222c
Merge branch 'feature/configurable-blocks' into 'develop'
...
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
6 years ago
squidboi
ea214b8ba6
combined outgoing_blocks with statement
6 years ago
Vivian Lim
6160a1b3c0
mix format
6 years ago
Vivian Lim
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
6 years ago
Vivian Lim
6316003946
fixes- found that TwitterAPI.Controller adds .json suffix already
6 years ago
Vivian Lim
f2badd4424
return empty array for api/qvitter/mutes.json queries instead of html
6 years ago
squidboi
c4038ede07
fix mind-crushingly dumb syntax error
6 years ago
squidboi
f4990283de
change moved attributes into normal variables
6 years ago
squidboi
4e099fcfa9
move configurable module attributes into relevant functions
6 years ago
Haelwenn (lanodan) Monnier
5a4a45b875
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
6 years ago
Haelwenn (lanodan) Monnier
a05c0ff61d
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
6 years ago
Haelwenn (lanodan) Monnier
359093d73b
Fake 2.4.0 API
6 years ago
Haelwenn (lanodan) Monnier
c45133377a
lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format
...
Hnng!
6 years ago
Francis Dinh
082920044a
Normalize file extension for uploaded files
6 years ago
William Pitcock
60d6038be5
mrf simple: add accept lists
...
accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.
in other words, this functionality can be used to implement instances similar to
awoo.space.
6 years ago
lambda
90cf75f4a7
Merge branch 'features/column_media_streaming' into 'develop'
...
Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225
6 years ago
lambda
be800d7936
Merge branch 'bugfix/block-follow-relationships' into 'develop'
...
fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230
6 years ago
William Pitcock
056305dfa7
user: add helper function to fetch a user given only an ap_id (fix tests)
6 years ago
lambda
db0731b6ac
Merge branch 'feature/exclude-replies-filter' into 'develop'
...
activitypub: support filtering activities by whether or not they are a reply (closes #109 )
Closes #109
See merge request pleroma/pleroma!226
6 years ago
William Pitcock
320ca7b11e
user: when processing a block in User.block(), ensure all follow relationships are broken
...
this is needed for activitypub conformance
ref #213
6 years ago
William Pitcock
c95941e64d
activitypub transmogrifier: fix handling of contentMap.
6 years ago
William Pitcock
7e0f62acee
object: add helper functions to handle various forms of a given object and return a normalized one
6 years ago
William Pitcock
6f384d35dd
ostatus: we need to include the original author of a message as a mention
...
this is due to the use of activity.recipients which may not necessarily contain the original
author if the actors are not following each other.
6 years ago
William Pitcock
591c82620e
activitypub: filter destination list for announce activities differently than normal ( closes #164 )
6 years ago
William Pitcock
4f589998ee
activitypub: support filtering activities by whether or not they are a reply ( closes #109 )
6 years ago
Haelwenn (lanodan) Monnier
b670d4d683
MastodonAPI: Add streaming to media tabs of federated and local TLs
6 years ago
Henry Jameson
0b1ca6a584
Token-generating task
6 years ago
squidboi
2e294ee44a
Merge branch 'develop' into feature/configurable-blocks
6 years ago
lambda
1ea4a18ad8
Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'
...
Configs for mrf_rejectnonpublic
See merge request pleroma/pleroma!205
6 years ago
eal
a938d07df1
Merge branch 'bugfix/mastofe_thread_render' into 'develop'
...
lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads
See merge request pleroma/pleroma!223
6 years ago
Haelwenn (lanodan) Monnier
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
6 years ago
lain
00d7d109ef
Fix typo
6 years ago
lambda
de20c8d620
Merge branch 'fix/missing-file-extension' into 'develop'
...
Add missing file extension if file does not have one
See merge request pleroma/pleroma!222
6 years ago
Francis Dinh
0a95b5594b
Add missing file extension if file does not have one
6 years ago
eal
12c7a023de
upload.ex: add MPEG Layer 3 file header.
6 years ago
lambda
2723fb5150
Merge branch 'bugfix/mrf-orphaning' into 'develop'
...
activitypub transmogrifier: handle activity lookup failure
Closes #156
See merge request pleroma/pleroma!216
6 years ago
lambda
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
6 years ago
lambda
2c303b3302
Merge branch 'bugfix/oauth2-param-name' into 'develop'
...
oauth: support either name or username parameter with grant_type=password
Closes #180
See merge request pleroma/pleroma!219
6 years ago
lambda
280ac243aa
Merge branch 'bugfix/oauth-password-with-email' into 'develop'
...
oauth: fix password-based login when username is email address
Closes #199
See merge request pleroma/pleroma!220
6 years ago
William Pitcock
5442466569
oauth: fix password-based login when username is email address
...
closes #199
6 years ago
William Pitcock
4894b88b1b
oauth: support either name or username parameter with grant_type=password
...
closes #180
6 years ago
Francis Dinh
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
6 years ago
William Pitcock
401e8af943
activitypub transmogrifier: handle activity lookup failure
...
with the introduction of MRF, it is possible that an activity may be orphaned from it's parent, if
an activity in the chain was rejected by the active MRF policies. accordingly, handle this in the
same way as any other orphaned activity.
closes #156
6 years ago
William Pitcock
b5bc08fac3
streamer: don't relay boosts of messages which would otherwise be blocked
6 years ago
lambda
ea42ba603f
Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'
...
webfinger: send JRD by default instead of XRD
See merge request pleroma/pleroma!211
6 years ago
William Pitcock
3d402a9e20
webfinger: send JRD by default instead of XRD
...
JRD being the default representation for WebFinger responses was standardized 5 years ago in
RFC 7033.
6 years ago
William Pitcock
59f95a7095
webfinger: refactor webfinger() functions
...
- remove code duplication
- move user lookup to parent with statement
- tighten both user lookup by nickname and activitypub URI with a type constraint
6 years ago
Henry Jameson
9c1cf1befb
formatting
6 years ago
Henry Jameson
f42ffbe9a8
Initial invites support + tests.
6 years ago
lambda
3f42806b1b
Merge branch 'develop' into 'develop'
...
Dedupe uploads
See merge request pleroma/pleroma!115
6 years ago
lambda
564c73ab24
Merge branch 'feature/list-streaming' into 'develop'
...
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
6 years ago
William Pitcock
9810471237
router: remove stub /domain_blocks entry
6 years ago
William Pitcock
f8e0942745
twitter api: add approve/deny endpoints
6 years ago
William Pitcock
e08cf21e5b
twitter api: add friend requests list api
6 years ago
William Pitcock
ba8dab7542
twitterapi: user view: return if an account is locked or not
6 years ago
William Pitcock
d96377f359
activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it
6 years ago
William Pitcock
5eed1ea181
run mix format
6 years ago
William Pitcock
993312cdb3
twitterapi: add profile setting for locked/unlocked accounts
6 years ago
William Pitcock
4084889a2d
activitypub transmogrifier: remove debug code
6 years ago
William Pitcock
1452b2823f
user: add a workaround for situations where Pleroma may believe a followee is followed
...
this was caused by lack of Undo follows in the early days, and can likely be eventually removed
6 years ago
William Pitcock
76f80ba8c2
activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused
6 years ago
William Pitcock
a2c4a5a75b
mastodon api: allow setting an account locked or not
6 years ago
William Pitcock
ad7188fe92
user: use Enum.uniq on the follow request query
6 years ago
William Pitcock
f328de8eb7
activitypub transmogrifier: send Rejects in the format Mastodon wants
6 years ago
William Pitcock
876ad6aa38
activitypub transmogrifier: send @context on accept activities
6 years ago
William Pitcock
760eb72a38
add a bunch of stuff
6 years ago
William Pitcock
6f89d2d583
stash api controller
6 years ago
William Pitcock
9c88933422
implement tracking of follow requests
6 years ago
William Pitcock
6041380774
activitypub transmogrifier: learn locked state in Update messages
6 years ago
William Pitcock
e5206752e1
activitypub: only send accept back automatically if the account is not locked
6 years ago
lambda
7f79b467b1
Merge branch 'feature/domain-blocks' into 'develop'
...
Domain blocks
See merge request pleroma/pleroma!190
6 years ago
squidboi
07f0cfa53f
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
6 years ago
squidboi
4f9ecfc77a
formatting
6 years ago
squidboi
8903f1ad4d
more fixes
6 years ago
squidboi
16d896f526
fixes
6 years ago
squidboi
b3580b6971
add option to not deny follow if blocked (fixed)
6 years ago
squidboi
2847fc8f90
add option to not unfollow on block, and option to not federate outgoing blocks
6 years ago
lambda
45a935f0bd
Merge branch 'users' into 'develop'
...
Fix users lookup/return type
See merge request pleroma/pleroma!201
6 years ago
lambda
bb639a362e
Merge branch 'feature/rejectnonpublic' into 'develop'
...
Add MRF to drop all posts with "followers-only" or "direct" privacy settings
See merge request pleroma/pleroma!202
6 years ago
Rachel H
fa0c2727d8
Fix users lookup/return type
...
* Allow viewing user in frontend by id on pageload
6 years ago
lambda
4a16ade2ee
Merge branch 'mastopost' into 'develop'
...
Allow posting images without text in mastofe
See merge request pleroma/pleroma!194
6 years ago
squidboi
e2c4013c88
s/get_by_ap_id/get_cached_by_ap_id/
6 years ago
squidboi
6e7f91bf8f
final format
6 years ago
squidboi
82225dfc8d
even more formatting
6 years ago
lambda
c86823f724
Merge branch 'bugfix/locked-account-regression' into 'develop'
...
security fix: locked account regression
See merge request pleroma/pleroma!200
6 years ago
squidboi
990cde7439
more formatting
6 years ago
squidboi
5b9e1f228a
formatting
6 years ago
squidboi
f69d38e455
add mrf for dropping follower-only and direct posts
6 years ago
William Pitcock
1e9dd6fbc2
user: fix maybe_direct_follow() after user_info() refactoring broke it slightly
6 years ago
William Pitcock
47c7e259c4
activitypub transmogrifier: fix locked account state from being clobbered
6 years ago
William Pitcock
a003bdc30a
activitypub transmogrifier: learn locked state in Update messages
6 years ago
lambda
839cb7b424
Merge branch 'develop' into 'mastopost'
...
# Conflicts:
# .gitignore
6 years ago
lambda
595ca3bb3a
Merge branch 'feature/quarantine' into 'develop'
...
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
See merge request pleroma/pleroma!199
6 years ago
William Pitcock
09604182d0
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
6 years ago
Rachel H
1525a0404b
Fix follow errors
6 years ago
Sir_Boops
3f0440ac3c
Dedupe uploads
6 years ago
Rachel H
b4292295d7
Allow posting images without text in mastofe
6 years ago
eal
29c9c8d93b
Extract host from ap_id, add index
6 years ago
lambda
0a0c6bf394
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
...
webfinger robustness improvements
See merge request pleroma/pleroma!195
6 years ago
William Pitcock
1abf0f3b3e
webfinger: use https as default fallback instead of http
...
realistically, all instances need to be on https anyway to properly federate with all
software
6 years ago
William Pitcock
aaa81d3540
XML: handle erlang errors too
6 years ago
lambda
b5d8213e70
Merge branch 'fix/oauth-http-basic' into 'develop'
...
Make OAuth token endpoint work with HTTP Basic auth
See merge request pleroma/pleroma!191
6 years ago
D Anzorge
3607dc4558
Make token exchange return errors with 400 as status code
6 years ago
eal
f9719b064c
Merge branch 'fix/emoji-picker' into 'develop'
...
set visible_in_picker to true in custom_emojis
Closes #177 and mastofe#16
See merge request pleroma/pleroma!188
6 years ago
D Anzorge
73904e8f78
Make OAuth token endpoint work with HTTP Basic auth
...
client_id/client_secret can now be supplied in an Authorization header
6 years ago
eal
9075b6d25b
ActivityPub.ex: filter domain blocked activities.
6 years ago
eal
4856962434
MastoAPI: add domain blocking.
6 years ago
lain
8073af6e10
Better error handling for OstatusController.
6 years ago
eal
87566b6e2f
user.ex: add domain blocks.
6 years ago
lain
06439f64d0
Better error handling for ActivityPubController
6 years ago
lain
4856ba596f
Better error handling for MastodonApiController.
6 years ago
lain
0f70e83e8c
Better error handling in TwitterApiController.
6 years ago
Haelwenn (lanodan) Monnier
b143694b98
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picker to true in custom_emojis
...
Fixes: https://github.com/ilianaw/emojos.in/issues/4
Closes: https://git.pleroma.social/pleroma/pleroma/issues/177
Closes: https://git.pleroma.social/pleroma/mastofe/issues/16
6 years ago
eal
dca1d6d162
Merge branch 'fix/user-timeline-reading-user' into 'develop'
...
MastoAPI user timelines: render statuses for the logged in user.
See merge request pleroma/pleroma!187
6 years ago
eal
8c609ee3f9
MastoAPI user timelines: render statuses for the logged in user.
6 years ago
lambda
98b8f08783
Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
...
TwitterAPI: fix "Follows you" being shown for the wrong user.
Closes pleroma-fe#89
See merge request pleroma/pleroma!185
6 years ago
eal
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
6 years ago
lain
349400c06a
Fix url guessing attacks.
6 years ago
eal
5d3fdbc082
MastoAPI: Add streaming for lists.
6 years ago
eal
7cb2e2971e
MastoAPI: fix dm_timeline getting non-create activities.
6 years ago
eal
35cb8969c4
MastoAPI: Fix link headers with restrictive params.
6 years ago
lain
461f201caa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
lain
3ece4a3ebc
Only return certain activities in TwitterAPI mentions.
6 years ago
William Pitcock
d7eb2e1b65
run mix format
6 years ago
William Pitcock
a8df7fc690
formatter: use class='mention' on links to user profiles
...
helps mastodon frontend and apps have better context:
https://mastodon.social/users/Gargron/statuses/100101267352899379
6 years ago
lain
a9e36e5a64
Fix user topic streaming.
6 years ago
lain
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
6 years ago
lain
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
6 years ago
lain
6138b29783
There are no symbols in JSON.
6 years ago
lain
745072b2cc
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
6 years ago
lain
0a6c897c94
Formatting.
6 years ago
lain
bfce29866f
Make Mastodon follow hack more explicit.
6 years ago
lain
3839a11ef5
Don't treat remote accepts/rejects as local.
...
Also, use specialized functions to get safe data.
6 years ago
lain
dd9bb37893
Rename id helper method.
6 years ago
William Pitcock
7e873756e7
activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists
6 years ago
William Pitcock
1c926c7b60
activitypub: allow mastodon S2S block extension support to be disabled
6 years ago
Hakaba Hitoyo
e90b734f1c
debug
6 years ago
Hakaba Hitoyo
9c7da2ef48
output repeats at ActivityPub outbox
6 years ago
William Pitcock
7cf3cf77cf
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
6 years ago
William Pitcock
f35e6bf75b
activitypub transmogrifier: clean up accept/reject handling a bit
6 years ago
William Pitcock
e80d91c64a
introduce User.maybe_direct_follow() and use it where we used to call User.follow()
6 years ago
William Pitcock
c89b90222c
twitter api: also remove explicit User.follow here
6 years ago
William Pitcock
62c95e8d4d
run mix format
6 years ago
lambda
5d6d86bf00
Merge branch 'feature/blocks-deny-refollow' into 'develop'
...
activitypub conformance: deny refollow for blocks
See merge request pleroma/pleroma!170
6 years ago
William Pitcock
502ba33d01
activitypub: fix up accept/reject semantics for following
...
fixes #175
6 years ago
William Pitcock
c0ca9f82b9
mastodon api: properly track if an account is locked or not
6 years ago
William Pitcock
47dc52a758
activitypub utils: optimize block and follow activity lookup
...
multi-field @> comparison is very expensive, so only use @> for the field where it matters
this makes the query take only a few usec to execute verses many msec on a busy instance
6 years ago
William Pitcock
1d88abf2d4
user: do not allow refollowing somebody who has blocked a user
6 years ago
lambda
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
6 years ago
lambda
c2dcd767cf
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
...
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
6 years ago
Francis Dinh
1197ec10a8
Rewrite block fetch query
6 years ago
lambda
c41012053a
Merge branch 'feature/change-password' into 'develop'
...
Feature/change password
See merge request pleroma/pleroma!166
6 years ago
eal
3dbd9809d4
MastoAPI: add lists.
6 years ago
lain
1cd6194dee
More efficient queries.
6 years ago
eal
a8369db4f2
MastoAPI: add lists.
6 years ago
lain
0b5bc62b33
Don't save double tags in AP objects we create
...
This crashed Mastodon workers.
6 years ago
lambda
06c97f211f
Merge branch 'feature/deps-migration' into 'develop'
...
Migrate to comeonin 4 and Cachex 3
See merge request pleroma/pleroma!162
6 years ago
Francis Dinh
72b93d13f8
Hook up block/unblock to TwitterAPI
6 years ago
Francis Dinh
55f9aefd08
Hook unfollow into TwitterAPI
6 years ago
Francis Dinh
b2c6ae7d82
Hook up unfollow and (un)block to MastoAPI + tests
6 years ago
csaurus
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
6 years ago
Syldexia
d0690622cd
Added endpoint for changing passwords
6 years ago
lambda
b4064dfe30
Merge branch 'feature/clarify-http-sig-error' into 'develop'
...
clarify HTTP signature error in logs
See merge request pleroma/pleroma!165
6 years ago
William Pitcock
9a2d097ed8
activitypub controller: note that the HTTP Host header must be forwarded for http signature validation to work
6 years ago
Francis Dinh
46427cb90f
Pass correct number of arguments to unfollow
6 years ago
William Pitcock
75cfd9d34d
webfinger: fix finding the XRD uri for statusnet instances
6 years ago
lain
d269c69a0b
Actually fix missing alias.
6 years ago
lain
bf64208b52
Add missing alias.
6 years ago
Francis Dinh
d045b96f95
Add tests for incoming unfollow over OStatus
6 years ago
Francis Dinh
cc5373b846
Fix unblock handling
6 years ago
Francis Dinh
f2d6c3a512
Handle unfollows from OStatus
6 years ago
Francis Dinh
2573332214
Add undo block handler
6 years ago
Francis Dinh
c8a16f334d
Format
6 years ago
Francis Dinh
89c5de9096
Fix unfollows
6 years ago
Francis Dinh
1afd6d37bd
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
...
Fixed some conflicts in transmogrifier.ex
6 years ago
Thog
e55c6f311b
Migrate to comeonin 4 and Cachex 3
...
Also fix some warning in the code and add a missing alias
6 years ago
lain
dca26f3655
Fix specs.
6 years ago