mirror of
https://github.com/TheFunny/TelegramTwitterMediaBot.git
synced 2026-09-24 23:42:18 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0cffd5c297
|
||
|
|
b83bed5423
|
||
|
|
0f3131aec7
|
||
|
|
5483855de8
|
||
|
|
052163084b
|
||
|
|
cdee105c60
|
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM python:3.13-slim-bullseye
|
FROM python:3.12-slim-bullseye
|
||||||
|
|
||||||
LABEL maintainer="admin@yoursfunny.top"
|
LABEL maintainer="admin@yoursfunny.top"
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ ADMIN = [int(i) for i in os.getenv("BOT_ADMIN", "").split(",") if i]
|
|||||||
|
|
||||||
PIXIV_REFRESH_TOKEN = os.getenv("PIXIV_REFRESH_TOKEN")
|
PIXIV_REFRESH_TOKEN = os.getenv("PIXIV_REFRESH_TOKEN")
|
||||||
|
|
||||||
WEBHOOK = os.getenv("WEBHOOK", False)
|
WEBHOOK = os.getenv("WEBHOOK").strip().lower() in ("true", "yes", "1")
|
||||||
if WEBHOOK:
|
if WEBHOOK:
|
||||||
WEBHOOK_LISTEN = os.getenv("WEBHOOK_LISTEN", "0.0.0.0")
|
WEBHOOK_LISTEN = os.getenv("WEBHOOK_LISTEN", "0.0.0.0")
|
||||||
WEBHOOK_PORT = int(os.getenv("WEBHOOK_PORT", 8443))
|
WEBHOOK_PORT = int(os.getenv("WEBHOOK_PORT", 8443))
|
||||||
|
|||||||
+3
-3
@@ -1,4 +1,4 @@
|
|||||||
python-telegram-bot[webhooks]~=22.3
|
python-telegram-bot[webhooks]~=22.8
|
||||||
httpx[http2]~=0.27
|
httpx[http2]~=0.27
|
||||||
uvloop~=0.21; sys_platform != 'win32'
|
uvloop~=0.22; sys_platform != 'win32'
|
||||||
async-pixiv @ git+https://github.com/TheFunny/async-pixiv@main
|
async-pixiv~=1.1.2
|
||||||
+2
-2
@@ -3,7 +3,7 @@ from __future__ import annotations
|
|||||||
from typing import Literal, TYPE_CHECKING
|
from typing import Literal, TYPE_CHECKING
|
||||||
|
|
||||||
from async_pixiv import PixivClient
|
from async_pixiv import PixivClient
|
||||||
from async_pixiv.error import ApiError
|
from async_pixiv.error import APIError
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from async_pixiv.model.illust import Illust
|
from async_pixiv.model.illust import Illust
|
||||||
@@ -133,7 +133,7 @@ class ProcessPixiv(_ProcessPixiv):
|
|||||||
illust_id = self._parse_illust_id()
|
illust_id = self._parse_illust_id()
|
||||||
try:
|
try:
|
||||||
return (await self._client.ILLUST.detail(illust_id)).illust
|
return (await self._client.ILLUST.detail(illust_id)).illust
|
||||||
except ApiError:
|
except APIError:
|
||||||
await self.refresh_token()
|
await self.refresh_token()
|
||||||
return (await self._client.ILLUST.detail(illust_id)).illust # TODO use retry here
|
return (await self._client.ILLUST.detail(illust_id)).illust # TODO use retry here
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -84,7 +84,7 @@ class Tweet:
|
|||||||
|
|
||||||
@cached_property
|
@cached_property
|
||||||
def url(self) -> str:
|
def url(self) -> str:
|
||||||
return f"https://twitter.com/{self._author_id}/status/{self._id}"
|
return f"https://x.com/{self._author_id}/status/{self._id}"
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def author(self) -> str:
|
def author(self) -> str:
|
||||||
@@ -92,7 +92,7 @@ class Tweet:
|
|||||||
|
|
||||||
@cached_property
|
@cached_property
|
||||||
def author_url(self) -> str:
|
def author_url(self) -> str:
|
||||||
return f"https://twitter.com/{self._author_id}"
|
return f"https://x.com/{self._author_id}"
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def text(self) -> str:
|
def text(self) -> str:
|
||||||
|
|||||||
Reference in New Issue
Block a user