From e52a6fd17809bef93f367eb5f8efe55bdcd15b1a Mon Sep 17 00:00:00 2001
From: jfm <jfm@moerks.dk>
Date: Thu, 2 May 2024 09:00:14 +0200
Subject: [PATCH] Added media attachments model for statuses

---
 .coverage                    | Bin 53248 -> 53248 bytes
 src/mastodon/model/media.py  |  26 ++++++++++++
 src/mastodon/model/status.py |   3 +-
 tests/resources/status.json  |  77 +++++++++++++++++++++++------------
 4 files changed, 80 insertions(+), 26 deletions(-)
 create mode 100644 src/mastodon/model/media.py

diff --git a/.coverage b/.coverage
index 7e7574f3e943b34975781e69293f4c7311b4b3d3..0c7e8bc5d61586e0e351529e3f70b661ccecfc5a 100644
GIT binary patch
delta 366
zcmXw#KS)AR7{#By_k75^_ns@Y_eT*LtcYkR1#L}gatR}XjQ$w8rAVnm&}Mljr(A>@
z0zry|)LL6|Y7Rn&0%=JoD7%944Ike*hx3CkT~N~nwWRr7+-xeS;t2EXi`}t9=4DoT
zPvdloypu~3Ax^VdcJQjHd%3ElL}1w?R)bWBret(^jf+Nb$R0b0Mkiy502B2UcTZva
zk<FbADf#IjSZ)MoRmp29IK~3&unMh`4?0b*$QE(Y1dF4_d`vZ4l2<duMA)bEfF>!A
zYjdPez@nBhdIB8)*dS7V3y(Qn93cfAw9&*1o>0dvu2DoD=Qu$UF>E6w`#o?wxMs1t
z_+O>_*`HS%q{J{|XL1j-pZ2dIl3BO*-A$!LF}tpE<b-iHVnt4N?830goQ3mp{$g)b
Vnk8X8NV6o(Q|PLE7!^0qOaG0ta^3&{

delta 286
zcmZozz}&Eac>{}s5<iay1OHzBT7E0OuY5cB%K2>gn0WW_R`BZcyy98Glg6X5Sx|t9
zht-CknW28Nqo3|%aUWh*J{E>XRv=Gl@&zB^$#FjHY!19Iq0JY3OqhY@YBKQG@muqK
z<J-x*m*+LF0nbXFblyt73jTe3wtUPynm}`zc_u%Lwq@maWC5CXFxCuY5-T5!xA}35
zqOuY{e*y#lH~x40Px-I$pW@%ozm0z_|5E;${1f?G`K$Sh`4fN!S@BB?^0P2<s__5Y
z`TqkHK49Ym3i0t7O|I@&WBK!czy0K;{qfBF{4*!BPml-dD(2rjbAGl0P-N?5_5&c1
Le*Vc@&wB#^=F?e8

diff --git a/src/mastodon/model/media.py b/src/mastodon/model/media.py
new file mode 100644
index 0000000..3ff84d2
--- /dev/null
+++ b/src/mastodon/model/media.py
@@ -0,0 +1,26 @@
+from pydantic import BaseModel, Field
+
+class MetaData(BaseModel):
+    width: int
+    height: int
+    size: str
+    aspect: float
+
+class MetaCoordinates(BaseModel):
+    x: float
+    y: float
+
+class Meta(BaseModel):
+    original: MetaData
+    small: MetaData
+    focus: MetaCoordinates
+
+class MediaAttachment(BaseModel):
+    media_id: str = Field(alias="id")
+    media_type: str = Field(alias="type")
+    url: str
+    preview_url: str
+    text_url: str
+    meta: Meta
+    description: str
+    blurhash: str
diff --git a/src/mastodon/model/status.py b/src/mastodon/model/status.py
index 18ef4a3..114f828 100644
--- a/src/mastodon/model/status.py
+++ b/src/mastodon/model/status.py
@@ -4,6 +4,7 @@ from pydantic import BaseModel, Field
 from mastodon.model.application import Application
 from mastodon.model.account import Account
 from mastodon.model.card import Card
+from mastodon.model.media import MediaAttachment
 from mastodon.model.poll import Poll
 
 
@@ -29,7 +30,7 @@ class Status(BaseModel):
     reblog: Optional["Status"]
 #    application: Optional[Application]
     account: Account
-    media_attachments: List
+    media_attachments: List[MediaAttachment]
     mentions: List
     tags: List
     emojis: List
diff --git a/tests/resources/status.json b/tests/resources/status.json
index c185982..b24ebca 100644
--- a/tests/resources/status.json
+++ b/tests/resources/status.json
@@ -48,32 +48,59 @@
         "name": "Patreon",
         "value": "<a href=\"https://www.patreon.com/mastodon\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://www.</span><span class=\"\">patreon.com/mastodon</span><span class=\"invisible\"></span}",
         "verified_at": null
-      },
-      {
-        "name": "Homepage",
-        "value": "<a href=\"https://zeonfederated.com\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">zeonfederated.com</span><span class=\"invisible\"></span}",
-        "verified_at": "2019-07-15T18:29:57.191+00:00"
+  },
+  {
+    "name": "Homepage",
+    "value": "<a href=\"https://zeonfederated.com\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">zeonfederated.com</span><span class=\"invisible\"></span}",
+    "verified_at": "2019-07-15T18:29:57.191+00:00"
       }
     ]
   },
-  "media_attachments": [],
-  "mentions": [],
-  "tags": [],
-  "emojis": [],
-  "card": {
-    "url": "https://www.theguardian.com/money/2019/dec/07/i-lost-my-193000-inheritance-with-one-wrong-digit-on-my-sort-code",
-    "title": "‘I lost my £193,000 inheritance – with one wrong digit on my sort code’",
-    "description": "When Peter Teich’s money went to another Barclays customer, the bank offered £25 as a token gesture",
-    "type": "link",
-    "author_name": "",
-    "author_url": "",
-    "provider_name": "",
-    "provider_url": "",
-    "html": "",
-    "width": 0,
-    "height": 0,
-    "image": null,
-    "embed_url": ""
-  },
-  "poll": null
+  "media_attachments": [{
+    "id": "22345792",
+    "type": "image",
+    "url": "https://files.mastodon.social/media_attachments/files/022/345/792/original/57859aede991da25.jpeg",
+    "preview_url": "https://files.mastodon.social/media_attachments/files/022/345/792/small/57859aede991da25.jpeg",
+    "remote_url": null,
+    "text_url": "https://mastodon.social/media/2N4uvkuUtPVrkZGysms",
+    "meta": {
+      "original": {
+        "width": 640,
+        "height": 480,
+        "size": "640x480",
+        "aspect": 1.3333333333333333
+      },
+      "small": {
+        "width": 461,
+        "height": 346,
+        "size": "461x346",
+        "aspect": 1.3323699421965318
+      },
+      "focus": {
+        "x": -0.27,
+        "y": 0.51
+      }
+    },
+    "description": "test media description",
+    "blurhash": "UFBWY:8_0Jxv4mx]t8t64.%M-:IUWGWAt6M}"
+}],
+"mentions": [],
+"tags": [],
+"emojis": [],
+"card": {
+  "url": "https://www.theguardian.com/money/2019/dec/07/i-lost-my-193000-inheritance-with-one-wrong-digit-on-my-sort-code",
+  "title": "‘I lost my £193,000 inheritance – with one wrong digit on my sort code’",
+  "description": "When Peter Teich’s money went to another Barclays customer, the bank offered £25 as a token gesture",
+  "type": "link",
+  "author_name": "",
+  "author_url": "",
+  "provider_name": "",
+  "provider_url": "",
+  "html": "",
+  "width": 0,
+  "height": 0,
+  "image": null,
+  "embed_url": ""
+},
+"poll": null
 }