diff options
| author | salmonik <raisersoft@proton.me> | 2026-04-28 20:05:36 +0200 |
|---|---|---|
| committer | salmonik <raisersoft@proton.me> | 2026-04-28 20:05:36 +0200 |
| commit | 5675dfd20b24f1e0eef06b11d9ec41a894d3a5bf (patch) | |
| tree | caad1669db6fce506dd0494aeaf2a43f7e291679 /cogs/uploader.py | |
| parent | better UX for web.py (diff) | |
| download | senator-sperma-5675dfd20b24f1e0eef06b11d9ec41a894d3a5bf.tar.gz senator-sperma-5675dfd20b24f1e0eef06b11d9ec41a894d3a5bf.zip | |
multitude of changes.
but primarly, use db for all data.
Signed-off-by: salmonik <raisersoft@proton.me>
Diffstat (limited to 'cogs/uploader.py')
| -rw-r--r-- | cogs/uploader.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cogs/uploader.py b/cogs/uploader.py index 68a3938..df6908e 100644 --- a/cogs/uploader.py +++ b/cogs/uploader.py | |||
| @@ -7,11 +7,12 @@ import os | |||
| 7 | import aiofiles | 7 | import aiofiles |
| 8 | import requests | 8 | import requests |
| 9 | import urllib.parse | 9 | import urllib.parse |
| 10 | from typing import List, Optional | 10 | from typing import Optional |
| 11 | import discord | 11 | import discord |
| 12 | from discord.ext import commands | 12 | from discord.ext import commands |
| 13 | from discord import AutocompleteContext | 13 | from discord import AutocompleteContext |
| 14 | from cogs.utils import file_search as search_utils | 14 | from cogs.utils import file_search as search_utils |
| 15 | from cogs.utils.settings import get_uploadurl | ||
| 15 | import logging | 16 | import logging |
| 16 | 17 | ||
| 17 | logger = logging.getLogger(__name__) | 18 | logger = logging.getLogger(__name__) |
| @@ -23,7 +24,7 @@ class Uploader(commands.Cog): | |||
| 23 | self.bot = bot | 24 | self.bot = bot |
| 24 | self.temp_dir = get_temp_dir() | 25 | self.temp_dir = get_temp_dir() |
| 25 | self._cached_urls = {} | 26 | self._cached_urls = {} |
| 26 | self._uploadurl = os.getenv("COPYPARTY_URL_UPLOAD") | 27 | self._uploadurl = get_uploadurl() |
| 27 | 28 | ||
| 28 | async def _file_autocomplete(self, ctx: AutocompleteContext): | 29 | async def _file_autocomplete(self, ctx: AutocompleteContext): |
| 29 | query = ctx.value.lower() if ctx.value else "" | 30 | query = ctx.value.lower() if ctx.value else "" |
| @@ -77,8 +78,8 @@ class Uploader(commands.Cog): | |||
| 77 | 78 | ||
| 78 | async def _upload_file(self, file_path: str) -> Optional[str]: | 79 | async def _upload_file(self, file_path: str) -> Optional[str]: |
| 79 | """Upload a file and return the URL""" | 80 | """Upload a file and return the URL""" |
| 80 | if not self._uploadurl: | 81 | if self._uploadurl == "http://localhost:3939": |
| 81 | logger.error("COPYPARTY_URL_UPLOAD not set!") | 82 | logger.warning("COPYPARTY_URL_UPLOAD not set! Using default") |
| 82 | return None | 83 | return None |
| 83 | 84 | ||
| 84 | return await self._upload_to_copyparty(file_path) | 85 | return await self._upload_to_copyparty(file_path) |
