Maxim Filippov
94708d6370
Render only "id", "valid_until" and "app_name" in TokenView
6 years ago
lambda
f26582aae9
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
...
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon
See merge request pleroma/pleroma!834
6 years ago
lambda
ae84af4ad0
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
...
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
6 years ago
Ivan Tashkinov
d3fe2c8ec6
[ #468 ] Formatting fix.
6 years ago
Ivan Tashkinov
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
Ivan Tashkinov
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
6 years ago
rinpatch
8f98d970c1
Fix recipient count in hellthread policy
6 years ago
Haelwenn (lanodan) Monnier
4df455f69b
[MastoAPI] Add switching of frontend flavours
6 years ago
rinpatch
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
6 years ago
lain
269d3e1ca6
WelcomeMessage: Get rid of Ecto reference.
6 years ago
lain
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
6 years ago
lain
d812a347ca
Add optional welcome message.
6 years ago
Ivan Tashkinov
2a4a4f3342
[ #468 ] Defined OAuth restrictions for all applicable routes.
...
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
6 years ago
lambda
1ce1b7b58d
Merge branch 'bugfix/oauth-token-padding' into 'develop'
...
oauth: never use base64 padding when returning tokens to applications
See merge request pleroma/pleroma!825
6 years ago
rinpatch
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
6 years ago
Karen Konou
c2e0a0c8d4
Readd threshold is not 0 check, optmization?
6 years ago
Karen Konou
dca6bee2f7
Rename test, add check for follower collection when delisting
6 years ago
rinpatch
b63a5e309d
Merge branch 'bugfix/actor-containment' into 'develop'
...
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
6 years ago
Karen Konou
d943c90249
Add tests, change default config values, fix a bug
6 years ago
eugenijm
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the `follow`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
6 years ago
William Pitcock
da44cdd381
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
...
get_or_fetch() handles the nickname verses URI differences transparently.
6 years ago
lambda
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
6 years ago
William Pitcock
56862f4ce1
activitypub: clean up logging statements a little
6 years ago
Wim Vanderbauwhede
04b1c13554
Merge remote-tracking branch 'upstream/develop' into patch-image-description
6 years ago
Ivan Tashkinov
027adbc9e5
[ #468 ] Refactored OAuth scopes parsing / defaults handling.
6 years ago
Egor Kislitsyn
3f32d7b937
Fix queue name
6 years ago
Egor Kislitsyn
907306174b
fix S3 links encoding in Mediaproxy
6 years ago
William Pitcock
72ba5b4ab7
activitypub: user view: formatting
6 years ago
William Pitcock
5307c211b8
activitypub: user view: report totalItems=0 for follows/followers when hidden
6 years ago
William Pitcock
6542b86292
activitypub: user view: remove totalItems from user outbox
...
(this is based on a counter in User.Info, but the counter is not reliable.)
6 years ago
William Pitcock
ee2fa1a314
activitypub: user view: remove totalInbox from user inbox view
...
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
6 years ago
kaniini
bc9e5e6b65
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'
...
ActivityPub C2S oauth endpoints
See merge request pleroma/pleroma!821
6 years ago
William Pitcock
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
6 years ago
William Pitcock
e9ef4b8da6
oauth: never use base64 padding when returning tokens to applications
...
The normal Base64 alphabet uses the equals sign (=) as a padding character. Since
Base64 strings are self-synchronizing, padding characters are unnecessary, so don't
generate them in the first place.
6 years ago
William Pitcock
e05bf2940f
activitypub: transmogrifier: correctly handle nil inReplyTo value
6 years ago
William Pitcock
94cbbb0e3a
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
6 years ago
Mark Felder
f62c1d6266
Improve login error for OAuth flow
6 years ago
Ivan Tashkinov
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
William Pitcock
9bd6ed975e
activitypub: user view: use route helpers instead of hardcoded URIs
6 years ago
William Pitcock
29e946ace4
activitypub: user view: add oauthRegistrationEndpoint to user profiles
6 years ago
William Pitcock
db8abd958d
activitypub: user view: fix up endpoints rendering
6 years ago
William Pitcock
90facd3598
user view: add AP C2S oauth endpoints to local user profiles
6 years ago
Karen Konou
bef9b9cb66
refactored code
6 years ago
Karen Konou
adcdd21f16
Merge branch 'develop' into hellthread-filter-fix
6 years ago
lain
88a4de24f9
User.follow_all: Respect blocks in both directions.
6 years ago
Maxim Filippov
760fec4cb8
Update token.ex
6 years ago
Maxim Filippov
62a45bdc11
Add revoke token
6 years ago
Maxim Filippov
61a4bc5095
Add OAuth tokens endpoint
6 years ago
hakabahitoyo
b7bc666200
bugfix mdii uploader
6 years ago
Karen Konou
1d727cd069
added checks for public url and follower collections
6 years ago
Haelwenn (lanodan) Monnier
da4c662af3
Plugs.HTTPSecurityPlug: Add webpacker to connect-src
6 years ago
Haelwenn (lanodan) Monnier
00e8f0b07d
Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode
...
This is needed to run dev mode mastofe at the same time
6 years ago
Mark Felder
c984e8272a
Formatting
6 years ago
Mark Felder
4956ab5ea3
Fix compile
6 years ago
Mark Felder
ac7ef0999d
WIP: Fix Twitter Cards
...
Twitter cards were not passing any useful metadata. A few things were
being handled on Twitter's end by trying to match OpenGraph tags with
their own, but it wasn't working at all for media. This is an attempt to
fix that.
Common functions have been pulled out of opengraph and put into
utils. Twitter's functionality was entirely replaced with a direct copy
of Opengraph's and then modified as needed.
Profiles are now represented as Summary Cards
Posts with images are now represented as Summart with Large Image Cards
Posts with video and audio attachments are represented as Player Cards.
This now passes the Twitter Card Validator.
Validator and Docs are below
https://cards-dev.twitter.com/validator
https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards
6 years ago
shibayashi
ea1058929c
Use url[:scheme] instead of protocol to determine if https is enabled
6 years ago
rinpatch
379d04692c
Filter summary in keywordpolicy
6 years ago
rinpatch
39383a6b79
Merge branch 'feature/thread-muting' into 'develop'
...
Feature/thread muting
See merge request pleroma/pleroma!796
6 years ago
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