waifu/kemoverse
waifu/kemoverse
3
2
Fork 3
Code Issues 13 Pull requests 4 Projects 1 Releases Packages Wiki Activity

back to using mastodon.py

Browse source
This commit is contained in:
Moon 2025-06-12 12:47:51 +09:00
parent 91376c0eba
commit 89ae8a7290
1 changed files with 20 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
bot/pleroma_service.py
View file

@ -159,67 +159,35 @@ class PleromaService(FediverseService):
def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> FediverseFile: def upload_file(self, file_data: Union[BinaryIO, bytes], filename: Optional[str] = None) -> FediverseFile:
"""Upload a file to Pleroma instance""" """Upload a file to Pleroma instance"""
try: try:
import requests # Convert file_data to bytes if it's a stream for MIME detection
# Convert file_data to bytes if it's a stream
if hasattr(file_data, 'read'): if hasattr(file_data, 'read'):
file_bytes = file_data.read() # Check if we can seek back
try:
current_pos = file_data.tell()
header = file_data.read(8)
file_data.seek(current_pos)
except (io.UnsupportedOperation, OSError):
# Non-seekable stream, read all data
remaining_data = file_data.read()
file_bytes = header + remaining_data
file_data = io.BytesIO(file_bytes)
header = file_bytes[:8]
else: else:
file_bytes = file_data header = file_data[:8] if len(file_data) >= 8 else file_data
# Determine mime type from file header # Determine mime type from file header
mime_type = 'image/jpeg' # default if header.startswith(b'\xff\xd8\xff'):
if file_bytes.startswith(b'\xff\xd8\xff'):
mime_type = 'image/jpeg' mime_type = 'image/jpeg'
ext = '.jpg' elif header.startswith(b'\x89PNG\r\n\x1a\n'):
elif file_bytes.startswith(b'\x89PNG\r\n\x1a\n'):
mime_type = 'image/png' mime_type = 'image/png'
ext = '.png' elif header.startswith(b'GIF8'):
elif file_bytes.startswith(b'GIF8'):
mime_type = 'image/gif' mime_type = 'image/gif'
ext = '.gif' elif header.startswith(b'RIFF') and len(header) >= 8 and b'WEBP' in header:
elif file_bytes.startswith(b'RIFF') and b'WEBP' in file_bytes[:12]:
mime_type = 'image/webp' mime_type = 'image/webp'
ext = '.webp'
else: else:
ext = '.jpg' mime_type = 'image/jpeg' # Default fallback
# Create a filename if none provided media = self.client.media_post(file_data, mime_type=mime_type, description=filename)
if not filename: return self._convert_mastodon_file(media)
filename = f"upload{ext}"
# Direct HTTP POST to /api/v1/media with headers matching browser behavior
headers = {
'Authorization': f'Bearer {self.client.access_token}',
'Accept': '*/*',
'Cache-Control': 'no-cache',
'Pragma': 'no-cache',
'User-Agent': 'Kemoverse-Bot/1.0'
}
# Use files parameter to let requests handle multipart/form-data and content-type
files = {
'file': (filename, file_bytes, mime_type)
}
url = f"{self.client.api_base_url}/api/v1/media"
# Debug logging
print(f"DEBUG: Making POST request to: {url}")
print(f"DEBUG: Headers: {headers}")
print(f"DEBUG: Files keys: {list(files.keys())}")
response = requests.post(url, headers=headers, files=files)
print(f"DEBUG: Response status: {response.status_code}")
print(f"DEBUG: Response headers: {dict(response.headers)}")
print(f"DEBUG: Request method was: {response.request.method}")
if response.status_code in (200, 201):
media = response.json()
return self._convert_mastodon_file(media)
else:
raise Exception(f"Upload failed with {response.status_code}: {response.text}")
except Exception as e: except Exception as e:
raise RuntimeError(f"Failed to upload file to Pleroma: {e}") from e raise RuntimeError(f"Failed to upload file to Pleroma: {e}") from e