Skip to content
This repository has been archived by the owner on Nov 23, 2022. It is now read-only.

Commit

Permalink
Merge pull request #75 from FerrisChat/develop
Browse files Browse the repository at this point in the history
Merge dev into master
  • Loading branch information
tazz4843 authored Dec 6, 2021
2 parents d0a53d0 + 5397b3d commit d0b2e2b
Show file tree
Hide file tree
Showing 110 changed files with 4,623 additions and 5,352 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check -D clippy::pedantic -D clippy::nursery -A clippy::too_many_lines
args: --all -- --check

clippy:
name: Clippy
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: --all-features -- --forbid expect_used --forbid unwrap_used
args: --all-features -- -D clippy::pedantic -D clippy::nursery -A clippy::too_many_lines
name: Clippy Output
env:
DATABASE_URL: "postgres://postgres:postgres@localhost:5432/ferris_chat"
1 change: 1 addition & 0 deletions .idea/FerrisChat_server.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 58 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Conduct

* We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience,
gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
religion, nationality, or other similar characteristic.
* Please avoid using overtly sexual aliases or other nicknames that might detract from a friendly,
safe and welcoming environment for all.
* Please be kind and courteous. There’s no need to be mean or rude.
* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off
and numerous costs. There is seldom a right answer.
* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior.
We interpret the term “harassment” as including the definition in the Citizen Code of Conduct;
if you have any lack of clarity about what might be included in that concept, please read their definition.
In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or
made uncomfortable by a community member, please contact one of the FerrisChat team at `[email protected]`.
Whether you’re a regular contributor or a newcomer, we care about making this community a safe place for you and we’ve got your back.
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.

# Moderation

These are the policies for upholding our community’s standards of conduct. If you feel that a thread needs moderation,
please contact the FerrisChat moderation team.

1) Remarks that violate the Rust standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks,
are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
2) Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed.
3) Moderators will first respond to such remarks with a warning.
4) If the warning is unheeded, the user will be “kicked,” i.e., kicked out of the communication channel to cool off.
5) If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
6) Moderators may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology.
7) If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a
different moderator, in private. Complaints about bans in-channel are not allowed.
8) Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate
situation, they should expect less leeway than others.

In the Rust community we strive to go the extra step to look out for each other. Don’t just aim to be technically
unimpeachable, try to be your best self. In particular, avoid flirting with offensive or sensitive issues,
particularly if they’re off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust;
worse, it can drive people away from the community entirely.

And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it
was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are
good there was something you could’ve communicated better — remember that it’s your responsibility to make your fellow
Rustaceans comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk
about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust.

The enforcement policies listed above apply to all official FerrisChat venues; including FerrisChat and Discord channels,
GitHub repositories under FerrisChat; and all forums under ferris.chat or ferris.sh.

# Attribution

This is nearly a exact replica of the Rust Code of Conduct, at https://www.rust-lang.org/policies/code-of-conduct.

The Rust Code of Conduct was adapted from the
[Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling)
as well as the [Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/).
Loading

0 comments on commit d0b2e2b

Please sign in to comment.