lambda
f34232da86
Update sample_config.eex
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
William Pitcock
3208611bfc
mix: add task for setting an account as locked or not
6 years ago
eal
cdf5a668f2
Merge branch 'fix/mix-task-caching' into 'develop'
...
make_moderator.ex: set cache on update
See merge request pleroma/pleroma!206
6 years ago
eal
18837c2fed
make_moderator.ex: set cache on update
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
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