Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

When serializing polls over OStatus, serialize poll options to text #10160

Merged
merged 3 commits into from Mar 5, 2019

Conversation

@ThibG
Copy link
Collaborator

commented Mar 4, 2019

No description provided.

@@ -19,6 +19,10 @@ def format(status, **options)

raw_content = status.text

if status.poll && options[:inline_poll_options]

This comment has been minimized.

Copy link
@Gargron

Gargron Mar 4, 2019

Member

The other way around is better

This comment has been minimized.

Copy link
@ThibG

ThibG Mar 5, 2019

Author Collaborator

You mean, checking the option then the poll? Or have it on by default? Changed it for the former.

@ThibG ThibG force-pushed the ThibG:fixes/ostatus-include-poll-options branch from 54679ce to 4231b44 Mar 5, 2019
@ThibG ThibG force-pushed the ThibG:fixes/ostatus-include-poll-options branch from 4231b44 to 56177f1 Mar 5, 2019
@Gargron
Gargron approved these changes Mar 5, 2019
@Gargron Gargron merged commit 636db1f into tootsuite:master Mar 5, 2019
11 checks passed
11 checks passed
ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: check-i18n Your tests passed on CircleCI!
Details
ci/circleci: install Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.6 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.6 Your tests passed on CircleCI!
Details
ci/circleci: test-webui Your tests passed on CircleCI!
Details
codeclimate All good!
Details
@ThibG ThibG deleted the ThibG:fixes/ostatus-include-poll-options branch Mar 14, 2019
hiyuki2578 added a commit to ProjectMyosotis/mastodon that referenced this pull request Oct 2, 2019
…ootsuite#10160)

* When serializing polls over OStatus, serialize poll options to text

* Do the same for RSS feeds

* Use “[ ] ” as a prefix for poll options instead of “- ”
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.