Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,482 Commits 75 Branches 73 Tags
main
Commit Graph

944 Commits

Author SHA1 Message Date
Claire
2ac493ee8e Merge commit '9d5e10a70e006c1c0bc61e7f591b1078c7be6ab4' into glitch-soc/merge-upstream 2026-03-26 18:23:45 +01:00
Matt Jankowski
ea009d5062 Avoid rubocop:disable for private address spec (#38420) 2026-03-26 15:03:10 +00:00
David Roetzel
abd29109c5 Fetch unknown collection when handling FeatureRequest activity (#38413) 2026-03-26 13:30:27 +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
15dbf8040e Add support for multiple keypairs for remote accounts (#38279) 2026-03-25 14:52:12 +00:00
David Roetzel
c9eefd0ae7 Persist activity URI of a FeatureRequest (#38393) 2026-03-25 14:32:15 +00:00
Claire
60236bffe6 Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream 2026-03-24 12:13:39 +01:00
David Roetzel
e4e584a99e Handle Update of a FeaturedCollection (#38337) 2026-03-23 15:57:02 +00:00
Claire
39d9da3b82 Tag linked FeaturedCollection objects over ActivityPub (#38115) 2026-03-23 13:11:33 +00:00
Claire
469076c357 Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream 2026-03-20 18:03:14 +01:00
David Roetzel
ccf6f16f05 Handle Delete of a FeatureAuthorization (#38292) 2026-03-20 09:51:20 +00:00
Claire
842bac86f6 Merge commit 'db074fc3e2b671e28a44ae379e6df1fcbdbbce53' into glitch-soc/merge-upstream 2026-03-18 18:01:57 +01:00
Matt Jankowski
815c2cf8e9 Clean up Webfinger lib spec (#38259) 2026-03-18 13:23:06 +00:00
Claire
3593ddff11 Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream 2026-03-17 18:58:19 +01:00
Claire
04bf07a9cf Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream 2026-03-17 18:01:07 +01:00
Matt Jankowski
b320c9e4c9 Prefer to_json over JSON.generate when simple strings in stub request (#38258) 2026-03-17 16:10:54 +00:00
David Roetzel
f3035a8e51 Handle Reject of a FeatureRequest (#38256) 2026-03-17 15:59:51 +00:00
Matt Jankowski
b9d25bde3e Convert mix of JSON.parse and JSON.load_file (#38242) 2026-03-17 13:27:57 +00:00
Matt Jankowski
4d33490ec8 Update chewy to version 8.0.1 (#37983) 2026-03-17 13:27:37 +00:00
David Roetzel
5f36c482d2 Handle Accept of a FeatureRequest (#38251) 2026-03-17 11:45:00 +00: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
8792d6f840 Use JSON.generate in trivial string/hash conversion in specs (#38224) 2026-03-16 15:16:43 +00:00
Matt Jankowski
70230c632c Use to_json call for AP::Follow reject path (#38227) 2026-03-16 14:40:51 +00:00
Matt Jankowski
8124f1581a Use to_json call in cli/domains (#38219) 2026-03-16 14:03:20 +00:00
Matt Jankowski
6044219746 Use to_json call for raw event strings (#38215) 2026-03-16 13:55:58 +00:00
Claire
4359098740 Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream 2026-03-16 12:17:49 +01:00
David Roetzel
c993daa347 Start of handling FeatureRequest activities (#38193) 2026-03-16 09:04:28 +00:00
Claire
3833eadfbf Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream 2026-03-12 18:48:32 +01:00
David Roetzel
eeed483518 Handle Remove of an individual collection item (#38170) 2026-03-12 11:11:39 +00:00
David Roetzel
353c8b2abf Handle Remove activity on featuredCollections (#38169) 2026-03-12 10:37:53 +00:00
David Roetzel
94aa5d7c9e Handle Add activity to featuredCollections (#38167) 2026-03-12 10:14:22 +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
David Roetzel
1d46558e8d Ingestion of remote collection items (#38106) 2026-03-09 14:59:57 +00:00
Claire
4bcd0caa79 Merge commit 'e235c446c96280c015fb27f7eefe4e95a5a39892' into glitch-soc/merge-upstream 2026-03-09 12:41:12 +01:00
Claire
e235c446c9 Fix broken option defaults in tootctl email-domain-blocks (#38107) 2026-03-09 11:26:16 +00:00
Claire
c96db36396 Merge commit '8a0261c51caf76b6d12e3801da471759c31c9608' into glitch-soc/merge-upstream 2026-03-04 12:40:16 +01:00
Claire
8a0261c51c Add missing_attribution boolean to preview cards (#38043) 2026-03-04 11:18:37 +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
Claire
3b7c33e763 Add exclude_direct flag to /api/v1/accounts/:id/statuses to exclude direct messages (#37763) 2026-02-27 09:34:12 +00:00
Claire
85f72a3940 Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream 2026-02-20 21:08:06 +01:00
David Roetzel
7b85d21823 Re-use custom socket class for FASP requests (#37925) 2026-02-20 14:27:50 +00:00
Claire
5769ceb6e3 Merge commit '284c53f4391c0e2cdea788bc0aff73190913a488' into glitch-soc/merge-upstream 2026-02-16 13:35:39 +01:00
Matt Jankowski
1b724e9e12 Capture output in cli/emoji spec (#37861) 2026-02-16 08:24:39 +00:00
Claire
e451416d90 Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream 2026-02-12 18:00:45 +01:00
Claire
37e82ee66f Add --suspended-only option to tootctl emoji purge (#37828) 2026-02-12 10:25:29 +00:00
Claire
d62a7775b5 Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream 2026-01-29 21:08:46 +01:00
Daniel King
d5d57ac25a Add flag to preserve cached media on cleanup (#36200) 
Co-authored-by: Daniel King <git@kin.gy>
 2026-01-29 15:53:51 +00:00
Claire
95aaefe083 Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream 2026-01-21 22:04:02 +01:00