Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-12-06 04:41:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'user-agent' into 'master'

Browse Source 
[CHANGE] User-Agent to our proposed default format

See merge request allianceauth/allianceauth!1762
This commit is contained in:
Ariel Rin 2025-09-21 02:41:49 +00:00
commit 1608950d43
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
allianceauth/services/modules/discord/discord_client/client.py
View File

@ -16,8 +16,7 @@ from redis import Redis
from allianceauth.utils.cache import get_redis_client from allianceauth.utils.cache import get_redis_client
from allianceauth import __title__ as AUTH_TITLE from allianceauth import __title_useragent__, __url__, __version__
from allianceauth import __url__, __version__
from .. import __title__ from .. import __title__
from ..utils import LoggerAddTag from ..utils import LoggerAddTag
@ -647,7 +646,7 @@ class DiscordClient:
if self.is_rate_limited: if self.is_rate_limited:
self._ensure_rate_limed_not_exhausted(uid) self._ensure_rate_limed_not_exhausted(uid)
headers = { headers = {
'User-Agent': f'{AUTH_TITLE} ({__url__}, {__version__})', 'User-Agent': f'{__title_useragent__}/{__version__} (+{__url__})',
'accept': 'application/json', 'accept': 'application/json',
'X-RateLimit-Precision': 'millisecond', 'X-RateLimit-Precision': 'millisecond',
'authorization': str(authorization) 'authorization': str(authorization)

5
allianceauth/services/modules/discord/discord_client/tests/test_client.py
View File

@ -7,8 +7,7 @@ import requests_mock
from redis import Redis from redis import Redis
from requests.exceptions import HTTPError from requests.exceptions import HTTPError
from allianceauth import __title__ as AUTH_TITLE from allianceauth import __title_useragent__, __url__, __version__
from allianceauth import __url__, __version__
from allianceauth.utils.testing import NoSocketsTestCase from allianceauth.utils.testing import NoSocketsTestCase
from ...utils import set_logger_to_file from ...utils import set_logger_to_file
@ -46,7 +45,7 @@ API_BASE_URL = 'https://discord.com/api/'
TEST_RETRY_AFTER = 3000 TEST_RETRY_AFTER = 3000
DEFAULT_REQUEST_HEADERS = { DEFAULT_REQUEST_HEADERS = {
'User-Agent': f'{AUTH_TITLE} ({__url__}, {__version__})', 'User-Agent': f'{__title_useragent__}/{__version__} (+{__url__})',
'accept': 'application/json', 'accept': 'application/json',
'authorization': 'Bot ' + TEST_BOT_TOKEN 'authorization': 'Bot ' + TEST_BOT_TOKEN
} }

4
allianceauth/srp/managers.py
View File

@ -4,7 +4,7 @@ import requests
from django.contrib.auth.models import User from django.contrib.auth.models import User
from allianceauth import NAME from allianceauth import __title_useragent__, __url__, __version__
from allianceauth.srp.providers import esi from allianceauth.srp.providers import esi
from .models import SrpUserRequest from .models import SrpUserRequest
@ -24,7 +24,7 @@ class SRPManager:
def get_kill_data(kill_id): def get_kill_data(kill_id):
url = ("https://zkillboard.com/api/killID/%s/" % kill_id) url = ("https://zkillboard.com/api/killID/%s/" % kill_id)
headers = { headers = {
'User-Agent': NAME, 'User-Agent': f'{__title_useragent__}/{__version__} (+{__url__})',
'Content-Type': 'application/json', 'Content-Type': 'application/json',
} }
r = requests.get(url, headers=headers) r = requests.get(url, headers=headers)