Claire
06b1f8bd85
Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream added a condition where glitch-soc had changes on the same line.
Adapted upstream's changes.
2025-06-02 20:05:43 +02:00
Claire
d4bbe8b719
Fix blocked accounts not being automatically removed from trending statuses ( #34891 )
2025-06-02 13:38:47 +00:00
Claire
c00e27aa55
Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream
2025-05-30 17:41:31 +02:00
Matt Jankowski
c025824f98
Use config_for for cache buster values ( #34851 )
2025-05-30 11:54:25 +00:00
Claire
b627aee45f
Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
Conflict due to glitch-soc's different theming system.
Adapted upstream changes to glitch-soc's theming system.
2025-05-28 18:41:47 +02:00
David Roetzel
b195956ecb
Encapsulate redis key usage ( #34840 )
2025-05-28 12:34:37 +00:00
Claire
342290a9e0
Merge commit '198b59ca3ec45cbf6e73f53e1f39c7204d8a70c9' into glitch-soc/merge-upstream
2025-05-26 12:31:26 +02:00
Claire
198b59ca3e
Fix NoMethodError in ActivityPub::FetchFeaturedCollectionService ( #34811 )
2025-05-26 08:24:46 +00:00
Claire
706c8bf1a0
Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/embedded.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
2025-05-25 15:11:58 +02:00
Claire
304c0417ed
Fix handling of inlined featured collections in ActivityPub actor objects ( #34789 )
2025-05-23 15:01:07 +00:00
Claire
80849fbfba
Fix preview card being fetched even when a status has a quote or media attachment ( #34770 )
2025-05-22 12:42:16 +00:00
Claire
d14d7a5379
Merge commit 'aedc5f692144aa36245fe47c277bb5ad4766a335' into glitch-soc/merge-upstream
2025-05-05 20:31:48 +02:00
Claire
89cafb01b4
Remove double-query for signed query strings ( #34610 )
2025-05-05 12:33:31 +00:00
Claire
cbaba54e9d
Add support for importing embedded self-quotes ( #34584 )
2025-05-05 08:01:16 +00:00
Claire
3ec3814f8e
Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream
2025-05-03 17:37:26 +02:00
Claire
17e4345eb2
Add quoted_status attribute to PostStatusService for local testing ( #34553 )
2025-04-28 10:07:22 +00:00
Claire
9ed6a14d45
Add support for ingesting quote policies ( #34479 )
2025-04-28 08:48:27 +00:00
Eugen Rochko
a97647158c
Add REST API for featuring and unfeaturing a hashtag ( #34489 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online >
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-04-25 15:12:05 +00:00
Eugen Rochko
91db45b197
Change account search to be more forgiving of spaces ( #34455 )
2025-04-25 10:35:21 +00:00
Claire
ace0a3d61f
Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream
2025-04-21 15:22:22 +02:00
Claire
df2611a10f
Add initial support for ingesting and verifying remote quote posts ( #34370 )
2025-04-17 07:45:23 +00:00
Claire
4e6c7fba78
Merge commit '678c8dfeec2c221cf609b924161dc03cebfa41e1' into glitch-soc/merge-upstream
2025-04-10 17:50:04 +02:00
Matt Jankowski
4c2f64907b
Remove deprecated Import model ( #34371 )
2025-04-10 12:49:24 +00:00
Claire
99e3ea232f
Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream
2025-04-04 20:00:24 +02:00
Claire
dd23ba9c83
Refactor local-URI-to-account resolving ( #34349 )
2025-04-02 14:44:09 +00:00
Claire
166514d252
Merge commit 'aa575341c2da1e84d349ca0b42211b0da30a2254' into glitch-soc/merge-upstream
2025-03-27 19:40:04 +01:00
Matt Jankowski
0e3ff680d3
Update rubocop to version 1.75.0 ( #34283 )
2025-03-27 07:48:19 +00:00
Claire
449dc30739
Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
glitch-soc's `EXTRA_DATA_HOST`.
Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.
2025-03-26 19:14:26 +01:00
Claire
59e189ad3c
Add support for paginating partial collections in SynchronizeFollowersService ( #34277 )
2025-03-26 11:33:59 +00:00
Claire
745c445e7e
Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream
2025-03-25 19:59:59 +01:00
Claire
3edac14f02
Fix follower synchronization mechanism erroneously removing followers from multi-page collections ( #34272 )
2025-03-25 15:50:05 +00:00
Claire
d2c4f69148
Merge commit '30e334b51a4e7add05401895bff5a2ea4a97e0bd' into glitch-soc/merge-upstream
2025-03-17 20:25:32 +01:00
Claire
e30001bc80
Fix incorrect URL being used when cache busting ( #34189 )
2025-03-17 16:40:28 +00:00
Claire
0efa669fe9
Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream
2025-03-15 17:49:32 +01:00
Eugen Rochko
d213c585ff
Add age verification on sign-up ( #34150 )
2025-03-14 14:07:29 +00:00
Claire
b330cc21c4
Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream
2025-03-12 19:48:51 +01:00
Claire
966b816382
Refactor ActivityPub::FetchRepliesService and ActivityPub::FetchAllRepliesService ( #34149 )
2025-03-12 11:52:38 +00:00
Claire
9db26db495
Refactor reply-fetching code and disable it by default ( #34147 )
2025-03-12 10:28:06 +00:00
Jonny Saunders
46e13dd81c
Add Fetch All Replies Part 1: Backend ( #32615 )
...
Signed-off-by: sneakers-the-rat <sneakers-the-rat@protonmail.com >
Co-authored-by: jonny <j@nny.fyi >
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
Co-authored-by: Kouhai <66407198+kouhaidev@users.noreply.github.com >
2025-03-12 09:03:01 +00:00
Claire
9d5a9123b9
Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream
2025-03-07 13:15:10 +01:00
Matt Jankowski
d90d68bddf
Remove deprecated mb_chars method ( #34039 )
2025-03-03 16:50:57 +00:00
Claire
f3bc50778b
Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream
2025-02-18 20:38:57 +01:00
Matt Jankowski
d75c4bf53e
Update rubocop to version 1.72.2 and use plugins configuration style ( #33946 )
2025-02-18 08:25:41 +00:00
Claire
28d85ede4c
Merge commit '4fc8c6912979e8fd7882fb360b77e677ffd68565' into glitch-soc/merge-upstream
2025-02-12 18:40:21 +01:00
Claire
1248c4d1f4
Fix handling of duplicate mentions in incoming status Update ( #33911 )
2025-02-12 15:34:56 +00:00
Nicholas La Roux
7a50fd8849
Migrate BlockDomainService notification job enqueueing to Sidekiq's perform_bulk for efficiency ( #33897 )
2025-02-12 12:48:09 +00:00
Claire
a417d6f3fc
Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/precompute_feed_service.rb`:
Upstream added an option to skip half-generated timelines.
We have a conflict because we still maintain upstream's old chronological DM
timelines.
Update our code to apply the same logic to the DM timelines.
2025-02-07 21:21:28 +01:00
Claire
9e164c532f
Add --skip-filled-timeline option to tootctl feed build to skip half-filled feeds ( #33844 )
2025-02-06 09:38:32 +00:00
Claire
c85616ee3a
Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
Added upstream's code.
- `app/models/user_settings.rb`:
Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
setting added upstream.
Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
Same.
- `app/services/precompute_feed_service.rb`:
Not a real conflict, glitch-soc has extra code for the direct feed.
Added upstream's new code for populating lists.
2025-02-01 19:07:13 +01:00
Claire
a3d2849d15
Fix tootctl feeds build not building list timelines ( #33783 )
2025-01-30 09:18:46 +00:00
