Commit Graph

6328 Commits (e3214cdfe35e48d2ad964bdcba32febcd28744b7)

Author SHA1 Message Date
Haelwenn 8679a57a71 Merge branch 'bugfix/object-age-create' into 'develop'
3 years ago
Haelwenn (lanodan) Monnier 09dcb2b522
TwitterAPI: Make change_password require body params instead of query
3 years ago
Haelwenn (lanodan) Monnier c64eae40a2
ObjectAgePolicy: Fix pattern matching on published
3 years ago
Haelwenn f4af74b0fc Merge branch 'fix/streaming-api-for-create-activity' into 'develop'
3 years ago
Haelwenn 901204df22 Merge branch 'poll-notification' into 'develop'
3 years ago
kPherox ee5def34da
fix: stream out Create Activity
3 years ago
Sean King 1841bd8383 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
3 years ago
Egor Kislitsyn ad09bdb376
Improve readability
3 years ago
Ilja b0926a71b2
Make transparency_exclusions use tuples in admin-fe
3 years ago
Ilja f4028c908c
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
3 years ago
Ilja 03030b47c2
quarantine instances info
3 years ago
Ilja 47fc57bbcc
Change what nodeinfo returns without breaking backwards compatibility
3 years ago
Ilja 7fdc3cde06
Return maps in node_info
3 years ago
Ilja dfeb3862da
config :mrf, :transparency_exclusions works with tumples now
3 years ago
Ilja 27fe7b0274
Make quarentine work with list of tuples instead of strings
3 years ago
Ilja 4ba0beb60c
Make mrfSimple work with tuples
3 years ago
Alex Gleason b83758bd96
Merge remote-tracking branch 'pleroma/develop' into moderators
3 years ago
sadposter daab1eaa65 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
Alex Gleason 44ede0657f
Merge remote-tracking branch 'pleroma/develop' into staff-plug
3 years ago
sadposter 2519d4eb1a Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
Alex Gleason 7f23dd6cc8
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
3 years ago
Alex Gleason 9cc8642b80
Visibility: check Tombstone objects in visible_for_user?/2
3 years ago
sadposter de69585eaa :Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
Haelwenn 7acdab1f30 Merge branch 'mkljczk-develop-patch-60115' into 'develop'
3 years ago
Alex Gleason 62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
Alex Gleason 0b1c05ca1e
Poll notification: trigger PollWorker through common_pipeline
3 years ago
Alex Gleason 0114754db2
MastodonAPI: Support poll notification
3 years ago
Alex Gleason 3674179b26
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
3 years ago
Alex Gleason bad79f79e6
AdminAPI.InstanceController: clean up tests, rename actions
3 years ago
Alex Gleason 54dbcfe02a
AdminAPI: add DELETE /instances/:instance to delete all content from a remote instance
3 years ago
Alex Gleason 25676c84be
Create AdminAPI.InstanceController
3 years ago
feld 3f58213646 Merge branch 'admin-api-users-sort' into 'develop'
3 years ago
Alex Gleason 1a2fe96d56
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
3 years ago
Alex Gleason 167e14416b
AdminAPI: add date to users
3 years ago
Alex Gleason deb3f91136
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
3 years ago
Alex Gleason 5e88796784
AdminAPI: sort user results by ID descending
3 years ago
Alex Gleason 2b3d7794b2
AdminAPI: let moderators actually do things
3 years ago
Alex Gleason 4fe9a758f9
Let moderators manage custom emojis
3 years ago
Alex Gleason 1f093cb216
Moderators: reorganize :admin_api pipeline in Router
3 years ago
Alex Gleason 9bc1e79c56
Moderators: add UserIsStaffPlug
3 years ago
Haelwenn 173e977e28 Merge branch 'features/ingestion-page' into 'develop'
3 years ago
Haelwenn (lanodan) Monnier 6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline
3 years ago
Sean King 5d279a22b1 Merge develop branch upstream
3 years ago
marcin mikołajczak 6ef8e1776d fix the fucking list timelines on mastofe/soapbox-fe
3 years ago
Alex Gleason 99cc26bb02
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
3 years ago
Alex Gleason 43800d83f4
Deletions: allow deactivated users to be deleted
3 years ago
sadposter e56c319e8f merge
3 years ago
Haelwenn (lanodan) Monnier fc6ab78a84
Add test on changing [:instance, :upload_limit]
3 years ago
Haelwenn (lanodan) Monnier a851a24036
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change
3 years ago
feld 406dadb56b Merge branch 'fix/twittercard-video-dimensions' into 'develop'
3 years ago
Mark Felder 202ee5fd77 Add note about video thumbnails for code spelunkers unfamiliar with Media Preview Proxy
3 years ago
Mark Felder 6aa7fc15df Formatting of the comment
3 years ago
Mark Felder 5f7901cc48 Credo
3 years ago
Mark Felder 2a47156b87 Lint
3 years ago
Mark Felder 86bcb87e6c Fix incorrectly ordered arguments to the function and not properly merging lists.
3 years ago
Mark Felder 2cf648d419 Add a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled.
3 years ago
Mark Felder 19a49dd757 Remove Metadata.Utils.attachment_url/1
3 years ago
Haelwenn (lanodan) Monnier c839078a75
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing
3 years ago
Haelwenn 53cf801c30 Merge branch 'cycles-plug-deps' into 'develop'
3 years ago
Alex Gleason 45b7325b9e
Refactor skipped plugs into Pleroma.Web functions
3 years ago
Alex Gleason 67ec0e6c18
Switch to runtime deps in ActivityPub.SideEffects
3 years ago
Mark Felder 9cb8960284 Switch OGP default type from "website" to "article"
3 years ago
feld 4de2bd3b79 Merge branch 'cycles-user-view' into 'develop'
3 years ago
Mark Felder d70db63084 Set the correct height/width if the data is available when generating opengraph metadata
3 years ago
Alex Gleason 4faeec2c44
Create AdminAPI.UserView to avoid compile-time dep
3 years ago
Mark Felder aa8cc4e86e Only use fallback for videos and only add this metadata for images if we really have it.
3 years ago
Mark Felder d4ac9445cd Twittercard metadata for images should also include dimensions if available
3 years ago
Mark Felder 5de65ce3e8 Set the correct height/width if the data is available when generating twittercard metadata
3 years ago
feld 939b3bfe43 Merge branch 'improve-og-embed' into 'develop'
3 years ago
Alex Gleason b99f60615c Fix order of Pleroma.Web.Utils.Params aliases
3 years ago
Alex Gleason ec65b7ae29 Pleroma.Web.Params --> Pleroma.Web.Utils.Params
3 years ago
Alex Gleason 0877b120c3 Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
3 years ago
Alex Gleason 1399b82f7b
Create WrapperAuthenticator and simplify Authenticator behaviour
3 years ago
Alex Gleason d87dfcb5f0
Put custom guards in Web.Utils.Guards
3 years ago
Mark Felder 264458531a Formatting
3 years ago
feld 676c3c96dc Merge branch 'cycles-mrf-policy' into 'develop'
3 years ago
feld 64bc0c69ed Merge branch 'fix/plug_parser_multipart' into 'develop'
3 years ago
Alex Gleason 6fcfa33e4e
Fix MRF.config_descriptions/0
3 years ago
Alex Gleason fe4c4a7178
MRF: create MRF.Policy behaviour separate from MRF module
3 years ago
Sean King 26d2c677b7
Removing trailing space on empty line in OAuth controller
3 years ago
Sean King 2e310b3ec8
Fix more build errors
3 years ago
Sean King 839c2c6a12
Fix code mistake in OAuth controller
3 years ago
Sean King dc4814f0cd
Fix merge conflicts with upstream
3 years ago
Haelwenn 0c56f9de0d Merge branch 'tests/openapi-everywhere' into 'develop'
3 years ago
Haelwenn (lanodan) Monnier eb7313b0d3
Pipeline Ingestion: Page
3 years ago
Haelwenn (lanodan) Monnier 7d350b73f5
web endpoint: Use Config.get directly instead of a tuple
3 years ago
io 2c401dafa1 Improve opengraph embeds
3 years ago
Haelwenn (lanodan) Monnier 11844084d0
MIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []
3 years ago
Haelwenn (lanodan) Monnier 168687eef2
media_proxy: switch from :crypto.hmac to :crypto.mac
3 years ago
Haelwenn a5dce42c85 Merge branch 'chore/rename-chat' into 'develop'
3 years ago
Mark Felder 0be7eada92 Keep original Shoutbox channel name as chat:public
3 years ago
Alex Gleason 708210b994
Merge remote-tracking branch 'pleroma/develop' into cycles-streaming
3 years ago
Alex Gleason a744c47e9a
Remove deps from Streaming/Persisting behaviors
3 years ago
Mark Felder 2743c66693 Add "chat" back as a feature for backwards compat.
3 years ago
Mark Felder 48a0ea2fc3 Wire up join requests to the old "chat:public" channel into the new "shout:public" channel
3 years ago
Mark Felder d6432a65da Move shout configuration from :instance, update docs and changelog
3 years ago
Mark Felder ff00b354fa Rename the non-federating Chat feature to Shout
3 years ago
Alex Gleason c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
3 years ago
feld 75b94a2f35 Merge branch 'cycles-frontend-static' into 'develop'
3 years ago
feld 0ddf492c5d Merge branch 'cycles-base-url' into 'develop'
3 years ago
Haelwenn c4b4258374 Merge branch 'features/validators-note' into 'develop'
3 years ago
Alex Gleason f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
3 years ago
Alex Gleason 51a9f97e87
Deprecate Pleroma.Web.base_url/0
3 years ago
Alex Gleason 10dfe81479
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
3 years ago
Alex Gleason 2e682788a3
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1
3 years ago
Alex Gleason 595bca24ad
Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-static
3 years ago
Alex Gleason 721c966842
FrontendStatic: make Router a runtime dep
3 years ago
feld 5d40ffe429 Merge branch 'cycles-views' into 'develop'
3 years ago
feld b5f3a5c979 Merge branch 'cycles-html' into 'develop'
3 years ago
Alex Gleason 0de6716f06
Merge remote-tracking branch 'pleroma/develop' into cycles-pipeline
3 years ago
Alex Gleason fa543a9361
ActivityPub.Pipeline: switch to runtime deps
3 years ago
Alex Gleason 1a69f59221
Merge remote-tracking branch 'pleroma/develop' into cycles-html
3 years ago
Alex Gleason 3ff9c5e2a6
Break out activity-specific HTML functions into Pleroma.Activity.HTML
3 years ago
Alex Gleason 7c96c82b5b
Merge remote-tracking branch 'pleroma/develop' into cycles-views
3 years ago
Alex Gleason c9e4200ed2
Create real Views for all Controllers
3 years ago
feld 8871ca5aa3 Merge branch 'cycles-router-api-routes' into 'develop'
3 years ago
feld 359ded086c Merge branch 'simplepolicy-announce-leak' into 'develop'
3 years ago
feld edcdd15e01 Merge branch 'alias-router-helpers' into 'develop'
3 years ago
Alex Gleason 39127f15eb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
3 years ago
Alex Gleason c23b81e399
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
3 years ago
feld 7ad87571bd Merge branch 'cycles-router' into 'develop'
3 years ago
feld 9f386df83c Merge branch 'cycles-router-mediaproxy' into 'develop'
3 years ago
Alex Gleason bf2ee12fdb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
3 years ago
Alex Gleason fda34591ce
Don't make MediaProxy be a compile-dep of Router
3 years ago
Alex Gleason e885b49e35
Merge remote-tracking branch 'pleroma/develop' into cycles-router
3 years ago
Alex Gleason 21787546c0
Router: move StaticFEPlug to a pipeline
3 years ago
Mark Felder 4694853766 Provide totalItems field for featured collections
3 years ago
Mark Felder 05d678c070 Expose user email address to user/owner; not publicly.
3 years ago
Alex Gleason ad7d4ff8bc
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
3 years ago
Alex Gleason 07fed0fda2
Switch to aliasing `Router.Helpers` instead of importing
3 years ago
Alex Gleason bcf6efce15
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash
3 years ago
Alex Gleason 543e9402d6
Support blurhash
3 years ago
Alex Gleason ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta
3 years ago
Alex Gleason 6f0b42656d
Federate attachments as Links instead of Documents
3 years ago
Alex Gleason 02b9436494
Don't render media `meta` if nil
3 years ago
Alex Gleason 4c060ae733
Ingest remote attachment width/height
3 years ago
Alex Gleason ab9eabdf20
Add SetMeta filter to store uploaded image sizes
3 years ago
sadposter 50a644a221 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
3 years ago
Alex Gleason cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
3 years ago
Alex Gleason 1a45aa1278
Merge remote-tracking branch 'pleroma/develop' into notice-routes
3 years ago
Alex Gleason 50e3750758
Add notice compatibility routes for other frontends
3 years ago
Alex Gleason 926a233cc4
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
3 years ago
Alex Gleason c16c7fdb87
SimplePolicy: filter string Objects
3 years ago
Alex Gleason 3d742c3c1a
SimplePolicy: filter nested objects
3 years ago
Alex Gleason 52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
3 years ago
Alex Gleason 6727a3659f
Remove Pleroma.Formatter.minify/2
3 years ago
Alex Gleason e7ac15905e
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
3 years ago
Alex Gleason 762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
3 years ago
Mark Felder 9f711ddcf8 Try to set query timeout intelligently
3 years ago
Mark Felder 0effcd2cfe Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task.
3 years ago
Haelwenn f9bedf5597 Apply lanodan's suggestion(s) to 1 file(s)
3 years ago
Haelwenn 42185d8750 Apply lanodan's suggestion(s) to 1 file(s)
3 years ago
Haelwenn e104829c2f Apply lanodan's suggestion(s) to 1 file(s)
3 years ago
Haelwenn 30b1d50938 Apply lanodan's suggestion(s) to 1 file(s)
3 years ago
Sean King d1eb1913e8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc
3 years ago
Mark Felder efed94a23e Fix error response which was breaking tests related to pinned posts
3 years ago
Sean King 2b4f958b2a
Add opting out of Google FLoC to HTTPSecurityPlug headers
3 years ago
rinpatch c6dcd863e2 Apply rinpatch's suggestion(s) to 1 file(s)
3 years ago
rinpatch 15f87cf658 Merge branch 'features/ingestion-ecto-tag' into 'develop'
3 years ago
rinpatch 79376b4afb Merge branch 'feature/521-pinned-post-federation' into 'develop'
3 years ago
Sean King 8afa3f2d1b
Remove no longer necessary unit tests for MastoFE
3 years ago
Sean King 4f55d5123b
Remove MastoFE-related backend code and frontend pieces
3 years ago
Mark Felder 0feafcc20c Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE
4 years ago
Haelwenn (lanodan) Monnier 53193b84b1
utils: Fix maybe_splice_recipient when "object" isn’t a map
4 years ago
Haelwenn (lanodan) Monnier 6c9f6e62c8
transmogrifier: Fixing votes from Note to Answer
4 years ago
Haelwenn (lanodan) Monnier d1205406d9
ActivityPubControllerTest: Apply same addr changes to object
4 years ago
Haelwenn (lanodan) Monnier 96212b2e32
Fix addressing
4 years ago
Haelwenn (lanodan) Monnier 641184fc7a
recipients fixes/hardening for CreateGenericValidator
4 years ago
Haelwenn (lanodan) Monnier c944932674
Pipeline Ingestion: Note
4 years ago
Haelwenn (lanodan) Monnier e2a3365b5c
ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaults
4 years ago
Haelwenn (lanodan) Monnier e56779dd8d
Transmogrifier: Simplify fix_explicit_addressing and fix_implicit_addressing
4 years ago
Haelwenn (lanodan) Monnier ef36f7fa5c
Move tag fixup to object_validator
4 years ago
Haelwenn (lanodan) Monnier 7ebfe89900
object_validators: Mark validate_data as private
4 years ago
Haelwenn (lanodan) Monnier 37a7f521fd
Insert string-hashtags in Pipeline
4 years ago
Haelwenn (lanodan) Monnier 5ae27c8451
pipeline_test: Fix usage of %Activity{}
4 years ago
Haelwenn (lanodan) Monnier 9015df2229
TagValidator: New
4 years ago
Haelwenn 1e3db07586 Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'"
4 years ago
rinpatch ce9ed6c730 Merge branch 'refactor/object_validator_validate' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier af1cd28f9b
object_validator: Refactor most of validate/2 to a generic block
4 years ago
Miss Pasture 863010ea63 date-times are always strings
4 years ago
Mark Felder 03f38ac4eb Prefer FollowBot naming convention vs Followbot
4 years ago
Mark Felder 4796df0bc3 Remove Task.async as it is broken here and probably a premature optimization anyway
4 years ago
Mark Felder 778010ef8e Do not try to follow local users. Their posts are already available locally on the instance.
4 years ago
Mark Felder 86182ef8e4 Change module name to FollowbotPolicy
4 years ago
Mark Felder f0dcc1ca69 Lint
4 years ago
Mark Felder a176914c73 Better checking of previous follow request attempts
4 years ago
Mark Felder 3989ec508c Prevent duplicates from being processed
4 years ago
Mark Felder 3949cfdc24 Make the followbot only dispatch follow requests once per 30 day period
4 years ago
Mark Felder e78738173a Enforce that the followbot must be marked as a bot.
4 years ago
Mark Felder fba770b3ea Try to handle misconfiguration scenarios gracefully
4 years ago
Mark Felder 8b81d62227 Upstream original followbot implementation
4 years ago
Alexander Strizhakov 1885268c9c
expanding validator
4 years ago
Alexander Strizhakov 2a520ba008
expanding AddRemoveValidator
4 years ago
Alexander Strizhakov 8857242c95
removeing corresponding add activity
4 years ago
Alexander Strizhakov 3adb43cc20
refetch user on incoming add/remove activity
4 years ago
Alexander Strizhakov d1d2744ee3
featured_address valition in AddRemoveValidator
4 years ago
Alexander Strizhakov ff612750b1
validator renaming & add validation for target
4 years ago
Alexander Strizhakov 17f28c0507
mastodon pins
4 years ago
Alexander Strizhakov 3ec1dbd922
Let pins federate
4 years ago
Alex Gleason b6a69b5efd
Return token's primary key with POST /oauth/token
4 years ago