Merge branch 'master' into dependabot/pip/mkdocs-minify-plugin-0.8.0

instagrapi/extractors.py

@@ -26,6 +26,8 @@
     StoryLink,
     StoryMedia,
     StoryMention,
+    StoryLocation,
+    StoryHashtag,
     Track,
     User,
     UserShort,
@@ -332,8 +334,7 @@ def extract_direct_message(data):
     if xma_media_share:
         data["xma_share"] = extract_media_v1_xma(xma_media_share[0])
 
-    data['timestamp'] = datetime.datetime.fromtimestamp(data['timestamp'] // 1_000_000)
-    data['user_id'] = str(data['user_id'])
+    data['timestamp'] = datetime.datetime.fromtimestamp(int(data['timestamp']) // 1_000_000)
 
     return DirectMessage(**data)
 
@@ -393,8 +394,12 @@ def extract_story_v1(data):
     story["mentions"] = [
         StoryMention(**mention) for mention in story.get("reel_mentions", [])
     ]
-    story["locations"] = []
-    story["hashtags"] = []
+    story["locations"] = [
+        StoryLocation(**location) for location in story.get("story_locations", [])
+    ]
+    story["hashtags"] = [
+        StoryHashtag(**hashtag) for hashtag in story.get("story_hashtags", [])
+    ]
     story["stickers"] = data.get("story_link_stickers") or []
     feed_medias = []
     story_feed_medias = data.get("story_feed_media") or []

instagrapi/types.py

@@ -213,6 +213,7 @@ class StoryMention(TypesBaseModel):
     y: Optional[float] = None
     width: Optional[float] = None
     height: Optional[float] = None
+    rotation: Optional[float] = None
 
 
 class StoryMedia(TypesBaseModel):
@@ -241,14 +242,15 @@ class StoryHashtag(TypesBaseModel):
     y: Optional[float] = None
     width: Optional[float] = None
     height: Optional[float] = None
-
+    rotation: Optional[float] = None
 
 class StoryLocation(TypesBaseModel):
     location: Location
     x: Optional[float] = None
     y: Optional[float] = None
     width: Optional[float] = None
     height: Optional[float] = None
+    rotation: Optional[float] = None
 
 
 class StoryStickerLink(TypesBaseModel):

requirements-test.txt

@@ -4,7 +4,7 @@ isort==5.13.2
 bandit==1.7.7
 mike==2.0.0
 markdown-include==0.8.1
-mkdocs-material==9.5.5
+mkdocs-material==9.5.10
 mkdocs-minify-plugin==0.8.0
 mkdocstrings==0.24.0
 ./util/mkdocs-redirects

requirements.txt

@@ -1,5 +1,5 @@
 requests==2.31.0
 PySocks==1.7.1
-pydantic==2.5.3
+pydantic==2.6.2
 moviepy==1.0.3
 pycryptodomex==3.20.0

setup.py

@@ -21,7 +21,7 @@
 requirements = [
     "requests<3.0,>=2.25.1",
     "PySocks==1.7.1",
-    "pydantic==2.5.3",
+    "pydantic==2.6.2",
     "pycryptodomex==3.20.0",
 ]
 # requirements = [
@@ -31,7 +31,7 @@
 
 setup(
     name="instagrapi",
-    version="2.0.3",
+    version="2.0.4",
     author="Mark Subzeroid",
     author_email="[email protected]",
     license="MIT",