Merge pull request #586 from gzsombor/small-fixes

Small fixes

src/main/java/com/github/instagram4j/instagram4j/models/media/ImageMedia.java

@@ -0,0 +1,29 @@
+package com.github.instagram4j.instagram4j.models.media;
+
+import com.github.instagram4j.instagram4j.models.media.timeline.Comment.Caption;
+import com.github.instagram4j.instagram4j.models.user.User;
+
+public interface ImageMedia {
+    long getPk();
+
+    String getId();
+
+    long getTaken_at();
+
+    long getDevice_timestamp();
+
+    String getMedia_type();
+
+    String getCode();
+
+    String getClient_cache_key();
+
+    int getFilter_type();
+
+    User getUser();
+
+    Caption getCaption();
+
+    ImageVersions getImage_versions2();
+
+}

src/main/java/com/github/instagram4j/instagram4j/models/media/ImageVersionsMeta.java

@@ -3,7 +3,7 @@
 import lombok.Data;
 
 @Data
-public class ImageVersionsMeta {
+public class ImageVersionsMeta implements Meta {
     private String url;
     private int width;
     private int height;

src/main/java/com/github/instagram4j/instagram4j/models/media/Meta.java

@@ -0,0 +1,7 @@
+package com.github.instagram4j.instagram4j.models.media;
+
+public interface Meta {
+    int getWidth();
+    int getHeight();
+    String getUrl();
+}

src/main/java/com/github/instagram4j/instagram4j/models/media/VideoVersionsMeta.java

@@ -3,7 +3,7 @@
 import lombok.Data;
 
 @Data
-public class VideoVersionsMeta {
+public class VideoVersionsMeta implements Meta {
     private int height;
     private int width;
     private String id;

src/main/java/com/github/instagram4j/instagram4j/models/media/reel/ReelImageMedia.java

@@ -1,12 +1,13 @@
 package com.github.instagram4j.instagram4j.models.media.reel;
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.github.instagram4j.instagram4j.models.media.ImageMedia;
 import com.github.instagram4j.instagram4j.models.media.ImageVersions;
 
 import lombok.Data;
 
 @Data
 @JsonTypeName("1")
-public class ReelImageMedia extends ReelMedia {
+public class ReelImageMedia extends ReelMedia implements ImageMedia {
     private ImageVersions image_versions2;
 }

src/main/java/com/github/instagram4j/instagram4j/models/media/timeline/CaraouselItem.java → src/main/java/com/github/instagram4j/instagram4j/models/media/timeline/CarouselItem.java

@@ -7,13 +7,13 @@
 import lombok.Data;
 
 @Data
-@JsonTypeInfo(defaultImpl = CaraouselItem.class, use = JsonTypeInfo.Id.NAME,
+@JsonTypeInfo(defaultImpl = CarouselItem.class, use = JsonTypeInfo.Id.NAME,
         include = JsonTypeInfo.As.PROPERTY, property = "media_type", visible = true)
 @JsonSubTypes({
-        @JsonSubTypes.Type(value = ImageCaraouselItem.class),
-        @JsonSubTypes.Type(value = VideoCaraouselItem.class)
+        @JsonSubTypes.Type(value = ImageCarouselItem.class),
+        @JsonSubTypes.Type(value = VideoCarouselItem.class)
 })
-public class CaraouselItem extends IGBaseModel {
+public class CarouselItem extends IGBaseModel {
     private int original_width;
     private int original_height;
     private String media_type;

src/main/java/com/github/instagram4j/instagram4j/models/media/timeline/ImageCaraouselItem.java → src/main/java/com/github/instagram4j/instagram4j/models/media/timeline/ImageCarouselItem.java

@@ -8,6 +8,6 @@
 // media_type 1
 @Data
 @JsonTypeName("1")
-public class ImageCaraouselItem extends CaraouselItem {
+public class ImageCarouselItem extends CarouselItem {
     private ImageVersions image_versions2;
 }

src/main/java/com/github/instagram4j/instagram4j/models/media/timeline/TimelineCarouselMedia.java

@@ -10,5 +10,5 @@
 @JsonTypeName("8")
 public class TimelineCarouselMedia extends TimelineMedia {
     private int carousel_media_count;
-    private List<CaraouselItem> carousel_media;
+    private List<CarouselItem> carousel_media;
 }

src/main/java/com/github/instagram4j/instagram4j/models/media/timeline/TimelineImageMedia.java

@@ -3,14 +3,15 @@
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.github.instagram4j.instagram4j.models.media.ImageMedia;
 import com.github.instagram4j.instagram4j.models.media.ImageVersions;
 import com.github.instagram4j.instagram4j.models.media.ImageVersionsMeta;
 
 import lombok.Data;
 
 @Data
 @JsonTypeName("1")
-public class TimelineImageMedia extends TimelineMedia {
+public class TimelineImageMedia extends TimelineMedia implements ImageMedia {
     private ImageVersions image_versions2;
     private List<ImageVersionsMeta> candidates;
     private long video_duration;

src/main/java/com/github/instagram4j/instagram4j/models/media/timeline/VideoCaraouselItem.java → src/main/java/com/github/instagram4j/instagram4j/models/media/timeline/VideoCarouselItem.java

@@ -10,7 +10,7 @@
 
 @Data
 @JsonTypeName("2")
-public class VideoCaraouselItem extends CaraouselItem {
+public class VideoCarouselItem extends CarouselItem {
     private ImageVersions image_versions2;
     private List<VideoVersionsMeta> video_versions;
 }