follow upstream updates

Unblocks PythonistaGuild/Pythonista-Bot#41

Author: AbstractUmbra

README.md

@@ -21,6 +21,7 @@ If you want the docs for the `main` branch, those can be found [here](https://my
 ### Features
 
 - [x] - Creating pastes.
+  - [ ] Supporting attachments.
 - [ ] - Editing pastes.
     - Pending design work.
 - [x] - Deleting pastes.

mystbin/client.py

@@ -136,7 +136,7 @@ async def create_paste(
 
         resolved_files: Sequence[File] = []
         if filename and content:
-            resolved_files = [File(filename=filename, content=content)]
+            resolved_files = [File(filename=filename, content=content, attachment_url=None)]
         elif file:
             resolved_files = [file]
 

mystbin/paste.py

@@ -54,18 +54,15 @@ class File:
     __slots__ = (
         "filename",
         "content",
+        "attachment_url",
         "_lines_of_code",
         "_character_count",
     )
 
-    def __init__(
-        self,
-        *,
-        filename: str,
-        content: str,
-    ) -> None:
+    def __init__(self, *, filename: str, content: str, attachment_url: Optional[str]) -> None:
         self.filename: str = filename
         self.content: str = content
+        self.attachment_url: Optional[str] = attachment_url
 
     @property
     def lines_of_code(self) -> int:
@@ -77,10 +74,7 @@ def character_count(self) -> int:
 
     @classmethod
     def from_data(cls, payload: FileResponse, /) -> Self:
-        self = cls(
-            content=payload["content"],
-            filename=payload["filename"],
-        )
+        self = cls(content=payload["content"], filename=payload["filename"], attachment_url=payload["attachment"])
         self._lines_of_code = payload["loc"]
         self._character_count = payload["charcount"]
 
@@ -120,16 +114,11 @@ class Paste:
         "_last_edited",
     )
 
-    def __init__(
-        self,
-        *,
-        id: str,
-        created_at: str,
-        files: List[File],
-    ) -> None:
+    def __init__(self, *, id: str, created_at: str, files: List[File], notice: Optional[str]) -> None:
         self.id: str = id
         self.created_at: datetime.datetime = datetime.datetime.fromisoformat(created_at)
-        self.files: list[File] = files
+        self.files: List[File] = files
+        self.notice: Optional[str] = notice
 
     def __str__(self) -> str:
         return self.url
@@ -156,19 +145,15 @@ def views(self) -> Optional[int]:
     @classmethod
     def from_data(cls, payload: PasteResponse, /) -> Self:
         files = [File.from_data(data) for data in payload["files"]]
-        self = cls(
-            id=payload["id"],
-            created_at=payload["created_at"],
-            files=files,
-        )
+        self = cls(id=payload["id"], created_at=payload["created_at"], files=files, notice=payload["notice"])
         self._views = payload.get("views")
-        last_edited = payload.get("last_edited")
+        last_edited = payload["last_edited"]
         if last_edited:
             self._last_edited = datetime.datetime.fromisoformat(last_edited)
         else:
             self._last_edited = None
 
-        expires = payload.get("expires")
+        expires = payload["expires"]
         if expires:
             self._expires = datetime.datetime.fromisoformat(expires)
         else:

mystbin/types/responses.py

@@ -23,7 +23,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Optional, TypedDict
+from typing import List, Optional, TypedDict
 
 
 __all__ = (
@@ -37,15 +37,17 @@ class FileResponse(TypedDict):
     content: str
     loc: int
     charcount: int
+    attachment: Optional[str]
 
 
 class PasteResponse(TypedDict):
     id: str
+    author_id: Optional[int]
     created_at: str
     expires: Optional[str]
     last_edited: Optional[str]
-    views: int
-    files: list[FileResponse]
+    files: List[FileResponse]
+    notice: Optional[str]
 
 
 class EditPasteResponse(TypedDict):