mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,130 Commits
69 Branches
20 Tags
354 MiB
Commit Graph

3224 Commits (86b9d3b4e5f95be5a97924e4787a92112c6e6f11)

Author SHA1 Message Date
Claire 719cabe024
Fix logic of block/mute bypass for mentions from moderators (#31271) 2024-08-07 06:52:10 +00:00
Claire 08adca0c63 Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream 2024-08-06 17:27:48 +02:00
Claire 438dac99d6
Add option to request partial accounts in grouped notifications API (#31299) 2024-08-06 12:09:35 +00:00
Christian Schmidt 9d0cafd06b
Check Content-Length in ResponseWithLimitAdapter (#31285) 2024-08-06 08:23:48 +00:00
Christian Schmidt e9e63ed203
Support JSON-LD named graph (#31288) 2024-08-06 07:52:47 +00:00
Claire e67e07211f Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
 2024-08-02 18:09:48 +02:00
Claire da5b45a573
Add endpoints to accept and dismiss multiple notification requests at once (#31242) 2024-08-01 12:36:54 +00:00
Claire 8dd671a977 Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream 2024-07-31 18:16:01 +02:00
Claire 549ab089ee
Change grouped notifications API shape (take 2) (#31214) 2024-07-31 10:50:13 +00:00
Claire 1f796d129d Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
  Ported upstream changes.
 2024-07-30 20:47:34 +02:00
Claire 598ae4f2da
Add endpoints for unread notifications count (#31191) 2024-07-30 08:39:11 +00:00
Tim Rogers 2ce99c51dd
Fixed Rails route covering %40-encoded profile URL paths to not 404 (#31184) 2024-07-30 08:18:00 +00:00
Claire 654187a995 Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream 2024-07-29 19:16:58 +02:00
Emelia Smith c40e481169
Implement UI for Admin Search of Hashtags (#30880) 2024-07-29 15:49:44 +00:00
Matt Jankowski 95eadabe44
Extrude `fill_in_auth_details` method to `ProfileStories` spec support module (#31163) 2024-07-29 08:31:42 +00:00
Claire fb411b6d0f Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream 2024-07-27 13:19:38 +02:00
David Roetzel dd53792714
Move UI tests from controller to system spec (#31158) 2024-07-26 14:53:49 +00:00
Emelia Smith 693d9b03ed
Enable OAuth PKCE Extension (#31129) 2024-07-26 08:53:10 +00:00
Claire cf5d2c3fe4 Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream 2024-07-25 17:47:02 +02:00
Adam Niedzielski 887e64efd4
Allow @ at the end of an URL (#31124) 2024-07-25 15:02:58 +00:00
Adam Niedzielski fbf95216c5
Fix LinkCrawlWorker NoMethodError: undefined method `[]' for nil (#31144) 2024-07-25 14:51:44 +00:00
Matt Jankowski bfaa53343a
Improve failure message on pagination matcher (#31146) 2024-07-25 14:28:08 +00:00
Adam Niedzielski 337a7fcf30
Fix ß bug in regexp for mentions and tags (#31122) 2024-07-25 14:24:19 +00:00
Matt Jankowski e881a59671
Add `User.unconfirmed` scope, reduce factories in `scheduler/user_cleanup` spec (#31063) 2024-07-25 14:18:24 +00:00
Claire 68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Adam Niedzielski cd0ca4b994
Select correct self link when parsing Webfinger response (#31110) 2024-07-23 14:42:31 +00:00
Emelia Smith bb2e5a4b58
Add audit logs to Admin::InstancesController (#27386) 2024-07-23 08:12:30 +00:00
Claire 2aac73341a Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Conflict due to glitch-soc's local-only posts.
  Ported upstream's changes while keeping glitch-soc's feature.
 2024-07-22 17:38:30 +02:00
Claire ced5e853c7
Fix duplicate `orderedItems` in user archive's `outbox.json` (#31099) 2024-07-22 08:56:05 +00:00
Matt Jankowski 6e4305de69
Fix spec descriptions around configurable limit values (#31079) 2024-07-22 08:02:31 +00:00
Matt Jankowski ef796446e5
Ignore manifest JS parse/interrupt error on CI (#31080) 2024-07-22 07:46:41 +00:00
Claire f7598b267b Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
kyori19 3a00f89aa1
Respect `Account::DISPLAY_NAME_LENGTH_LIMIT` in account spec correctly (#31075) 2024-07-19 15:31:48 +00:00
Matt Jankowski 05342529dd
Reduce factory creation in AP activity move spec (#31064) 2024-07-19 08:31:34 +00:00
Claire c75fe09e2b Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00
Matt Jankowski 848b59c8ae
Reduce factory creation in `MediaAttachment` model spec (#31058) 2024-07-18 15:23:46 +00:00
Matt Jankowski 47ea83d246
Reduce factory creation in `AP::ProcessStatusUpdateService` spec (#31051) 2024-07-18 08:00:19 +00:00
Matt Jankowski 2616fde9e6
Use change-requiring records in admin/reports controller spec (#31052) 2024-07-18 07:49:44 +00:00
Matt Jankowski c5f8256801
Reduce extra factories in `FanOutOnWriteService` spec (#31053) 2024-07-18 07:45:59 +00:00
Claire 5e7720d11b Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream 2024-07-17 22:20:12 +02:00
Matt Jankowski 76c2c5c748
Reduce extra round trips in `activitypub` controller specs (#31041) 2024-07-17 08:09:34 +00:00
Matt Jankowski f5e90f3de3
Reduce extra round trips in `AP::SynchronizeFollowersService` spec (#31044) 2024-07-17 07:33:08 +00:00
Matt Jankowski 81877e7950
Reduce extra round trips in `AP::FetchRemoteStatusService` spec (#31045) 2024-07-17 07:24:14 +00:00
Claire c546757cd1 Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream 2024-07-16 17:54:36 +02:00
Emelia Smith aa88aca0ad
Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +00:00
Claire 64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.
 2024-07-15 18:51:38 +02:00
Matt Jankowski 91ef4a6fc5
Add assertion about key columns to account key generate spec (#30635) 2024-07-15 10:42:18 +00:00
Claire 1dd8262071
Add optional `filtered` attribute to notification entities in REST API (#31011) 2024-07-15 09:29:57 +00:00
Claire edec2e9fdf Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream 2024-07-14 18:43:35 +02:00
Matt Jankowski 00cb4a0313
Avoid repeated factory creation in media_attachments_vacuum_spec (#31000) 2024-07-12 14:09:16 +00:00
David Roetzel 35a437a03f
Destroy `NotificationRequest`s that are dismissed (#31008) 2024-07-12 12:09:52 +00:00
Claire 55cf5e0188 Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
Matt Jankowski 43e24dbb13
Use `include_pagination_headers` in more places (#30999) 2024-07-12 08:30:52 +00:00
Matt Jankowski 73d53827ea
Add change assertion to invites destroy spec (#31004) 2024-07-12 08:19:15 +00:00
Claire 52fb4f16ef Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream 2024-07-10 16:58:06 +02:00
David Roetzel 2ea9336b68
Do not pass unknown encoding names to nokogiri. (#30987) 2024-07-10 14:25:39 +00:00
Claire 388672ff0d Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream 2024-07-09 20:39:09 +02:00
David Roetzel 967505ee9b
Add size limit for all PreviewCard URLs (#30973) 2024-07-09 13:11:34 +00:00
Daniel M Brasil 3875bd138d
Fix HTTP 500 in `/api/v1/polls/:id/votes` (#25598) 2024-07-09 12:41:49 +00:00
Claire 6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
David Roetzel fa8e972722
Fix author names as arrays in linked data. (#30957) 2024-07-08 16:04:36 +00:00
Matt Jankowski f1300ad284
Rename jobs/attachments rspec tag names (#29762) 2024-07-08 16:01:08 +00:00
Claire d41b43ed4f
Limit attachments to `MEDIA_ATTACHMENTS_LIMIT` when returning posts through the API (#30932) 2024-07-08 07:41:50 +00:00
Claire 11dd51ef44 Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream and glitch-soc had different comments, some comments got updated upstream.
  Updated them in glitch-soc accordingly.
 2024-07-06 21:02:42 +02:00
David Roetzel 97eddb5906
Fix details extraction when no title exists. (#30933) 2024-07-05 13:28:52 +00:00
David Roetzel 016c1e4e78
Improve handling of encoding problems when creating link previews (#30929) 2024-07-05 11:54:38 +00:00
Claire e61a7794f8 Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict because glitch-soc has a different list of allowed tags.
  Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
  Conflict because of glitch-soc's default settings.
  Updated accordingly.
 2024-07-04 17:12:14 +02:00
Claire 502cf75b16
Merge pull request from GHSA-58x8-3qxw-6hm7 
* Fix insufficient permission checking for public timeline endpoints

Note that this changes unauthenticated access failure code from 401 to 422

* Add more tests for public timelines

* Require user token in `/api/v1/statuses/:id/translate` and `/api/v1/scheduled_statuses`
 2024-07-04 16:26:49 +02:00
Claire 395f17ca17
Merge pull request from GHSA-vp5r-5pgw-jwqx 
* Fix streaming sessions not being closed when revoking access to an app

* Add tests for GHSA-7w3c-p9j8-mq3x
 2024-07-04 16:11:28 +02:00
Emelia Smith 47f0faebc9
Implement HTML ruby tags for east-asian languages (#30897) 2024-07-03 20:05:59 +00:00
David Roetzel 9be77fc0db
Revert "Add system check for missing database indexes" (#30909) 2024-07-03 13:36:42 +00:00
David Roetzel ebd8e1bbb6
Add system check for missing database indexes (#30888) 2024-07-03 07:19:54 +00:00
Claire d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
Matt Jankowski 836c0477ac
Use vips setting instead of env var in media processing spec (#30859) 2024-06-27 16:03:26 +00:00
David Roetzel ff08d99d4d
Catch encoding errors when creating link previews. (#30853) 2024-06-27 14:41:03 +00:00
David Roetzel 42adb6eaee
Add size limit for link preview URLs (#30854) 2024-06-27 14:40:19 +00:00
Matt Jankowski f6390c3326
Use flatware to parallelize CI specs (#30284) 2024-06-27 07:42:57 +00:00
Claire 7a84b76bb1
Drop favicon.ico generation (#30375) 2024-06-26 13:44:08 +00:00
Claire 6f2771cb32 Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream 2024-06-25 17:57:39 +02:00
Matt Jankowski 8ef59729a1
Ignore intermittent chrome/manifest/icon interaction failure (#30793) 2024-06-25 13:57:40 +00:00
Emelia Smith 30ae5952d2
Fix: Ensure "With Media" is highlighted from Admin Accounts page (#30812) 2024-06-25 07:46:53 +00:00
Claire 21ca03581a Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream 2024-06-24 19:39:42 +02:00
Claire 8827cd597e
Fix `/admin/accounts/:account_id/statuses/:id` for edited posts with media attachments (#30819) 2024-06-24 13:11:10 +00:00
Claire 3b4607991d Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream 2024-06-22 20:59:23 +02:00
Matt Jankowski 72484a194f
Remove `CacheBuster` default options (#30718) 2024-06-21 15:32:49 +00:00
David Roetzel 2cab1c7b09
Improve encoding detection for link cards (#30780) 2024-06-21 12:51:10 +00:00
Claire cabd7c21fc Merge commit '2cda1dd542b20a47245cb8d28a4f6f8750c2284c' into glitch-soc/merge-upstream 2024-06-19 19:37:37 +02:00
Matt Jankowski 84a31319e9
Add `match_json_values` and use in AP worker specs (#30720) 2024-06-19 13:46:52 +00:00
Claire 52e34a6bd6 Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream 2024-06-19 11:59:06 +02:00
Claire 8098d27f84
Stop calling Webpacker in full-stack tests (#30763) 2024-06-19 09:31:30 +00:00
Claire b0c979af49 Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream 2024-06-18 18:20:36 +02:00
Claire 58ace2e45e
Fix SQL error in admin measures API (#30753) 2024-06-18 16:04:58 +00:00
Matt Jankowski 38c6825eda
Remove unused `Extractor#extract_cashtags_with_indices` method (#30742) 2024-06-18 12:16:16 +00:00
Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
 2024-06-17 18:30:28 +02:00
Matt Jankowski d7b7617321
Use `class_names` in admin/account_moderation_notes helper (#30719) 2024-06-17 12:20:57 +00:00
Claire 677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
Matt Jankowski f287462f76
Fix repeated Delete/Undo assertion in remove status service spec (#30715) 2024-06-17 10:21:29 +00:00
Claire 45abddb302
Fix pagination attributes not being returned in ungroupable-only pages (#30688) 2024-06-13 14:10:34 +00:00
Claire bf56e982a9
Fix notifications from limited users being outright dropped (#30559) 2024-06-12 13:50:38 +00:00
Claire 1dfd516284
Fix duplicate `@context` attribute in user export (#30653) 2024-06-12 07:28:28 +00:00
Claire f214813919 Adapt settings spec to glitch-soc 2024-06-11 19:54:27 +02:00
Claire 4daed855e5 Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream 2024-06-11 19:46:11 +02:00
Matt Jankowski d818ddd687
Extract `SIGN_COUNT_LIMIT` constant in `WebauthnCredential` class (#30636) 2024-06-11 15:36:21 +00:00
Matt Jankowski 62d070c438
Check both before/after state in `AccountDomainBlock` spec (#30640) 2024-06-11 13:59:56 +00:00
Matt Jankowski 1622f7aeb9
Remove duplicate fabricator validity checks (#29667) 2024-06-11 07:48:42 +00:00
Matt Jankowski edf6d64eeb
Use correct params in `settings/preferences/appearance` spec (#30379) 2024-06-11 07:36:46 +00:00
Matt Jankowski b2496177e0
Use correct params in `v1/admin/domain_allows` spec (#30378) 2024-06-11 07:35:30 +00:00
Matt Jankowski cfd4823b65
Use fabricator in follow_spec (#30642) 2024-06-11 06:57:09 +00:00
Claire be68f8f4af Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream 2024-06-10 18:20:08 +02:00
Matt Jankowski 9cc4040308
Extract `COMMENT_SIZE_LIMIT` constant in `AP::Activity::Flag` class (#30637) 2024-06-10 15:23:55 +00:00
Matt Jankowski 9bf2e2eda0
Extract `TEXT_LENGTH_LIMIT` constant in `Appeal` class (#30638) 2024-06-10 15:23:17 +00:00
Matt Jankowski 3e3f3d7580
Match report validation spec to extracted constant (#30633) 2024-06-10 15:04:01 +00:00
Matt Jankowski 92b3004bf3
Reference constants from account validation specs (#30634) 2024-06-10 15:03:41 +00:00
Daniel M Brasil 28f9a8f2ec
Add Specs for Scheduled Status Model Validations (#30585) 2024-06-10 14:52:33 +00:00
Daniel M Brasil 77c2216e47
fix: Return HTTP 422 when scheduled status time is less than 5 minutes (#30584) 2024-06-10 13:33:48 +00:00
Matt Jankowski 827e36ff9e
Fix `Capybara/NegationMatcher` cop in spec/system (#30616) 2024-06-08 17:10:06 +00:00
Claire 7277d2f130 Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream 2024-06-07 20:30:51 +02:00
Claire 1408733386
Fix Mastodon relying on ImageMagick even with `MASTODON_USE_LIBVIPS` (#30590) 2024-06-07 09:27:59 +00:00
Matt Jankowski 04ebbe3077
Add `sidekiq_inline` to appeal service spec (#30562) 2024-06-06 14:19:37 +00:00
Matt Jankowski 07cc94e05f
Use `sidekiq_inline` in requests/api/v1/admin/account_actions spec (#30563) 2024-06-06 14:19:22 +00:00
Matt Jankowski 9b9b0e25b6
Use `sidekiq_inline` in requests/api/v1/reports spec (#30564) 2024-06-06 14:14:33 +00:00
Matt Jankowski a662c6d1d8
Use `sidekiq_inline` in admin/account_action model spec (#30565) 2024-06-06 14:12:58 +00:00
Claire 578b0eae7d Fix /api/v1/timelines/link specs for glitch-soc default settings 2024-06-06 12:52:15 +02:00
Claire 30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00
Eugen Rochko a2505e8611
Add timeline of public posts about a trending link to REST API (#30381) 2024-06-06 08:43:04 +00:00
Emelia Smith e02d23b549
Change `read:me` scope to `profile` scope (#30357) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-06 07:30:10 +00:00
Emelia Smith 4655be0da6
Fix add validation to webpush subscription keys (#30542) 2024-06-05 19:16:47 +00:00
Eugen Rochko 5f15a892fa
Add support for libvips in addition to ImageMagick (#30090) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-05 19:15:39 +00:00
Emelia Smith eef2cc054f
Add url validation to Web::PushSubscription endpoints (#30540) 2024-06-05 08:06:06 +00:00
Matt Jankowski 249cbc449c
Use existing config access to `local_domain` value (#30509) 2024-06-03 09:15:58 +00:00
Claire 974335e414
Add experimental server-side notification grouping (#29889) 2024-06-03 08:35:59 +00:00
Matt Jankowski 4d047b95ae
Use more direct attribute handling in `User` fabricator (#30495) 2024-05-31 09:54:11 +00:00
Claire b8271f20c5 Merge commit '7f808ff6e9148f1cfe1e16d000e2405b6e31f243' into glitch-soc/merge-upstream 2024-05-30 15:41:31 +02:00
Claire 16249946ae
Merge pull request from GHSA-q3rg-xx5v-4mxh 2024-05-30 14:14:04 +02:00
Claire 3ea4275ae3
Merge pull request from GHSA-5fq7-3p3j-9vrf 2024-05-30 14:03:13 +02:00
Claire c827a98f19 Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
 2024-05-29 17:03:24 +02:00
Emelia Smith d20a5c3ec9
Fix: remove broken OAuth Application vacuuming & throttle OAuth Application registrations (#30316) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-29 14:00:05 +00:00
Claire 36fe8f8566
Change `ids` param to `id` in `/api/v1/statuses` and `/api/v1/accounts` for consistency (#30465) 2024-05-29 09:19:17 +00:00
Matt Jankowski c61e356475
Add `Status::MEDIA_ATTACHMENTS_LIMIT` configuration constant (#30433) 2024-05-27 09:49:44 +00:00
Matt Jankowski 564ebfefcf
Remove hard reference from status pin validator spec (#30432) 2024-05-27 09:20:28 +00:00
Claire 51631c785f Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
  Glitch-soc had changes to adjacent lines.
  Ported upstream's changes.
 2024-05-23 20:30:23 +02:00
Claire 0e8633f6c7 Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream 2024-05-23 20:11:12 +02:00
Claire 133d98fb25
Normalize language code of incoming posts (#30403) 2024-05-23 17:28:18 +00:00
Matt Jankowski 3a862439df
Remove unused account record in api/v2/admin/accounts spec (#30397) 2024-05-23 08:26:58 +00:00
Claire 5ab111554e Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream 2024-05-21 17:45:21 +02:00
Claire 32223863a5
Add coverage to `/admin/accounts/:id` (#30386) 2024-05-21 13:17:34 +00:00
Claire d3136e6d58 Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream 2024-05-21 12:06:38 +02:00
Claire 89f89d738f
Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385) 2024-05-21 08:56:08 +00:00
Claire 20fdf8e22c Merge commit '0a2110b9af52005798251dc9d245a66dd5dd20fa' into glitch-soc/merge-upstream 2024-05-20 17:47:48 +02:00
Matt Jankowski 0a2110b9af
Add coverage for custom filters (#30347) 2024-05-20 15:00:09 +00:00
Claire e46321e63d Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream 2024-05-20 12:17:36 +02:00
Claire de4815afda
Add more tests for self-destruct mode (#30374) 2024-05-20 10:06:51 +00:00
Matt Jankowski def6b686ff
Fix `Rails/WhereRange` cop (#30343) 2024-05-20 09:37:36 +00:00
Matt Jankowski 70608f824e
Add coverage for `AdminMailer#auto_close_registrations` (#30349) 2024-05-20 08:03:39 +00:00
Emelia Smith 2da2a1dae9
Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192) 2024-05-17 13:46:12 +00:00
Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.
 2024-05-16 19:30:10 +02:00
Matt Jankowski 65e82211cd
Rename `cache_*` methods to `preload_*` in controller concern (#30209) 2024-05-16 08:03:46 +00:00
Emelia Smith 5fd56512de
Improve Report Notes and Account Moderation Notes (#30288) 2024-05-15 13:38:36 +00:00
Jason Punyon 85c625d319
Fix repetitive database queries from #30040 (#30259) 2024-05-15 09:38:16 +00:00
Matt Jankowski 6beead3867
Move `simplecov` config into `rails_helper` (#30302) 2024-05-15 09:33:36 +00:00
Renaud Chaput 40639510f8
Retain unconfirmed users longer (1 week) (#30285) 2024-05-15 08:27:34 +00:00
Claire f35ba6963d Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream 2024-05-11 22:10:56 +02:00
Matt Jankowski 0d397db5dd
Consolidate system specs into single directory, use rspec tags for configuration (#30206) 2024-05-10 12:36:09 +00:00
Matt Jankowski fa43a6c835
Use more accurate `redirect_uri` in oauth spec (#30212) 2024-05-10 09:43:59 +00:00
Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.
 2024-05-06 17:53:51 +02:00
Claire 2fe1b8d169
Add API to get multiple accounts and statuses (#27871) 
Co-authored-by: noellabo <noel.yoshiba@gmail.com>
 2024-05-06 15:19:15 +00:00
Fawaz Farid bc24c4792d
Allow admins to configure instance favicon and logo (#30040) 2024-05-06 15:06:52 +00:00
Emelia Smith 116f01ec7d
Implement RFC 8414 for OAuth 2.0 server metadata (#29191) 2024-05-06 13:17:56 +00:00
Claire 30ef9fccf0
Fix hashtag matching pattern matching some link anchors (#30190) 2024-05-06 12:47:19 +00:00
Matt Jankowski dbaa4ed891
Use `chewy` which relaxes ES version reqs (#30157) 2024-05-06 11:50:45 +00:00
Claire e5062b7135
Fix post deletion not being deferred when those are part of an account warning (#30163) 2024-05-06 09:52:34 +00:00
Claire 3789d9f825 Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream 
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests.
 2024-05-04 16:28:30 +02:00
Claire f09f5b35f2 Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Upstream refactored this file a bit, moving validation limits to constants.
  We already had a similar change, although with different constant names.
  Updated to match upstream's code.

The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
 2024-05-04 16:12:51 +02:00
Claire d6f9c97ae4 Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream 2024-05-04 15:24:22 +02:00
Claire 253ead3aa7
Fix not being able to block a subdomain of an already-blocked domain through the API (#30119) 2024-05-02 20:56:21 +00:00
Matt Jankowski 1e7d5d2957
Update `devise-two-factor` to version 5.0.0 (#28325) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-05-02 09:31:41 +00:00
Matt Jankowski 2447497a4c
Status length validation spec updates (#30132) 2024-05-02 08:31:06 +00:00
Claire b039e62194 Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream 2024-05-01 19:49:59 +02:00
Claire eeefb7cdbc Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream 2024-05-01 19:42:34 +02:00
Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.
 2024-05-01 19:38:34 +02:00
Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
 2024-05-01 19:30:41 +02:00
Claire 946bd2e7e1 Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
Claire 6f342a6d4c Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
- `app/models/account.rb`:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream.
 2024-05-01 18:56:48 +02:00
Claire 9ce82a35cb Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
Claire 555e33a392 Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict because of our different theming systems.
  Updated accordingly, along with `app/helpers/theme_helper.rb`
  and `app/helpers/theme_helper_spec.rb`.
 2024-05-01 18:38:55 +02:00
Claire 0fb469e2f3 Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream 2024-05-01 17:30:52 +02:00
Claire 15f6d2d038 Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Conflict due to glitch-soc having a different default site name.
  Updated the tests as upstream did, keeping glitch-soc's default name.
 2024-05-01 17:22:02 +02:00
Claire 2c386d4cfe Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream 2024-05-01 17:06:49 +02:00
Claire d52263e0e3 Merge commit '143d9553fa0187b9950a802cdedaea5c8cd12f75' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependencies as well.
 2024-05-01 17:04:33 +02:00
Claire 7b46517c38 Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream 2024-05-01 14:31:14 +02:00
Claire 7208edbd37 Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 
Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced
 2024-04-28 15:45:42 +02:00
Claire 91ca90e25b
Fix Idempotency-Key ignored when scheduling a post (#30084) 2024-04-26 13:19:02 +00:00
Claire e845594878
Fix moderator account being exposed in account moderation notification (#30082) 2024-04-26 12:42:06 +00:00
Claire 4ef0b48b95
Add in-app notifications for moderation actions/warnings (#30065) 2024-04-25 17:26:05 +00:00
Emelia Smith 049b159beb
Add read:me OAuth 2.0 scope, allowing more limited access to user data (#29087) 2024-04-23 11:47:00 +00:00
Matt Jankowski a15139bc02
Fix intermittent order based failure in `UpdateStatusService` spec (#30008) 2024-04-22 08:30:38 +00:00
Matt Jankowski f5d341382e
Add `any_args` to have_enqueued_sidekiq_job call (quiets deprecation) (#29999) 2024-04-19 19:44:59 +00:00
Matt Jankowski 11e0049b08
Use enum-generated scopes/queries for `BulkImport` (#29975) 2024-04-18 10:13:35 +00:00
Claire 8bece467f8
Change `have_enqueued_sidekiq_job` usage to always make argument expectations explicit (#29974) 2024-04-17 11:13:52 +00:00
Matt Jankowski 650c548c31
Add `not_featured_by` scope to Tag (#28815) 2024-04-17 10:05:38 +00:00