Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-29 23:23:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,649 Commits 74 Branches 58 Tags
80c24f2833c75ecb9b7591505ca0b013dc16db14
Commit Graph

1566 Commits

Author SHA1 Message Date
Claire
a53edd223e Merge commit '22c9f190e8f7b79ac6b66343680ed58d8ae65cc5' into glitch-soc/merge-4.3 2025-10-08 18:02:53 +02:00
Claire
414f8ff60d Fix redirect to external object when URL is missing or malformed (#36347) 2025-10-08 15:45:47 +02:00
Claire
ef4ecd5eeb Merge commit 'a86078e8bb082eb15e0fd0d183a8a610f043827f' into glitch-soc/merge-4.3 2025-09-23 18:19:32 +02:00
Claire
60771df3e7 Fix getting Create and Update out of order (#36176) 2025-09-23 14:33:27 +02:00
Claire
62f21ab1fc Merge commit '42594f253e64c559ca2462abab0623dddc82f54c' into glitch-soc/backports-4.3 2025-08-05 15:16:11 +02:00
Claire
65f1d77043 Disable ActiveRecord query cache in Create critical path (#35662) 2025-08-05 11:43:25 +02:00
Claire
a076fa2063 Merge commit 'f6dbb2206c5a4c1b27ce1395b477492139cfcbcc' into glitch-soc/merge-4.3 2025-07-02 19:06:55 +02:00
Darius Kazemi
ea6736681b Fix NoMethodError in edge case of emoji cache handling (#34749) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-07-02 12:51:46 +02:00
Claire
447527c154 Fix search operators sometimes getting lost (#35190) 2025-07-02 12:51:46 +02:00
Claire
5039e9d474 Add basic support for remote attachments with multiple media types (#34996) 2025-07-02 12:51:46 +02:00
Claire
4632be68eb Fix inconsistent filtering of silenced accounts for other silenced accounts (#34863) 2025-07-02 12:51:46 +02:00
Claire
f1cfde4152 Fix admin dashboard crash on specific Elasticsearch connection errors (#34683) 2025-07-02 12:51:46 +02:00
Jeong Arm
45fa4d99b3 Handle rotation is not present in the video metadata (#33261) 2025-07-02 12:51:46 +02:00
Eugen Rochko
11a466ab53 Fix wrong video dimensions for some rotated videos (#33008) 2025-07-02 12:51:46 +02:00
Claire
bd8d96e699 Merge commit 'e6591bf322c7e47a8420a588d52a44a585c10b54' into glitch-soc/merge-4.3 
Conflicts:
- `docker-compose.yml`:
  Conflict because of different repo names. Updated version.
 2025-05-06 15:28:55 +02:00
Claire
6d46225718 Merge commit from fork 
* Check scheme in account and post links

* Harden media attachments

* Client-side mitigation

* Client-side mitigation for media attachments
 2025-05-06 15:02:13 +02:00
Claire
7917b495d2 Merge commit 'ec2023233d3e7cae1aba5aa1bdce0e6d72437101' into glitch-soc/backports-4.3 2025-05-05 20:35:05 +02:00
Claire
e6a6c26c36 Remove double-query for signed query strings (#34610) 2025-05-05 18:48:39 +02:00
Claire
4a271072f5 Merge commit '6d53e8c6c5273bc8405ed8cf10ec6455ad7cc677' into glitch-soc/merge-4.3 2025-03-31 19:55:39 +02:00
Claire
d9fb61f305 Change account suspensions to be federated to recently-followed accounts as well (#34294) 2025-03-31 15:38:00 +02:00
Claire
6af733d1d8 Change AccountReachFinder to consider statuses based on suspension date (#34291) 2025-03-31 15:38:00 +02:00
Matt Jankowski
29eae75ca0 Define constants for sampling sizes in AccountReachFinder (#32805) 2025-03-31 15:38:00 +02:00
Claire
4cb3fe35be Fix handling of malformed/unusual HTML (#34201) 2025-03-31 15:38:00 +02:00
Claire
baac429103 Merge commit 'b1a584d252f4df4c2a1a9400d6588b4f36768216' into glitch-soc/merge-4.3 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
  In addition, upstream changed how notifications from follow subscriptions were
  handled, refactoring this file in the process.
  Ported upstream's changes.
- `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.
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
- `app/workers/feed_insert_worker.rb`:
  Upstream changed how notifications from follow subscriptions were handled,
  refactoring this file in the process.
  Conflict is due to glitch-soc having an extra timeline type (direct).
  Ported upstream's changes.
 2025-02-25 18:33:54 +01:00
Claire
679e7555ee Fix filtering for lists (#33842) 2025-02-25 17:11:09 +01:00
Claire
452153d55d Optimize timeline generation (#33839) 2025-02-25 17:11:09 +01:00
Claire
b32a67ff74 Fix tootctl feeds build not building list timelines (#33783) 2025-02-25 17:11:09 +01:00
Claire
6e906884cf Fix missing timeout options in Request class (#33769) 2025-02-25 17:11:09 +01:00
Claire
317715254f Fix incorrect signature after HTTP redirect (#33757) 2025-02-25 17:11:09 +01:00
Claire
17695ace33 Fix featured tags for remote accounts not being kept up to date (#33372) 2025-02-25 17:11:09 +01:00
Claire
f24b0e9505 Fix exclusive lists interfering with notifications (#28162) 2025-02-25 17:11:09 +01:00
Claire
63f4e2070c Merge commit 'faed9bf9f14f077443374f5eb3075b9878e24214' into glitch-soc/stable-4.3 2025-01-16 11:43:10 +01:00
Claire
3a4242ce01 Merge commit from fork 2025-01-16 11:10:08 +01:00
Claire
0d69cc068c Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
 2024-12-02 21:49:12 +01:00
Claire
3f0d90f019 Fix inactive users' timelines being backfilled on follow and unsuspend (#33094) 2024-12-02 16:20:32 +01:00
Claire
15e1a63e4a Fix direct inbox delivery pushing posts into inactive followers' timelines (#33067) 2024-12-02 16:20:32 +01:00
Eugen Rochko
0720ef5f62 Fix min_id and max_id causing error in search API (#32857) 2024-12-02 16:20:32 +01:00
Hugo Gameiro
dd0992b25d Fix and improve batch attachment deletion handling when using OpenStack Swift (#32637) 2024-12-02 16:20:32 +01:00
Claire
b091e531a5 Merge commit '49b3d5692e6f217e6506674ad8a623a4ba8d0c5f' into glitch-soc/backports-4.3 2024-10-15 17:42:22 +02:00
kenkiku1021
304e440f88 add SWIFT object storage uri to CSP media hosts (#32439) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-15 17:37:14 +02:00
Claire
dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
 2024-10-05 20:45:05 +02:00
Matt Jankowski
74291dfb77 Remove unneeded reorder(nil) conditions (#32200) 2024-10-04 17:48:03 +02:00
Matt Jankowski
f07707a9bb Extract WebPushRequest from push notification worker and subscription (#32208) 2024-10-04 17:48:03 +02:00
Jeong Arm
b8fdffe824 Ignore error if mentioned account was not processable (#29215) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-04 17:48:03 +02:00
Claire
7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
Claire
513f187daf Add “A Mastodon update is available.” message on admin dashboard for non-bugfix updates (#32106) 2024-09-26 19:27:57 +00:00
Claire
633165ba9c Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream 2024-09-25 17:41:37 +02:00
Renaud Chaput
3dc4ddc663 Fix search params being dropped when redirected to non-deck path (#31984) 2024-09-25 13:35:37 +00:00
Claire
c6039f99ce Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream 2024-09-24 19:34:30 +02:00
André Menrath
556837f156 Fix the summary of converted object types to be treated as HTML (#28629) 2024-09-24 15:57:53 +00:00