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

1864 Commits

Author SHA1 Message Date
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
David Roetzel
2a4b205c75
Make sure Delete reaches collection owner (#38399) 2026-03-25 15:28:20 +00:00
Claire
15dbf8040e
Add support for multiple keypairs for remote accounts (#38279) 2026-03-25 14:52:12 +00:00
David Roetzel
a0f6b6d365
Fix off-by-one error when creating collection items (#38394) 2026-03-25 14:29:11 +00:00
David Roetzel
84ea8334fe
Do not auto-accept remote collection items (#38386) 2026-03-25 13:04:05 +00:00
David Roetzel
d9db4779cf
Handle local/remote collection items differently when deleting (#38383) 2026-03-25 10:57:34 +00:00
Matt Jankowski
52a8bf4118
Add constants for delay in services (#38375) 2026-03-25 09:59:38 +00:00
Claire
3d8e40f7c9 Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream 2026-03-24 17:05:53 +01:00
Claire
4559e4ed1a
Merge commit from fork 2026-03-24 15:44:08 +01:00
Claire
60236bffe6 Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream 2026-03-24 12:13:39 +01:00
Matt Jankowski
0ef43a431d
Skip non-collection urls in process links service (#38351) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-03-24 09:52:35 +00:00
Claire
ca08c040b0
Federate new profile settings (#38314) 2026-03-24 09:20:17 +00:00
David Roetzel
3c47020f93
Allow service to update existing Collections (#38329) 2026-03-23 14:09:10 +00:00
Claire
39d9da3b82
Tag linked FeaturedCollection objects over ActivityPub (#38115) 2026-03-23 13:11:33 +00:00
Claire
d48470a1fc
Change media description length limit for remote media attachments from 1500 to 10000 characters (#37921) 2026-03-23 10:32:41 +00:00
Claire
21576e29ab
Refactor ProcessMentionsService to remove save_records parameter (#38277) 2026-03-23 09:12:30 +00:00
Claire
469076c357 Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream 2026-03-20 18:03:14 +01:00
Matt Jankowski
4e276e4476
Use Mention arel/exist in report service scope build-out (#38300) 2026-03-20 16:03:23 +00:00
David Roetzel
7aa696149f
Fetch an actor's featured collections (#38306) 2026-03-20 15:34:04 +00:00
David Roetzel
ccf6f16f05
Handle Delete of a FeatureAuthorization (#38292) 2026-03-20 09:51:20 +00:00
Claire
291f141a02 Merge commit '1ee457f2d37c2b77a7fbce246a7c72ac9f9d3056' into glitch-soc/merge-upstream 2026-03-19 18:14:55 +01:00
Matt Jankowski
49430b7eea
Prefer to_json in backup service (#38297) 2026-03-19 15:14:47 +00:00
David Roetzel
f43969a0eb
New service to fetch remote collections (#38298) 2026-03-19 14:27:02 +00:00
Claire
fac3080289 Merge commit 'cffa8de6267a57673b7f6264fab671153f965d23' into glitch-soc/merge-upstream 2026-03-19 12:38:31 +01:00
Matt Jankowski
2ce4529e1e
Final backup service prep for JSON cleanup (#38284) 2026-03-19 10:20:42 +00:00
Claire
842bac86f6 Merge commit 'db074fc3e2b671e28a44ae379e6df1fcbdbbce53' into glitch-soc/merge-upstream 2026-03-18 18:01:57 +01:00
Matt Jankowski
db074fc3e2
Add constant for backup service placeholder (#38280) 2026-03-18 16:22:24 +00:00
Claire
2b0531914f Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream 2026-03-18 12:01:23 +01:00
Matt Jankowski
e839a94b93
Use with_index iterator in backup service (#38264) 2026-03-18 09:11:14 +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
David Roetzel
96c93ba835
Only persist a collection item's approval URI once it is verified (#38255) 2026-03-17 15:14:30 +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
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
3832030711
Convert Oj.load -> JSON.parse in most places (#38236) 2026-03-16 16:38:19 +00:00
Matt Jankowski
703f2d0263
Use implicit to_json call in app/services (#38225) 2026-03-16 15:17:57 +00:00
Matt Jankowski
0c75e97345
Use JSON.generate in backup service (#38234) 2026-03-16 15:10:10 +00:00
Matt Jankowski
c05492ed5a
Use JSON.generate call for fan out service (#38222) 2026-03-16 14:31:58 +00:00
Matt Jankowski
330357507d
Use to_json call for webhook service (#38217) 2026-03-16 14:01:37 +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
12c63a382c
Handle adding already approved collection items (#38213) 2026-03-16 10:35:07 +00:00
Claire
3833eadfbf Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream 2026-03-12 18:48:32 +01:00
David Roetzel
84d8020165
Store a remote actor's featuredCollections URI (#38166) 2026-03-12 09:11:32 +00:00
Claire
b5222606e3 Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream 2026-03-11 18:50:59 +01:00
David Roetzel
3091e2e525
Ingestion of remote collections (#38144) 2026-03-11 14:29:00 +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