x-twitter-scraper 0.4.2 → 0.4.4

data/sig/x_twitter_scraper/models/draw_list_params.rbs

@@ -1,29 +1,29 @@
 module XTwitterScraper
   module Models
     type draw_list_params =
-      { after: String, limit: Integer }
+      { cursor: String, limit: Integer }
       & XTwitterScraper::Internal::Type::request_parameters
 
     class DrawListParams < XTwitterScraper::Internal::Type::BaseModel
       extend XTwitterScraper::Internal::Type::RequestParameters::Converter
       include XTwitterScraper::Internal::Type::RequestParameters
 
-      attr_reader after: String?
+      attr_reader cursor: String?
 
-      def after=: (String) -> String
+      def cursor=: (String) -> String
 
       attr_reader limit: Integer?
 
       def limit=: (Integer) -> Integer
 
       def initialize: (
-        ?after: String,
+        ?cursor: String,
         ?limit: Integer,
         ?request_options: XTwitterScraper::request_opts
       ) -> void
 
       def to_hash: -> {
-        after: String,
+        cursor: String,
         limit: Integer,
         request_options: XTwitterScraper::RequestOptions
       }

data/sig/x_twitter_scraper/models/embedded_tweet.rbs

@@ -0,0 +1,187 @@
+module XTwitterScraper
+  module Models
+    type embedded_tweet =
+      {
+        id: String,
+        bookmark_count: Integer,
+        like_count: Integer,
+        quote_count: Integer,
+        reply_count: Integer,
+        retweet_count: Integer,
+        text: String,
+        view_count: Integer,
+        author: XTwitterScraper::UserProfile,
+        content_disclosure: XTwitterScraper::ContentDisclosure,
+        conversation_id: String,
+        created_at: String,
+        display_text_range: ::Array[Integer],
+        entities: ::Hash[Symbol, top],
+        in_reply_to_id: String,
+        in_reply_to_user_id: String,
+        in_reply_to_username: String,
+        is_limited_reply: bool,
+        is_note_tweet: bool,
+        is_quote_status: bool,
+        is_reply: bool,
+        lang: String,
+        media: ::Array[XTwitterScraper::TweetMedia],
+        source: String,
+        type: String,
+        url: String
+      }
+
+    class EmbeddedTweet < XTwitterScraper::Internal::Type::BaseModel
+      attr_accessor id: String
+
+      attr_accessor bookmark_count: Integer
+
+      attr_accessor like_count: Integer
+
+      attr_accessor quote_count: Integer
+
+      attr_accessor reply_count: Integer
+
+      attr_accessor retweet_count: Integer
+
+      attr_accessor text: String
+
+      attr_accessor view_count: Integer
+
+      attr_reader author: XTwitterScraper::UserProfile?
+
+      def author=: (
+        XTwitterScraper::UserProfile
+      ) -> XTwitterScraper::UserProfile
+
+      attr_reader content_disclosure: XTwitterScraper::ContentDisclosure?
+
+      def content_disclosure=: (
+        XTwitterScraper::ContentDisclosure
+      ) -> XTwitterScraper::ContentDisclosure
+
+      attr_reader conversation_id: String?
+
+      def conversation_id=: (String) -> String
+
+      attr_reader created_at: String?
+
+      def created_at=: (String) -> String
+
+      attr_reader display_text_range: ::Array[Integer]?
+
+      def display_text_range=: (::Array[Integer]) -> ::Array[Integer]
+
+      attr_reader entities: ::Hash[Symbol, top]?
+
+      def entities=: (::Hash[Symbol, top]) -> ::Hash[Symbol, top]
+
+      attr_reader in_reply_to_id: String?
+
+      def in_reply_to_id=: (String) -> String
+
+      attr_reader in_reply_to_user_id: String?
+
+      def in_reply_to_user_id=: (String) -> String
+
+      attr_reader in_reply_to_username: String?
+
+      def in_reply_to_username=: (String) -> String
+
+      attr_reader is_limited_reply: bool?
+
+      def is_limited_reply=: (bool) -> bool
+
+      attr_reader is_note_tweet: bool?
+
+      def is_note_tweet=: (bool) -> bool
+
+      attr_reader is_quote_status: bool?
+
+      def is_quote_status=: (bool) -> bool
+
+      attr_reader is_reply: bool?
+
+      def is_reply=: (bool) -> bool
+
+      attr_reader lang: String?
+
+      def lang=: (String) -> String
+
+      attr_reader media: ::Array[XTwitterScraper::TweetMedia]?
+
+      def media=: (
+        ::Array[XTwitterScraper::TweetMedia]
+      ) -> ::Array[XTwitterScraper::TweetMedia]
+
+      attr_reader source: String?
+
+      def source=: (String) -> String
+
+      attr_reader type: String?
+
+      def type=: (String) -> String
+
+      attr_reader url: String?
+
+      def url=: (String) -> String
+
+      def initialize: (
+        id: String,
+        bookmark_count: Integer,
+        like_count: Integer,
+        quote_count: Integer,
+        reply_count: Integer,
+        retweet_count: Integer,
+        text: String,
+        view_count: Integer,
+        ?author: XTwitterScraper::UserProfile,
+        ?content_disclosure: XTwitterScraper::ContentDisclosure,
+        ?conversation_id: String,
+        ?created_at: String,
+        ?display_text_range: ::Array[Integer],
+        ?entities: ::Hash[Symbol, top],
+        ?in_reply_to_id: String,
+        ?in_reply_to_user_id: String,
+        ?in_reply_to_username: String,
+        ?is_limited_reply: bool,
+        ?is_note_tweet: bool,
+        ?is_quote_status: bool,
+        ?is_reply: bool,
+        ?lang: String,
+        ?media: ::Array[XTwitterScraper::TweetMedia],
+        ?source: String,
+        ?type: String,
+        ?url: String
+      ) -> void
+
+      def to_hash: -> {
+        id: String,
+        bookmark_count: Integer,
+        like_count: Integer,
+        quote_count: Integer,
+        reply_count: Integer,
+        retweet_count: Integer,
+        text: String,
+        view_count: Integer,
+        author: XTwitterScraper::UserProfile,
+        content_disclosure: XTwitterScraper::ContentDisclosure,
+        conversation_id: String,
+        created_at: String,
+        display_text_range: ::Array[Integer],
+        entities: ::Hash[Symbol, top],
+        in_reply_to_id: String,
+        in_reply_to_user_id: String,
+        in_reply_to_username: String,
+        is_limited_reply: bool,
+        is_note_tweet: bool,
+        is_quote_status: bool,
+        is_reply: bool,
+        lang: String,
+        media: ::Array[XTwitterScraper::TweetMedia],
+        source: String,
+        type: String,
+        url: String
+      }
+    end
+  end
+end

