Skip to content

Allow posting media alongside polls#2524

Open
TheEssem wants to merge 2 commits into
glitch-soc:mainfrom
TheEssem:feature/poll-media
Open

Allow posting media alongside polls#2524
TheEssem wants to merge 2 commits into
glitch-soc:mainfrom
TheEssem:feature/poll-media

Conversation

@TheEssem

Copy link
Copy Markdown

Resolves #2486 and #2487. Just noticed those issues and decided to send this patch over; we've been running it for a few weeks with no issues as far as I can tell.

@github-actions

Copy link
Copy Markdown

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions

Copy link
Copy Markdown

This pull request has resolved merge conflicts and is ready for review.

@kescherCode

Copy link
Copy Markdown

How does vanilla Mastodon behave when receiving such a post? When fetching a remote post with both, does it drop the media or the poll, or does it actually display both?

@kescherCode

kescherCode commented Jan 4, 2024

Copy link
Copy Markdown

Also, it would be great if this "feature"/removal of restrictions was exposed in /api/{v1,v2}/instance, so clients can know that this restriction is lifted.

@TheEssem

TheEssem commented Jan 7, 2024

Copy link
Copy Markdown
Author

How does vanilla Mastodon behave when receiving such a post? When fetching a remote post with both, does it drop the media or the poll, or does it actually display both?

It renders both, with the poll above the media. Vanilla Mastodon supports rendering posts with both polls and media just fine; it just doesn't expose the functionality to do so.

Also, it would be great if this "feature"/removal of restrictions was exposed in /api/{v1,v2}/instance, so clients can know that this restriction is lifted.

Added. Might make it a config option too, if possible...

@kescherCode

@codecov-commenter

codecov-commenter commented Jan 7, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 50.00000% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 84.97%. Comparing base (25ac55e) to head (c540156).
Report is 223 commits behind head on main.

Files Patch % Lines
app/services/update_status_service.rb 0.00% 0 Missing and 1 partial ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2524      +/-   ##
==========================================
+ Coverage   84.87%   84.97%   +0.09%     
==========================================
  Files        1066     1068       +2     
  Lines       28921    28836      -85     
  Branches     4656     4657       +1     
==========================================
- Hits        24548    24502      -46     
+ Misses       3170     3135      -35     
+ Partials     1203     1199       -4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@github-actions

Copy link
Copy Markdown

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions

Copy link
Copy Markdown

This pull request has resolved merge conflicts and is ready for review.

@github-actions

github-actions Bot commented Mar 7, 2024

Copy link
Copy Markdown

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions

Copy link
Copy Markdown

This pull request has resolved merge conflicts and is ready for review.

@github-actions

Copy link
Copy Markdown

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions

Copy link
Copy Markdown

This pull request has resolved merge conflicts and is ready for review.

@github-actions

Copy link
Copy Markdown

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions

Copy link
Copy Markdown

This pull request has resolved merge conflicts and is ready for review.

TomCasavant added a commit to TomCasavant/mastodon that referenced this pull request Jun 30, 2025
@github-actions

Copy link
Copy Markdown

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions

Copy link
Copy Markdown

This pull request has resolved merge conflicts and is ready for review.

@github-actions

Copy link
Copy Markdown

This pull request has merge conflicts that must be resolved before it can be merged.

@github-actions

Copy link
Copy Markdown

This pull request has resolved merge conflicts and is ready for review.

@ClearlyClaire ClearlyClaire force-pushed the main branch 2 times, most recently from 11bd515 to 7821634 Compare September 25, 2025 16:38
@github-actions

Copy link
Copy Markdown

This pull request has merge conflicts that must be resolved before it can be merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Allow adding polls to media

3 participants