captain_arepa
/
akkoma-cachapa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3865 Commits
10 Branches
75 Tags
292 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '3b14119471'
${ noResults }
Commit Graph

2117 Commits (3b141194715e362d65482672d00b10991d102fa2)

Author SHA1 Message Date
Martin Kühl d94ee5cd50 Mastodon API: Support push subscription CRUD
6 years ago
William Pitcock 56577d8b48 twitter api: add no_rich_text option to userview for account prefs
6 years ago
William Pitcock df00a364fb mastodon api: formatting
6 years ago
William Pitcock c2b69798dd twitter api: add support for disabling rich text
6 years ago
William Pitcock 958e085acb mastodon api: add support for user-supplied html policy
6 years ago
William Pitcock 2f5b026548 twitter api: add support for user-specified html policy
6 years ago
kaniini 0fe165165f Merge branch 'task-204-on-options-request' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier 40c51f118f
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
6 years ago
Haelwenn (lanodan) Monnier f74725df41
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
6 years ago
Haelwenn (lanodan) Monnier 33a1e92584
[Pleroma.Web.Router]: Fake /api/v1/endorsements
6 years ago
Haelwenn (lanodan) Monnier a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
6 years ago
Haelwenn (lanodan) Monnier 43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
6 years ago
William Pitcock c9585ec007 twitter api: fix mimetype fallback when attachments use a URI instead of a URL object
6 years ago
William Pitcock 0cac493fdc mastodon api: default attachment type to image if one is not present
6 years ago
Martin Kühl f4fcea5258 Revert "Mastodon API: Fake support for loading filters"
6 years ago
Dominique Feyer 9b0f2d572b Return 204 response on options request
6 years ago
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'
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'
6 years ago
kaniini 530561a091 Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
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
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'
6 years ago
lain 636ad3e155 Add new plugs to router.
6 years ago
kaniini 76c67a41c1 Merge branch 'develop' into 'feature/staff-discovery-api'
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'
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'
6 years ago
kaniini 3c7280934e Merge branch 'security/activitypub-spoofing' into 'develop'
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
6 years ago
Martin Kühl ad2a7972e7 OAuth: Set `created_at` in token exchange response
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'
6 years ago
Will Pearson 0c2a0e3551 Specify default scope in verify_credentials
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'"
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'
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'
6 years ago
kaniini 65e8d47cfb Merge branch 'backendhack' into 'develop'
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'
6 years ago
lambda 440b459cd1 Merge branch 'bugfix/announce-timeline-flooding' into 'develop'
6 years ago
kaniini 63094cfd3e Merge branch 'feature/emoji-in-local-users' into 'develop'
6 years ago
William Pitcock bc3c30430e fix formatting
6 years ago
kaniini 1ad5cbed51 Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'
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'
6 years ago
kaniini 0f5bff8c66 Merge branch 'develop' into 'feature/relay'
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
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'
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
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'
6 years ago
kaniini a6d4cc8917 Merge branch 'sanitize-bio' into 'develop'
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.
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
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'
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'
6 years ago
eal 51a21284c6 ActivityPub: follow redirects when fetching user
6 years ago
shadowfacts 6698749073 Fix typo in app creation response
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'
6 years ago
kaniini 5fbb14f5ec Merge branch 'bugfix/federation-kroeg' into 'develop'
6 years ago
kaniini 38361e7b5e Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
6 years ago
lambda 9908cf8fda Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
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'
6 years ago
lambda 9de6145737 Merge branch 'fix/remote-follow-errormessage' into 'develop'
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
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
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'
6 years ago
lambda 54963a6379 Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
6 years ago
lambda 6f23fb53d3 Merge branch 'feature/fe-configuration' into 'develop'
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
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'
6 years ago
lambda ceffb91065 Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
6 years ago
lambda b1fcfcfae1 Merge branch 'bugfix/activitypub-object-actor' into 'develop'
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'
6 years ago
lambda 4a922305af Merge branch 'feature/article-support' into 'develop'
6 years ago
lambda 33b0334216 Merge branch 'bugfix/status-url-field' into 'develop'
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
6 years ago
Haelwenn (lanodan) Monnier 7a351cb36f
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
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
6 years ago
lambda fc012491a5 Merge branch 'fix/mutes.json-emptyarray' into 'develop'
6 years ago
lambda dfc96f222c Merge branch 'feature/configurable-blocks' into 'develop'
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
6 years ago
William Pitcock 60d6038be5 mrf simple: add accept lists
6 years ago
lambda 90cf75f4a7 Merge branch 'features/column_media_streaming' into 'develop'
6 years ago
lambda db0731b6ac Merge branch 'feature/exclude-replies-filter' into 'develop'
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
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'
6 years ago
eal a938d07df1 Merge branch 'bugfix/mastofe_thread_render' into 'develop'
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'
6 years ago
lambda 8c7fdcb31b Merge branch 'feature/twitterapi-unrepeat' into 'develop'
6 years ago
lambda 2c303b3302 Merge branch 'bugfix/oauth2-param-name' into 'develop'
6 years ago
lambda 280ac243aa Merge branch 'bugfix/oauth-password-with-email' into 'develop'
6 years ago
William Pitcock 5442466569 oauth: fix password-based login when username is email address
6 years ago
William Pitcock 4894b88b1b oauth: support either name or username parameter with grant_type=password
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
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'
6 years ago
William Pitcock 3d402a9e20 webfinger: send JRD by default instead of XRD
6 years ago
William Pitcock 59f95a7095 webfinger: refactor webfinger() functions
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'
6 years ago
lambda 564c73ab24 Merge branch 'feature/list-streaming' into 'develop'
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
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'
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'
6 years ago
lambda bb639a362e Merge branch 'feature/rejectnonpublic' into 'develop'
6 years ago
Rachel H fa0c2727d8 Fix users lookup/return type
6 years ago
lambda 4a16ade2ee Merge branch 'mastopost' into 'develop'
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'
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'
6 years ago
lambda 595ca3bb3a Merge branch 'feature/quarantine' into 'develop'
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'
6 years ago
William Pitcock 1abf0f3b3e webfinger: use https as default fallback instead of http
6 years ago
William Pitcock aaa81d3540 XML: handle erlang errors too
6 years ago
lambda b5d8213e70 Merge branch 'fix/oauth-http-basic' into 'develop'
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'
6 years ago
D Anzorge 73904e8f78 Make OAuth token endpoint work with HTTP Basic auth
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
6 years ago
eal dca1d6d162 Merge branch 'fix/user-timeline-reading-user' into 'develop'
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'
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.
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.
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
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
6 years ago
lambda f3a71f2986 Merge branch 'feature/lists' into 'develop'
6 years ago
lambda c2dcd767cf Merge branch 'feature/incoming-remote-unfollow' into 'develop'
6 years ago
Francis Dinh 1197ec10a8 Rewrite block fetch query
6 years ago
lambda c41012053a Merge branch 'feature/change-password' into 'develop'
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
6 years ago
lambda 06c97f211f Merge branch 'feature/deps-migration' into 'develop'
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'
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
6 years ago
Thog e55c6f311b
Migrate to comeonin 4 and Cachex 3
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'
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'
6 years ago
lambda ad563669c8 Merge branch 'feature/remote-user-deactivation' into 'develop'
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"
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."
6 years ago
lain 1027d1f696 Remove 'unlisted' handling for now.
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
6 years ago
lambda aeff2d6474 Merge branch 'feature/unrepeats' into 'develop'
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"
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"
6 years ago
Francis Dinh 0b527b5528 Revert "Use [] instead of nil"
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
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'
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.
6 years ago
Mark Felder 79d41aa12e Dirty hack to remove the warning
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.
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'
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'
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'
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'
6 years ago
William Pitcock 90bbd94614 ActivityPub MRF SimplePolicy: fix media stripping
7 years ago
eal 845bd56c9c Merge branch 'patch-1' into 'develop'
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.
7 years ago
lain c78e7d8b11 Fix formatting.
7 years ago
lambda 7a52c4549c Merge branch 'feature/message-rewrite-facility' into 'develop'
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'
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"
7 years ago
lain 0574df273c Small cleanup.
7 years ago
Francis Dinh c649ca8958 Rename make_unannounce_data helper to make_undo_data
7 years ago
eal 22bfeac256 Update note count in ActivityPub.create.
7 years ago
lain 9e6ae44729 Formatting fixes.
7 years ago
lain ff5e957476 Make search use id index too.
7 years ago
Francis Dinh f0798440de Use correct activity for undo
7 years ago
Francis Dinh 4b9f2ab526 Fix federation of unreblog activity
7 years ago
Francis Dinh c5dc7e6e31 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
7 years ago
lain a61e8ac154 Formatting.
7 years ago
eal fa37acfcc7 TwitterAPI: Add Qvitter notification endpoint.
7 years ago
nenolod@dereferenced.org f08f9d4498 ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case)
7 years ago
Francis Dinh 32a26eb910 Fix TwitterAPI.delete call
7 years ago
William Pitcock ee6f15529d CommonAPI post: kill \r with fire
7 years ago
eal 947431e9aa MastoAPI and OAuth: allow login with either email or username.
7 years ago
Francis Dinh 7b4f55238e Handle unrepeats via the TwitterAPI
7 years ago
Francis Dinh 687db1bc3a Expose unannounce activity so that it can be tested
7 years ago
Francis Dinh 0251690e96 Add federation for unrepeats
7 years ago
Francis Dinh c9e7b984d5 Add make_unannounce_data helper function
7 years ago
Francis Dinh 85bd191291 Remove unretweet function for now
7 years ago
Francis Dinh 42279f54cf Return target status in MastoAPI endpoint instead of reblog activity
7 years ago
Francis Dinh d16877251a doc fixes
7 years ago
Francis Dinh b949577472 Add unrepeat functionality
7 years ago
William Pitcock d24ddd9fb9 ActivityPub MRF: implement the SimplePolicy policy
7 years ago
William Pitcock 4a178b3d65 ActivityPub: implement MRF core hook and baseline noop policy object
7 years ago
eal 48380aeccc ActivityPub.ex: do not return boosted statuses from blocked users.
7 years ago
Gian Sass 907df9b8ed Fix issue #124
7 years ago
lain 1dd2c8163f Order masto searches by date.
7 years ago
lambda 9998b4519d Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
7 years ago
lambda 9a2d3705c6 Merge branch 'fix/persisted-mastofe-settings' into 'develop'
7 years ago
William Pitcock 1857f403be mastodon api: report version as the Mastodon API version supported with the real version in parenthesis
7 years ago
William Pitcock 52a1a40d7d mastodon api: implement /api/v1/lists stub
7 years ago
lain 8f9bcc4ab0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
lain 70bcdf32bd Only search in public data for now.
7 years ago
eal 7c47534970 MastoAPI: Persist frontend timelines and settings.
7 years ago
lambda d41bfd1d47 Merge branch 'bugfix/html-webfinger-host-meta' into 'develop'
7 years ago
eal e7ddda44c0 Follow import: allow URI in addition to screen_name.
7 years ago
William Pitcock bf9d3d4aba XML: use try/catch with XPath functions
7 years ago
lain 303289d7da MastodonAPI search: return only create activities.
7 years ago
RX14 033771d9f1
Fix failure to serve media from custom upload path
7 years ago
lain d70d1c427a TwitterAPI: Don't put follows into the public tls.
7 years ago
lain b3b7ab5d9a Load all users at once in timelines.
7 years ago
lain 96007753ad Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
lain 360c51f1f5 Use context_ids directly if we have them.
7 years ago
lain bc31bee7c4 Generates contexts and ids on insertion time.
7 years ago
lain a4db3a732f Pre-fetch conversation ids.
7 years ago
Morgan Bazalgette 5e4bb4ad92
masto api: run emojis through mediaproxy
7 years ago
lambda 978df55a86 Merge branch 'feature/mastodon-search-tags' into 'develop'
7 years ago
KANEKO Yoshitaka b3d67750f0 Fix conflict
7 years ago
William Pitcock 2dcc6037d0 mastodon search api: implement a reasonable hashtags stub
7 years ago
William Pitcock 4bf86d4cf5 config: make the upload limit configurable
7 years ago
lambda 5fa8237bc1 Merge branch 'new-mastofe' into 'develop'
7 years ago
lain 2222e5599c Don't fetch anything except ap_id for follower / following
7 years ago
Morgan Bazalgette 7f2174d811
Remove pl-dark-masto-fe, add preloading for common scripts
7 years ago
lain 802736679c Remove unused ActivityRepresenter module.
7 years ago
lain 7ab94ae22d TwitterApiController: Use ActivityView.
7 years ago
lain e90f8f6c4b TwApi ActivityView: Add delete activities.
7 years ago
lain 1f32ba052c TwApi ActivityView: Add follows.
7 years ago
lain 4afbef39f4 Format the code.
7 years ago
lain 480932c8e5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
lain c1d529ee94 TwApi ActivityView: Add announces.
7 years ago
lain 1f1caab138 TwApi ActivityView: Add Like rendering.
7 years ago
lain 675839e13c Fix TwApi reply visibility.
7 years ago
Morgan Bazalgette 457e040473
Add char_limit to initial-state of mastofe
7 years ago
lain df8fc72491 Don't go through all available emoji.
7 years ago
lain e30752bc79 Add basic activity view.
7 years ago
lain 37e5014d3e Reduce OP fetching queries.
7 years ago
lain ff7afe46b9 Don't try to fetch OP if none is there.
7 years ago
lain d2099c849d More Jason changes.
7 years ago
lain fbc187ac15 Switch to Jason for json handling.
7 years ago
lain 46f63ea8af Fix atom feed pagination.
7 years ago
lain 2c1c221301 Fix follower collection id.
7 years ago
lain 09de76ad5a Return "audio" info in mastodon api.
7 years ago
lambda 809bffbb21 Merge branch 'feature/oauth-token-password' into 'develop'
7 years ago
KANEKO Yoshitaka aa19fdef00 Fix favicon and add to index.html
7 years ago
William Pitcock 2aea3bc632 activitypub transmogrifier: rewrite incoming hashtags
7 years ago
lain 847cb15626 Fix tests.
7 years ago
lain c7be7a9454 Unify user fetching.
7 years ago
lain e3a81fe58f Fetch the same data from json webfinger as from xml webfinger.
7 years ago
lain eb7ce61ca5 Fix hashtags.
7 years ago
William Pitcock dd21137f38 oauth: implement grant_type=password for single-page apps
7 years ago
lain fbe9aa3506 Strip html from emoji stuff.
7 years ago
lain 5da2355e71 For outgoing objects, fake mastodon style ap id for ostatus.
7 years ago
lain b72a25f5b1 Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints
7 years ago
lain f9ab38a443 Fix test.
7 years ago
William Pitcock 4d3af2af71 webfinger: implement json response parsing
7 years ago
William Pitcock 1decd2ecb2 webfinger: attempt to fall back if LRDD template cannot be found
7 years ago
William Pitcock 8aa639a450 webfinger: support JSON output
7 years ago
William Pitcock 3fcdfb75d0 activitypub: add outbox endpoint
7 years ago
William Pitcock 381ba256bf activitypub: add restrict_limit
7 years ago
William Pitcock 1a94704230 activitypub: implement following/followers endpoints
7 years ago
lain c50c7745bc Fetch relayed messages from source while we don't have linked data sigs.
7 years ago
lambda 9b97b023c5 Merge branch 'feld-Logger' into 'develop'
7 years ago
Mark Felder 16d102c153 Clarify that this error is about a problem decoding the expected JSON
7 years ago
Mark Felder 96cfc67e05 LRDD, you are special and we love you too
7 years ago
Mark Felder 2702df489f cap again
7 years ago
Mark Felder 2549a73d6d start with a capital
7 years ago
Mark Felder 9a858621d6 AP and WebFinger need love here
7 years ago
Mark Felder 8d561f952f Make XML feel special too
7 years ago
Mark Felder 032ed2b945 This log message was do do 💩
7 years ago
Mark Felder 4190abbf27 Another WebSub CamelCase
7 years ago
Mark Felder 7430ff9173 Capitalize Atom
7 years ago
Mark Felder 7f77433c0e CamelCase WebSub in log messages
7 years ago
Mark Felder 25279dba77 Capitalize start of log message
7 years ago
Mark Felder 0cf6f7a54d capitalize Salmon protocol name
7 years ago
Mark Felder 04395cb9bd Grammar consistency
7 years ago
Mark Felder 402e775a80 ap -> AP for consistency
7 years ago
lain ec83175100 Use connection pools.
7 years ago
lain 4d5161b16d Only fetch if it's http.
7 years ago
William Pitcock 000b3f1837 mastodon api: fix rendering the mentions JSON
7 years ago
William Pitcock 59a76ea464 activitypub transmogrifier: rewrite non-http URLs using the object's external URL
7 years ago
lain 68aa9a2826 Do more jobs by default.
7 years ago
lain 0067c9d2be Only push to still valid websub subscriptions.
7 years ago
lain 2b2fa94e94 Move stuff around.
7 years ago
Wim Vanderbauwhede 36f615135f A small patch to show the instance name and favicon in the browser title
7 years ago
lain 30d65639c1 Fix Mastodon emojis.
7 years ago
lain 312a8783f8 Ignore incoming empty chat messages.
7 years ago
lain 368e085144 Don't validate on missing public key.
7 years ago
lain a9f78fe8e0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
lain f29902a241 More signature debugging.
7 years ago
eal 18e1202a3b MastoAPI: Add unimplemented status card endpoint.
7 years ago
eal 2e32012d57 Add next and previous headers to user pages and tag timelines.
7 years ago
lain ff7bc16a7e Restrict activity fixing more.
7 years ago
lain 611ca385de Merge branch 'develop' into feature/activitypub
7 years ago
lain 8228ae96d8 Only run the fix-up tasks once.
7 years ago
lain fcf1937a40 Correctly handle unlisted messages coming in through Ostatus.
7 years ago
lain b82637f32d Don't use special query for feed.
7 years ago
lain 0e20d5529a Add way to disable federation.
7 years ago
lain d2ad99298e Handle incoming deletes.
7 years ago
lain 1377b2e569 Restrict public by recipients.
7 years ago
lain a17ba0ee0d Only return posts in TwAPI user view.
7 years ago
lain 82df16f7c3 Actual real fix.
7 years ago
lain 0d69bbc1fb One more fix.
7 years ago
lain 8c712b3198 Fix context stitching.
7 years ago
lain e1b0ccce77 Mastodon API context fix.
7 years ago
lain e9de04b74b Add support for outgoing update.
7 years ago
lain f61fd00db5 Make likes and announces public.
7 years ago
lain 8a47974217 Fix specs.
7 years ago
lain 4ea2a41014 Fix more specs.
7 years ago
lain 4d13cc0dc6 Fix specs.
7 years ago
lain dfaddeb765 Use update_and_set cache.
7 years ago
lain e3629af4da Handle remote update activities.
7 years ago
lain dd97193311 Set conversation to parent conversation.
7 years ago
lain b76de1ecd3 Some fixes to AP fetching.
7 years ago
lain 0e9bd6d148 Hotfix for tag problems.
7 years ago
lain 7e0ce32f4d Fix external url in twitterapi.
7 years ago
lain 82e34cae95 Unify object representation.
7 years ago
lain 2b5d265954 Don't deliver to local followers.
7 years ago
lain df73a9c6d6 .
7 years ago
lain 5bc7628022 Fix.
7 years ago
lain 59ad395ffa Better signature errors messages.
7 years ago
lain a7c3ead9e6 Invalidate user after key creation.
7 years ago
lain fb5add56fa Bit more signature debugging.
7 years ago
lain ac67453e8a More logging for signature problems.
7 years ago
lain e5fcc51a06 Remove unneccesary subscriptions on update.
7 years ago
lain fa3aa59248 Add missing alias.
7 years ago
lain fb02300234 Pleroma AP detection mechanism.
7 years ago
lain 9a4d400ff4 Fix remote following.
7 years ago
lain 06b512acf1 Never update local users from foreign sources.
7 years ago
lain 541a4cbbb6 Oh no! More fixes!
7 years ago
lain 01d5ef65fa More fixes to user upgrading.
7 years ago
lain efd4d04933 Fix user upgrading code.
7 years ago
lain 1331a39d39 Webfinger: Remove leading @s.
7 years ago
lain aa79d64e0d Correctly stitch mastodon -> ostatus replies.
7 years ago
lain 2583a9f6e8 More logging.
7 years ago
lain 95e6e82138 Correctly display accounts without name.
7 years ago
lain 5dc68d303b Get objects that people you know favorite.
7 years ago
lain c443aec83d Add banner image to user json.
7 years ago
lain 37e406ae36 Get avatar and banner from AP users.
7 years ago
lain 4816b09fa7 Add user upgrade function.
7 years ago
lain 94db9ac4db Merge branch 'develop' into feature/activitypub
7 years ago
lain a06b9a3e0b Logging.
7 years ago
lain 67afd024a7 Streamer: Make it less chatty.
7 years ago
lain 810cf8618f ActivityPub: Fetch missing activities on reply.
7 years ago
lain 947ba6495d More TwAPI fixes.
7 years ago
lain 92021fd00c Logging, put incoming ap docs into incoming queue.
7 years ago
lain 279e1ce556 Typo.
7 years ago
lain 66aa35903e Add missing alias.
7 years ago
lain b52672294e Move incoming AP to Federator.
7 years ago
lain 391b3e3586 TwitterAPI: Fix some bugz.
7 years ago
lain fd95075e32 TwitterAPI: Fix mentions.
7 years ago
lain eec6a87dbb Allow moderators to delete posts.
7 years ago
lain 5bc810c452 Add moderator function.
7 years ago
lain 486e205810 Remove some noise.
7 years ago
lain 9c89916969 ActivityPub: One queue item per server.
7 years ago
lain 297a2c7d3f Ignore duplicate create activities.
7 years ago
lain ffa2f57c36 Salmons can't carry private information.
7 years ago
lain 6b6ab592ab AP: Fix incoming conversations.
7 years ago
lain 6b32b9e346 Notifications: Use all recipients, not just "to".
7 years ago
lain 01faa7c555 TwitterAPI: support follow activities without published date.
7 years ago
lain 1633470e4a TwitterAPI: Only fetch creates, announces, follows.
7 years ago
lain 313f186a66 Ostatus: Use all recipients as mentions.
7 years ago
lain 932d346d35 fix typo.
7 years ago
lain 8b11546334 For existing users, just replace info.
7 years ago
lain decbf3a47f fix typo.
7 years ago
lain 342d0b01d1 Only push to followers if they are addressed.
7 years ago
lain 78516a8daa Salmon: Take both versions of public keys.
7 years ago
lain dc1d3ceb72 Fix log.
7 years ago
lain e368b68dcf Log but ignore signature errors.
7 years ago
lain 76e71f47d3 Inbox: Don't add the same thing twice.
7 years ago
lain 010f818a29 Fix conversations.
7 years ago
lain deaad6d97a Fix delivery to CC.
7 years ago
lain 8567feed47 Salmon is ok!
7 years ago
lain 803bdc1a67 Federate non-public over ActivityPub only, do some better signing.
7 years ago
lain 4bc57ef20c Don't relay non-public messages.
7 years ago
lain 5d89997a70 Respect visibility in API.
7 years ago
lain 5729233c36 Don't show unlisted in public.
7 years ago
lain c974f6544f Show users their own posts in timeline.
7 years ago
lain 44586f2967 ActivityPub: Fallback for unhandled outgoing activities.
7 years ago
lain 2997fe1ba9 CommonAPI: If no visibility is given, return parent visibility.
7 years ago
lain d4b08dd838 MastodonAPI: Post with visibility settings
7 years ago
lain 539340d914 Handle sensitive property.
7 years ago
lain 20e6190ead Transmogrify outgoing nsfw.
7 years ago
lain 8ca66b5961 ActivityPub: Add conversation id.
7 years ago
lain 912ca56e59 Mastodon StatusView: Return correct visibility.
7 years ago
lain 6ab0aba50a Transmogrify outgoing hashtags.
7 years ago
lain 6046f10431 Actually fix incoming attachments.
7 years ago
lain 6352dffd13 Drop unhandle activities.
7 years ago
lain b99eeb2bdf Try to fetch AP user data first.
7 years ago
lain 68752b2047 Switch protocols to AP when post come in through AP.
7 years ago
lain 77c6c424a6 ActivityPub: Make fake Create activities for objects without one.
7 years ago
lain 81ea359a7c ActivityPub: Handle incoming announces.
7 years ago
lain 5e36b750c1 ActivityPub: Fetch an object from an id.
7 years ago
lain 0f2ad25a7b AcitvityPub: Outgoing Announces.
7 years ago
lain 32b995fbb6 ActivityPub: Implement outgoing likes.
7 years ago
lain e1b12a7782 ActivityPub: Handle incoming likes.
7 years ago
lain 1f98de2079 ActivityPub: Use shared inbox.
7 years ago
lain ab27c90c9f ActivityPub: Handle attachments.
7 years ago
lain c2d0cb1a29 ActivtyPub Delivery: Use shared inbox if possible.
7 years ago
lain 7b26443a76 ActivityPub: Send out Accept after Follow.
7 years ago
lain e7b73359e3 ActivityPub: Partly handle incoming follows.
7 years ago
lain 5682e48a25 ActivityPub: tags -> tag.
7 years ago
lain 05ba6ca1b8 Do some transmogrifying for the output.
7 years ago
lain 5a371892a0 Fix specs.
7 years ago
lain 7851b9ba81 ActivityPub: Use recipients fields.
7 years ago
lain 5454ec6a6c ActivityPubController: Handle inbox data.
7 years ago
lain ef0300889d Transmogrifier: Handle basic notice creation.
7 years ago
lain ae26604378 ActivityPub: Refactor create function.
7 years ago
lain b331cb449a Merge branch 'develop' into feature/activitypub
7 years ago
lain 91928b06ab Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop
7 years ago
lain 8cf97ee8e1 ActivityPub: Basic note federation with Mastodon.
7 years ago
lain ce31f3a922 Twitter Representers: Handle Mastodon attachments.
7 years ago
Roger Braun ae1ec858f4 Basic AP user building.
7 years ago
Roger Braun 52200998c9 Merge branch 'develop' into feature/activitypub
7 years ago
hakabahitoyo a61f21ff4f print <link rel="next"> element in atom.feed
7 years ago
Hakaba Hitoyo 7124f12a94 introduce max_id parameter in feed.atom (debug)
7 years ago
Roger Braun 08f458e6df UtilController: Fix statusnet config api compatibility.
7 years ago
Hakaba Hitoyo 9c61f60558 introduce max_id parameter in feed.atom
7 years ago
lambda af854f7e01 Merge branch 'develop' into 'develop'
7 years ago
lambda f0cde24f71 Merge branch 'fix/config-disable-chat' into 'develop'
7 years ago
Calv Collins 73249fa5ff Changed fallback controller to handle all cases from OAuthController
7 years ago
Calv Collins 314f4775c5 Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop
7 years ago
Calv Collins bdb5dd2194 Create action_fallback for username/password incorrect input
7 years ago
Roger Braun 2f291576e4 Fix compile errors on 1.4.5
7 years ago
lambda 61c16193de Merge branch 'move-backend-images' into 'develop'
7 years ago
Hakaba Hitoyo c8a2931549 add backend endpoint /images
7 years ago
eal f0745148a3 Add config option for enabling/disabling chat.
7 years ago
eal 29be70c008 Add remote following of local profiles.
7 years ago
eal ab83e0de6d TwitterAPI: Add is_local to user view.
7 years ago
Hakaba Hitoyo 03c15a54f5 provide instance thumbnail at /api/v1/instance (debug)
7 years ago
Hakaba Hitoyo e47f60c053 provide instance thumbnail at /api/v1/instance (debug)
7 years ago
Hakaba Hitoyo a4335e391f provide instance thumbnail at /api/v1/instance
7 years ago
Roger Braun 5e37adedfb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Roger Braun ad0ab3a57b Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
7 years ago
Hakaba Hitoyo cefb6cfea1 provide logo at feed.atom (debug)
7 years ago
Hakaba Hitoyo b713b28dfd provide logo at feed.atom
7 years ago
lambda 2f23ae5b68 Merge branch 'pr-upstream-http-proxy' into 'develop'
7 years ago
Roger Braun 64e51c2cfa Fix incoming Pleroma CWs. Closes #96.
7 years ago
Jeff Becker dffde6631d
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
7 years ago
eal beb13bf3a9 Revert "Revert "Add remote follow pages.""
7 years ago
eal 57d413e655 Revert "Revert "Add remote follow path to webfinger.""
7 years ago
eal b259b4e4d1 Revert "Add remote follow pages."
7 years ago
eal fb5aa34092 Revert "Add remote follow path to webfinger."
7 years ago
eal 47e8c8db05 Add remote follow pages.
7 years ago
eal bc689740f0 Add remote follow path to webfinger.
7 years ago
eal b3e7d7ae6d Fetch external profile in the background.
7 years ago
eal 80f6ac412a Merge branch 'default-pictures' into 'develop'
7 years ago
eal 14b086eec2 Add a default profile picture and banner.
7 years ago
eal d8db39564e Move user count to stats agent.
7 years ago
eal 9717166d10 Add a stats agent for storing data from expensive queries.
7 years ago
Jeff Becker 1e185b9301
apply proxy settings to media_proxy
7 years ago
eal 5c09d8d3f1 Unlink follow import process from the one processing request.
7 years ago
href 0ccd0e5cc9
Remove a useless URI.encode call in MediaProxy
7 years ago
lambda 35ac549a99 Merge branch 'media-proxy' into 'develop'
7 years ago
Lain Iwakura 2a744cdff8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Lain Iwakura f1f79c0dca Fix timelines in subway tooter.
7 years ago
lambda 29c9812789 Merge branch 'fix/twitterapi-follow-lists' into 'develop'
7 years ago
Lain Iwakura 47887ac848 MastoAPI: Fix always-sensitive bugs.
7 years ago
Lain Iwakura 846d59a536 Send out salmons before websub.
7 years ago
eal 1969773fb4 Fix follower/following lists.
7 years ago
lambda 6b48489237 Merge branch 'feature/follow-import' into 'develop'
7 years ago
eal fdfb508259 Run follow import in the background.
7 years ago
eal d89193a8d7 Allow uploading a file for follow import.
7 years ago
Lain Iwakura 4a13b84887 Add recipients field to activities.
7 years ago
eal 39ccfdc084 Add follow import.
7 years ago
href f909aec050
proxy emojis
7 years ago
href 8e82547179
fix content-type and fallback to image/jpeg
7 years ago
Roger Braun 888ec9e579 ActivityPub: Check inbox requests for valid signature.
7 years ago
Roger Braun a9c23e1c32 Add plug to validate signed http requests.
7 years ago
Lain Iwakura 64330d9455 ActivityPub: Add object routes / controller.
7 years ago
Lain Iwakura a89a613e4e ActivityPub: Use only string keys in views.
7 years ago
Lain Iwakura da005d3332 ActivityPub: Add Objects View.
7 years ago
lambda 4b06e46a3a Merge branch 'fix/tootdon-mentions' into 'develop'
7 years ago
eal b00e230760 Add a bunch of useless HTML to mentions.
7 years ago
Roger Braun c3bcafc51b HTTPSig: Add method to validate conn
7 years ago
Roger Braun 5599c5920c Basic incoming AP support.
7 years ago
href 9093b2cf49
Merge remote-tracking branch 'upstream/develop' into media-proxy
7 years ago
href 077faaed8c
Limit body size to 25MB
7 years ago
Roger Braun 25118aeef7 Add link to AP address in webfinger.
7 years ago
Roger Braun 30e9b22f96 Merge branch 'develop' into feature/activitypub
7 years ago
Roger Braun d5a13c10ac Merge branch 'feature/user_deletion' into develop
7 years ago
lambda 35cfbf43a0 Merge branch 'fix/linkify' into 'develop'
7 years ago
eal bf91e5659f Fix HTML escape breaking some links.
7 years ago
eal 5436dbaeaf MastoAPI: don't add attachment links.
7 years ago
Lain Iwakura e31a5ff4af Priority queue fixes.
7 years ago
Lain Iwakura 66c3813ea6 Add basic queue prioritization.
7 years ago
href 72f7baa654
Merge remote-tracking branch 'upstream/develop' into media-proxy
7 years ago
Roger Braun 5945ec84e9 Don't save user in socket, just save the name.
7 years ago
Roger Braun 69f1024bb0 Add basic channel state.
7 years ago