Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-12 23:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream

Browse Source 
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.
This commit is contained in:
Claire
2025-10-28 22:10:12 +01:00
parent 3bd56b92c1 4896d2c4c6
commit 48ec31bec8
136 changed files with 1041 additions and 1409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/statuses_controller.rb
View File

@@ -159,7 +159,7 @@ class Api::V1::StatusesController < Api::BaseController
end
def set_quoted_status
@quoted_status = Status.find(status_params[:quoted_status_id]) if status_params[:quoted_status_id].present?
@quoted_status = Status.find(status_params[:quoted_status_id])&.proper if status_params[:quoted_status_id].present?
authorize(@quoted_status, :quote?) if @quoted_status.present?
rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
# TODO: distinguish between non-existing and non-quotable posts