julianfssen
diff --git a/‎lib/tweetkit/response/tweet.rb‎
Lines changed: 24 additions & 1 deletion b/‎lib/tweetkit/response/tweet.rb‎
Lines changed: 24 additions & 1 deletion
diff --git a/‎lib/tweetkit/response/tweets.rb‎
Lines changed: 12 additions & 18 deletions b/‎lib/tweetkit/response/tweets.rb‎
Lines changed: 12 additions & 18 deletions
@@ -52,6 +52,10 @@ def author_id
         data["author_id"]
       end
 
+      def author
+        expansions&.users.find { |user| user.id == author_id }
+      end
+
       # Returns the origin / root Tweet ID of the conversation (which includes direct replies, replies of replies)
       # 
       # @note The field +tweet.fields=conversation_id+ must be specified when fetching the tweet to access this data
@@ -61,6 +65,10 @@ def conversation_id
         data["conversation_id"]
       end
 
+      def conversation
+        expansions&.tweets.find { |tweet| tweet.conversation_id == conversation_id }
+      end
+
       # If this Tweet is a reply, returns the user ID of the parent tweet's author
       # 
       # @note The expansion +expansions=in_reply_to_user_id+ must be specified when fetching the tweet to access this data
@@ -70,6 +78,10 @@ def in_reply_to_user_id
         data["in_reply_to_user_id"]
       end
 
+      def reply_to
+        expansions&.users.find { |user| user.id == in_reply_to_user_id }
+      end
+
       # A list of Tweets this Tweet refers to. For example, if the parent Tweet is a Retweet, a Retweet with comment (also known as Quoted Tweet) or a Reply, it will include the related Tweet referenced to by its parent
       #
       # @note The field +tweet.fields=referenced_tweets+ must be specified when fetching the tweet to access this data
@@ -87,6 +99,8 @@ def referenced_tweets
       #
       # @return [Attachments]
       def attachments
+        return if data.dig("attachments", "media_keys").nil?
+
         @attachments ||= Attachments.new(data["attachments"]["media_keys"])
       end
 
@@ -96,6 +110,8 @@ def attachments
       #
       # @return [Polls]
       def polls
+        return if data.dig("attachments", "poll_ids").nil?
+
         @polls ||= Polls.new(data["attachments"]["poll_ids"])
       end
 
@@ -105,6 +121,8 @@ def polls
       #
       # @return [Geo]
       def geo
+        return if data["geo"].nil?
+
         @geo ||= Geo.new(data["geo"])
       end
 
@@ -116,6 +134,8 @@ def geo
       #
       # @return [ContextAnnotations]
       def context_annotations
+        return if data["context_annotations"].nil?
+
         @context_annotations ||= ContextAnnotations.new(data["context_annotations"])
       end
 
@@ -128,6 +148,8 @@ def context_annotations
       #
       # @return [EntityAnnotations]
       def entity_annotations
+        return if data["entities"].nil?
+
         @entity_annotations ||= EntityAnnotations.new(data["entities"])
       end
 
@@ -153,6 +175,8 @@ def withheld
       #
       # @return [Tweetkit::Response::Tweet::Metrics]
       def metrics
+        return if data["public_metrics"].nil? && data["non_public_metrics"].nil? && data["organic_metrics"].nil? && data["promoted_metrics"].nil?
+
         @metrics ||= Metrics.new(
           public_metrics: data["public_metrics"], 
           private_metrics: data["non_public_metrics"], 
@@ -250,7 +274,6 @@ def url
       alias_method :device, :source
       alias_method :date, :created_at
       alias_method :parent_tweet_id, :conversation_id
-      alias_method :reply_to, :in_reply_to_user_id
       alias_method :nsfw?, :possibly_sensitive
       alias_method :sensitive?, :possibly_sensitive
       alias_method :non_public_metrics, :private_metrics
 
@@ -19,8 +19,7 @@ class Tweets
 
       def initialize(response, **options)
         @response = response
-        @tweets = extract_tweets(response["data"])
-        assign_expansions(@tweets, expansions: response["includes"]) unless response["includes"].nil?
+        @tweets = extract_tweets(response["data"], expansions: response["includes"])
       end
 
       def each(*args, &block)
@@ -31,6 +30,14 @@ def last
         @tweets.last
       end
 
+      def [](key)
+        if key.kind_of?(Integer)
+          @tweets[key]
+        else
+          @tweets.send(:[], key)
+        end
+      end
+
       # Returns the Tweets fetched from the given IDs
       #
       # @return [Tweetkit::Response::Tweets] Collection of Tweets fetched
@@ -47,28 +54,15 @@ def meta
         @meta ||= Meta.new(response["meta"])
       end
 
-      # Returns the expansions data based off the expansions passed in the initial query
-      #
-      # @return [Tweetkit::Response::Tweets::Expansions] Expansions data
-      def expansions
-        return if response["includes"].nil?
-
-        @expansions ||= Expansions.new(response["includes"])
-      end
-
       private
 
-      def extract_tweets(data)
+      def extract_tweets(data, expansions:)
         if data.kind_of? Array
-          data.collect { |data| Tweet.new(data) }
+          data.collect { |data| Tweet.new(data, expansions:) }
         else
-          [Tweet.new(data)]
+          [Tweet.new(data, expansions:)]
         end
       end
-
-      def assign_expansions(tweets, expansions:)
-        # TODO: Think of how to assign expansions when Tweet is in multiform
-      end
     end
   end
 end