PR#241: Update Code of Conduct information to Fedora Code of Conduct - fedora-commops/fedora-happiness-packets

fedora-commops / fedora-happiness-packets

#241 Update Code of Conduct information to Fedora Code of Conduct

Merged 4 years ago by jflory7. Opened 4 years ago by shraddhaag.

fedora-commops/ shraddhaag/fedora-happiness-packets minor-changes into master

Update Code of Conduct information to Fedora Code of Conduct

Shraddha Agrawal • 4 years ago

6780fdc

templates/_email_footer.txt

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`Have a happy day!`

		`Open-Source Happiness Packets is an open-source project by Sasha Romijn`
		`- and Mikey Ariel. Need help? Email us at info@happinesspackets.io`
		`+ and Mikey Ariel. Need help? Report an issue at pagure.io/coc`

		`Never want to receive email from us again? Block {{ recipient }}:`
		`{{ protocol }}://{{ domain }}{{ blacklist_url }}`

templates/base.html

file modified

+1 -1

		`@@ -108,7 +108,7 @@`
		`{% endblock %}`
		`Fedora Happiness Packets is a fork of <a href="https://github.com/mxsasha/happinesspackets/">Happiness Packets</a> and part of GSoC 2018.`
		`<br>`
		`- Need help? <a href="mailto:fedora.happinesspackets@gmail.com">fedora.happinesspackets@gmail.com</a>`
		`+ Need help? Report an issue <a href="https://pagure.io/coc">here</a>.`
		`<img class="emoji" src="{% static 'images/emoji/loveletter.png' %}" alt="💌" title="Love letter" aria-label="Emoji: Love letter" style="vertical-align: text-bottom">`
		`<br>`
		`Got feedback? File an issue <a href="https://pagure.io/fedora-commops/fedora-happiness-packets/new_issue">here</a>`

templates/base_email.html

file modified

+1 -1

		`@@ -19,7 +19,7 @@`
		`Open-source happiness packets is an`
		`<a href="https://github.com/erikr/happinesspackets/" style="color: #3c6eb4;">open-source project</a>`
		`<br>`
		`- Need help? <a href="mailto:fedora.happinesspackets@gmail.com" style="color: #3c6eb4;">fedora.happinesspackets@gmail.com</a>`
		`+ Need help? Report an issue <a href="https://pagure.io/coc" style="color: #3c6eb4;">here</a>.`
		`</p>`
		`<p>`
		`Never want to receive email from us again?<br>`

templates/messaging/faq.html

file modified

+4 -4

		`@@ -32,12 +32,12 @@`
		`<h3>Can I send anything I want?</h3>`
		`<p>`
		`We don't screen the content of messages. However, all messages must meet the`
		`- <a href="https://www.djangoproject.com/conduct/">Django Project Code of Conduct</a>.`
		`+ <a href="https://docs.fedoraproject.org/en-US/project/code-of-conduct/">Fedora Code of Conduct</a>.`
		`Notably, harassment, insults and other exclusionary behavior are never acceptable.`
		`</p>`
		`<p>`
		`Violations of this can result in blocking you from using the service. Your message might also be shared with`
		`- the Django Code of Conduct committee, who reserve the right to take further action of their own. If you're a member`
		`+ the Fedora Code of Conduct committee, who reserve the right to take further action of their own. If you're a member`
		`of another open-source community, your message might be shared with any code of conduct committee or similar group`
		`from that community.`
		`</p>`
		`@@ -79,8 +79,8 @@`

		`<h3>I received an abusive message, what should I do?</h3>`
		`<p>`
		`- Please report this to <a href="mailto:info@happinesspackets.io">info@happinesspackets.io</a>, preferably by`
		`- forwarding the original email that contains the message.`
		`+ Please see the <a href="https://docs.fedoraproject.org/en-US/project/code-of-conduct/">Fedora Code of Conduct</a>`
		`+ to find the steps to report it to the Project.`
		`</p>`

		`<h3>I don't want to receive any email from you</h3>`

shraddhaag commented 4 years ago

This commit addresses issue #42

rebased onto ff8c6ea76281af2cf7bcb5543b2b50556ec96014

4 years ago

Metadata Update from @jflory7:
- Pull-request tagged with: PASSED, improvement, needs review, type - frontend, type - summer coding

4 years ago

jflory7 commented 4 years ago

Thanks @shraddhaag for grabbing this one. :thumbsup:

Before merging this, I also want to update the contact info email address currently used in the application. We need to change two email addresses to instead point to pagure.io/coc. I used a recursive grep search to look up any references for the two old email addresses:

$ grep -rnw . -e 'fedora.happinesspackets@gmail.com'
./happinesspackets/settings/base.py:34:DEFAULT_FROM_EMAIL = "Happiness Packets <fedora.happinesspackets@gmail.com>"
./templates/base.html:111:                    Need help? <a href="mailto:fedora.happinesspackets@gmail.com">fedora.happinesspackets@gmail.com</a>
./templates/base_email.html:22:                Need help? <a href="mailto:fedora.happinesspackets@gmail.com" style="color: #3c6eb4;">fedora.happinesspackets@gmail.com</a>

$ grep -rnw . -e 'info@happinesspackets.io'
./templates/messaging/faq.html:82:        Please report this to <a href="mailto:info@happinesspackets.io">info@happinesspackets.io</a>, preferably by
./templates/_email_footer.txt:4:and Mikey Ariel. Need help? Email us at info@happinesspackets.io

Could you please also update the above places to direct people to the right place if they need help?

Otherwise this looks good to me.

jflory7 commented on line 22 of templates/messaging/faq.html 4 years ago

For consistency, it would be cleaner to follow the same line break convention used in other paragraphs in this document. It also makes it easier to review diffs in PRs, since Pagure doesn't wrap lines automatically.

Metadata Update from @jflory7:
- Request assigned

4 years ago

jflory7 commented 4 years ago

@bex @mattdm @bcotton @jonatoni @till @ausil Could a Fedora Council member please sign-off on the language used for reporting Code of Conduct-related incidents in the FHP web app? This will close #42 opened by @bex.

Metadata Update from @jflory7:
- Pull-request tagged with: needs changes

4 years ago

bex commented on line 22 of templates/messaging/faq.html 4 years ago

Please change line 22 to, "Please see the https://docs.fedoraproject.org/en-US/project/code-of-conduct/">Fedora Code of Conduct to find the steps to report it to the Project.
" - thank you.

bex commented 4 years ago

I've submitted an update request that should allow this to be merged.

jflory7 commented 4 years ago

Thank you @bex!

rebased onto 6780fdc

4 years ago

shraddhaag commented 4 years ago

Hi @jflory7!
I've updated all the mentioned places except in settings/base.py. From what I understand, DEFAULT_FROM_EMAIL is the one used to send all happiness packets. I'm unsure if we should change this one.
Reading Django settings, I think we should include SERVER_EMAIL.

Please let me know what are the appropriate steps here. :)

shraddhaag commented 4 years ago

Please change line 22 to, "Please see the https://docs.fedoraproject.org/en-US/project/code-of-conduct/">Fedora Code of Conduct to find the steps to report it to the Project.
" - thank you.

Thank you @bex! I've updated the same :)

jflory7 commented 4 years ago

Nice catch @shraddhaag. I opened #244 to track the issue about outgoing email since that will actually block us from deploying the app for #111. But that shouldn't block this PR.

The updated changes look good to me! Thanks for getting this one Shraddha. Merging! :ocean:

Metadata Update from @jflory7:
- Pull-request untagged with: needs changes

4 years ago

Pull-Request has been merged by jflory7

4 years ago