data/sig/x_twitter_scraper/models/error.rbs

@@ -10,62 +10,349 @@ module XTwitterScraper
       def to_hash: -> { error: XTwitterScraper::Models::Error::error }
 
       type error =
-        :internal_error
-        | :invalid_format
-        | :invalid_id
-        | :invalid_input
-        | :invalid_params
-        | :invalid_tool_type
-        | :invalid_tweet_id
-        | :invalid_tweet_url
-        | :invalid_username
-        | :missing_params
-        | :missing_query
-        | :monitor_already_exists
-        | :monitor_limit_reached
-        | :no_subscription
-        | :not_found
-        | :stream_registration_failed
-        | :subscription_inactive
-        | :tweet_not_found
-        | :unauthenticated
-        | :usage_limit_reached
-        | :user_not_found
-        | :webhook_inactive
-        | :x_api_rate_limited
-        | :x_api_unavailable
-        | :x_api_unauthorized
+        XTwitterScraper::Models::Error::Error::legacy_error_code
+        | XTwitterScraper::Error::Error::StructuredError
 
       module Error
-        extend XTwitterScraper::Internal::Type::Enum
-
-        INTERNAL_ERROR: :internal_error
-        INVALID_FORMAT: :invalid_format
-        INVALID_ID: :invalid_id
-        INVALID_INPUT: :invalid_input
-        INVALID_PARAMS: :invalid_params
-        INVALID_TOOL_TYPE: :invalid_tool_type
-        INVALID_TWEET_ID: :invalid_tweet_id
-        INVALID_TWEET_URL: :invalid_tweet_url
-        INVALID_USERNAME: :invalid_username
-        MISSING_PARAMS: :missing_params
-        MISSING_QUERY: :missing_query
-        MONITOR_ALREADY_EXISTS: :monitor_already_exists
-        MONITOR_LIMIT_REACHED: :monitor_limit_reached
-        NO_SUBSCRIPTION: :no_subscription
-        NOT_FOUND: :not_found
-        STREAM_REGISTRATION_FAILED: :stream_registration_failed
-        SUBSCRIPTION_INACTIVE: :subscription_inactive
-        TWEET_NOT_FOUND: :tweet_not_found
-        UNAUTHENTICATED: :unauthenticated
-        USAGE_LIMIT_REACHED: :usage_limit_reached
-        USER_NOT_FOUND: :user_not_found
-        WEBHOOK_INACTIVE: :webhook_inactive
-        X_API_RATE_LIMITED: :x_api_rate_limited
-        X_API_UNAVAILABLE: :x_api_unavailable
-        X_API_UNAUTHORIZED: :x_api_unauthorized
-
-        def self?.values: -> ::Array[XTwitterScraper::Models::Error::error]
+        extend XTwitterScraper::Internal::Type::Union
+
+        type legacy_error_code =
+          :internal_error
+          | :account_already_connected
+          | :account_needs_reauth
+          | :account_not_found
+          | :account_required
+          | :account_restricted
+          | :api_key_limit_reached
+          | :article_not_found
+          | :dm_not_permitted
+          | :invalid_format
+          | :invalid_id
+          | :invalid_input
+          | :invalid_params
+          | :invalid_tool_type
+          | :invalid_tweet_id
+          | :invalid_tweet_url
+          | :invalid_user_id
+          | :invalid_user_ids
+          | :invalid_username
+          | :invalid_json
+          | :insufficient_credits
+          | :login_cooldown
+          | :login_failed
+          | :media_download_failed
+          | :missing_params
+          | :missing_query
+          | :monitor_already_exists
+          | :no_media
+          | :no_credits
+          | :no_subscription
+          | :not_found
+          | :payment_failed
+          | :rate_limit_exceeded
+          | :service_unavailable
+          | :style_not_found
+          | :subscription_inactive
+          | :tweet_not_found
+          | :unauthenticated
+          | :unsupported_field
+          | :user_not_found
+          | :x_account_feature_required
+          | :x_account_protected
+          | :x_account_suspended
+          | :x_api_rate_limited
+          | :x_api_unavailable
+          | :x_api_unauthorized
+          | :x_auth_failure
+          | :x_content_too_long
+          | :x_daily_limit
+          | :x_dm_not_allowed
+          | :x_duplicate_action
+          | :x_login_auth_failed
+          | :x_login_challenge
+          | :x_login_denied
+          | :x_login_failed
+          | :x_login_proxy_error
+          | :x_login_rate_limited
+          | :x_login_service_unavailable
+          | :x_login_suspended
+          | :x_rate_limited
+          | :x_rejected
+          | :x_target_not_found
+          | :x_transient_error
+          | :x_user_lookup_failed
+          | :x_write_ambiguous
+          | :x_write_failed
+          | :x_write_unconfirmed
+
+        module LegacyErrorCode
+          extend XTwitterScraper::Internal::Type::Enum
+
+          INTERNAL_ERROR: :internal_error
+          ACCOUNT_ALREADY_CONNECTED: :account_already_connected
+          ACCOUNT_NEEDS_REAUTH: :account_needs_reauth
+          ACCOUNT_NOT_FOUND: :account_not_found
+          ACCOUNT_REQUIRED: :account_required
+          ACCOUNT_RESTRICTED: :account_restricted
+          API_KEY_LIMIT_REACHED: :api_key_limit_reached
+          ARTICLE_NOT_FOUND: :article_not_found
+          DM_NOT_PERMITTED: :dm_not_permitted
+          INVALID_FORMAT: :invalid_format
+          INVALID_ID: :invalid_id
+          INVALID_INPUT: :invalid_input
+          INVALID_PARAMS: :invalid_params
+          INVALID_TOOL_TYPE: :invalid_tool_type
+          INVALID_TWEET_ID: :invalid_tweet_id
+          INVALID_TWEET_URL: :invalid_tweet_url
+          INVALID_USER_ID: :invalid_user_id
+          INVALID_USER_IDS: :invalid_user_ids
+          INVALID_USERNAME: :invalid_username
+          INVALID_JSON: :invalid_json
+          INSUFFICIENT_CREDITS: :insufficient_credits
+          LOGIN_COOLDOWN: :login_cooldown
+          LOGIN_FAILED: :login_failed
+          MEDIA_DOWNLOAD_FAILED: :media_download_failed
+          MISSING_PARAMS: :missing_params
+          MISSING_QUERY: :missing_query
+          MONITOR_ALREADY_EXISTS: :monitor_already_exists
+          NO_MEDIA: :no_media
+          NO_CREDITS: :no_credits
+          NO_SUBSCRIPTION: :no_subscription
+          NOT_FOUND: :not_found
+          PAYMENT_FAILED: :payment_failed
+          RATE_LIMIT_EXCEEDED: :rate_limit_exceeded
+          SERVICE_UNAVAILABLE: :service_unavailable
+          STYLE_NOT_FOUND: :style_not_found
+          SUBSCRIPTION_INACTIVE: :subscription_inactive
+          TWEET_NOT_FOUND: :tweet_not_found
+          UNAUTHENTICATED: :unauthenticated
+          UNSUPPORTED_FIELD: :unsupported_field
+          USER_NOT_FOUND: :user_not_found
+          X_ACCOUNT_FEATURE_REQUIRED: :x_account_feature_required
+          X_ACCOUNT_PROTECTED: :x_account_protected
+          X_ACCOUNT_SUSPENDED: :x_account_suspended
+          X_API_RATE_LIMITED: :x_api_rate_limited
+          X_API_UNAVAILABLE: :x_api_unavailable
+          X_API_UNAUTHORIZED: :x_api_unauthorized
+          X_AUTH_FAILURE: :x_auth_failure
+          X_CONTENT_TOO_LONG: :x_content_too_long
+          X_DAILY_LIMIT: :x_daily_limit
+          X_DM_NOT_ALLOWED: :x_dm_not_allowed
+          X_DUPLICATE_ACTION: :x_duplicate_action
+          X_LOGIN_AUTH_FAILED: :x_login_auth_failed
+          X_LOGIN_CHALLENGE: :x_login_challenge
+          X_LOGIN_DENIED: :x_login_denied
+          X_LOGIN_FAILED: :x_login_failed
+          X_LOGIN_PROXY_ERROR: :x_login_proxy_error
+          X_LOGIN_RATE_LIMITED: :x_login_rate_limited
+          X_LOGIN_SERVICE_UNAVAILABLE: :x_login_service_unavailable
+          X_LOGIN_SUSPENDED: :x_login_suspended
+          X_RATE_LIMITED: :x_rate_limited
+          X_REJECTED: :x_rejected
+          X_TARGET_NOT_FOUND: :x_target_not_found
+          X_TRANSIENT_ERROR: :x_transient_error
+          X_USER_LOOKUP_FAILED: :x_user_lookup_failed
+          X_WRITE_AMBIGUOUS: :x_write_ambiguous
+          X_WRITE_FAILED: :x_write_failed
+          X_WRITE_UNCONFIRMED: :x_write_unconfirmed
+
+          def self?.values: -> ::Array[XTwitterScraper::Models::Error::Error::legacy_error_code]
+        end
+
+        type structured_error =
+          {
+            code: XTwitterScraper::Models::Error::Error::StructuredError::code,
+            message: String,
+            type: XTwitterScraper::Models::Error::Error::StructuredError::type_
+          }
+
+        class StructuredError < XTwitterScraper::Internal::Type::BaseModel
+          attr_accessor code: XTwitterScraper::Models::Error::Error::StructuredError::code
+
+          attr_accessor message: String
+
+          attr_accessor type: XTwitterScraper::Models::Error::Error::StructuredError::type_
+
+          def initialize: (
+            code: XTwitterScraper::Models::Error::Error::StructuredError::code,
+            message: String,
+            type: XTwitterScraper::Models::Error::Error::StructuredError::type_
+          ) -> void
+
+          def to_hash: -> {
+            code: XTwitterScraper::Models::Error::Error::StructuredError::code,
+            message: String,
+            type: XTwitterScraper::Models::Error::Error::StructuredError::type_
+          }
+
+          type code =
+            :internal_error
+            | :account_already_connected
+            | :account_needs_reauth
+            | :account_not_found
+            | :account_required
+            | :account_restricted
+            | :api_key_limit_reached
+            | :article_not_found
+            | :dm_not_permitted
+            | :invalid_format
+            | :invalid_id
+            | :invalid_input
+            | :invalid_params
+            | :invalid_tool_type
+            | :invalid_tweet_id
+            | :invalid_tweet_url
+            | :invalid_user_id
+            | :invalid_user_ids
+            | :invalid_username
+            | :invalid_json
+            | :insufficient_credits
+            | :login_cooldown
+            | :login_failed
+            | :media_download_failed
+            | :missing_params
+            | :missing_query
+            | :monitor_already_exists
+            | :no_media
+            | :no_credits
+            | :no_subscription
+            | :not_found
+            | :payment_failed
+            | :rate_limit_exceeded
+            | :service_unavailable
+            | :style_not_found
+            | :subscription_inactive
+            | :tweet_not_found
+            | :unauthenticated
+            | :unsupported_field
+            | :user_not_found
+            | :x_account_feature_required
+            | :x_account_protected
+            | :x_account_suspended
+            | :x_api_rate_limited
+            | :x_api_unavailable
+            | :x_api_unauthorized
+            | :x_auth_failure
+            | :x_content_too_long
+            | :x_daily_limit
+            | :x_dm_not_allowed
+            | :x_duplicate_action
+            | :x_login_auth_failed
+            | :x_login_challenge
+            | :x_login_denied
+            | :x_login_failed
+            | :x_login_proxy_error
+            | :x_login_rate_limited
+            | :x_login_service_unavailable
+            | :x_login_suspended
+            | :x_rate_limited
+            | :x_rejected
+            | :x_target_not_found
+            | :x_transient_error
+            | :x_user_lookup_failed
+            | :x_write_ambiguous
+            | :x_write_failed
+            | :x_write_unconfirmed
+
+          module Code
+            extend XTwitterScraper::Internal::Type::Enum
+
+            INTERNAL_ERROR: :internal_error
+            ACCOUNT_ALREADY_CONNECTED: :account_already_connected
+            ACCOUNT_NEEDS_REAUTH: :account_needs_reauth
+            ACCOUNT_NOT_FOUND: :account_not_found
+            ACCOUNT_REQUIRED: :account_required
+            ACCOUNT_RESTRICTED: :account_restricted
+            API_KEY_LIMIT_REACHED: :api_key_limit_reached
+            ARTICLE_NOT_FOUND: :article_not_found
+            DM_NOT_PERMITTED: :dm_not_permitted
+            INVALID_FORMAT: :invalid_format
+            INVALID_ID: :invalid_id
+            INVALID_INPUT: :invalid_input
+            INVALID_PARAMS: :invalid_params
+            INVALID_TOOL_TYPE: :invalid_tool_type
+            INVALID_TWEET_ID: :invalid_tweet_id
+            INVALID_TWEET_URL: :invalid_tweet_url
+            INVALID_USER_ID: :invalid_user_id
+            INVALID_USER_IDS: :invalid_user_ids
+            INVALID_USERNAME: :invalid_username
+            INVALID_JSON: :invalid_json
+            INSUFFICIENT_CREDITS: :insufficient_credits
+            LOGIN_COOLDOWN: :login_cooldown
+            LOGIN_FAILED: :login_failed
+            MEDIA_DOWNLOAD_FAILED: :media_download_failed
+            MISSING_PARAMS: :missing_params
+            MISSING_QUERY: :missing_query
+            MONITOR_ALREADY_EXISTS: :monitor_already_exists
+            NO_MEDIA: :no_media
+            NO_CREDITS: :no_credits
+            NO_SUBSCRIPTION: :no_subscription
+            NOT_FOUND: :not_found
+            PAYMENT_FAILED: :payment_failed
+            RATE_LIMIT_EXCEEDED: :rate_limit_exceeded
+            SERVICE_UNAVAILABLE: :service_unavailable
+            STYLE_NOT_FOUND: :style_not_found
+            SUBSCRIPTION_INACTIVE: :subscription_inactive
+            TWEET_NOT_FOUND: :tweet_not_found
+            UNAUTHENTICATED: :unauthenticated
+            UNSUPPORTED_FIELD: :unsupported_field
+            USER_NOT_FOUND: :user_not_found
+            X_ACCOUNT_FEATURE_REQUIRED: :x_account_feature_required
+            X_ACCOUNT_PROTECTED: :x_account_protected
+            X_ACCOUNT_SUSPENDED: :x_account_suspended
+            X_API_RATE_LIMITED: :x_api_rate_limited
+            X_API_UNAVAILABLE: :x_api_unavailable
+            X_API_UNAUTHORIZED: :x_api_unauthorized
+            X_AUTH_FAILURE: :x_auth_failure
+            X_CONTENT_TOO_LONG: :x_content_too_long
+            X_DAILY_LIMIT: :x_daily_limit
+            X_DM_NOT_ALLOWED: :x_dm_not_allowed
+            X_DUPLICATE_ACTION: :x_duplicate_action
+            X_LOGIN_AUTH_FAILED: :x_login_auth_failed
+            X_LOGIN_CHALLENGE: :x_login_challenge
+            X_LOGIN_DENIED: :x_login_denied
+            X_LOGIN_FAILED: :x_login_failed
+            X_LOGIN_PROXY_ERROR: :x_login_proxy_error
+            X_LOGIN_RATE_LIMITED: :x_login_rate_limited
+            X_LOGIN_SERVICE_UNAVAILABLE: :x_login_service_unavailable
+            X_LOGIN_SUSPENDED: :x_login_suspended
+            X_RATE_LIMITED: :x_rate_limited
+            X_REJECTED: :x_rejected
+            X_TARGET_NOT_FOUND: :x_target_not_found
+            X_TRANSIENT_ERROR: :x_transient_error
+            X_USER_LOOKUP_FAILED: :x_user_lookup_failed
+            X_WRITE_AMBIGUOUS: :x_write_ambiguous
+            X_WRITE_FAILED: :x_write_failed
+            X_WRITE_UNCONFIRMED: :x_write_unconfirmed
+
+            def self?.values: -> ::Array[XTwitterScraper::Models::Error::Error::StructuredError::code]
+          end
+
+          type type_ =
+            :api_error
+            | :authentication_error
+            | :billing_error
+            | :dependency_error
+            | :invalid_request_error
+            | :permission_error
+            | :rate_limit_error
+
+          module Type
+            extend XTwitterScraper::Internal::Type::Enum
+
+            API_ERROR: :api_error
+            AUTHENTICATION_ERROR: :authentication_error
+            BILLING_ERROR: :billing_error
+            DEPENDENCY_ERROR: :dependency_error
+            INVALID_REQUEST_ERROR: :invalid_request_error
+            PERMISSION_ERROR: :permission_error
+            RATE_LIMIT_ERROR: :rate_limit_error
+
+            def self?.values: -> ::Array[XTwitterScraper::Models::Error::Error::StructuredError::type_]
+          end
+        end
+
+        def self?.variants: -> ::Array[XTwitterScraper::Models::Error::error]
       end
     end
   end

