Skip to content

Commit e2c3775

Browse files
authored
Merge branch 'master' into master
2 parents 473c416 + fd36b07 commit e2c3775

File tree

145 files changed

+5635
-1468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+5635
-1468
lines changed

.github/CODE_OF_CONDUCT.md

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
Our Discord server.
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

.github/CONTRIBUTING.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ If the bug report is missing this information then it'll take us longer to fix t
3434

3535
Submitting a pull request is fairly simple, just make sure it focuses on a single aspect and doesn't manage to have scope creep and it's probably good to go. It would be incredibly lovely if the style is consistent to that found in the project. This project follows PEP-8 guidelines (mostly) with a column limit of 125.
3636

37+
## Use of "type: ignore" comments
38+
In some cases, it might be necessary to ignore type checker warnings for one reason or another.
39+
If that is that case, it is **required** that a comment is left explaining why you are
40+
deciding to ignore type checking warnings.
41+
3742
### Licensing
3843

3944
By submitting a pull request, you agree that; 1) You hold the copyright on all submitted code inside said pull request; 2) You agree to transfer all rights to the owner of this repository, and; 3) If you are found to be in fault with any of the above, we shall not be held responsible in any way after the pull request has been merged.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Developer Certificate of Origin (DCO)
2+
```
3+
Version 1.1
4+
5+
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
6+
7+
Everyone is permitted to copy and distribute verbatim copies of this
8+
license document, but changing it is not allowed.
9+
10+
11+
Developer's Certificate of Origin 1.1
12+
13+
By making a contribution to this project, I certify that:
14+
15+
(a) The contribution was created in whole or in part by me and I
16+
have the right to submit it under the open source license
17+
indicated in the file; or
18+
19+
(b) The contribution is based upon previous work that, to the best
20+
of my knowledge, is covered under an appropriate open source
21+
license and I have the right under that license to submit that
22+
work with modifications, whether created in whole or in part
23+
by me, under the same open source license (unless I am
24+
permitted to submit under a different license), as indicated
25+
in the file; or
26+
27+
(c) The contribution was provided directly to me by some other
28+
person who certified (a), (b) or (c) and I have not modified
29+
it.
30+
31+
(d) I understand and agree that this project and the contribution
32+
are public and that a record of the contribution (including all
33+
personal information I submit with it, including my sign-off) is
34+
maintained indefinitely and may be redistributed consistent with
35+
this project or the open source license(s) involved.
36+
```

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
attributes:
77
value: >
88
Thanks for taking the time to fill out a bug.
9-
If you want real-time support, consider joining our Discord at https://discord.gg/r3sSKJJ instead.
9+
If you want real-time support, consider joining our Discord at https://pycord.dev/discord instead.
1010
1111
Please note that this form is for bugs only!
1212
- type: input

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ contact_links:
55
url: https://github.com/Pycord-Development/pycord/discussions
66
- name: Discord Server
77
about: Use our official Discord server to ask for help and questions as well.
8-
url: https://discord.gg/UCXwPR7Pew
8+
url: https://pycord.dev/discord
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Vulnerability Report
2+
description: Report vulnerabilities
3+
labels: unconfirmed vulnerability
4+
assignees: BobDotCom,Lulalaby,CodeWithSwastik
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: >
9+
Thanks for taking the time to fill out a vulnerability report.
10+
If you want real-time support, consider joining our Discord at https://pycord.dev/discord instead.
11+
12+
Please note that this form is for vulnerability reports only!
13+
- type: textarea
14+
attributes:
15+
label: Summary
16+
description: A simple summary of your vulnerability report
17+
validations:
18+
required: true
19+
- type: textarea
20+
attributes:
21+
label: Reproduction Steps
22+
description: >
23+
What you did to make it happen.
24+
validations:
25+
required: true
26+
- type: textarea
27+
attributes:
28+
label: Minimal Reproducible Code
29+
description: >
30+
A short snippet of code that showcases the vulnerability.
31+
render: python
32+
- type: textarea
33+
attributes:
34+
label: System Information
35+
description: >
36+
Run `python -m discord -v` and paste this information below.
37+
38+
This command required v1.1.0 or higher of the library. If this errors out then show some basic
39+
information involving your system such as operating system and Python version.
40+
validations:
41+
required: true
42+
- type: checkboxes
43+
attributes:
44+
label: Checklist
45+
description: >
46+
Let's make sure you've properly done due dilligence when reporting this issue!
47+
options:
48+
- label: I have searched the open issues for duplicates.
49+
required: true
50+
- label: I have shown the entire steps to reproduce the vulnerability.
51+
required: true
52+
- label: I have removed my token from display, if visible.
53+
required: true
54+
- type: textarea
55+
attributes:
56+
label: Additional Context
57+
description: If there is anything else to say, please do so here.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
- [ ] If code changes were made then they have been tested.
1010
- [ ] I have updated the documentation to reflect the changes.
11+
- [ ] If `type: ignore` comments were used, a comment is also left explaining why
1112
- [ ] This PR fixes an issue.
1213
- [ ] This PR adds something new (e.g. new method or parameters).
1314
- [ ] This PR is a breaking change (e.g. methods or parameters removed/renamed)
14-
- [ ] This PR is **not** a code change (e.g. documentation, README, ...)
15+
- [ ] This PR is **not** a code change (e.g. documentation, README, typehinting, examples, ...)

.github/SECURITY.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| 2.0.0 | :white_check_mark: |
8+
| 1.7.x | :white_check_mark: |
9+
| < 1.7.3 | :x: |
10+
11+
## Reporting a Vulnerability
12+
13+
If you find a vulnerability you have two ways to report it:
14+
- Write us on https://pycord.dev/discord
15+
- Open an [issue](https://github.com/Pycord-Development/pycord/issues/new/choose)

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "pip"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"

.github/workflows/bandit.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: bandit
2+
on: [pull_request, push]
3+
jobs:
4+
bandit:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v2
8+
- uses: actions/setup-python@v2
9+
- run: pip install bandit
10+
- run: bandit --recursive --skip B101,B104,B105,B110,B307,B311,B404,B603,B607 .

0 commit comments

Comments
 (0)