William Pitcock
342ed84446
MRF: add policy for normalizing HTML markup (local and remote) to a specific 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
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
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
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
3aba585e7a
Add Plugs to router.
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
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
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
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
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
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
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
shibayashi
18ad8aaecf
Explicitly set 'http_only' to true
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
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
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
William Pitcock
aab2bdddf4
twitter api: provide object descriptions as attachment description field
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
c95941e64d
activitypub transmogrifier: fix handling of contentMap.
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
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
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
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