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

245 Commits

Author SHA1 Message Date
Claire
478462ab25 Merge commit 'ed17b3a7ec52c0421ae2483a8e08431316f08b1c' into glitch-soc/merge-upstream 2026-01-12 21:00:14 +01:00
David Roetzel
a9cfddf28e
AP/AS serialization of Collections (#37434) 2026-01-12 08:39:25 +00:00
Claire
b1d219afd0 Merge commit '82fb2596c70a18fc4a2d99ab51106180196bfe98' into glitch-soc/merge-upstream 2026-01-05 18:19:58 +01:00
Claire
b5bc301cbd
Fix serialization of context pages (#37376) 2026-01-05 11:59:10 +00:00
Claire
04f4725249 Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream 2025-12-19 18:43:09 +01:00
David Roetzel
4e63958914
Federated "featureable in collections" preference (#37298) 2025-12-19 13:44:27 +00:00
Claire
84feffd6e6 Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added a method right next to glitch-soc-only methods.
  Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a line right next to a glitch-soc addition.
  Changed the code as upstream did.
 2025-12-17 18:27:14 +01:00
David Roetzel
5e8b8f9c23
Extract interaction policy class (#37277) 2025-12-17 10:12:43 +00:00
Asahi Lina
394ed551bb
Serialize legacy quotes (#3203) 2025-11-11 13:23:51 +01:00
Claire
490c89a5a9 Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream 2025-10-09 17:59:13 +02:00
Claire
d4a4a7177a
Fix crash when serializing quotes of deleted posts for ActivityPub (#36381) 2025-10-09 13:52:38 +00:00
Claire
b15b07606c Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream 2025-09-24 18:26:13 +02:00
Claire
e1f7847b64
Remove the outgoing_quotes feature flag, making the feature unconditional (#36130) 2025-09-24 08:58:08 +00:00
Claire
a548c5c29b Merge commit '24ddf80ff7a707bcea01a6e59831ffefe495f3e0' into glitch-soc/merge-upstream 2025-09-23 18:41:09 +02:00
Claire
24ddf80ff7
Revert "Add compatibility hack for GoToSocial interaction policies (#36004)" (#36218) 2025-09-23 08:14:11 +00:00
Claire
cc52833296 Merge commit '38fa0102c111f1c0cff5a42eba6882ffae4ca109' into glitch-soc/merge-upstream 2025-09-15 18:39:09 +02:00
Claire
e4bb0fc43a
Add server-side support for handling posts with a quote policy allowing followers to quote (#36127) 2025-09-15 15:03:44 +00:00
Claire
128a69c1f4 Merge commit '75f78244d5df52cc8242b6a7c6b8d1531963aa63' into glitch-soc/merge-upstream 2025-09-11 12:13:47 +02:00
Claire
b60ee191ac
Fix QuoteAuthorization id not being properly serialized when federating revocation (#36083) 2025-09-11 09:37:56 +00:00
Claire
06f45a2046 Merge commit 'eb118d85238da8d0583868abab2756bb329742ba' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies textually adjacent to glitch-soc-only ones.
  Updated them as upstream did.
 2025-09-10 18:11:12 +02:00
Claire
e1dc960219
Rework FEP-7888 implementation (#36064) 2025-09-09 18:27:30 +00:00
Jesse Karmani
65b4a0a6f1
Implement FEP 7888: Part 1 - publish conversation context (#35959) 2025-09-05 19:28:29 +00:00
Claire
6fc9febb47 Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream 2025-09-05 20:03:42 +02:00
Claire
14cb5ff881
Add compatibility hack for GoToSocial interaction policies (#36004) 2025-09-03 19:35:43 +00:00
Claire
4d9150735a Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
  Updated the dependency as upstream did.
 2025-08-17 20:52:34 +02:00
Claire
0e99d428b2
Change serialization of Delete activities for QuoteAuthorization to inline the latter (#35725) 2025-08-11 08:55:18 +00:00
Claire
e68de292b4 Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream 2025-08-07 18:16:54 +02:00
Claire
496a5f423e
Inline instrument quote post in outgoing QuoteRequest activities (#35713) 2025-08-07 13:19:18 +00:00
Claire
235037a3b2 Merge commit 'ac59772dc6cda646258e61debfd792f9057c1c39' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added an extension where glitch-soc had an extra one.
  Added upstream's extension while keeping glitch-soc's.
- `app/services/update_status_service.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
 2025-08-06 22:02:55 +02:00
Claire
c8f263c419
Export interaction policies for local posts over ActivityPub (#35697) 2025-08-06 11:31:36 +00:00
Claire
53185f5381 Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream 2025-08-04 21:24:47 +02:00
Claire
32791c9745
Accept remote quotes of local quotes according to set policy (#35629) 2025-08-04 15:27:46 +00:00
Claire
dbab707d64 Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream 2025-08-01 22:11:59 +02:00
Claire
591df1f205
Add support for local quote stamps (#35626) 2025-08-01 14:55:25 +00:00
Claire
2dfdcc7dcb
Add API endpoints to view and revoke one's quoted posts (#35578) 2025-07-31 09:36:51 +00:00
Claire
8649681c51 Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added context extensions where glitch-soc had its own.
  Added upstream's new context extension while keeping ours.
 2025-07-25 21:45:00 +02:00
Claire
5a88b7f683
Add experimental basic quote post authoring (#35355) 2025-07-25 12:35:24 +00:00
Claire
eeffe580d8 Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream 2025-07-15 18:19:32 +02:00
Claire
c0eabe289b
Always give local quote of remote posts a quote request URI (#35383) 2025-07-15 13:01:03 +00:00
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Claire
ae3b7dd28d
Reject incoming QuoteRequest activities (#34480) 2025-04-25 23:28:09 +00:00
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 2025-01-14 20:38:32 +01:00
Claire
d517fa5ab7
Change ActivityPub path generation to all happen in ActivityPub::TagManager (#33527) 2025-01-13 09:39:05 +00:00
Claire
c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Eugen Rochko
aaab6b7adc
Add reblogs and favourites counts to statuses in ActivityPub (#32007) 2024-09-23 13:14:15 +00: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
10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00
Claire
3b4607991d Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream 2024-06-22 20:59:23 +02:00