Commit Graph

921 Commits (ce1f66aa2dcc3789afc65ba0a012d6496a238eaf)

Author SHA1 Message Date
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
eal 286f6698ee Detect file type if none given.
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
Hakaba Hitoyo ea6d1b2b17 move avi.png & banner.png from /priv/static/static to /priv/static/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
eal 0f194dc56b Merge branch 'feature/instance-thumbnail-api' into 'develop'
7 years ago
eal ab8b9ababa Split emoji to default and custom.
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 066fe1a697
use nil instead of empty string
7 years ago
Jeff Becker dffde6631d
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
7 years ago
Roger Braun 0f722a8c22 Stats: Make less crashy and improve query.
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
Jeff Becker 5ddd15d794
make httppoison use configurable http 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
Lain Iwakura ef2322bdb7 Delete notifications on activity deletion.
7 years ago
Lain Iwakura bad499b3fd Basic user deletion.
7 years ago
lambda 35cfbf43a0 Merge branch 'fix/linkify' into 'develop'
7 years ago
eal a3e68f0233 Allow parentheses in links.
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 6df6ad0b42 User deletion: Remove relationships.
7 years ago
Lain Iwakura a78ae2a685 Don't follow deactivated users.
7 years ago
Lain Iwakura b727ecc5e7 Add function to deactivate users.
7 years ago
Lain Iwakura 0ec5aeb8a7 Don't log in deactivated users.
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 1c90bfb4f6 Merge remote-tracking branch 'origin/develop' into feature/chat
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
eal c1fa1e8844 Fix basic auth for passwords with a colon.
7 years ago
Lain Iwakura 5c40986120 Basic backend chat.
7 years ago
Roger Braun d08a34e88b OStatus: Add user bio as summary field
7 years ago
Lain Iwakura 5637d163e6 MastodonAPI: Add proper user count.
7 years ago
href 1cb5cbdc6c
Improve error handling, add configuration
7 years ago
href e28c110eba
mandatory typo fix...
7 years ago
href 5f35fdcf5d
media proxy: good enough wip
7 years ago
lambda 9d1c0ec18d Merge branch 'salmon-native-keys' into 'develop'
7 years ago
href 4524721fba
Salmon: generate private key with native crypto if available.
7 years ago
Lain Iwakura c680ae581d Return xml notice at /notice path.
7 years ago
Roger Braun d16b613929 MastodonUI login: Show error message on error.
7 years ago
lambda 698a75cb39 Merge branch 'develop' into 'develop'
7 years ago
eal 1625021a9c Merge branch 'fix/self-follow' into 'develop'
7 years ago
eal e9037ffc8d Do not include user in their own follower count.
7 years ago
eal fa19de97ba MastoAPI: no more than 4 attachments.
7 years ago
Roger Braun 747a68a075 Treat internal emoji like external.
7 years ago
Roger Braun cf0bbf320d MastoAPI: Add max_toot_chars.
7 years ago
eal bd921ca5d7 Fix posts being streamed to non-local websocket channels.
7 years ago
eal 4db5954786 Don't let the user unfollow their own account.
7 years ago
eal aadf54e0df Don't show the user in their own following count.
7 years ago
Hyper! (Stitch) 36011fee4e Add Custom Pleroma-dark theme
7 years ago
Roger Braun 52aa65fe6e Federator Queue: Add seperate in/out queues.
7 years ago
Roger Braun 5ff5d583b6 MastodonAPI: Streaming fixes.
7 years ago
Roger Braun 0f099dac67 MastodonAPI: Add sign out.
7 years ago
Roger Braun c336a13d2c MastoAPI: Only return create activties in contexts.
7 years ago
Thog 59770c3f5c
Fix all compilation warnings
7 years ago
lambda ed3403ad8b Merge branch 'formatting-fixes' into 'develop'
7 years ago
eal 146ec80285 Merge branch 'fix/mastofe-login-redirect' into 'develop'
7 years ago
eal f53cdabcdf Add #nsfw tag if sensitive content bit is set
7 years ago
eal 31e4277ba5 Don't add summary if empty.
7 years ago
eal fb118b2978 Don't insert newlines to generated HTML.
7 years ago
eal 66e78c3ec4 Escape HTML instead of discarding it.
7 years ago
Roger Braun 4647bcd6e6 Don't start streamer during tests.
7 years ago
eal 9c60cc88df Redirect to Getting Started on login.
7 years ago
Roger Braun a743940463 MastoAPI: Implement all streaming functions.
7 years ago
Roger Braun 5719f69ae3 MastodonAPI: Stream fixes.
7 years ago
Roger Braun 43499848d0 Small css fix.
7 years ago
Shpuld Shpuldson 189513e4ff Add styles to make login page resemble mastodon's
7 years ago
Roger Braun 8de890a0d9 Add custom emoji to Mastodon UI initial state.
7 years ago
Roger Braun ced0d64d75 MastoAPI: Make attachment ids strings.
7 years ago
lambda 1cca544e20 Merge branch 'twitterapi-bitlbee' into 'develop'
7 years ago
eal f9828e578c TwitterAPI: Add /users/show.
7 years ago
eal 163c658202 TwitterAPI: Add unimplemented /mutes/users/ids.
7 years ago
eal 22bbe27115 TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
7 years ago
eal 3533bf7eac TwitterAPI: Add /friends/ids.
7 years ago
eal 06c3ee3bac Accept 1 as true.
7 years ago
eal c84723b679 MastoAPI: Add media timelines.
7 years ago
Roger Braun 083cd169d2 MastoAPI: Fix repeat api bug.
7 years ago
Roger Braun 5fc6e9d467 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Roger Braun d293ceb1b5 Add Mastodon frontend.
7 years ago
lambda 08bc316742 Merge branch 'mastodon-notification-endpoints' into 'develop'
7 years ago
lambda 87dee3902a Merge branch 'filetype-recognition' into 'develop'
7 years ago
lambda efcf54dc02 Merge branch 'mastoapi-update-credentials' into 'develop'
7 years ago
eal 18a95cd375 Add common video and audio types.
7 years ago
eal fc7483cb3c MastoAPI: Add update credentials endpoint.
7 years ago
eal 260b148b92 Use headers for file content type recognition.
7 years ago
Roger Braun 414c52509b MastoAPI: Websocket streaming for federated timeline.
7 years ago
Roger Braun bd5bdc4c24 MastoAPI: Basic streaming.
7 years ago
Roger Braun a1923d20e8 MastoAPI: Fix reblog emojis.
7 years ago
Roger Braun fd12e585c9 Handle existing redirect params.
7 years ago
Roger Braun 1d3d66a841 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Roger Braun 6e9c22c0af MastoAPI: Use string ids everywhere.
7 years ago
eal e6a78c6ed0 MastoAPI: Add notification get, clear and dismiss.
7 years ago
Roger Braun 1b8ad9f731 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Roger Braun 266d9c008d MastoAPI: Fetch statuses in search.
7 years ago
lambda 2247d7580e Merge branch 'fix-tootdon-image-uploads' into 'develop'
7 years ago
eal e942e1e552 Correct mimetype on bad uploads.
7 years ago
Roger Braun f1d27a5fbb Add actor column to activities.
7 years ago
Roger Braun 41b8a76e96 Re-fetch user data on salmon decode error.
7 years ago
lambda 77e272df2d Merge branch 'following-you-in-user-view' into 'develop'
7 years ago
eal f7fc048aeb TwitterAPI user view: add follows_you.
7 years ago
Roger Braun d2430d5007 Look through whole db for user timelines.
7 years ago
eal 4656cb9b99 TwitterAPI user view: add blocks.
7 years ago
eal 6c0758e041 TwitterAPI: Add blocks.
7 years ago
lambda be67db5547 Merge branch 'mastodon-emoji-endpoint' into 'develop'
7 years ago
eal c6210183e1 Add mastodon API endpoint for custom emoji.
7 years ago
lambda d761b1543a Merge branch 'authenticated-profile-fetching' into 'develop'
7 years ago
Roger Braun 722c4614ad Allow self-rt.
7 years ago
Roger Braun 7da978f3f5 Linkify fixes.
7 years ago
Roger Braun 6dfa62800a Revert "Longer timeouts for user fetching."
7 years ago
Roger Braun 7de3a65214 Longer timeouts for user fetching.
7 years ago
eal f85566324e Allow profile fetching for authenticated users only.
7 years ago
lambda ed1eb5deea Merge branch 'fix-tootdon-oauth' into 'develop'
7 years ago
eal b0e27b21dd Fix tootdon logins.
7 years ago
Roger Braun 7252f6b054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
Roger Braun 046bee34d3 Fix bug when no posts are in the db.
7 years ago
lambda fa1f11e8e9 Merge branch 'feature/blocks' into 'develop'
7 years ago
Roger Braun c6b9b777da MastoAPI: Add list of blocked users.
7 years ago
Roger Braun 5bf92e50be MastoAPI: Add blocking.
7 years ago
Roger Braun 33beb51da4 MastoAPI: Add blocking to AccountView.
7 years ago
Roger Braun 8a1a7191fd MastoAPI: Fix mentions always being for an anonymous user.
7 years ago
Roger Braun 9b63647aff MastoApi: Add blocking to fetches.
7 years ago
Roger Braun d89a7a0b34 TwitterAPI: Add blocking to fetches.
7 years ago
Roger Braun 867ac1e4f5 Handle nil cases.
7 years ago
Roger Braun 8ef58a266b Don't return blocked users' activities in contexts.
7 years ago
Roger Braun a47727adde Don't return activities from blocked users.
7 years ago
Roger Braun 632da6c927 Don't create notifications if the user is blocked.
7 years ago
Roger Braun 6a5f087174 Add blocks to User.
7 years ago
Roger Braun 9be286a900 Handle empty terms / tags.
7 years ago
Roger Braun 6f05367325 Federate out content warnings.
7 years ago
Roger Braun e014cc6ed8 Allow using cws in mastodon api.
7 years ago
Roger Braun 44295dd49a MastoAPI: Include CW.
7 years ago
Roger Braun 04217f52c9 TwitterAPI: Display cws.
7 years ago
Roger Braun 4cbf17dac6 Save cws in the activitypub data.
7 years ago
Roger Braun 4dcbb64f19 Avoid potentially slow count queries for user note count.
7 years ago
Roger Braun 3037814fde Only search through last 100_000 activities for fetches.
7 years ago
Roger Braun 968a546d4a MastoAPI: Return id as string instead of integer.
7 years ago
Roger Braun ce7f9f527c MastoAPI: Always return an url for statuses.
7 years ago
Roger Braun 502cb38cd6 Move user search to User module.
7 years ago
Mark Felder efe12e1a73 Fix /api/v1/accounts/search by splitting account search into its own function
7 years ago
eal 2ffc6da207 Clean style.
7 years ago
eal c56d28f96c Fix return type of /api/v1/follows
7 years ago
eal 11d2287476 Return error message on errors
7 years ago
eal 813d2eaaf0 Add mastodon API endpoint for follow
7 years ago
Roger Braun 5293516730 Use more efficient query to fetch likes.
7 years ago
Roger Braun 9af560083f Use more efficient user note count update query.
7 years ago
Roger Braun ec546baee9 Use different index for object fetching.
7 years ago
Roger Braun 261ec82451 Return nil for nil object requests.
7 years ago
Roger Braun b35ff8f755 Use index in basic activity query.
7 years ago
Roger Braun 9f417fd5e9 Speed up deletion and related queries.
7 years ago
Roger Braun 5912dd0f5d Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
7 years ago
Roger Braun 64bc38e009 MastoAPI: Add emoji output.
7 years ago
eal fe7804e42d Add an API endpoint for emoji.
7 years ago
Roger Braun 38f3908c14 Revert "Simplify query."
7 years ago
Roger Braun 6af164f27b Add password reset.
7 years ago
Roger Braun a17b261379 Simplify query.
7 years ago
Roger Braun b4f055b604 Don't reject already accepted subscriptions.
7 years ago
Roger Braun 6268b7e0eb HTTP Signatures: Work with all test vectors.
7 years ago
Roger Braun 9cefbaf016 Start of HTTP Signatures.
7 years ago
Roger Braun 2b980dea2f Remove tag links for now, they break some regular links.
7 years ago
Roger Braun 270c903220 Add tag links.
7 years ago
Roger Braun d009a79df5 TwitterAPI: Return proper error.
7 years ago
Roger Braun ae38b72e24 MastoAPI: Fix reblog view.
7 years ago
Roger Braun 260f09dd6c MastoAPI: Return reblogs, too.
7 years ago
Roger Braun 6000f61727 MastoAPI: Add repeats to statusview.
7 years ago
Roger Braun fb46d6fbc4 Prefer post-specific emoji.
7 years ago
Roger Braun 422d0f324f MastodonAPI: Add user favorites endpoint.
7 years ago
Roger Braun 6d5bd4dcc0 TwitterAPI: Use correct endpoint for tag timeline.
7 years ago
Roger Braun 6877d7aaad Fix typo.
7 years ago
Roger Braun 255a681782 TwitterAPI: Add tag timeline.
7 years ago
Roger Braun b7b3e3f263 Use inserted_at as sort in search.
7 years ago
Roger Braun 678dd4c8ec Use desc id to sort instead of desc inserted_at
7 years ago
Roger Braun 7c82b82197 Make emoji configurable in files.
7 years ago
Roger Braun 959e993c7d Apply incoming custom emoji.
7 years ago
Roger Braun 16b1fcd271 Handle incoming emoji.
7 years ago
Roger Braun 884006a9e9 Federate emoji out.
7 years ago
Roger Braun 79aeb219d8 Small emoji refactor.
7 years ago
Roger Braun c17c8ce36d Don't check limit twice in TwitterAPIController.
7 years ago
Roger Braun 03952a2760 Sort by updated_at
7 years ago
Roger Braun f039c9c19a Don't specify order in results for now.
7 years ago
Roger Braun 5d1f8dcd1c TwitterAPI: Add search.
7 years ago
Roger Braun 44693c100d Federate banners out.
7 years ago
Roger Braun 0fbf1911f5 Banners are objects.
7 years ago
Roger Braun abac96f41d Update banner from remote accounts.
7 years ago
Roger Braun 0872f5f394 Add undocumented default user default settings.
7 years ago
Roger Braun 5602293690 Fix callback state.
7 years ago
Roger Braun c36229c4aa Add remote user fetching to search.
7 years ago