tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,613 Commits 5 Branches 0 Tags
Commit Graph

2641 Commits

Author SHA1 Message Date
Claire
69b70d48c6 Merge commit 'db13dddcf90343574dee320fff7e8bb9bf3707e4' into glitch-soc/merge-upstream 2026-04-07 20:08:57 +02:00
Matt Jankowski
71e6e50846
Simplify media attachment lookup in show/player actions (#38565) 2026-04-07 09:58:37 +00:00
Claire
45bd1ca785 Merge commit 'ffcf87e0234a5529652295d2386a8c9c8e43a7ff' into glitch-soc/merge-upstream 2026-04-02 12:03:44 +02:00
Claire
ffcf87e023
Fix refreshing keys from stale actors on signature verification error (#38515) 2026-04-02 09:07:44 +00:00
Claire
7a4747122e Merge commit 'ca5c0a144ade4bff7bd10446a39d86116879884e' into glitch-soc/merge-upstream 
- `CODE_OF_CONDUCT.md`:
  Adopt upstream's new Code of Conduct
 2026-04-01 19:11:21 +02:00
Eugen Rochko
93dcca7f12
Add email subscriptions to profiles in web UI (#38487) 2026-04-01 14:24:28 +00:00
Claire
db704180b2
Fix signature verification when the key ID is an acct: URI (#38516) 2026-04-01 14:14:53 +00:00
Claire
30bb39fe54 Merge commit '8e00f7cc8fab9b447f80a27a972eef78186633ad' into glitch-soc/merge-upstream 2026-03-27 18:15:50 +01:00
Matt Jankowski
df9dec741f
Add private method for event export filename (#38454) 2026-03-27 15:25:19 +00:00
Claire
2ac493ee8e Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream 2026-03-26 18:23:45 +01:00
Matt Jankowski
b321d5d377
Use resources to declare API TOS access endpoints (#38416) 2026-03-26 14:07:06 +00:00
Claire
806e2a993a
Fix Webfinger endpoint not handling new AP ID scheme (#38391) 2026-03-26 09:58:47 +00:00
Claire
79958d9442 Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  Upstream added a line adjacent to one that had been modified due to local-only posting.
  Added upstream's change.
- `tsconfig.json`:
  Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
  glitch-soc had extra paths. Updated as upstream did.
 2026-03-25 21:36:32 +01:00
Claire
572f18c322 Merge commit '664efcf4c3f9713894054fb642a252d8752a4123' into glitch-soc/merge-upstream 2026-03-25 21:09:30 +01:00
Eugen Rochko
bcf0718a9a
Add email subscriptions (#38163) 2026-03-25 16:25:45 +00:00
Claire
15dbf8040e
Add support for multiple keypairs for remote accounts (#38279) 2026-03-25 14:52:12 +00:00
David Roetzel
bcead76410
Only federate accepted collection items (#38385) 2026-03-25 13:04:09 +00:00
Matt Jankowski
5d7682c7dd
Extract security_key_options endpoint to standalone controller (#38367) 2026-03-25 10:35:09 +00:00
Claire
60236bffe6 Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream 2026-03-24 12:13:39 +01:00
Matt Jankowski
5a7c565396
Extract common lists for status/reblog preload/cacheable (#35285) 2026-03-23 15:53:56 +00:00
Claire
04bf07a9cf Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream 2026-03-17 18:01:07 +01:00
Matt Jankowski
f07e84f9de
Rescue JSON::ParserError where already converted (#38244) 2026-03-17 08:57:10 +00:00
Claire
73f77c49d8 Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.
 2026-03-16 18:16:56 +01:00
Matt Jankowski
16c41e035b
Use JSON.parse in AP inboxes (#38238) 2026-03-16 16:58:13 +00:00
Matt Jankowski
3832030711
Convert Oj.load -> JSON.parse in most places (#38236) 2026-03-16 16:38:19 +00:00
Matt Jankowski
092acbd47b
Use to_json call for pins API (#38231) 2026-03-16 15:06:22 +00:00
Matt Jankowski
8ed13bc6f7
Use to_json call for accounts API (#38226) 2026-03-16 14:40:03 +00:00
Matt Jankowski
7933fa4f94
Use to_json call in donation campaigns (#38223) 2026-03-16 14:32:05 +00:00
Claire
b7246518bf
Add avatar_description and header_description parameters to PATCH /api/v1/profile (#38221) 2026-03-16 14:04:25 +00:00
Claire
4359098740 Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream 2026-03-16 12:17:49 +01:00
Matt Jankowski
e2bf09d57d
Add timestamp spec for markers API response (#38206) 2026-03-16 08:48:10 +00:00
Claire
8d717ab161 Merge commit '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/application_controller_spec.rb`:
  Upstream moved specs that were textually-adjacent to glitch-soc ones.
  Kept the glitch-soc ones.
 2026-03-09 18:14:15 +01:00
Matt Jankowski
2c6d072175
Extract ErrorResponses from application controller (#38105) 2026-03-09 11:30:41 +00:00
Claire
0a989af8c6 Merge commit '3d8d5f6dc7625d9638cc2e3387247442225d4e3f' into glitch-soc/merge-upstream 2026-03-05 18:21:07 +01:00
Claire
1add29cf40
Redirect to short account URLs when requesting HTML for one of the AP endpoints (#38056) 2026-03-04 17:44:27 +00:00
Claire
45b87f31ff Merge commit 'a3aeae02885408381c7c1f3f6a0cc88799823409' into glitch-soc/merge-upstream 2026-03-03 18:12:16 +01:00
Claire
a3aeae0288
Add test to cover proper URL for media in DELETE /api/v1/statuses/:id (#38037) 2026-03-03 15:36:54 +00:00
Claire
1b92ac0729 Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream 2026-03-02 18:11:45 +01:00
David Roetzel
f953d40289
Add API to revoke collection item (#38027) 2026-03-02 13:38:03 +00:00
Claire
0e1ea3110e Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
  line adding a glitch API version.
 2026-02-27 21:25:37 +01:00
Matt Jankowski
7e5e96739f
Use consistent calling style for TagManager#normalize_domain (#35764) 2026-02-27 16:38:34 +00:00
Matt Jankowski
9762b4a75c
Use normalizes for tag name attribute (#37119) 2026-02-27 15:56:08 +00:00
David Roetzel
6b88dd4923
Issue FeatureAuthorizations (#38004) 2026-02-27 11:00:21 +00:00
Claire
e3cb4dea42 Merge commit '4d2a148ccbedc818c98fd712a0b44869c1019321' into glitch-soc/merge-upstream 2026-02-25 19:11:22 +01:00
David Roetzel
e2c9426c77
Split status batch and moderation actions (#37970) 2026-02-25 10:07:46 +00:00
Claire
c15c49b5b6 Merge commit '1e87bd178d96ab7d760f019fcf651ecc1585e701' into glitch-soc/merge-upstream 2026-02-24 15:14:25 +01:00
Claire
43ef9f66b6
Add PATCH /api/v1/profile (#37934) 2026-02-24 10:48:56 +00:00
Claire
85f72a3940 Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream 2026-02-20 21:08:06 +01:00
David Roetzel
6ba6285a73
Reject unconfirmed FASPs (#37926) 2026-02-20 14:40:31 +00:00
Claire
cc1e65dcec
Add GET /api/v1/profile (#37912) 2026-02-20 10:16:04 +00:00