squidboi
4f9ecfc77a
formatting
6 years ago
squidboi
8903f1ad4d
more fixes
6 years ago
squidboi
16d896f526
fixes
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
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
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
3ece4a3ebc
Only return certain activities in TwitterAPI mentions.
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
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
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
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
lain
ff007af0c2
Return visilility in twitter api, too.
6 years ago
lain
434601a5c3
Return private / direct posts on user timelines, too.
6 years ago
lambda
8b0c222b43
Merge branch 'feature/account-deletion' into 'develop'
...
Feature/account deletion
Closes #115
See merge request pleroma/pleroma!157
6 years ago
Francis Dinh
a9141d88aa
Pass user instead of their ap_id to User.block
6 years ago
Francis Dinh
3b706ea493
Remove handler for incoming undos with object references
6 years ago
Francis Dinh
1e43de0f86
Formatting and add tests for blocks/unblocks
6 years ago
Francis Dinh
da9744eb84
Use correct variable names in unfollow
6 years ago
Thog
6f39ecc41b
Support Undo like activities ( Fix #139 )
6 years ago
Syldexia
d1366f8d46
Modified deleting an account to run as a task
6 years ago
lambda
7831b38705
Merge branch 'feature/webfinger-mime-ld-json' into 'develop'
...
webfinger: handle application/ld+json links
See merge request pleroma/pleroma!159
6 years ago
lambda
ad563669c8
Merge branch 'feature/remote-user-deactivation' into 'develop'
...
remote user deactivation
See merge request pleroma/pleroma!154
6 years ago
William Pitcock
725b05d04a
run mix format
6 years ago
William Pitcock
2051530868
activitypub transmogrifier: handle hubzilla AP actor quirks
6 years ago
William Pitcock
4d2c6707c2
activitypub: normalize the actor to ensure we have its URI
6 years ago
William Pitcock
1a250d65af
webfinger: only do ld+json on modern json webfinger
6 years ago
William Pitcock
d1f6ecf607
webfinger: interpret application/ld+json links as an alternate to application/activity+json
6 years ago
William Pitcock
cce5a9cb1c
webfinger: expose the application/ld+json link alongside the older application/activity+json link
6 years ago
William Pitcock
13d4b6d2b5
remote user deactivation: fix test failures
6 years ago
Francis Dinh
0ec1abb3b6
Add federated blocks
6 years ago
Francis Dinh
8d11bae0d5
Revert "Undo formatting in user.ex"
...
This reverts commit e6dc15b96c
.
6 years ago
Francis Dinh
e6dc15b96c
Undo formatting in user.ex
6 years ago
Francis Dinh
d8c842a771
Add support for incoming remote unfollows
6 years ago
csaurus
4dfb40a546
Handle cases where a to/cc field is absent on a status
6 years ago
William Pitcock
9390492138
ActivityPub create: discard activities from deactivated users
6 years ago
csaurus
2ce48c1a42
Formatting
6 years ago
csaurus
9aabff4883
Fix tests.
6 years ago
Syldexia
98b36d359a
Fixed formatting and test
6 years ago
Syldexia
5bfb7b4ce6
Moved account deletion stuff to somewhere that hopefully makes more sense
6 years ago
Syldexia
a16117225f
Added endpoint for user account deletion
6 years ago
lain
c7a85de35c
Revert "Remove 'unlisted' handling for now."
...
This reverts commit 1027d1f696
.
6 years ago
lain
1027d1f696
Remove 'unlisted' handling for now.
...
It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it.
6 years ago
lain
a5c9dd0a2a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
lain
3c3933e40b
Unlisted fetching: Reverse logic
...
Generates a faster query.
6 years ago
lambda
aeff2d6474
Merge branch 'feature/unrepeats' into 'develop'
...
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
6 years ago
lain
ec531ca281
Add test.
6 years ago
lain
29376fcc13
Format.
6 years ago
lain
76722ea9c8
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
6 years ago
Francis Dinh
54ccbd8479
Use original status id instead of announce id
6 years ago
csaurus
c8d418acdd
api/v1/timelines/direct implementation
6 years ago
csaurus
392bd9ef56
Stream function to handle direct messages.
6 years ago
csaurus
c60a5405db
Detect and try to stream incoming "direct" messages
6 years ago
Francis Dinh
4d88747561
Revert "Log error when handling unrepeats"
...
This reverts commit c17c55e989
.
6 years ago
Francis Dinh
c17c55e989
Log error when handling unrepeats
6 years ago
Francis Dinh
271fb5ccb1
Probably better way of handling non-follow undos in ostatus
6 years ago
Francis Dinh
4151cbe6b2
Revert "Do not send non-follow undos over ostatus for now"
...
This reverts commit 07fdc07238
.
6 years ago
Francis Dinh
0b527b5528
Revert "Use [] instead of nil"
...
This reverts commit 42268b0981
.
6 years ago
Francis Dinh
42268b0981
Use [] instead of nil
6 years ago
Francis Dinh
07fdc07238
Do not send non-follow undos over ostatus for now
6 years ago
href
c220a6db43
format & made get_policies/1 private
6 years ago
href
e9e6f37bda
Chain policies
...
- The `:pleroma, :instance, :rewrite_policy` can now be either a policy
or a list of policies
- Made a behaviour for MRF policies
6 years ago
Francis Dinh
900c735467
Match proper number of values from unannounce
6 years ago
Francis Dinh
54f6628590
Change argument order and call correct # of args
6 years ago
Francis Dinh
e55f69a676
Handle Undo activites containing an Announce
6 years ago
Francis Dinh
4d5ec883b7
Federate correct activity
6 years ago
lain
ffe028cd73
More warning fixes.
6 years ago
lambda
6c2903d9a1
Merge branch 'feld-warnings' into 'develop'
...
Clean up warnings
See merge request pleroma/pleroma!144
6 years ago
eal
bfad57c7c9
Get rid of unsafe variables.
6 years ago
lain
9810153aeb
Streamer: Don't send out stream events for blocked users.
6 years ago
lain
96add86b50
Unify wss uri generation.
6 years ago
lain
c464355d1a
Idempotency: Use special cache, keep for 6 hours.
6 years ago
Mark Felder
7a884d70d8
Group def renders here as well
6 years ago
Mark Felder
31ea9cbcd8
Group def renders together to fix warning
6 years ago
Mark Felder
14c0c6d16b
Fix formatting
6 years ago
Mark Felder
a24eed0f57
That last change was stupid. Multiline comments in Elixir don't really exist.
...
Instead we'll just pad with # intstead of playing stupid games with the compiler.
6 years ago
Mark Felder
79d41aa12e
Dirty hack to remove the warning
...
warning: code block contains unused literal "internal -> Mastodon\n" (remove the literal or assign it to _ to avoid warnings)
lib/pleroma/web/activity_pub/transmogrifier.ex
6 years ago
Mark Felder
aaacebd906
Fix unused variables, imports, and aliases
6 years ago
Mark Felder
42f1a098aa
Fix build. Too eager with the fixing of unused variables.
...
== Compilation error in file lib/pleroma/web/activity_pub/views/user_view.ex ==
** (CompileError) lib/pleroma/web/activity_pub/views/user_view.ex:54: undefined function _total/0
(stdlib) lists.erl:1338: :lists.foreach/2
(stdlib) erl_eval.erl:670: :erl_eval.do_apply/6
6 years ago
Mark Felder
636f0fa402
Clean up unused aliases and imports
6 years ago
Mark Felder
943820ae29
More unused variables
6 years ago
Mark Felder
ab4aa5720a
Fix a bunch of unused variable warnings
6 years ago
lambda
11a1241d41
Merge branch 'feature/nodeinfo' into 'develop'
...
Implements the nodeinfo endpoints
See merge request pleroma/pleroma!140
6 years ago
lain
90c4bed0af
Don't expire idempotency cache for five minutes.
6 years ago
lain
fcd3eca167
MastodonAPI: Support idempotency key.
6 years ago
Dashie
c3f9e24c70
Use a variable for stats to avoid double call
6 years ago
Dashie
724f096ac7
Add metadata.nodeName
6 years ago
Dashie
804497542d
Return the right content-type for the schema call
6 years ago
Dashie
e448734952
Explicit error message
6 years ago
Dashie
fd0bf3aa71
Simplify version and fix typo
6 years ago
Dashie
b8789cc8b6
Add localPosts count, also set to 0 if null
6 years ago
Dashie
abeb009acc
Change path of nodeinfo to use .json format
6 years ago
Dashie
65168393d8
Format files
6 years ago
Dashie
67dadd954e
Add first try at nodeinfo
6 years ago
lain
bc215f5684
Fix format.
6 years ago
lambda
b7584edcea
Merge branch 'patch-bio' into 'develop'
...
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
6 years ago
William Pitcock
a3d1d4894f
ActivityPub core: fix handling of unlisted statuses by leveraging a similar strategy as for blocks
6 years ago
lain
4d55d7c95e
Insert object after being rewritten.
6 years ago
lambda
a7a40bb8f1
Merge branch 'fix/blocked-user-boosts' into 'develop'
...
ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111
6 years ago
Wim Vanderbauwhede
634c0c52a1
Merge remote-tracking branch 'upstream/develop' into patch-bio
6 years ago
lambda
39c80a3667
Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
...
ActivityPub MRF SimplePolicy: fix media stripping
See merge request pleroma/pleroma!133
6 years ago
William Pitcock
90bbd94614
ActivityPub MRF SimplePolicy: fix media stripping
7 years ago
eal
845bd56c9c
Merge branch 'patch-1' into 'develop'
...
Fix typo in MastoFE login page.
See merge request pleroma/pleroma!132
7 years ago
lain
a7eb148d61
Optionally deactivate public timelines.
7 years ago
Francis Dinh
2d775bf1be
Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats
7 years ago
Francis Dinh
9e0dd21ed6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
7 years ago
Francis Dinh
0df1a4efc8
Fix comment grammar
7 years ago
Normandy
715c90e54f
Fix typo in MastoFE login page.
...
see https://git.pleroma.social/pleroma/mastofe/issues/13
7 years ago
lain
c78e7d8b11
Fix formatting.
7 years ago
lambda
7a52c4549c
Merge branch 'feature/message-rewrite-facility' into 'develop'
...
message rewrite facility
See merge request pleroma/pleroma!112
7 years ago
Wim Vanderbauwhede
7517155544
Changed to support \r\n and \n
7 years ago
Wim Vanderbauwhede
52ee91efce
Patch to replace newlines with <br> tags in bio
7 years ago
Dashie
9972678a68
Add User.decrease_note_count and call it from ActivityPub.delete
7 years ago
lambda
62a2287bba
Merge branch 'favicon_tag' into 'develop'
...
Fix endpoint for favicon
See merge request pleroma/pleroma!84
7 years ago
Francis Dinh
8c0806539c
Embed announce activity data instead of linking to it
7 years ago
Francis Dinh
b1742eca42
Revert "Rename make_unannounce_data helper to make_undo_data"
...
This reverts commit c649ca8958
.
7 years ago