From 686d8e1029386ffe9f41f51fbe6a34805f7d10ba Mon Sep 17 00:00:00 2001
From: jfm <jfm@moerks.dk>
Date: Thu, 2 May 2024 09:39:27 +0200
Subject: [PATCH] MediaAttachment debuggingw

---
 .coverage                    | Bin 53248 -> 53248 bytes
 src/mastodon/model/media.py  |  24 +++++++++++++++++-----
 src/mastodon/model/status.py |   2 +-
 src/mastodon/timelines.py    |   2 +-
 tests/resources/status.json  |  38 ++++++++++++++++++++++++++++++++++-
 5 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/.coverage b/.coverage
index b3cf506611344cee8a4edca26fb1b53a16c27233..95518a879450960e0ce9ffb249389cfbb54634ee 100644
GIT binary patch
delta 87
zcmV-d0I2_fpaX!Q1F!~wB2xel_7Cn4<qy^m$`8K}whyfjr4N}8kq?Crdk=08W)D-d
t5fCd6lU0u!4GRtg0SOom_V51h{sWVHk0=5ElcbL#1fIA54ztRSHb750AjJRx

delta 85
zcmV-b0IL6hpaX!Q1F!~wB2@qn_7Cn4<qy^m$`8K}whyfjr4N}8kq?Crdk=6AXb)Ah
r5fCj8lT(iy3kePc0SOci_TBprlY5US0e_REk0J!l+kXSI%8xcc@Wvh(

diff --git a/src/mastodon/model/media.py b/src/mastodon/model/media.py
index ad8948e..f2a38ef 100644
--- a/src/mastodon/model/media.py
+++ b/src/mastodon/model/media.py
@@ -2,19 +2,33 @@ from pydantic import BaseModel, Field
 from typing import Optional
 
 class MetaData(BaseModel):
-    width: int
-    height: int
-    size: str
-    aspect: float
+    width: Optional[int] = None
+    height: Optional[int] = None
+    size: Optional[str] = None
+    aspect: Optional[float] = None
+    frame_rate: Optional[str] = None
+    duration: Optional[float] = None
+    bitrate: Optional[int] = None
 
 class MetaCoordinates(BaseModel):
     x: float
     y: float
 
 class Meta(BaseModel):
+    length: Optional[str] = None
+    duration: Optional[float] = None
+    fps: Optional[int] = None
+    size: Optional[str] = None
+    width: Optional[int] = None
+    height: Optional[int]= None
+    aspect: Optional[float] = None
+    audio_encode: Optional[str] = None
+    audio_bitrate: Optional[str] = None
+    audio_channels: Optional[str] = None
+ 
     original: MetaData
     small: MetaData
-    focus: Optional[MetaCoordinates]
+    focus: Optional[MetaCoordinates] = None
 
 class MediaAttachment(BaseModel):
     media_id: str = Field(alias="id")
diff --git a/src/mastodon/model/status.py b/src/mastodon/model/status.py
index 114f828..4c0f60d 100644
--- a/src/mastodon/model/status.py
+++ b/src/mastodon/model/status.py
@@ -28,7 +28,7 @@ class Status(BaseModel):
     bookmarked: bool
     content: str
     reblog: Optional["Status"]
-#    application: Optional[Application]
+    application: Optional[Application] = None
     account: Account
     media_attachments: List[MediaAttachment]
     mentions: List
diff --git a/src/mastodon/timelines.py b/src/mastodon/timelines.py
index 9e05670..ba6bd05 100644
--- a/src/mastodon/timelines.py
+++ b/src/mastodon/timelines.py
@@ -23,5 +23,5 @@ class Timelines():
             parameters["limit"] = limit
 
         response = requests.get(url, headers=self.auth.get_auth_headers(), params=parameters)
-        logger.debug("JSON: {}".format(response.raw()))
+        logger.debug("JSON: {}".format(response.raw))
         return response.json()
diff --git a/tests/resources/status.json b/tests/resources/status.json
index b24ebca..e93e0d0 100644
--- a/tests/resources/status.json
+++ b/tests/resources/status.json
@@ -83,7 +83,43 @@
     },
     "description": "test media description",
     "blurhash": "UFBWY:8_0Jxv4mx]t8t64.%M-:IUWGWAt6M}"
-}],
+},
+{
+  "id": "22546306",
+  "type": "video",
+  "url": "https://files.mastodon.social/media_attachments/files/022/546/306/original/dab9a597f68b9745.mp4",
+  "preview_url": "https://files.mastodon.social/media_attachments/files/022/546/306/small/dab9a597f68b9745.png",
+  "remote_url": null,
+  "text_url": "https://mastodon.social/media/wWd1HJIBmH1MZGDfg50",
+  "meta": {
+    "length": "0:01:28.65",
+    "duration": 88.65,
+    "fps": 24,
+    "size": "1280x720",
+    "width": 1280,
+    "height": 720,
+    "aspect": 1.7777777777777777,
+    "audio_encode": "aac (LC) (mp4a / 0x6134706D)",
+    "audio_bitrate": "44100 Hz",
+    "audio_channels": "stereo",
+    "original": {
+      "width": 1280,
+      "height": 720,
+      "frame_rate": "6159375/249269",
+      "duration": 88.654,
+      "bitrate": 862056
+    },
+    "small": {
+      "width": 400,
+      "height": 225,
+      "size": "400x225",
+      "aspect": 1.7777777777777777
+    }
+  },
+  "description": null,
+  "blurhash": "U58E0g8_0M.94T?bIr00?bD%NGoM?bD%oLt7"
+}
+],
 "mentions": [],
 "tags": [],
 "emojis": [],