Commit Graph

7257 Commits (99bc175f0257fb0cb9275cba94df662ed219eacf)

Author SHA1 Message Date
Alex Gleason 702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
4 years ago
Alex Gleason 93638935d7
SimpleMRF: :silence --> :followers_only
4 years ago
Alex Gleason d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
4 years ago
Haelwenn 269b61a240 Merge branch '1996-dont-break-on-chatmessages' into 'develop'
4 years ago
lain de5c7e20a3 Merge branch 'bugfix/remote-user-atom' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 2e27847573
feed/user_controller: Return 404 when the user is remote
4 years ago
lain 79f9ddd8b7 Merge branch 'by-approval' into 'develop'
4 years ago
lain 66974e17a0 Endpoint: Serve a dynamically configured admin interface
4 years ago
lain 6a25f72a75 FrontendStatic: Work correctly for other frontend types.
4 years ago
lain c25c21dd22 AccountController: Don't explicitly ask to keep users unconfirmed.
4 years ago
lain edf8b6abfe EnsureRePrepended: Don't break on chat messages.
4 years ago
Alex Gleason 2a99e7df8e
SimpleMRF silence: optimize, work okay with nil values in addressing
4 years ago
Alex Gleason 3c90f7f715
SimpleMRF: Let instances be silenced
4 years ago
rinpatch dab1d8c98e gun ConnectionPool: Re-add a missing cast for remove_client
4 years ago
Alex Gleason 3b7c454418
Let favourites and emoji reactions optionally be hidden
4 years ago
rinpatch 4ce6179dc7 gun ConnectionPool: replace casts with calls
4 years ago
lain ad5c42628a FrontendStatic: Add plug to serve frontends based on configuration.
4 years ago
lain 14c28dcbd1 InstanceStatic: Refactor.
4 years ago
lain e5ac9534aa Merge branch 'cleanup/masto_fe-default_settings' into 'develop'
4 years ago
Alex Gleason f688c8df82
Fix User.registration_reason HTML sanitizing issues
4 years ago
Alex Gleason f43518eb74
Lint, fix test
4 years ago
Alex Gleason 6f44a0ee84
Add configurable registration_reason limit
4 years ago
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
lain e1a1c8e7de Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
4 years ago
Haelwenn (lanodan) Monnier 4a6389316d
masto_fe_view: Remove @default_settings
4 years ago
lain 9e6f4694dd Pipeline: Unify embedded_object / object_data, move to validator.
4 years ago
lain 762c9ea564 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
4 years ago
lain 2a3abfd326 Merge branch 'issue/1934-welcome-email' into 'develop'
4 years ago
lain 0d5d1c62ef Apply 1 suggestion(s) to 1 file(s)
4 years ago
Haelwenn 64b21cee14 Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop'
4 years ago
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
rinpatch 6bf8eee5f9 ReverseProxy tesla client: remove handling of old_conn
4 years ago
rinpatch d4fbec62a3 ReverseProxy: Fix a gun connection leak when there is an error with no
4 years ago
Alibek Omarov 6107440ea0 OpenAPI: remove accidentally pasted buffer data
4 years ago
Alibek Omarov b31844d6e0 OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
4 years ago
Lain Soykaf 3d13fb05f8 Side Effects: On undoing, put information about the undone object.
4 years ago
Lain Soykaf 91f3cf9bc6 Pipeline: Add embedded object federation.
4 years ago
Maksim Pechnikov 61ef1fca4b remove duplicate module
4 years ago
feld 51627a10e5 Merge branch 'unblock-domain-via-query' into 'develop'
4 years ago
Mark Felder 4bfad0b483 Support blocking via query parameters as well and document the change.
4 years ago
Haelwenn 6100b90209 Merge branch '1976-status-view-fixes' into 'develop'
4 years ago
Maksim Pechnikov 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email
4 years ago
lain 76aa49a0c5 Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
4 years ago
Ivan Tashkinov 9ea51a6de5 [#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.
4 years ago
lain b2ba70eec4 Merge branch 'bugfix/mrf-reject-logging' into 'develop'
4 years ago
lain 250e0369c7 Merge branch 'issue/1878' into 'develop'
4 years ago
lain a81581472f Merge branch 'linkify' into 'develop'
4 years ago
Maksim Pechnikov 7991ddad58 added warning to use old keys
4 years ago
Ivan Tashkinov 6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
4 years ago
lain 1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
4 years ago
Maksim Pechnikov db0224d174 added check user email for welcome email
4 years ago
Lain Soykaf 0cb9e1da74 StatusView: Handle badly formatted emoji reactions.
4 years ago
Maksim Pechnikov 5879d36854 fix sender for welcome email
4 years ago
Mark Felder 341a8f3500 Skip the correct plug
4 years ago
lain 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
4 years ago
lain 696c13ce54 Revert "Merge branch 'linkify' into 'develop'"
4 years ago
Mark Felder 97c60b6a43 Merge branch 'develop' into fix/pleroma-api-emoji-packs
4 years ago
lain 2b5d9eb105 Merge branch 'linkify' into 'develop'
4 years ago
lain fa2421dd7e Merge branch 'gopher-fix' into 'develop'
4 years ago
Egor Kislitsyn bdb3375933
Allow unblocking a domain via query params
4 years ago
Maksim Pechnikov 3edaecae96 added welcome email
4 years ago
Alex Gleason 204dddcfaa
Pleroma.Formatter can have partial updates
4 years ago
Ivan Tashkinov bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
Alex Gleason afa8b469ed
Allow restricting public timeline by instance
4 years ago
href 4bac25e6f5 Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used
4 years ago
KokaKiwi 7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
4 years ago
Haelwenn 10d46235cf Merge branch 'fix-1958' into 'develop'
4 years ago
Alex Gleason 48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
4 years ago
Alex Gleason 5756843736
Fully delete users with status :approval_pending
4 years ago
Mark Felder 20a496d2cb Expose the post formats in /api/v1/instance
4 years ago
Alexander Strizhakov af376cbffb
using atom keys in search params
4 years ago
Mark Felder 62438530e2 TOTP length is configurable, so we can't hardcode this here.
4 years ago
Alex Gleason 5e74556703
Sanitize `reason` param in POST /api/v1/accounts
4 years ago
Alex Gleason 38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
4 years ago
Mark Felder 3be64556db Improve TOTP token and recovery input fields in OAuth login
4 years ago
Alex Gleason 9ce95fa68f
Use `approval_required` in /api/v1/instance
4 years ago
Mark Felder b2d398b1d0 Merge branch 'develop' into refactor/gun-pool-registry
4 years ago
Mark Felder 9d30bacace Merge branch 'develop' into refactor/notification_settings
4 years ago
rinpatch 0fe36b311c Merge branch 'features/mrf-reasons' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
4 years ago
rinpatch 7115c5f82e ConnectionPool.Worker: do not stop with an error when there is a timeout
4 years ago
href 6d583bcc3b Set a default timeout for Gun adapter timeout
4 years ago
href afd378f84c host is now useless
4 years ago
href ce1a42bd04 Simplify TLS opts
4 years ago
href 53ba6815b1 parentheses...
4 years ago
href 23d714ed30 Fix race in enforcer/reclaimer start
4 years ago
href 6a0f2bdf8c Ensure connections error get known by the caller
4 years ago
href 46dd276d68 ConnectionPool.Worker: Open gun conn in continue instead of init
4 years ago
rinpatch a705637dcf Connection Pool: fix LRFU implementation to not actually be LRU
4 years ago
rinpatch 9b73c35ca8 Request limiter setup: consider {:error, :existing} a success
4 years ago
rinpatch 12fa5541f0 FollowRedirects: Unconditionally release the connection if there is an error
4 years ago
rinpatch 37f1e781cb Gun adapter helper: fix wildcard cert issues on OTP 23
4 years ago
rinpatch 007843b75e Add documentation for new connection pool settings and remove some
4 years ago
rinpatch 7882f28569 Use erlang monotonic time for CRF calculation
4 years ago
rinpatch 00926a63fb Adapter Helper: Use built-in ip address type
4 years ago
rinpatch 4128e3a84a HTTP: Implement max request limits
4 years ago
rinpatch 94c8f3cfaf Use a custom pool-aware FollowRedirects middleware
4 years ago
rinpatch 281ddd5e37 Connection pool: fix connections being supervised by gun_sup
4 years ago
rinpatch 1b15cb066c Connection pool: Add client death tracking
4 years ago
rinpatch e94ba05e52 Connection pool: Fix a possible infinite recursion if the pool is exhausted
4 years ago
rinpatch 7738fbbaf5 Connection pool: implement logging and telemetry events
4 years ago
rinpatch 0ffde499b8 Connection Pool: register workers using :via
4 years ago
rinpatch ec9d0d146b Connection pool: Fix race conditions in limit enforcement
4 years ago
rinpatch d08b157699 Connection pool: check that there actually is a result
4 years ago
rinpatch fffbcffb8c Connection Pool: don't enforce pool limits if no new connection needs to be opened
4 years ago
rinpatch 58a4f350a8 Refactor gun pooling and simplify adapter option insertion
4 years ago
Haelwenn (lanodan) Monnier e4beff90f5
Create Question: Add context field to create
4 years ago
Haelwenn (lanodan) Monnier bfe2dafd39
{Answer,Question}Validator: Keep both actor and attributedTo for now but sync them
4 years ago
Haelwenn (lanodan) Monnier c19bdc811e
Fix attachments in polls
4 years ago
Haelwenn (lanodan) Monnier d713930ea7
Fixup for EctoType module move
4 years ago
Haelwenn (lanodan) Monnier 435a65b976
QuestionValidator: Use AttachmentValidator
4 years ago
Haelwenn (lanodan) Monnier fe6924d00d
CreateGenericValidator: add expires_at
4 years ago
Haelwenn (lanodan) Monnier 82895a4012
SideEffects: port ones from ActivityPub.do_create and ActivityPub.insert
4 years ago
Haelwenn (lanodan) Monnier 4f70fd4105
question_validator: remove conversation field
4 years ago
Haelwenn (lanodan) Monnier 173f69c854
question_validator: fix for mastodon poll expiration
4 years ago
Haelwenn (lanodan) Monnier 47ba796f41
create_question_validator: remove validate_recipients_match
4 years ago
Haelwenn (lanodan) Monnier ad867ccfa1
fetcher: Reinject Question through validator
4 years ago
Haelwenn (lanodan) Monnier 6b9c4bc1f1
fetcher: more descriptive variable names
4 years ago
Haelwenn (lanodan) Monnier 4644a8bd10
Fix multiple-choice poll detection
4 years ago
Haelwenn (lanodan) Monnier 10bd08ef07
transmogrifier_test: test date, anyOf and oneOf completely
4 years ago
Haelwenn (lanodan) Monnier 89a2433154
QuestionOptionsValidator: inline schema for replies
4 years ago
Haelwenn (lanodan) Monnier c5efaf6b00
AnswerValidator: Create
4 years ago
Haelwenn (lanodan) Monnier 7bcd7a9595
QuestionValidator: Create
4 years ago
Alex Gleason 0d004a9d04
Email admins when a new unapproved account is up for review
4 years ago
Alex Gleason 48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
Alex Gleason df3d1bf5e5
Add :approval_pending to User @type account_status
4 years ago
Alex Gleason 20d24741af
AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint
4 years ago
Alex Gleason 33f1b29b2c
AdminAPI: Filter users by `need_approval`
4 years ago
Alex Gleason b750129da1
AdminAPI: Return `approval_pending` with users
4 years ago
Maksim Pechnikov 1dd767b8c7 Include port in host for signatures
4 years ago
Mark Felder 777a7edc6b Lint and fix test to match new log message
4 years ago
Mark Felder 37297a8482 Improve error messages
4 years ago
Alex Gleason a1570ba6ad
AdminAPI: Return `registration_reason` with users
4 years ago
feld 3f65f2ea79 Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
4 years ago
feld 63798e89de Merge branch 'fix/scrubber-recompile-warnings-as-errors' into 'develop'
4 years ago
feld 2909dc873b Merge branch '1940-admin-token-oauthless-auth' into 'develop'
4 years ago
Ivan Tashkinov 124b4709dc [#1940] Added `admin_token` param (as `admin_api_params/0`) to existing Admin API OpenAPI operations.
4 years ago
feld 246f49d685 Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'
4 years ago
rinpatch e6ccc25565 Fix in-db configuration in dev environment
4 years ago
Haelwenn (lanodan) Monnier 858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
4 years ago
Ivan Tashkinov 9b225db7d8 [#1940] Applied rate limit for requests with bad `admin_token`. Added doc warnings on `admin_token` setting.
4 years ago
Ivan Tashkinov cf3f8cb72a [#1940] Reinstated OAuth-less `admin_token` authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence).
4 years ago
Alex Gleason 5ddf0415c4
Accept `reason` in POST /api/v1/accounts and store in DB
4 years ago
= b221b640a2 Transmogrifier: filtering weirdness in address fields
4 years ago
Mark Felder 80c21100db Merge branch 'develop' into refactor/notification_settings
4 years ago
feld 5d215fd81f Merge branch 'config-behaviours-runtime' into 'develop'
4 years ago
feld 8f9ee694ed Merge branch 'features/profile-fields-emojo' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier ce243b107f
Use Logger.info for {:reject, reason}
4 years ago
Haelwenn (lanodan) Monnier 2aac92e9e0
Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post
4 years ago
Haelwenn f918b6f86d Merge branch '1937-renaming' into 'develop'
4 years ago
Alex Gleason bcfd38c8f3
Make a user unapproved when registering with `account_approval_required` on
4 years ago
Alex Gleason e4e5577818
Prevent unapproved users from logging in
4 years ago
Alex Gleason 51ab8d0128
Add `account_approval_required` instance setting
4 years ago
Alex Gleason a62f17da17
Add `approval_pending` field to User
4 years ago
href 4347d2de5e Config/Docs: Expand behaviour suggestions at runtime
4 years ago
Alexander Strizhakov b376442325
MediaProxy whitelist setting now supports hosts with scheme
4 years ago
Roman Chvanikov 3116a75e80 Check if mogrify available before calling it
4 years ago
Roman Chvanikov 523f1b93a4 Remove Logger requirement
4 years ago
Roman Chvanikov 45bd64e2a7 Error in Filter.Exiftool if exiftool not found
4 years ago
Roman Chvanikov aedbbec88a Add Pleroma.Utils.command_available?/1 and use where appropriate
4 years ago
Maksim Pechnikov 62fc8eab0d fix reset confirmation email in admin section
4 years ago
Mark Felder b329f05ed6 Remove unused @types
4 years ago
Mark Felder 9e45672674 Add a moduledoc
4 years ago
Mark Felder 6167593881 Support Exiftool for stripping EXIF data
4 years ago
Mark Felder 3c0c1fd2ef Merge branch 'develop' into issue/1790-updated-oban
4 years ago
feld ce9514000d Merge branch 'proxy-range-and-chunk' into 'develop'
4 years ago
Mark Felder 72b3dbf4d1 Credo line length complaint
4 years ago
href a1dace088c ReverseProxy: Streaming and disable encoding if Range
4 years ago
lain 93e494ec21 ActivityPub: Don't rename a clashing nickname with the same ap id.
4 years ago
lain b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
Haelwenn 31a0ed5d01 Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'
4 years ago
lain 48f98a2748 Merge branch 'mix-tasks-improvement' into 'develop'
4 years ago
Haelwenn 4ac6e6283f Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
4 years ago
Haelwenn 5ea6387572 Merge branch 'user-search-nickname-rank-boost' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier cc7153cd82
user: Add support for custom emojis in profile fields
4 years ago
Mark Felder 2b979cc90c Add AdminFE reports URL to report emails
4 years ago
Mark Felder d23804f191 Use the Pleroma.Config alias
4 years ago
Mark Felder 49c4e24953 Merge branch 'develop' into fix/csp-for-captcha
4 years ago
lain 8ca1f3e8c6 Merge branch '1723-token-fixes' into 'develop'
4 years ago
lain f4469dc741 Merge branch 'features/favicons' into 'develop'
4 years ago
Haelwenn bdc7b60610 Merge branch '1925-muting-reblogs' into 'develop'
4 years ago
eugenijm c2be0da79f Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
4 years ago
Haelwenn 68036f5a3b Merge branch 'follow-pipeline' into 'develop'
4 years ago
lain 6d688f14fa Merge branch 'bugfix/status-deletion' into 'develop'
4 years ago
Ivan Tashkinov 123352ffa1 Removed unused trigram index on `users`. Fixed `users_fts_index` usage.
4 years ago
lain 00e54f8fe7 ActivityPub: Remove `follow` and fix issues.
4 years ago
lain 9dda8b5427 CommonAPI: Switch to pipeline for following.
4 years ago
Alexander Strizhakov b28cc15459
don't restart pleroma in mix tasks
4 years ago
Alexander Strizhakov 72ad3a66f4
don't fully start pleroma in mix tasks
4 years ago
lain 172f4aff8e Transmogrifier: Move following to the pipeline.
4 years ago
lain 29fa75d00d Notification: For follows, notify the followed.
4 years ago
lain 7d0e2b3fdd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
4 years ago
lain cdc153db31 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
4 years ago
lain 6335b32aa8 Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
4 years ago
Ivan Tashkinov 704a383055 Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.
4 years ago
Ivan Tashkinov a6495f4a68 [#1895] credo fix.
4 years ago
lain c0385cf47a AccountController: Fix muting / unmuting reblogs.
4 years ago
Ivan Tashkinov 3f8370a285 [#1895] Applied code review suggestion.
4 years ago
Maksim Pechnikov e341f81785 fixed delete `Like` activity in remove user
4 years ago
Haelwenn (lanodan) Monnier 31fef95e35
Add changelog and documentation
4 years ago
Haelwenn (lanodan) Monnier 312fc55f14
Add [:instances_favicons, :enabled] setting, defaults to false
4 years ago
Haelwenn (lanodan) Monnier 8c9df2d2e6
instance: Prevent loop of updates
4 years ago
Haelwenn (lanodan) Monnier 013e2c5057
Use instances table instead of Cachex
4 years ago
Haelwenn (lanodan) Monnier 6a679d80c9
Move get_favicon to Pleroma.Instances, use /
4 years ago
Haelwenn (lanodan) Monnier f6d09fafee
Add support for remote favicons
4 years ago
Haelwenn a8447c3803 Merge branch '1918-avatar-background-header-reset-2' into 'develop'
4 years ago
Haelwenn db13acf242 Merge branch 'fix/twitter-rich-media-preview' into 'develop'
4 years ago
lain 8939ff39e4 Merge branch 'remove-twitter-api' into 'develop'
4 years ago
Ivan Tashkinov 3e08e77151 [#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
4 years ago
Mark Felder 18438a9bf0 Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
4 years ago
lain c8dd973af5 AccountController: Remove unused `update_?` routes.
4 years ago
lain 59cf78e412 AccountController: Allow removal / reset of user images.
4 years ago
lain 9ad305209a Merge branch 'bugfix/peertube-videos' into 'develop'
4 years ago
Haelwenn fa0fa4552f Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier fbb9743a70
Fix getting videos from peertube
4 years ago
Haelwenn d81acb5f62 Merge branch 'description-limits' into 'develop'
4 years ago
Mark Felder da4029391d IO list, not concatenation
4 years ago
Mark Felder 65843d92c4 Simplify the logic
4 years ago
lain a6a12b241f FollowValidator: Add basic validation.
4 years ago
lain 28feba8af4 Preloaders: Remove status_net preloader
4 years ago
lain 1963e143c5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
4 years ago
lain 158c26d7dd StaticFE Plug: Use phoenix helper to get the requested format.
4 years ago
lain ed4f9f6a29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
4 years ago
lain 208baf157a ActivityPub: Add new 'capabilities' to user.
4 years ago
lain 74b88c0a8b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
rinpatch 69f0b286f7 Merge branch '1915-dont-filter-announce-notifications' into 'develop'
4 years ago
lain cc8b4e48d9 InstanceView: Add chat limit, description limit
4 years ago
lain af7720237b Upload: Restrict description length
4 years ago
Alexander Strizhakov 20c27bef40
renaming back and reject nil on create
4 years ago
Alexander Strizhakov 771748db1f
Apply suggestion to lib/pleroma/filter.ex
4 years ago
Alexander Strizhakov 6558f31cda
don't filter notifications for follow and move types
4 years ago
Sergey Suprunenko 8277b29790
Restrict thread statuses that contain user's irreversible filters
4 years ago
Sergey Suprunenko 5af1bf443d
Skip notifications for statuses that contain an irreversible filtered word
4 years ago
Sergey Suprunenko 4a8c26654e
Restrict statuses that contain user's irreversible filters
4 years ago
Alexander Strizhakov 480dfafa83
don't save tesla settings into db
4 years ago
Roman Chvanikov fc1f34b851 Delete activity before sending response to client
4 years ago
Ivan Tashkinov 9faa632037 [#2497] Fixed merge issue.
4 years ago
Mark Felder af612bd006 Ensure all CSP parameters for remote hosts have a scheme
4 years ago
lain cf56655614 Streamer: Don't filter out announce notifications.
4 years ago
Mark Felder e9a28078ad Rename function and clarify that CSP is only strict with MediaProxy enabled
4 years ago
Mark Felder eaa59daa4c Add Captcha endpoint to CSP headers when MediaProxy is enabled.
4 years ago
Mark Felder 4695bdd81b Merge branch 'develop' into issue/1790-updated-oban
4 years ago
lain c2a052a346 Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
4 years ago
lain 9a27ef47f1 Merge branch '1912-leading-trailing-space-search' into 'develop'
4 years ago
lain d3efb50262 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
4 years ago
lain 19fbfbb767 Merge branch '1892-exclude-bots-from-search-results' into 'develop'
4 years ago
lain 945e75c8e8 SearchController: Trim query.
4 years ago
lain e3b5559780 AccountController: Make setting accepts_chat_messages possible.
4 years ago
lain 4a7b89e372 ChatMessageValidator: Additional validation.
4 years ago
lain 3ca9af1f9f Account Schema: Add `accepts_chat_messages`
4 years ago
lain 5c0bf4c472 ActivityPub: Ingest information about chat acceptance.
4 years ago
lain 26a7cc3f00 UserView: Add acceptsChatMessages field
4 years ago
lain 37fdb05058 User, Migration: Change `accepts_chat_messages` to be nullable
4 years ago
lain 3250228be9 AccountView: Add 'accepts_chat_messages' to view.
4 years ago
lain 98bfdba108 User: On registration, set `accepts_chat_messages` to true.
4 years ago
rinpatch 86151b23a6 Merge branch '1910-migration-fix' into 'develop'
4 years ago
lain 59b426ebef Notification Backfill: Explicitly select the needed fields.
4 years ago
Ivan Tashkinov 90764670dc [#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results.
4 years ago
Mark Felder 8121e46f25 Merge branch 'develop' into activation-meta
4 years ago
Mark Felder d44ec2bf4c Remove camelCase from the keys
4 years ago
Ivan Tashkinov 61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
rinpatch 4c044f6225 Merge branch 'fetcher-fixes' into 'develop'
4 years ago
lain bad08f34ca Credo fixes.
4 years ago
lain 311b7c19d0 Streamer: Align announce streaming with polling.
4 years ago
lain 61fe94d698 SideEffects: Refactor.
4 years ago
lain fedfe8f7d6 ActivityPub: Handle clashing nicknames for the same ap id
4 years ago
lain ce92e6e5ce Fetcher: Work when we can't get the OP.
4 years ago
Alex Gleason 8daacc9114
AutoLinker --> Linkify, update to latest version
4 years ago
Mark Felder 5a8e0208b1 Add fields limits to instance metadata, add tests
4 years ago
Mark Felder 0883a706dc Merge branch 'develop' into activation-meta
4 years ago
Ivan Tashkinov 3d2989278c [#1892] Excluded bot actors (applications, services) from search results.
4 years ago
Mark Felder d69af7f742 Rename user.settings column
4 years ago
lain 8b7055e25e Credo fixes
4 years ago
lain 0176b7bca2 Merge branch 'preload-fixups-2' into preloadfixups
4 years ago
lain 2382a2a151 Preload: Load the correct instance panel
4 years ago
rinpatch 7bb3618939 Merge branch 'fix-notification-filtering' into 'develop'
4 years ago
lain 09c5991f82 Apply suggestion to lib/pleroma/notification.ex
4 years ago
lain 90083a754d Notifications: Never return `nil` in the notification list.
4 years ago
Egor Kislitsyn 979f02ec94
Fix CastAndValidate plug
4 years ago
Egor Kislitsyn 67d92ac7b7
Remove `/statusnet/config`
4 years ago
Egor Kislitsyn 8693e01799
Fix warning
4 years ago
Alexander Strizhakov 6512ef6879
excluding attachment links from RichMedia
4 years ago
Egor Kislitsyn 4a306720e8
Merge branch 'develop' into remove-twitter-api
4 years ago
lain 59540131c1 Credo fixes.
4 years ago
lain f308196b75 Token Response: Remove empty file.
4 years ago
lain e374872fe7 AccountOperation: Correctly describe create response.
4 years ago
lain bb168ed94a OAuth: Extract view-type functions to a view.
4 years ago
lain 8630a6c7f5 Preloaders: Use strings as keys.
4 years ago
lain a19f8778af User preloader: Put user info at correct key
4 years ago
lain 577da132da Merge branch '1031-parent-visible' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 9f51b03eed
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses
4 years ago
Haelwenn (lanodan) Monnier 1566543bec
object/fetcher: Pass full Transmogrifier error
4 years ago
Haelwenn (lanodan) Monnier 244655e884
MastoAPI: Show source field when deleting
4 years ago
Mark Felder 69848d5c97 Rename notification "privacy_option" setting
4 years ago
Haelwenn bf1c5e255a Merge branch 'block-handling' into 'develop'
4 years ago
Haelwenn 09478c9cf7 Merge branch '1258-anti-link-spam-exemption' into 'develop'
4 years ago
Mark Felder fd5e797379 Simplify notification filtering settings further
4 years ago
Mark Felder b950fb01db Merge branch 'develop' into refactor/notification_settings
4 years ago
lain a5bbfa21a1 StaticFE: Prioritize json in requests.
4 years ago
lain f378e93bf4 AccountController: Return scope in proper format.
4 years ago
lain a2002ebb63 Preloading: Fix nodeinfo url.
4 years ago
lain 4a7a34ae8c Preloading: Return correct data for statusnet stuff.
4 years ago
lain 7ed2296416 Nodeinfo: Add chat information back in.
4 years ago
lain 15a8b70318 User: Don't unfollow on block when the relevant setting is set.
4 years ago
lain c3383d4fab BlockValidator: Restore old behavior for incoming blocks.
4 years ago
Haelwenn (lanodan) Monnier 27c33f216a
activity_draft: Add source field
4 years ago
Haelwenn (lanodan) Monnier d6c958b4c2
nodeinfo: Fix MRF transparency
4 years ago
feld 8288419686 Merge branch 'preload-data' into 'develop'
4 years ago
Mark Felder 433c01b370 Merge branch 'develop' into refactor/notification_settings
4 years ago
lain 04abee782b AntiSpamLinkPolicy: Exempt local users.
4 years ago
lain 1cd1977c0f Merge branch 'issue/1872-ex_aws' into 'develop'
4 years ago
lain 84f9ca1956 Blocking: Don't federate if the options is set.
4 years ago
lain 44bb7cfccd ActivityPub: Remove `block`.
4 years ago
lain 8cfb58a8c0 AccountController: Extract blocking to CommonAPI.
4 years ago
lain e38293c8f1 Transmogrifier: Switch to pipeline for Blocks.
4 years ago
lain 89e5b2046b ObjectValidator: Basic `Block` support.
4 years ago
lain 0e26ef2ab9 Merge branch 'fix/following-request-from-deactivated' into 'develop'
4 years ago
Maksim Pechnikov 439a1a0218 added wrapper Pleroma.HTTP for ExAws.S3
4 years ago
Mark Felder 67ab580553 Filter outstanding follower requests from deactivated accounts
4 years ago
Maksim Pechnikov cc837f9d15 fixed config/descpiption.exs
4 years ago
Alexander Strizhakov aae1af8cf1
fix for emoji pagination in pack show
4 years ago
lain 4c5fb831b3 Status schema: Add parent_visible.
4 years ago
lain 35f6770436 StatusView: Add pleroma.parent_visible
4 years ago
lain 88ccade1cb Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
4 years ago
Maksim Pechnikov 721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient
4 years ago
lain 98af7b59e4 Merge branch 'update-validator' into 'develop'
4 years ago
Roman Chvanikov 1471b70ef1 Merge develop
4 years ago
Haelwenn c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
4 years ago
Maksim Pechnikov a8d967762e migrate to oban 2.0-rc1
4 years ago
lain b7f297f0bd Merge branch 'issue/1798' into 'develop'
4 years ago
lain aee815b478 ObjectValidator: Clarify type of object.
4 years ago
lain 2c603f2009 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
4 years ago
Maksim Pechnikov 2715c40e1d added tests
4 years ago
Haelwenn (lanodan) Monnier c116b6d6d6
ActivityPubController: Update upload_media @doc
4 years ago
Haelwenn d21ef5e66b Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'
4 years ago
Mark Felder df5e048cbb Do not need a function to provide fallback value with default defined in config.exs
4 years ago
Haelwenn 98f014d3be Merge branch 'warning/mastofe-settings-blob' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 8f6ba4b22f
Add warning against parsing/reusing MastoFE settings blob
4 years ago
lain 46f7e51b27 Merge branch 'add-muted-to-notifications' into 'develop'
4 years ago
Egor Kislitsyn b3a549e916
Update NotificationOperation spec
4 years ago
Egor Kislitsyn 7e6f43c0d7
Add `is_muted` to notifications
4 years ago
Maksim Pechnikov b0a40fc2e4 added verify RUM settings before start app
4 years ago
lain 59bdef0c33 Merge branch 'feature/1739-account-endpoints' into 'develop'
4 years ago
lain 8b5bdd164e Merge branch 'fix/1825-admin-api-error-codes' into 'develop'
4 years ago
lain b05f795326 Credo fixes
4 years ago
lain e785cd5cae ActivityPub: Remove `update` and switch to pipeline.
4 years ago
rinpatch c75ba63bef Merge branch '1865-media-only' into 'develop'
4 years ago
lain 9438f83f83 Transmogrifier: Handle `Update` with the pipeline.
4 years ago
lain 31a4d42ce0 SideEffects: Handle user updating.
4 years ago
rinpatch 282f492cd5 Merge branch '1883-mrf-chat' into 'develop'
4 years ago
lain 93ae1c8bd3 Merge branch 'feature/1854-emoji-pagination' into 'develop'
4 years ago
lain 35e9282ffd HellthreadPolicy: Restrict to Notes and Articles.
4 years ago
Alexander Strizhakov b5f13af7ba Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
4 years ago
Alexander Strizhakov c5863438ba
proper error codes for error in adminFE
4 years ago
lain 31761340fe Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'
4 years ago
lain 0e789bc55f Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
4 years ago
lain 7d542450b1 Merge branch 'develop' into '1865-media-only'
4 years ago
Alexander Strizhakov 1a704e1f1e
fix for packs pagination
4 years ago
Haelwenn (lanodan) Monnier 3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused)
4 years ago
feld f928267773 Merge branch 'issue/1855' into 'develop'
4 years ago
Sergey Suprunenko ac0344dd24
Only accounts with Service actor_type are considered as bots
4 years ago
Sergey Suprunenko b63646169d
Add support for bot field in update_credentials
4 years ago
lain 75670a99e4 UpdateValidator: Only allow updates from the user themselves.
4 years ago
lain cafdf18408 Merge branch '1873-pagination-fixes' into 'develop'
4 years ago
lain 372533b7c3 Merge branch 'dry-up-follower-update' into 'develop'
4 years ago
lain abdb540d45 ObjectValidators: Add basic UpdateValidator.
4 years ago
Ivan Tashkinov 5237a2df9f [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
4 years ago
Alexander Strizhakov 02ca8a363f
default page size for files
4 years ago
Alexander Strizhakov 3e3f9253e6
adding overall count for packs and files
4 years ago
Alexander Strizhakov 4975ed86bc
emoji pagination for pack show action
4 years ago
Alexander Strizhakov 3becdafd33
emoji packs pagination
4 years ago
Maksim Pechnikov c9b5e3feda revert 'database' option to rejected keys
4 years ago
Maksim Pechnikov 4044f24e2e fix test
4 years ago
Mark Felder 2731ea1334 Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url
4 years ago
Mark Felder c08c9db0c1 Remove misleading is_ prefix from boolean function
4 years ago
Mark Felder 71a5d9bffb Empty list as default
4 years ago
Mark Felder 3462d4b995 Merge branch 'develop' into issue/1855
4 years ago
lain d772361e62 Merge branch 'fix/1787-mogrify-args' into 'develop'
4 years ago
Egor Kislitsyn d4b5a9730e
Remove `poll` from `notification_type` OpenAPI spec
4 years ago
Maksim 9a371bf5f6 Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
4 years ago
Maksim 44ce97a9c9 Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex
4 years ago
Maksim 74fd761637 Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex
4 years ago
rinpatch 4ec2fb967e Merge branch 'features/users-raw_bio' into 'develop'
4 years ago
Alexander Strizhakov a77b0388f4
credo fix
4 years ago
Maksim Pechnikov 02a5648feb fixed migration the settings to DB
4 years ago
rinpatch 5c0e1039ce Chunk the notification type backfill migration
4 years ago
Haelwenn b536e57124 Merge branch '1866-last-status-stuff' into 'develop'
4 years ago
href 39f7fc5b8e Update majic & call plug before OpenApiSpex
4 years ago
Alexander Strizhakov b66e6eb521
fixes for tests
4 years ago
Alexander Strizhakov ed189568f3
moving mrf settings from instance to separate group
4 years ago
Alexander Strizhakov 3c2cee33ad
moving custom ecto types in context folders
4 years ago
href f124f68205 Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
4 years ago
href ec1452fd1c Pleroma.MIME: use gen_magic
4 years ago
Alexander Strizhakov 32c6576b60
naming
4 years ago
Alexander Strizhakov e1603ac8fe
fix attemps to merge map
4 years ago
Alexander Strizhakov 9a4fde9766
Mogrify args as custom tuples
4 years ago
lain 1eb6cedaad ActivityPub: When restricting to media posts, only show 'Creates'.
4 years ago
Maksim Pechnikov b023110799 fixed a visibility of functions
4 years ago
stwf faba1a6e33 fix tests
4 years ago
lain e1ee8bc1da User: update_follower_count refactor.
4 years ago
Maksim Pechnikov 579763126f Merge branch 'develop' into issue/1855
4 years ago
Egor Kislitsyn 58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
Maksim Pechnikov 62b8c31b7a added tests
4 years ago
lain b7df7436c8 Conversations: Return last dm for conversation, not last message.
4 years ago
Maksim Pechnikov 2e8a236cef fix invalidates media url's
4 years ago
eugenijm b15cfc3d36 Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
4 years ago
rinpatch 271ea5068f Merge branch '1851-favorites-pagination' into 'develop'
4 years ago
lain 1d625c29a0 ControllerHelper: Always return id field.
4 years ago
lain 4b865bba10 Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
href cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
Egor Kislitsyn 520367d6fd Fix atom leak in Rich Media Parser
4 years ago
Mark Felder 26f710b9e3 Merge branch 'develop' into preload-data
4 years ago
feld 90676bdfe3 Merge branch 'fix/csp-mediaproxy-base-url' into 'develop'
4 years ago
rinpatch cd2df734dd Merge branch 'bugfix/csp-unproxied' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier e313aa0977 static-fe.css: Restore and move to /priv/static/static-fe
4 years ago
Haelwenn 4115701f71 Merge branch 'recipients-experiments' into 'develop'
4 years ago
href 8efd1614ec Remove use of atoms in MRF.UserAllowListPolicy
4 years ago
Egor Kislitsyn 8b8b8599e9 Fix atom leak in Rich Media Parser
4 years ago
Egor Kislitsyn 09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
4 years ago
Egor Kislitsyn 697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
4 years ago
lain e557265a03 Merge branch 'global-status-expiration' into 'develop'
4 years ago
Maksim Pechnikov f9dcf15ecb added admin api for MediaProxy cache invalidation
4 years ago
Ivan Tashkinov 2188097066 [#1794] Fixes URI query handling for hashtags extraction in search.
4 years ago
Egor Kislitsyn 2419776e19
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
4 years ago
Mark Felder 7f7a1a4676 Check for media proxy base_url, not Upload base_url
4 years ago
Mark Felder 8a59fde0e5 Merge branch 'develop' into fix/csp-mediaproxy-base-url
4 years ago
Egor Kislitsyn 1f35acce54
Merge OGP parser with TwitterCard
4 years ago
Ivan Tashkinov b28cec4271 [#1794] Fixes URI query handling for hashtags extraction in search.
4 years ago
lain 5e44e9d698 Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
rinpatch 99afc7f4e4 HTTP security plug: add media proxy base url host to csp
4 years ago
rinpatch 7aa6c82937 Merge branch 'remake-remodel-dms' into 'develop'
4 years ago
lain 9e411372d0 ActivityPub: Don't show announces of your own objects in timeline.
4 years ago
lain 86fec45f40 ControllerHelper: Fix wrong comparison.
4 years ago
lain b4c50be9df Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
lain be7c322865 Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
lain c4f267b3be Apply suggestion to lib/pleroma/web/controller_helper.ex
4 years ago
lain 1b746cfbbb Merge branch 'add-url-to-admin-account-view' into 'develop'
4 years ago
Egor Kislitsyn 3dd1de61a7 Add `url` field to AdminAPI.AccountView
4 years ago
lain 063e6b9841 StatusController: Correctly paginate favorites.
4 years ago
lain 064c4f86f3 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 40d5058cc4 Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain e1bc37d118 MigrationHelper: Move notification backfilling to own module.
4 years ago
lain fc04a138d4 Apply suggestion to lib/pleroma/notification.ex
4 years ago
Haelwenn (lanodan) Monnier fe1cb56fdc
transmogrifier: MIME.valid?/1 for mediaType
4 years ago
Roman Chvanikov 604a83ae3e merge develop
4 years ago
Egor Kislitsyn d44843e677
Restrict ActivityExpirationPolicy to Notes only
4 years ago
Egor Kislitsyn da22119c2f
Merge branch 'develop' into global-status-expiration
4 years ago
lain d192492658 Merge branch 'openapi/admin/relay' into 'develop'
4 years ago
lain c450b248cc Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
4 years ago
lain 3b5282bef2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 89b85f6529 ChatController: Remove nonsensical pagination.
4 years ago
lain 7d66dd180a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch ada9d15eee Merge branch 'recipients-query-speedup' into 'develop'
4 years ago
lain c29ad60c20 Activity.Queries: Use correct actor restriction.
4 years ago
lain e9aa6a3fa4 ActivityPub: Change ordering to `nulls last` in favorites query
4 years ago
rinpatch 3687788cf2 Merge branch 'notification-fixes' into 'develop'
4 years ago
rinpatch f10b40828f [stable rewrite]: fix streamer streaming out announces from a muted thread
4 years ago
Haelwenn 9396b2f8cf Merge branch 'features/apc2s-pagination' into 'develop'
4 years ago
rinpatch a51284b60a Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
4 years ago
lain fe2a5d0614 ChatController: Make last_read_id mandatory.
4 years ago
Sergey Suprunenko 8d9e586887
Delete pending follow requests on user deletion
4 years ago
lain 801e668a97 ChatController: Add `last_read_id` option to mark_as_read.
4 years ago
lain 2cdaac4330 SideEffects: Move streaming of chats to after the transaction.
4 years ago
lain 1a11f0e453 Chats: Change id to flake id.
4 years ago
lain 0365053c8d AttachmentValidator: Check if the mime type is valid.
4 years ago
lain 40fc4e974e Notfication: Add validation of notification types
4 years ago
lain f4cf4ae16e ChatController: Use new oauth scope *:chats.
4 years ago
Haelwenn (lanodan) Monnier e1b07402ab
User: Add raw_bio, storing unformatted bio
4 years ago
lain f77d4a302d Credo fixes.
4 years ago
lain 9189b489ee Migrations: Move Notification migration code to helper
4 years ago
lain 9fa3f0b156 Notification: Change type of `type` to an enum.
4 years ago
lain ca0e6e702b ChatMessageReference -> Chat.MessageReference
4 years ago
lain 137adef6e0 ChatMessageReference: Use FlakeId.Ecto.Type
4 years ago
lain 239d03499e Chat: creation_cng -> changeset
4 years ago
lain 4e8c0eecd5 WebPush: Don't break on contentless chat messages.
4 years ago
Egor Kislitsyn 167812a3f2
Fix pagination
4 years ago
Egor Kislitsyn b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
4 years ago
lain f24d2f714f Credo fixes
4 years ago
lain a8ca030d85 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Haelwenn d74985af23 Merge branch 'features/apc2s-pagination' into 'develop'
4 years ago
Haelwenn 54bae06b4f Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
4 years ago
lain 115d08a754 Pipeline: Add a side effects step after the transaction finishes
4 years ago
lain 65689ba9bd If Credo fixes is so good, why is there no Credo fixes 2?
4 years ago
lain f3ea6ee2c8 Credo fixes.
4 years ago
lain 0efa8aa0b9 Transmogrifier: For follows, create notifications last.
4 years ago
lain cc8a7dc205 SideEffects / ChatView: Add an unread cache.
4 years ago
lain aa2ac76510 Notification: Don't break on figuring out the type of old EmojiReactions
4 years ago
lain d44da91bbf SubscriptionOperation: Let chat mentions through.
4 years ago
Egor Kislitsyn 317e2b8d61
Use atoms as keys in `ActivityPub.fetch_*` functions options
4 years ago
lain 56dfa0e0fb Transmogrifier: Update notification after accepting.
4 years ago
lain 00748e9650 ChatMessageReferences: Change seen -> unread
4 years ago
minibikini b57e4ad1ab Merge branch 'develop' into 'openapi/admin/relay'
4 years ago
lain b952f3f379 WebPush: Push out chat message notications.
4 years ago
Egor Kislitsyn 70f054b083
Merge branch 'develop' into openapi/admin/relay
4 years ago
Egor Kislitsyn b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
4 years ago
stwf 5677b21e82 clean up
4 years ago
stwf 3b8180d7d1 add status_net/config
4 years ago
stwf dbcc1b105e encode data properly
4 years ago
stwf 29ae5bb771 preload data into index.html
4 years ago
lain e46aecda55 Notification: Fix notifications backfill for compacted activities
4 years ago
lain b3407344d3 ChatController: Add function to mark single message as read.
4 years ago
lain c020fd4352 ChatMessageReferenceView: Return read status as `unread`.
4 years ago
Egor Kislitsyn c16315d055
Add OpenAPI spec for AdminAPI.ReportController
4 years ago
Egor Kislitsyn 9d572f2f66
Move report actions to AdminAPI.ReportController
4 years ago
lain fb4ae9c720 Streamer, SideEffects: Stream out ChatMessageReferences
4 years ago
Haelwenn 18b050dfd1 Merge branch 'openapi/update-admin-api/status' into 'develop'
4 years ago
lain 903955b189 FollowingRelationship: Remove meaningless change
4 years ago
lain 7f5c5b11a5 Chats: Remove `unread` from the db, calculate from unseen messages.
4 years ago
lain 73127cff75 Credo fixes.
4 years ago
lain 2591745fc2 ChatMessageReferences: Move tests
4 years ago
Egor Kislitsyn 8a43611e01
Use AdminAPI.StatusView in api/admin/users
4 years ago
lain f3ccd50a33 ChatMessageReferences: Adjust views
4 years ago
lain aa22fce8f4 ChatMessageReference: Introduce and switch in chat controller.
4 years ago
feld 6c1c2cddec Merge branch 'fix/1794-hashtag-search-results' into 'develop'
4 years ago
Egor Kislitsyn 7922e63825
Update OpenAPI spec for AdminAPI.StatusController
4 years ago
Egor Kislitsyn 68cb152a08
Merge branch 'develop' into openapi/admin/relay
4 years ago
lain 879304dcd9 Merge branch 'replies-domain-block' into 'develop'
4 years ago
lain 5da38c15cd Merge branch 'openapi/admin/oauth-apps' into 'develop'
4 years ago
lain 6977500ef7 Merge branch 'tagline' into 'develop'
4 years ago
lain 022d975a39 Merge branch 'openapi/admin/invites' into 'develop'
4 years ago
lain 2860c66e88 Merge branch 'feature/embeddable-posts' into 'develop'
4 years ago
lain 2c6ebe709a Credo fixes
4 years ago
lain 6cd2fa2a4c Migrations: Add a migration to backfill notification types.
4 years ago
lain 38dce485c4 Notification: Add function to backfill notification types
4 years ago
lain 904295d53b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 37542a9dfa Activity: Remove notifications-related functions.
4 years ago
lain 127ccc4e1c NotificationController: Don't return chat_mentions by default.
4 years ago
lain cd2abcc0e3 Merge branch 'fix/invisible-repeats' into 'develop'
4 years ago
lain 805ab86933 Notifications: Make notifications save their type.
4 years ago
rinpatch 165a4b2a69 Do not include activities of invisible users unless explicitly requested
4 years ago
lain d111eae798 Merge branch 'feature/status-by-id-account-view' into 'develop'
4 years ago
lain 8e1db6a835 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Alexander Strizhakov 19f468c5bc
replies filtering for blocked domains
4 years ago
rinpatch 6fb900a496 Merge branch 'user-updates' into 'develop'
4 years ago
Alexander Strizhakov 7e6ec778d9
exclude replies on blocked domains
4 years ago
Egor Kislitsyn 6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
4 years ago
lain af9090238e CommonAPI: Newlines -> br for chat messages.
4 years ago
Egor Kislitsyn a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
4 years ago
lain 8ff3425828 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain d4d4b92f75 TimelineController: Only return `Create` in public timelines.
4 years ago
lain 9460983032 AccountController: Federate user account changes.
4 years ago
Alex Gleason 954acdda20
Add `account_activation_required` to /api/v1/instance
4 years ago
Haelwenn e96765df6b Merge branch 'chore/bump-hackney' into 'develop'
4 years ago
rinpatch 0cb7b0ea84 hackney adapter helper: support tlsv1.3 and remove custom opts
4 years ago
lain 6ff079ca9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 8bdf18d7c1 CommonAPI: Linkify chat messages.
4 years ago
lain 2c9465cc51 SafeText: Let through basic html.
4 years ago
lain b004c427a0 Merge branch 'conversation-pagination' into 'develop'
4 years ago
Steven Fuchs 6d4b80822b Conversation pagination
4 years ago
Ivan Tashkinov 24f40b8a26 [#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
4 years ago
Ivan Tashkinov 78c80a261a Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results
4 years ago
rinpatch d23b3701d8 Merge branch 'bugfix/csp-unproxied' into 'develop'
4 years ago
rinpatch 109af93227 Apply suggestion to lib/pleroma/plugs/http_security_plug.ex
4 years ago
rinpatch 660d49227b Merge branch 'connect-src' into 'develop'
4 years ago
Ivan Tashkinov c181e555db [#1794] Improvements to hashtags extraction from search query.
4 years ago
Alex Gleason d38f28870e
Add blob: to connect-src CSP
4 years ago
lain 219d2b3146 Merge branch 'fix-streaming' into 'develop'
4 years ago
feld 81db758e8e Merge branch 'mix/database-vacuum-options' into 'develop'
4 years ago
kPherox de0e262839
Fix argument error in streamer
4 years ago
Haelwenn (lanodan) Monnier da1e31fae3
http_security_plug.ex: Fix non-proxied media
4 years ago
Haelwenn (lanodan) Monnier a43b435c0a
AP C2S: allow limit & order on outbox & read_inbox
4 years ago
Haelwenn (lanodan) Monnier 2c18830d0d
Bugfix: router: allow basic_auth for outbox
4 years ago
Haelwenn (lanodan) Monnier b3b367b894
Bugfix: Reuse Controller.Helper pagination for APC2S
4 years ago
lain 3898dd69a6 SideEffects: Ensure a chat is present before streaming something out.
4 years ago
lain 767ce8b803 StreamerView: Actually send Chats, not ChatMessages.
4 years ago
lain 863c02b25d SideEffects: Stream out chat messages.
4 years ago
lain c86a88edec Streamer: Add a chat message stream.
4 years ago
lain 9848978109 Merge branch 'fix-relay-repeat-notification' into 'develop'
4 years ago
lain af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
kPherox 228ff3760e
Use `User.is_internal_user?` instead
4 years ago
kPherox 9df5b1e6ae
Don't make relay announce notification
4 years ago
rinpatch 396bc69aee Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'
4 years ago
rinpatch 27180611df HTTP Security plug: make starting csp string generation more readable
4 years ago
Egor Kislitsyn 06f20e9181
Add OpenApi spec to AdminAPI.ConfigController
4 years ago
Egor Kislitsyn d1ee3527ef
Move config actions to AdminAPI.ConfigController
4 years ago
lain f6ddf0cc50 Merge branch 'feature/1792-update-actor-type' into 'develop'
4 years ago
Alex Gleason d4a18d44fe
Update default instance description
4 years ago
Mark Felder 9eea800026 Refactor notification settings
4 years ago
Mark Felder 30f96b19c1 Abstract out the database maintenance. I'd like to use this from AdminFE too.
4 years ago
Mark Felder 95f6240889 Fix minor spelling error
4 years ago
rinpatch 29ff6d414b HTTP security plug: Harden img-src and media-src when MediaProxy is enabled
4 years ago
rinpatch 455a402c8a HTTP Security plug: rewrite &csp_string/0
4 years ago
rinpatch 8f6d428880 AccountView: Use mediaproxy URLs for emojis
4 years ago
kPherox 48fd9be65a
Exclude post actor from to of relay announce
4 years ago
rinpatch d35be02e70 Merge branch 'refactor-add-mention-step-one' into 'develop'
4 years ago
rinpatch 91f73a7592 Merge branch 'notification-fixes' into 'develop'
4 years ago
Alexander Strizhakov 047a11c48f Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
4 years ago
Egor Kislitsyn c6290be682
Fix typo
4 years ago
lain b8e029b5ea Notification: Actually preload objects.
4 years ago
lain b9e2678b9e Merge branch 'fav-speedup' into 'develop'
4 years ago
lain 7e13200869 ActivityPub: Change ordering to `nulls last` in favorites query
4 years ago
Alexander Strizhakov 3249141588
validate actor type
4 years ago
rinpatch cf139b06a3 Merge branch 'fav-speedup' into 'develop'
4 years ago
rinpatch 3601c0015c Merge branch '1808-pleroma-sucks' into 'develop'
4 years ago
rinpatch ed08da9135 Merge branch '1813-throttling' into 'develop'
4 years ago
lain d8d99fd4cf Activity.Queries: Use correct actor restriction.
4 years ago
Egor Kislitsyn 2069ec5006
Fix Oban warnings
4 years ago
lain 51bc6674f6 Mastodon API Controllers: Use the correct params for rate limiting.
4 years ago
Egor Kislitsyn fca48154a2
Add AdminAPI.InviteView
4 years ago
Egor Kislitsyn 2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController
4 years ago
Egor Kislitsyn 95ebfb9190
Move invite actions to AdminAPI.InviteTokenController
4 years ago
Alexander Strizhakov 8f08384d80
another view for account in admin-fe status_show
4 years ago
Ivan Tashkinov d7a57004ef [#1501] Made user feed contain public and unlisted activities.
4 years ago
Egor Kislitsyn 0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller
4 years ago
lain dbd07d29a3 Streamer: Don't crash on streaming chat notifications
4 years ago
lain 6bd7070b00 Transmogrifier: Use a simpler way to get mentions.
4 years ago
lain 5fef405208 User: Change signature of get_users_from_set
4 years ago
Egor Kislitsyn cbcd592300
Add OpenAPI spec for AdminAPI.RelayController
4 years ago
lain f20dff451e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks
4 years ago
lain ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain ec470c4c77 Merge branch 'openapi/admin/status' into 'develop'
4 years ago
lain d0c26956da User: Don't error out if we want to refresh a user but can't
4 years ago
rinpatch 7bc2ec0aa2 Merge branch 'mastodon-migration-compat' into 'develop'
4 years ago
lain ddbbefeb2e Merge branch 'feature/configure-filename-truncate' into 'develop'
4 years ago
Roman Chvanikov 5d60b25e69 Apply suggestion to lib/pleroma/web/common_api/utils.ex
4 years ago
Roman Chvanikov cc82229ba7 Add filename_display_max_length config
4 years ago
lain 91c8467582 OStatusController: Add Mastodon activity compat route.
4 years ago
lain 355aa3bdc7 ActivityPubController: Add Mastodon activity compat route.
4 years ago
lain 8a4bd9e5d1 OStatusController: Add Mastodon compatibility route for objects.
4 years ago
rinpatch 1fa7aa9fc5 Merge branch 'emoji-react-better-errors' into 'develop'
4 years ago
Egor Kislitsyn ba106aa9c8
Fix notifications mark as read API
4 years ago
lain ca755f9a73 ActivityPubController: Add Mastodon compatibility route.
4 years ago
lain bcb549531f EmojiReactionController: Return more appropriate error.
4 years ago
Haelwenn 7b02bfca51 Merge branch 'announce-validator' into 'develop'
4 years ago
Haelwenn a57e7f3503 Merge branch '1113-op-mentioning' into 'develop'
4 years ago
Ivan Tashkinov 3a1e810aaa [#2497] Customized `exexec` launch to support root operation (currently required by Gitlab CI).
4 years ago
Ivan Tashkinov 610343edb3 [#2497] Image preview proxy: image resize & background color fix with ffmpeg -filter_complex.
4 years ago
lain ab1154e13f Merge branch 'admin-logo-upload' into 'develop'
4 years ago
lain 578ed3a37f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain a42a0716ec Merge branch 'features/emoji_stealer' into 'develop'
4 years ago
lain f166316f50 Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
4 years ago
lain 283fb1e05b Merge branch 'issue/749' into 'develop'
4 years ago
Egor Kislitsyn 45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
4 years ago
lain cc0d462e91 Attachments: Have the mediaType on the root, too.
4 years ago
lain 814c3e5171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain cdc6ba8d7b AnnounceValidator: Check for announcability
4 years ago
lain c76267afb9 Credo fixes.
4 years ago
lain 23e248694d Announcements: Fix all tests.
4 years ago
lain d9d425708e SideEffects: Builed out Announce effects.
4 years ago
Egor Kislitsyn 9de9760aa6
Move status actions to AdminAPI.StatusController
4 years ago
eugenijm b7fc61e17b Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
4 years ago
Ivan Tashkinov 6fd4f58ead Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
Ivan Tashkinov 1871a5ddb4 [#2497] Image preview proxy: implemented ffmpeg-based resizing, removed eimp & mogrify-based resizing.
4 years ago
lain 39031f4860 Pipeline: Don't federate if federation is disabled.
4 years ago
lain e42bc5f557 Announcements: Handle through common pipeline.
4 years ago
lain 265746b21f Merge branch 'openapi/pleroma-api/emojis' into 'develop'
4 years ago
lain c7cdc553ff Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
4 years ago
lain 423ea497bb Merge branch 'feature/1734-user-deletion' into 'develop'
4 years ago
lain eb5f428565 CommonAPI: Change public->private implicit addressing.
4 years ago
Egor Kislitsyn 26f01744bc
Add `background_image` to `InstanceOperation`
4 years ago
Egor Kislitsyn 5ba6e1c322
Move notification actions to PleromaAPI.NotificationController
4 years ago
Egor Kislitsyn f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController
4 years ago
Egor Kislitsyn 9a5de0f454
Move reaction actions to EmojiReactionController
4 years ago
Egor Kislitsyn 490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
4 years ago
Haelwenn 94ba5a7802 Merge branch 'exposed-background-image' into 'develop'
4 years ago
lain 6dd1575c64 Merge branch 'issue/1509' into 'develop'
4 years ago
lain 8a6ddf26ac InstanceOperation: Add background image to example
4 years ago
Haelwenn 5a149e5788 Merge branch 'openapi/pleroma-api/scrobble' into 'develop'
4 years ago
Egor Kislitsyn 47ed9ee441
Fix summary
4 years ago
lain be322541c8 User.Query: Remove superfluous `distinct`
4 years ago
Egor Kislitsyn 6609714d66
Move Scrobble views to ScrobbleView
4 years ago
Egor Kislitsyn 524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController
4 years ago
lain a985bd57b4 User.Query: Speed up recipients query.
4 years ago
Egor Kislitsyn e4c720f14c
Fix typo
4 years ago
Haelwenn 58ccd2bbfd Merge branch 'openapi/pleroma-api/mascot' into 'develop'
4 years ago
Maksim Pechnikov 41f8f17260 fix api/v1/accounts/update_credentials
4 years ago
Maksim Pechnikov 5f0a3ac74d added tests
4 years ago
lain d19c716770 AttachmentValidator: Handle empty mediatypes
4 years ago
Egor Kislitsyn fe5d423b43
Add OpenAPI spec for MascotController
4 years ago
Egor Kislitsyn 45c3a72404
[OpenAPI] Use BooleanLike in all request bodies
4 years ago
lain be4db41d71 ChatMessageValidator: Allow one message in an array, too.
4 years ago
lain 0d417e005d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov 5735b5c8be Fixed missing support for `with_muted` param in direct timeline.
4 years ago
Egor Kislitsyn aef31c69df
Rename EmojiAPIController to EmojiPackController
4 years ago
Egor Kislitsyn 8bde8dfec2
Cleanup Pleroma.Emoji.Pack
4 years ago
Egor Kislitsyn 6e4de715b3
Add OpenAPI spec for PleromaAPI.EmojiAPIController
4 years ago
lain 0d5bce018d AnnounceValidator: Validate for existing announce
4 years ago
lain 17a8342c1e ObjectValidators: Add basic Announce validator.
4 years ago
lain 7d381b16b7 Transmogrifier Test: Extract Announce handling.
4 years ago
Alexander Strizhakov 215daabdb4
copyright update
4 years ago
lain 188b32145e InstanceView: Expose background image link.
4 years ago
lain 96f7b1b140 Merge branch 'show-media-endpoint-fixes' into 'develop'
4 years ago
Roman Chvanikov 01bd6a1e54 Merge branch 'develop' into feature/admin-api-status-count-per-instance
4 years ago
Alexander Strizhakov 1671864d88
return :visible instead of boolean
4 years ago
Alexander Strizhakov b1aa402229
removing 410 status
4 years ago
Alexander Strizhakov e7bc2f980c
account visibility
4 years ago
Ivan Tashkinov 9b76565264 MediaController: enforced owner-only access in :show action.
4 years ago
Maksim Pechnikov c33a4315fb updated docs
4 years ago
lain baf051a59e SideEffects: Don't update unread count for actor in chatmessages.
4 years ago
lain 9c17109765 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 8bfd9710ae Pleroma Authenticator: Also update passwords here.
4 years ago
lain bfdd90f6d7 AuthenticationPlug: Also update crypt passwords.
4 years ago
lain baef35bcc8 Authentication Plug: Update bcrypt password on login.
4 years ago
lain 4b28d812cf Merge branch 'restricted-relations-embedding' into 'develop'
4 years ago
Ivan Tashkinov af9dfdce6b MediaController OAuth scope assignments fix.
4 years ago
Maksim Pechnikov 3f8d68bdf3 added example cache purge script
4 years ago
lain d96f8f17e8 Merge branch 'features/mastoapi_v2_media' into 'develop'
4 years ago
lain d15aa9d950 Merge branch 'develop' into 'remove-twitter-api'
4 years ago