Cleanup unused portions of statuses/status partial #26045
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ClearlyClaire
approved these changes
Jul 18, 2023
|
This pull request has merge conflicts that must be resolved before it can be merged. |
mjankowski
force-pushed
the
clean-up-status-partial
branch
2 times, most recently
from
12f7051
to
ec33efa
Compare
I didn't catch it locally, but the CI |
|
This pull request has resolved merge conflicts and is ready for review. |
|
This pull request has merge conflicts that must be resolved before it can be merged. |
mjankowski
force-pushed
the
clean-up-status-partial
branch
from
ec33efa
to
120065e
Compare
renchap
added
refactoring
|
Rebased this one as well - would like to confirm that just deleting these keys is correct thing to do here re: crowdin. |
|
This pull request has resolved merge conflicts and is ready for review. |
|
This pull request has merge conflicts that must be resolved before it can be merged. |
A good chunk of this file is doing conditional things with instance vars which were all removed in: mastodon@86f6631 It looks like its only used at this point by the embed view, which never shows reblogs, and never has many of the other conditions the partial was checking for. This change removes the code paths which no longer get hit in this partial.
mjankowski
force-pushed
the
clean-up-status-partial
branch
from
120065e
to
0aaacfa
Compare
|
This pull request has resolved merge conflicts and is ready for review. |
jsgoldstein
pushed a commit
to jsgoldstein/mastodon
that referenced
this pull request
Jul 21, 2023
ClearlyClaire
added a commit
to glitch-soc/mastodon
that referenced
this pull request
Jul 30, 2023
* Cleanup unused portions of statuses/status partial (mastodon#26045) * Wrong count in response when removing favourite/reblog (mastodon#24365) Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Paperclip: add support for Azure blob storage (mastodon#23607) * Fix a missing redirection on getting-started in multi column mode (mastodon#26070) * Fix haml-lint Rubocop `Style/NumericPredicate` cop (mastodon#26040) * Change casing for 'Server Settings' string (mastodon#26011) * Move localized subject mailer shared example to separate file (mastodon#25889) * Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop (mastodon#26039) * Fix `Lint/Void` cop (mastodon#25922) * Add stricter protocol fields validation for accounts (mastodon#25937) * Improve the bug report templates (mastodon#25621) * Fix the crossorigin attribute (mastodon#26096) * Fix replica being used even if not explicitly defined (mastodon#26074) * Clean up unused application records (mastodon#24871) * Change thread view to scroll to the selected post rather than the post being replied to (mastodon#24685) * Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades (mastodon#26023) * change focus ui for keyboard only input (mastodon#25935) * Use username as display name for suspended users or users with blank display names (mastodon#25276) * Fix CSP headers being unintendedly wide (mastodon#26105) * Fix linting issue (mastodon#26106) * Replace 'favourite' by 'favorite' for American English (mastodon#26009) * Override default Action Mailer `preview_path` (mastodon#26110) * Favourits -> Favorites (mastodon#26109) * Bump version to v4.1.5 (mastodon#26108) * Fix incorrect connect timeout in outgoing requests (mastodon#26116) * Fix missing translation strings for importing lists (mastodon#26120) * Use valid email address for first account (mastodon#26114) * Update haml-lint 0.49.1 (mastodon#26118) * Fix focus and hover styles in web UI (mastodon#26125) * Remove back button from bookmarks, favourites and lists screens in web UI (mastodon#26126) * Remove 16:9 cropping from web UI (mastodon#26132) * Change design of link previews in web UI (mastodon#26136) * change poll form element colors to fit with the rest of the ui (mastodon#26139) * Add `lang` attribute to trending links (mastodon#26111) * Update dependency rdf-normalize to v0.6.1 (mastodon#26130) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency brakeman to v6.0.1 (mastodon#26141) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency postcss to v8.4.27 (mastodon#26144) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix unexpected redirection to /explore after sign-in (mastodon#26143) * Update dependency aws-sdk-s3 to v1.131.0 (mastodon#26145) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add report.updated webhook (mastodon#24211) * Fix LinkCrawlWorker crashing on `null` `created_at` (mastodon#26151) * Fix UI Overlap with the loupe icon in the Explore Tab (mastodon#26113) * Fix missing border on error screen in light theme in web UI (mastodon#26152) * Fix missing action label on sensitive videos and embeds in web UI (mastodon#26135) * Fix `lang` for UI texts in link preview (mastodon#26149) * Add published date and author to news on the explore screen in web UI (mastodon#26155) * Coverage for `Auth::OmniauthCallbacks` controller (mastodon#26147) * fix poll input active style (mastodon#26162) * Add `published_at` attribute to preview cards (mastodon#26153) * Update dependency sass to v1.64.1 (mastodon#26146) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Revert poll colors to green outside of compose form (mastodon#26164) * Preserve translation on status re-import (mastodon#26168) * Fix missing GIF badge in account gallery (mastodon#26166) * Reformat large text arg in `FetchLinkCardService` spec (mastodon#26183) * Ignore long line in regex initializer (mastodon#26182) * Reformat large key values in service specs (mastodon#26181) * Reformat large hash in `ContextHelper` module (mastodon#26180) * Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration (mastodon#26178) * Extract private methods in `StatusCacheHydrator` (mastodon#26177) * New Crowdin Translations (automated) (mastodon#26072) Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Remove the `sr` locale override .rb files (mastodon#25927) * Use correct naming on controller concern specs (mastodon#26197) * Migrate to request specs in `/api/v2/filters` (mastodon#25721) * Fix wrong filters sometimes applying in streaming (mastodon#26159) * Refactor streaming's filtering logic & improve documentation (mastodon#26213) * Add role badges to the WebUI (mastodon#25649) * Change interaction modal in web UI (mastodon#26075) Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> * Fix crash when processing Flag activity with no status (mastodon#26189) * Storage: add :azure to remaining callers (mastodon#26080) * Remove queued_at value from pubsub payloads (mastodon#26173) * Fix emoji picker button scrolling with textarea content in single-column view (mastodon#25304) * Change the wording of the dismissable explore prompt (mastodon#25917) * Update dependency haml_lint to v0.49.2 (mastodon#26222) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix: Streaming server memory leak in HTTP EventSource cleanup (mastodon#26228) * Swap debug statements in streaming server (mastodon#26231) * Fix missing return values in streaming (mastodon#26233) * [Glitch] Wrong count in response when removing favourite/reblog Port 4c18928 to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix a missing redirection on getting-started in multi column mode Port 586b1c9 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Change thread view to scroll to the selected post rather than the post being replied to Port e4ea80d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Replace 'favourite' by 'favorite' for American English Port 217ef7f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] change poll form element colors to fit with the rest of the ui Port 80809ef to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Add `lang` attribute to trending links Port 76fce34 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix UI Overlap with the loupe icon in the Explore Tab Port 9a567ec to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix missing border on error screen in light theme in web UI Port d1a9f60 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix missing action label on sensitive videos and embeds in web UI Port 714a206 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] fix poll input active style Port 49d2e89 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Revert poll colors to green outside of compose form Port ce1f35d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Add published date and author to news on the explore screen in web UI Port f826a95 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Preserve translation on status re-import Port 6781dc6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix missing GIF badge in account gallery Port a4b69be to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * Fix interaction modal being broken because of glitch-soc's theming system * [Glitch] Change interaction modal in web UI Port b4e739f to glitch-soc Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Change the wording of the dismissable explore prompt Port a4ec187 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * Fix CSP tests in glitch-soc --------- Signed-off-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Matt Jankowski <matt@jankowski.online> Co-authored-by: Christian Schmidt <github@chsc.dk> Co-authored-by: Misty De Méo <mistydemeo@gmail.com> Co-authored-by: Stanislas Signoud <signez@stanisoft.net> Co-authored-by: gunchleoc <fios@foramnagaidhlig.net> Co-authored-by: Renaud Chaput <renchap@gmail.com> Co-authored-by: Trevor Wolf <teeerevor@gmail.com> Co-authored-by: наб <nabijaczleweli@nabijaczleweli.xyz> Co-authored-by: mogaminsk <mgmnjp@icloud.com> Co-authored-by: Nick Schonning <nschonni@gmail.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Vyr Cossont <VyrCossont@users.noreply.github.com> Co-authored-by: gol-cha <info@mevo.xyz> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Daniel M Brasil <danielmbrasil@protonmail.com> Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A good chunk of this file is doing conditional things with instance vars which were all removed in: 86f6631
Some other usage was removed in: 839f893
It looks like its only used at this point by the embed view, which never shows reblogs, and never has many of the other conditions the partial was checking for.
This change removes the code paths which no longer get hit in this partial.