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

948 Commits

Author SHA1 Message Date
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
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
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
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
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
Claire
cc1e65dcec
Add GET /api/v1/profile (#37912) 2026-02-20 10:16:04 +00:00
Claire
b041869887 Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream 2026-02-18 18:40:03 +01:00
Nicholas La Roux
438602c488
Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795) 2026-02-17 14:56:46 +00:00
Claire
f47e2937cf Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream 2026-02-17 12:11:33 +01:00
Claire
0b66e74426
Add GET /api/v1/donation_campaigns (#37880) 2026-02-17 10:54:21 +00:00
Claire
ddc7df2064 Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream 2026-02-13 13:03:51 +01:00
David Roetzel
6c3bd944f8
Allow reporting (local) Collections (#37848) 2026-02-13 11:11:44 +00:00
Claire
59e02a628d Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Upstream refactored activity serialization while glitch-soc passed an extra argument.
  Followed upstream's refactor, keeping our extra argument.
 2026-02-05 12:43:12 +01:00
David Roetzel
73206856c5
Refactor activity serialization (#37678) 2026-02-05 09:39:27 +00:00
Claire
b14cbb3ee9
Merge pull request #3364 from ClearlyClaire/glitch-soc/features/local-only-drop-emoji 
Deprecate eye emoji in favor of a bespoke API parameter
 2026-01-27 22:30:17 +01:00
Claire
b96c8ecff4 Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream 2026-01-26 18:09:54 +01:00
Matt Jankowski
29ec2cd186
Add targeted_account_notes association to simplify usage (#35540) 2026-01-23 16:35:19 +00:00
Claire
e33a8d5bfb Merge commit '9b5986b36e86d50d19b68b10788b3316012894c3' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream refactored a bit where we had an extra argument for markdown/HTML.
  Adapted upstream change.
 2026-01-13 18:01:53 +01:00
Shlee
9b5986b36e
Fix quote_approval_policy being reset to user defaults when omitted in status update (#37436) 2026-01-13 10:40:08 +00:00
Claire
780fefa700 Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream 2025-12-16 18:27:03 +01:00
Claire
550a6d4765
Add wrapstodon to initial state and show wrapstodon sidebar item on load (#37261) 2025-12-16 09:47:18 +00:00
Claire
1fdb48c668 Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Updated upstream changes.
 2025-12-15 20:22:20 +01:00
David Roetzel
1766616ebc
Refactor relation preloading (#37217) 2025-12-15 07:35:46 +00:00
Claire
05e45beb34 Merge commit '607449336da198ea9fe9c014220a5374a0ca1ae4' into glitch-soc/merge-upstream 2025-12-08 16:33:27 +01:00
Claire
607449336d
Merge commit from fork 2025-12-08 15:44:08 +01:00
Claire
34aa825e96 Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream 2025-12-04 20:16:21 +01:00
Claire
f8422e1fa4
Add API for on-demand generation of annual reports (#37055) 2025-12-02 13:37:05 +00:00
Claire
c1ef6e31cb Merge commit '441eb895371cf8ed6a5b8e294367bbbfd0f4c037' into glitch-soc/merge-upstream 2025-11-08 10:44:43 +01:00
Claire
70d71c10c8
Fix /api/v1/statuses/:id/context sometimes returing Mastodon-Async-Refresh without result_count (#36779) 2025-11-07 10:02:25 +00:00
Claire
6ff4dad89d Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream 2025-10-31 18:03:21 +01:00
Dima
ebf5cee38e
Fix media URL inconsistency when deleting statuses via API (#35880) 2025-10-29 16:46:16 +00:00
Claire
48ec31bec8 Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed stuff too close to glitch-soc's theming system changes.
  Applied upstream's changes.
- `streaming/index.js`:
  Upstream refactored a bunch of stuff where our code was different due to
  local-only posts.
  Applied upstream's changes while taking care of local-only posts.
 2025-10-28 22:10:12 +01:00
Claire
4b42fe6aba
Change API behavior of reblogs wrt. quotes for consistency (#36559) 2025-10-28 08:05:23 +00:00
Claire
73a625c284 Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Upstream replaced a setting with 4 new ones, while glitch-soc had modified
  the default value of that setting.
  Removed the old setting and added the new settings, but with defaults
  matching glitch-soc's previous behavior.
 2025-10-06 19:24:16 +02:00
Claire
2d2c525097
Split timeline_preview setting into more granular settings (#36338) 2025-10-06 08:34:05 +00:00
Claire
17e0c745c6 Merge commit 'f69ca085dbfca2253404574dcdc4dc6c2aaa35c0' into glitch-soc/merge-upstream 2025-10-01 19:13:18 +02:00
Claire
cbb94bdfde Merge commit '45219dbf64805746a472e50bb7c9bcb52972ab2a' into glitch-soc/merge-upstream 2025-09-30 18:06:45 +02:00