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
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
6 years ago
00d7d109ef
Fix typo
6 years ago
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
0a95b5594b
Add missing file extension if file does not have one
6 years ago
12c7a023de
upload.ex: add MPEG Layer 3 file header.
6 years ago
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
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
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
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
5442466569
oauth: fix password-based login when username is email address
...
closes #199
6 years ago
4894b88b1b
oauth: support either name or username parameter with grant_type=password
...
closes #180
6 years ago
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
6 years ago
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
b5bc08fac3
streamer: don't relay boosts of messages which would otherwise be blocked
6 years ago
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
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
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
9c1cf1befb
formatting
6 years ago
f42ffbe9a8
Initial invites support + tests.
6 years ago
3f42806b1b
Merge branch 'develop' into 'develop'
...
Dedupe uploads
See merge request pleroma/pleroma!115
6 years ago
564c73ab24
Merge branch 'feature/list-streaming' into 'develop'
...
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
6 years ago
9810471237
router: remove stub /domain_blocks entry
6 years ago
f8e0942745
twitter api: add approve/deny endpoints
6 years ago
e08cf21e5b
twitter api: add friend requests list api
6 years ago
ba8dab7542
twitterapi: user view: return if an account is locked or not
6 years ago
d96377f359
activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it
6 years ago
5eed1ea181
run mix format
6 years ago
993312cdb3
twitterapi: add profile setting for locked/unlocked accounts
6 years ago
4084889a2d
activitypub transmogrifier: remove debug code
6 years ago
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
76f80ba8c2
activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused
6 years ago
a2c4a5a75b
mastodon api: allow setting an account locked or not
6 years ago
ad7188fe92
user: use Enum.uniq on the follow request query
6 years ago
f328de8eb7
activitypub transmogrifier: send Rejects in the format Mastodon wants
6 years ago
876ad6aa38
activitypub transmogrifier: send @context on accept activities
6 years ago
760eb72a38
add a bunch of stuff
6 years ago
6f89d2d583
stash api controller
6 years ago
9c88933422
implement tracking of follow requests
6 years ago
6041380774
activitypub transmogrifier: learn locked state in Update messages
6 years ago
e5206752e1
activitypub: only send accept back automatically if the account is not locked
6 years ago
7f79b467b1
Merge branch 'feature/domain-blocks' into 'develop'
...
Domain blocks
See merge request pleroma/pleroma!190
6 years ago
07f0cfa53f
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
6 years ago
4f9ecfc77a
formatting
6 years ago
8903f1ad4d
more fixes
6 years ago
16d896f526
fixes
6 years ago
b3580b6971
add option to not deny follow if blocked (fixed)
6 years ago
2847fc8f90
add option to not unfollow on block, and option to not federate outgoing blocks
6 years ago
45a935f0bd
Merge branch 'users' into 'develop'
...
Fix users lookup/return type
See merge request pleroma/pleroma!201
6 years ago
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
fa0c2727d8
Fix users lookup/return type
...
* Allow viewing user in frontend by id on pageload
6 years ago
4a16ade2ee
Merge branch 'mastopost' into 'develop'
...
Allow posting images without text in mastofe
See merge request pleroma/pleroma!194
6 years ago
e2c4013c88
s/get_by_ap_id/get_cached_by_ap_id/
6 years ago
6e7f91bf8f
final format
6 years ago
82225dfc8d
even more formatting
6 years ago
c86823f724
Merge branch 'bugfix/locked-account-regression' into 'develop'
...
security fix: locked account regression
See merge request pleroma/pleroma!200
6 years ago
990cde7439
more formatting
6 years ago
5b9e1f228a
formatting
6 years ago
f69d38e455
add mrf for dropping follower-only and direct posts
6 years ago
1e9dd6fbc2
user: fix maybe_direct_follow() after user_info() refactoring broke it slightly
6 years ago
47c7e259c4
activitypub transmogrifier: fix locked account state from being clobbered
6 years ago
a003bdc30a
activitypub transmogrifier: learn locked state in Update messages
6 years ago
839cb7b424
Merge branch 'develop' into 'mastopost'
...
# Conflicts:
# .gitignore
6 years ago
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
09604182d0
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
6 years ago
1525a0404b
Fix follow errors
6 years ago
3f0440ac3c
Dedupe uploads
6 years ago
b4292295d7
Allow posting images without text in mastofe
6 years ago
29c9c8d93b
Extract host from ap_id, add index
6 years ago
0a0c6bf394
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
...
webfinger robustness improvements
See merge request pleroma/pleroma!195
6 years ago
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
aaa81d3540
XML: handle erlang errors too
6 years ago
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
3607dc4558
Make token exchange return errors with 400 as status code
6 years ago
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
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
9075b6d25b
ActivityPub.ex: filter domain blocked activities.
6 years ago
4856962434
MastoAPI: add domain blocking.
6 years ago
8073af6e10
Better error handling for OstatusController.
6 years ago
87566b6e2f
user.ex: add domain blocks.
6 years ago
06439f64d0
Better error handling for ActivityPubController
6 years ago
4856ba596f
Better error handling for MastodonApiController.
6 years ago
0f70e83e8c
Better error handling in TwitterApiController.
6 years ago
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
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
8c609ee3f9
MastoAPI user timelines: render statuses for the logged in user.
6 years ago
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
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
6 years ago
349400c06a
Fix url guessing attacks.
6 years ago
5d3fdbc082
MastoAPI: Add streaming for lists.
6 years ago
7cb2e2971e
MastoAPI: fix dm_timeline getting non-create activities.
6 years ago
35cb8969c4
MastoAPI: Fix link headers with restrictive params.
6 years ago
461f201caa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
3ece4a3ebc
Only return certain activities in TwitterAPI mentions.
6 years ago
d7eb2e1b65
run mix format
6 years ago
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
a9e36e5a64
Fix user topic streaming.
6 years ago
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
6 years ago
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
6 years ago
6138b29783
There are no symbols in JSON.
6 years ago
745072b2cc
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
6 years ago
0a6c897c94
Formatting.
6 years ago
bfce29866f
Make Mastodon follow hack more explicit.
6 years ago
3839a11ef5
Don't treat remote accepts/rejects as local.
...
Also, use specialized functions to get safe data.
6 years ago
dd9bb37893
Rename id helper method.
6 years ago
7e873756e7
activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists
6 years ago
1c926c7b60
activitypub: allow mastodon S2S block extension support to be disabled
6 years ago
7cf3cf77cf
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
6 years ago
f35e6bf75b
activitypub transmogrifier: clean up accept/reject handling a bit
6 years ago
e80d91c64a
introduce User.maybe_direct_follow() and use it where we used to call User.follow()
6 years ago
c89b90222c
twitter api: also remove explicit User.follow here
6 years ago
62c95e8d4d
run mix format
6 years ago
5d6d86bf00
Merge branch 'feature/blocks-deny-refollow' into 'develop'
...
activitypub conformance: deny refollow for blocks
See merge request pleroma/pleroma!170
6 years ago
502ba33d01
activitypub: fix up accept/reject semantics for following
...
fixes #175
6 years ago
c0ca9f82b9
mastodon api: properly track if an account is locked or not
6 years ago
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
1d88abf2d4
user: do not allow refollowing somebody who has blocked a user
6 years ago
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
6 years ago
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
1197ec10a8
Rewrite block fetch query
6 years ago
c41012053a
Merge branch 'feature/change-password' into 'develop'
...
Feature/change password
See merge request pleroma/pleroma!166
6 years ago
3dbd9809d4
MastoAPI: add lists.
6 years ago
1cd6194dee
More efficient queries.
6 years ago
a8369db4f2
MastoAPI: add lists.
6 years ago
0b5bc62b33
Don't save double tags in AP objects we create
...
This crashed Mastodon workers.
6 years ago
06c97f211f
Merge branch 'feature/deps-migration' into 'develop'
...
Migrate to comeonin 4 and Cachex 3
See merge request pleroma/pleroma!162
6 years ago
72b93d13f8
Hook up block/unblock to TwitterAPI
6 years ago
55f9aefd08
Hook unfollow into TwitterAPI
6 years ago
b2c6ae7d82
Hook up unfollow and (un)block to MastoAPI + tests
6 years ago
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
6 years ago
d0690622cd
Added endpoint for changing passwords
6 years ago
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
9a2d097ed8
activitypub controller: note that the HTTP Host header must be forwarded for http signature validation to work
6 years ago
46427cb90f
Pass correct number of arguments to unfollow
6 years ago
75cfd9d34d
webfinger: fix finding the XRD uri for statusnet instances
6 years ago
d269c69a0b
Actually fix missing alias.
6 years ago
bf64208b52
Add missing alias.
6 years ago
d045b96f95
Add tests for incoming unfollow over OStatus
6 years ago
cc5373b846
Fix unblock handling
6 years ago
f2d6c3a512
Handle unfollows from OStatus
6 years ago
2573332214
Add undo block handler
6 years ago
c8a16f334d
Format
6 years ago
89c5de9096
Fix unfollows
6 years ago
1afd6d37bd
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
...
Fixed some conflicts in transmogrifier.ex
6 years ago
e55c6f311b
Migrate to comeonin 4 and Cachex 3
...
Also fix some warning in the code and add a missing alias
6 years ago
dca26f3655
Fix specs.
6 years ago
ff007af0c2
Return visilility in twitter api, too.
6 years ago
434601a5c3
Return private / direct posts on user timelines, too.
6 years ago
8b0c222b43
Merge branch 'feature/account-deletion' into 'develop'
...
Feature/account deletion
Closes #115
See merge request pleroma/pleroma!157
6 years ago
a9141d88aa
Pass user instead of their ap_id to User.block
6 years ago
eal