data/sig/x_twitter_scraper/models/event.rbs

@@ -5,8 +5,11 @@ module XTwitterScraper
         id: String,
         data: ::Hash[Symbol, top],
         monitor_id: String,
+        monitor_type: XTwitterScraper::Models::Event::monitor_type,
         occurred_at: Time,
         type: XTwitterScraper::Models::event_type,
+        keyword_monitor_id: String,
+        query: String,
         username: String
       }
 
@@ -17,29 +20,58 @@ module XTwitterScraper
 
       attr_accessor monitor_id: String
 
+      attr_accessor monitor_type: XTwitterScraper::Models::Event::monitor_type
+
       attr_accessor occurred_at: Time
 
       attr_accessor type: XTwitterScraper::Models::event_type
 
-      attr_accessor username: String
+      attr_reader keyword_monitor_id: String?
+
+      def keyword_monitor_id=: (String) -> String
+
+      attr_reader query: String?
+
+      def query=: (String) -> String
+
+      attr_reader username: String?
+
+      def username=: (String) -> String
 
       def initialize: (
         id: String,
         data: ::Hash[Symbol, top],
         monitor_id: String,
+        monitor_type: XTwitterScraper::Models::Event::monitor_type,
         occurred_at: Time,
         type: XTwitterScraper::Models::event_type,
-        username: String
+        ?keyword_monitor_id: String,
+        ?query: String,
+        ?username: String
       ) -> void
 
       def to_hash: -> {
         id: String,
         data: ::Hash[Symbol, top],
         monitor_id: String,
+        monitor_type: XTwitterScraper::Models::Event::monitor_type,
         occurred_at: Time,
         type: XTwitterScraper::Models::event_type,
+        keyword_monitor_id: String,
+        query: String,
         username: String
       }
+
+      type monitor_type = :account | :keyword
+
+      module MonitorType
+        extend XTwitterScraper::Internal::Type::Enum
+
+        ACCOUNT: :account
+        KEYWORD: :keyword
+
+        def self?.values: -> ::Array[XTwitterScraper::Models::Event::monitor_type]
+      end
     end
   end
 end