Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 00:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,639 Commits 74 Branches 58 Tags
ef4ecd5eebcbeff372cc7fd33a088ef8ae32b864
Commit Graph

172 Commits

Author SHA1 Message Date
Claire
ef4ecd5eeb Merge commit 'a86078e8bb082eb15e0fd0d183a8a610f043827f' into glitch-soc/merge-4.3 2025-09-23 18:19:32 +02:00
Claire
60771df3e7 Fix getting Create and Update out of order (#36176) 2025-09-23 14:33:27 +02:00
Claire
a076fa2063 Merge commit 'f6dbb2206c5a4c1b27ce1395b477492139cfcbcc' into glitch-soc/merge-4.3 2025-07-02 19:06:55 +02:00
Claire
5039e9d474 Add basic support for remote attachments with multiple media types (#34996) 2025-07-02 12:51:46 +02:00
Claire
91b3859b7b Add tests for featured tag removal (#34888) 2025-06-03 15:04:23 +02:00
Claire
baac429103 Merge commit 'b1a584d252f4df4c2a1a9400d6588b4f36768216' into glitch-soc/merge-4.3 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
  In addition, upstream changed how notifications from follow subscriptions were
  handled, refactoring this file in the process.
  Ported upstream's changes.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
- `app/workers/feed_insert_worker.rb`:
  Upstream changed how notifications from follow subscriptions were handled,
  refactoring this file in the process.
  Conflict is due to glitch-soc having an extra timeline type (direct).
  Ported upstream's changes.
 2025-02-25 18:33:54 +01:00
Claire
08d2250ad2 Fix handling of duplicate mentions in incoming status Update (#33911) 2025-02-25 17:11:09 +01:00
Claire
227d48dbd5 Fix LDSignature tests (#33705) 2025-02-25 17:11:09 +01:00
Matt Jankowski
4da31b8263 Fix intermittent failure on ap/activity/create spec timestamp check (#33406) 2025-02-25 17:11:09 +01:00
Claire
17695ace33 Fix featured tags for remote accounts not being kept up to date (#33372) 2025-02-25 17:11:09 +01:00
Claire
198283a188 Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while
  glitch-soc has a different version of the file overall.
  Added upstream's changes.
 2024-10-16 12:42:12 +02:00
Matt Jankowski
527d1253bf Reduce factory creation (14 -> 8) in ActivityPub::Activity::Block spec (#32488) 2024-10-16 12:40:58 +02:00
Claire
dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
 2024-10-05 20:45:05 +02:00
Jeong Arm
b8fdffe824 Ignore error if mentioned account was not processable (#29215) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-04 17:48:03 +02:00
Claire
221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
Matt Jankowski
5405bdd344 Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00
Claire
83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
Claire
c35ea59ee6 Fix security context sometimes not being added in LD-Signed activities (#31871) 2024-09-12 12:58:12 +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
Claire
f7598b267b Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
Matt Jankowski
05342529dd Reduce factory creation in AP activity move spec (#31064) 2024-07-19 08:31:34 +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
6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
Matt Jankowski
f1300ad284 Rename jobs/attachments rspec tag names (#29762) 2024-07-08 16:01:08 +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
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
133d98fb25 Normalize language code of incoming posts (#30403) 2024-05-23 17:28:18 +00:00
Claire
06881a8669 Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream 2024-03-13 19:16:47 +01:00
Matt Jankowski
8349b45d60 Accept extra args that we wont verify in ap/activity/add_spec (#29005) 2024-03-13 08:46:11 +00:00
Claire
ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.
 2024-02-24 14:46:14 +01:00
Claire
6c1b6194f7 Merge pull request from GHSA-jhrq-qvrm-qr36 
* Fix insufficient Content-Type checking of fetched ActivityStreams objects

* Allow JSON-LD documents with multiple profiles
 2024-02-16 12:17:15 +01:00
Claire
9fee5e8526 Merge pull request from GHSA-jhrq-qvrm-qr36 
* Fix insufficient Content-Type checking of fetched ActivityStreams objects

* Allow JSON-LD documents with multiple profiles
 2024-02-16 11:56:12 +01:00
Matt Jankowski
ed4939296a Reduce RSpec/MultipleExpectations in ap/activity/create spec (#29224) 2024-02-16 07:43:00 +00:00
Matt Jankowski
15437e4ad9 Add context and before to lengthy tag manager spec examples (#29129) 2024-02-08 10:03:04 +00:00
Claire
ff58ec0103 Merge pull request from GHSA-3fjr-858r-92rw 
* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1
 2024-02-01 15:57:08 +01:00
Claire
1726085db5 Merge pull request from GHSA-3fjr-858r-92rw 
* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1
 2024-02-01 15:56:46 +01:00
Claire
5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
Claire
087415d0fe Add tests for processing statuses using bearcap URIs (#28904) 2024-01-25 11:13:36 +00:00
Claire
464051c2d2 Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 2024-01-15 20:06:31 +01:00
MitarashiDango
2c05b8a60d Fix Undo Announce activity is not sent, when not followed by the reblogged post author (#18482) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-12 15:58:28 +00:00
Claire
23d8bd8ce1 Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream 2024-01-11 13:24:20 +01:00
Matt Jankowski
00341c70ff Use Sidekiq fake! instead of inline! in specs (#25369) 2024-01-10 11:06:58 +00:00
Claire
c5b0e6d5a0 Merge branch 'main' into glitch-soc/merge-upstream 2023-12-28 16:57:10 +01:00
Claire
ea6c187fca Fix media attachment order of remote posts (#28469) 2023-12-22 18:45:36 +01:00
Claire
2bf84b93d4 Fix media attachment order of remote posts (#28469) 2023-12-22 15:10:39 +00:00
Matt Jankowski
c99f88e1a8 Clean up of RSpec/LetSetup within spec/lib (#28447) 2023-12-21 11:19:56 +00:00
Claire
2e786e13cb Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/status_pin_validator.rb`:
  Upstream refactored that file, while glitch-soc had configurable limits for
  pinned statuses.
  Updated the code with upstream's refactor, while keeping glitch-soc's
  configurability.
 2023-12-19 20:51:37 +01:00