Skip to content

Commit

Permalink
Merge branch 'JDsProjects:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
pieckenst authored Aug 26, 2024
2 parents b2f6dc4 + 9d26e4b commit 84c51cf
Show file tree
Hide file tree
Showing 12 changed files with 325 additions and 384 deletions.
24 changes: 24 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
version: 2
updates:
- package-ecosystem: "devcontainers"
directory: "/"
schedule:
interval: "monthly"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
groups:
ci-dependencies:
patterns:
- "*"

- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "monthly"
groups:
python-dependencies:
patterns:
- "*"
4 changes: 2 additions & 2 deletions .github/workflows/auto-poetry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11' # Specify the Python version you need

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run linter
uses: psf/black@stable
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -56,7 +56,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -69,4 +69,4 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
5 changes: 4 additions & 1 deletion cogs/bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,9 @@ async def fetch_source(self, ctx, item):
return command_wanted.callback, item

def process_source(self, src):
module = src.__module__
module = getattr(src, "__module__", None) or getattr(src, "__name__", "None") or ""
# adds # just in case.

try:
filename = inspect.getsourcefile(src)
except TypeError:
Expand Down Expand Up @@ -851,6 +853,7 @@ async def translators(self, ctx):
}

# might be good paginating this soon.
# might be worth paginating now.

users = sorted(
[
Expand Down
10 changes: 0 additions & 10 deletions cogs/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,16 +312,6 @@ async def cog_load(self):
self.rtfm_dictionary = sorted(await self.bot.db.fetch("SELECT * FROM RTFM_DICTIONARY"))
self.tio = async_tio.Tio(session=self.bot.session)

self.invalidation_config = [
utils.InvalidationConfig(record.entity_id, record.entity_type, self.bot)
for record in await self.bot.db.fetch("SELECT * FROM invalidation_config")
]
self.invalidation_opt_out = [
utils.InvalidationConfig(record.entity_id, record.entity_type, self.bot)
for record in await self.bot.db.fetch("SELECT * FROM invalidation_out")
]
# find a better way to handle invalidation_config and invalidation_opt_out.

async def cog_unload(self):
await self.github.close()

Expand Down
8 changes: 4 additions & 4 deletions locales/convert_speed.json
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@
"meters": "미터",
"feet": "피트",
"megameters": "메가미터",
"light": "상수 (빛의 속도)"
"light": "상수 (광속)"
},
"desc": {
"text": "선택한 온도:"
Expand Down Expand Up @@ -463,7 +463,7 @@
},
"speed": {
"name": "velocidad",
"description": "Porfavor inserte un número"
"description": "Por favor inserte un número"
},
"translator_id": "311977922481356801"
},
Expand Down Expand Up @@ -502,7 +502,7 @@
},
"speed": {
"name": "velocidad",
"description": "Porfavor inserte un número"
"description": "Por favor inserte un número"
},
"translator_id": "311977922481356801"
},
Expand Down Expand Up @@ -1247,4 +1247,4 @@
},
"translator_id": "236831708354314240"
}
}
}
4 changes: 2 additions & 2 deletions locales/convert_temperature.json
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@
"text": "Temperatura:"
},
"unit_names": {
"celsius": "Celcius:",
"celsius": "Celsius:",
"fahrenheit": "Fahrenheit:",
"kelvin": "Kelvin:",
"rankine": "Rankine:"
Expand Down Expand Up @@ -500,7 +500,7 @@
"text": "Temperatura:"
},
"unit_names": {
"celsius": "Celcius:",
"celsius": "Celsius:",
"fahrenheit": "Fahrenheit:",
"kelvin": "Kelvin:",
"rankine": "Rankine:"
Expand Down
Loading

0 comments on commit 84c51cf

Please sign in to comment.