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

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
Ghost-IU committed Apr 15, 2021
2 parents 5fad460 + 61058e9 commit f396575
Show file tree
Hide file tree
Showing 90 changed files with 1,002 additions and 895 deletions.
24 changes: 24 additions & 0 deletions .github/disabled/black.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Black

on: push

jobs:
black:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- name: Install black
run: |
python -m pip install --upgrade pip
python -m pip install black
- name: Run black
run: black SaitamaRobot
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
commit-message: Format code using black
title: Format code.
body: Format code using black.
labels: ⚫️ black
branch: autofix
2 changes: 1 addition & 1 deletion .github/disabled/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
with:
heroku_api_key: ${{secrets.HEROKU_API_KEY}}
heroku_app_name: ${{secrets.HEROKU_APP_NAME}} #Must be unique in Heroku
heroku_email: ${{secrets.HEROKU_EMAIL}}
heroku_email: ${{secrets.HEROKU_EMAIL}}
6 changes: 3 additions & 3 deletions .github/disabled/yapf.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Format Python code
on:
push:
on:
push:
branches: [shiken]
pull_request:
branches: [shiken]
Expand All @@ -19,5 +19,5 @@ jobs:
title: Automated code formatting.
body: This is an automated code formatting pull request.
labels: Code Formatting
reviewers: Accipiter7
reviewers: Accipiter7
branch: autofix
2 changes: 1 addition & 1 deletion .github/workflows/issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
ignore-comments: true
labels-synonyms: '{"bug":["error","need fix","not working"],"enhancement":["upgrade"],"question":["help"]}'
labels-not-allowed: '["good first issue"]'
default-labels: '["help wanted"]'
default-labels: '["help wanted"]'
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ SaitamaRobot/config.ini
log.txt
kangsticker.png
updates.txt
start_service.bat

# Session files
SaitamaRobot/*.session
Expand Down Expand Up @@ -149,4 +150,4 @@ dmypy.json
.project
.pydevproject
.directory
.vscode
.vscode
24 changes: 24 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-docstring-first
- id: debug-statements
- id: requirements-txt-fixer
- id: check-added-large-files
- id: check-ast
- id: check-builtin-literals
- id: check-case-conflict
- id: destroyed-symlinks
- id: check-merge-conflict
- id: check-yaml
- id: debug-statements
- id: detect-private-key
- id: fix-byte-order-marker
- repo: https://github.com/asottile/add-trailing-comma
rev: v2.0.1
hooks:
- id: add-trailing-comma
args: [--py36-plus]
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ In addition to the above clause in the Code of Conduct, the following clauses mu
- Don't be an asshole. No one likes them. Please be friendly while making contributions.
- Don't act entitled to perks or Collaborator access just because of a contribution. (Refer to [Code of Merit](https://codeofmerit.org/code/) Clause 4)
- Individual characteristics, including but not limited to, body, sex, sexual preference, race, language, religion, nationality, or political preferences are irrelevant in the scope of the project and will not be taken into account concerning your value or that of your contribution to the project. ([Code of Merit](https://codeofmerit.org/code/) Clause 8)
- Participation on the project equates to agreement of this modified code of conduct.
- Participation on the project equates to agreement of this modified code of conduct.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Removing the module file should result in a bot which is still in perfect workin
- If a module is dependent on multiple other files, which might not be loaded, then create a list of at module
load time, in `__main__`, by looking at attributes. This is how migration, /help, /stats, /info, and many other things
are based off of. It allows the bot to work fine with the LOAD and NO_LOAD configurations.
- Keep in mind that some things might clash; eg a regex handler could clash with a command handler - in this case, you
- Keep in mind that some things might clash; eg a regex handler could clash with a command handler - in this case, you
should put them in different dispatcher groups.

Might seem complicated, but it'll make sense when you get into it. Feel free to ask us in issue requests if you ever need to!
2 changes: 1 addition & 1 deletion Git_Pull.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
TITLE Github Quick-Pull

:: Print the branch cause ..oooooo fancy!
echo Pulling from branch:
echo Pulling from branch:
git branch
echo.
git pull
12 changes: 6 additions & 6 deletions Git_Push.bat
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
@echo off
TITLE Github Quick-pushing
TITLE Github Quick-pushing

:: Print the branch cause people like me push to wrong branches and cry about it later.
echo Pushing to branch:
:: Print the branch cause people like me push to wrong branches and cry about it later.
echo Pushing to branch:
git branch
echo.
:: Take input for comment and thats about it
set /p commit_title="Enter Commit title (pushes with you as author): "

:: If you are reading comments to understand this part then you can go back stab yourself.
:: If you are reading comments to understand this part then you can go back stab yourself.
echo.
git pull
git pull
git add *
git commit -m "%commit_title%"
git push


:: Hail Hydra
:: Hail Hydra
2 changes: 1 addition & 1 deletion SaitamaRobot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# if version < 3.6, stop bot.
if sys.version_info[0] < 3 or sys.version_info[1] < 6:
LOGGER.error(
"You MUST have a python version of at least 3.6! Multiple features depend on this. Bot quitting."
"You MUST have a python version of at least 3.6! Multiple features depend on this. Bot quitting.",
)
quit(1)

Expand Down
Loading

0 comments on commit f396575

Please sign in to comment.