rettiwt-api 6.1.0 → 6.1.2

package/dist/types/raw/user/Notifications.d.ts

@@ -4,76 +4,33 @@
  * @public
  */
 export interface IUserNotificationsResponse {
-    globalObjects: GlobalObjects;
-    timeline: Timeline;
-}
-interface GlobalObjects {
-    notifications: Notifications;
+    data: Data;
 }
-interface Notifications {
-    [key: string]: Notification;
-}
-interface Notification {
-    id: string;
-    timestampMs: string;
-    icon: Icon;
-    message: Message;
-    template: Template;
+interface Data {
+    viewer_v2: ViewerV2;
 }
-interface Icon {
-    id: string;
+interface ViewerV2 {
+    user_results: UserResults;
 }
-interface Message {
-    text: string;
-    entities: Entity[];
-    rtl: boolean;
-}
-interface Entity {
-    fromIndex: number;
-    toIndex: number;
-    format: string;
-}
-interface Template {
-    aggregateUserActionsV1: AggregateUserActionsV1;
+interface UserResults {
+    result: Result;
 }
-interface AggregateUserActionsV1 {
-    targetObjects: TargetObject[];
-    fromUsers: FromUser[];
-    additionalContext: AdditionalContext;
+interface Result {
+    __typename: string;
+    rest_id: string;
+    notification_timeline: NotificationTimeline;
 }
-interface TargetObject {
-    tweet: Tweet;
-}
-interface Tweet {
+interface NotificationTimeline {
     id: string;
-}
-interface FromUser {
-    user: User;
-}
-interface User {
-    id: string;
-}
-interface AdditionalContext {
-    contextText: ContextText;
-}
-interface ContextText {
-    text: string;
-    entities: any[];
+    timeline: Timeline;
 }
 interface Timeline {
-    id: string;
     instructions: Instruction[];
 }
 interface Instruction {
-    clearCache?: ClearCache;
-    addEntries?: AddEntries;
-    clearEntriesUnreadState?: ClearEntriesUnreadState;
-    markEntriesUnreadGreaterThanSortIndex?: MarkEntriesUnreadGreaterThanSortIndex;
-}
-interface ClearCache {
-}
-interface AddEntries {
-    entries: Entry[];
+    type: string;
+    entries?: Entry[];
+    sort_index?: string;
 }
 interface Entry {
     entryId: string;
@@ -81,38 +38,380 @@ interface Entry {
     content: Content;
 }
 interface Content {
-    operation?: Operation;
-    item?: Item;
+    entryType: string;
+    __typename: string;
+    value?: string;
+    cursorType?: string;
+    itemContent?: ItemContent;
+    clientEventInfo?: ClientEventInfo;
+}
+interface ItemContent {
+    itemType: string;
+    __typename: string;
+    id: string;
+    notification_icon: string;
+    rich_message: RichMessage;
+    notification_url: NotificationUrl;
+    template: Template;
+    timestamp_ms: string;
 }
-interface Operation {
-    cursor: Cursor;
+interface RichMessage {
+    rtl: boolean;
+    text: string;
+    entities: Entity[];
 }
-interface Cursor {
-    value: string;
-    cursorType: string;
+interface Entity {
+    fromIndex: number;
+    toIndex: number;
+    ref: Ref;
 }
-interface Item {
-    content: Content2;
-    clientEventInfo: ClientEventInfo;
-    feedbackInfo?: FeedbackInfo;
+interface Ref {
+    type: string;
+    user_results: UserResults2;
 }
-interface Content2 {
-    notification: Notification2;
+interface UserResults2 {
+    result: Result2;
 }
-interface Notification2 {
+interface Result2 {
+    __typename: string;
     id: string;
-    url: Url;
-    fromUsers: string[];
-    targetTweets: string[];
-}
-interface Url {
-    urlType: string;
+    rest_id: string;
+    affiliates_highlighted_label: AffiliatesHighlightedLabel;
+    avatar: Avatar;
+    core: Core;
+    dm_permissions: DmPermissions;
+    follow_request_sent: boolean;
+    has_graduated_access: boolean;
+    is_blue_verified: boolean;
+    legacy: Legacy;
+    location: Location;
+    media_permissions: MediaPermissions;
+    parody_commentary_fan_label: string;
+    profile_image_shape: string;
+    profile_bio: ProfileBio;
+    privacy: Privacy;
+    relationship_perspectives: RelationshipPerspectives;
+    tipjar_settings: TipjarSettings;
+    verification: Verification;
+    verified_phone_status: boolean;
+}
+interface AffiliatesHighlightedLabel {
+}
+interface Avatar {
+    image_url: string;
+}
+interface Core {
+    created_at: string;
+    name: string;
+    screen_name: string;
+}
+interface DmPermissions {
+    can_dm: boolean;
+}
+interface Legacy {
+    default_profile: boolean;
+    default_profile_image: boolean;
+    description: string;
+    entities: Entities;
+    fast_followers_count: number;
+    favourites_count: number;
+    followers_count: number;
+    friends_count: number;
+    has_custom_timelines: boolean;
+    is_translator: boolean;
+    listed_count: number;
+    media_count: number;
+    normal_followers_count: number;
+    notifications: boolean;
+    pinned_tweet_ids_str: any[];
+    possibly_sensitive: boolean;
+    profile_interstitial_type: string;
+    statuses_count: number;
+    translator_type: string;
+    want_retweets: boolean;
+    withheld_in_countries: any[];
+}
+interface Entities {
+    description: Description;
+}
+interface Description {
+    urls: any[];
+}
+interface Location {
+    location: string;
+}
+interface MediaPermissions {
+    can_media_tag: boolean;
+}
+interface ProfileBio {
+    description: string;
+}
+interface Privacy {
+    protected: boolean;
+}
+interface RelationshipPerspectives {
+    followed_by: boolean;
+    following: boolean;
+}
+interface TipjarSettings {
+}
+interface Verification {
+    verified: boolean;
+}
+interface NotificationUrl {
     url: string;
+    urlType: string;
     urtEndpointOptions?: UrtEndpointOptions;
 }
 interface UrtEndpointOptions {
-    title: string;
     cacheId: string;
+    title: string;
+}
+interface Template {
+    __typename: string;
+    target_objects: TargetObject[];
+    from_users: FromUser[];
+}
+interface TargetObject {
+    __typename: string;
+    tweet_results: TweetResults;
+}
+interface TweetResults {
+    result: Result3;
+}
+interface Result3 {
+    __typename: string;
+    rest_id: string;
+    core: Core2;
+    unmention_data: UnmentionData;
+    edit_control: EditControl;
+    is_translatable: boolean;
+    views: Views;
+    source: string;
+    grok_analysis_button: boolean;
+    legacy: Legacy3;
+}
+interface Core2 {
+    user_results: UserResults3;
+}
+interface UserResults3 {
+    result: Result4;
+}
+interface Result4 {
+    __typename: string;
+    id: string;
+    rest_id: string;
+    affiliates_highlighted_label: AffiliatesHighlightedLabel2;
+    avatar: Avatar2;
+    core: Core3;
+    dm_permissions: DmPermissions2;
+    follow_request_sent: boolean;
+    has_graduated_access: boolean;
+    is_blue_verified: boolean;
+    legacy: Legacy2;
+    location: Location2;
+    media_permissions: MediaPermissions2;
+    parody_commentary_fan_label: string;
+    profile_image_shape: string;
+    profile_bio: ProfileBio2;
+    privacy: Privacy2;
+    relationship_perspectives: RelationshipPerspectives2;
+    tipjar_settings: TipjarSettings2;
+    verification: Verification2;
+    verified_phone_status: boolean;
+}
+interface AffiliatesHighlightedLabel2 {
+}
+interface Avatar2 {
+    image_url: string;
+}
+interface Core3 {
+    created_at: string;
+    name: string;
+    screen_name: string;
+}
+interface DmPermissions2 {
+    can_dm: boolean;
+}
+interface Legacy2 {
+    default_profile: boolean;
+    default_profile_image: boolean;
+    description: string;
+    entities: Entities2;
+    fast_followers_count: number;
+    favourites_count: number;
+    followers_count: number;
+    friends_count: number;
+    has_custom_timelines: boolean;
+    is_translator: boolean;
+    listed_count: number;
+    media_count: number;
+    needs_phone_verification: boolean;
+    normal_followers_count: number;
+    pinned_tweet_ids_str: any[];
+    possibly_sensitive: boolean;
+    profile_interstitial_type: string;
+    statuses_count: number;
+    translator_type: string;
+    want_retweets: boolean;
+    withheld_in_countries: any[];
+}
+interface Entities2 {
+    description: Description2;
+}
+interface Description2 {
+    urls: any[];
+}
+interface Location2 {
+    location: string;
+}
+interface MediaPermissions2 {
+    can_media_tag: boolean;
+}
+interface ProfileBio2 {
+    description: string;
+}
+interface Privacy2 {
+    protected: boolean;
+}
+interface RelationshipPerspectives2 {
+    following: boolean;
+}
+interface TipjarSettings2 {
+}
+interface Verification2 {
+    verified: boolean;
+}
+interface UnmentionData {
+}
+interface EditControl {
+    edit_tweet_ids: string[];
+    editable_until_msecs: string;
+    is_edit_eligible: boolean;
+    edits_remaining: string;
+}
+interface Views {
+    count: string;
+    state: string;
+}
+interface Legacy3 {
+    bookmark_count: number;
+    bookmarked: boolean;
+    created_at: string;
+    conversation_id_str: string;
+    display_text_range: number[];
+    entities: Entities3;
+    favorite_count: number;
+    favorited: boolean;
+    full_text: string;
+    is_quote_status: boolean;
+    lang: string;
+    quote_count: number;
+    reply_count: number;
+    retweet_count: number;
+    retweeted: boolean;
+    user_id_str: string;
+    id_str: string;
+}
+interface Entities3 {
+    hashtags: any[];
+    symbols: any[];
+    timestamps: any[];
+    urls: any[];
+    user_mentions: any[];
+}
+interface FromUser {
+    __typename: string;
+    user_results: UserResults4;
+}
+interface UserResults4 {
+    result: Result5;
+}
+interface Result5 {
+    __typename: string;
+    id: string;
+    rest_id: string;
+    affiliates_highlighted_label: AffiliatesHighlightedLabel3;
+    avatar: Avatar3;
+    core: Core4;
+    dm_permissions: DmPermissions3;
+    follow_request_sent: boolean;
+    has_graduated_access: boolean;
+    is_blue_verified: boolean;
+    legacy: Legacy4;
+    location: Location3;
+    media_permissions: MediaPermissions3;
+    parody_commentary_fan_label: string;
+    profile_image_shape: string;
+    profile_bio: ProfileBio3;
+    privacy: Privacy3;
+    relationship_perspectives: RelationshipPerspectives3;
+    tipjar_settings: TipjarSettings3;
+    verification: Verification3;
+    verified_phone_status: boolean;
+}
+interface AffiliatesHighlightedLabel3 {
+}
+interface Avatar3 {
+    image_url: string;
+}
+interface Core4 {
+    created_at: string;
+    name: string;
+    screen_name: string;
+}
+interface DmPermissions3 {
+    can_dm: boolean;
+}
+interface Legacy4 {
+    default_profile: boolean;
+    default_profile_image: boolean;
+    description: string;
+    entities: Entities4;
+    fast_followers_count: number;
+    favourites_count: number;
+    followers_count: number;
+    friends_count: number;
+    has_custom_timelines: boolean;
+    is_translator: boolean;
+    listed_count: number;
+    media_count: number;
+    normal_followers_count: number;
+    notifications: boolean;
+    pinned_tweet_ids_str: any[];
+    possibly_sensitive: boolean;
+    profile_interstitial_type: string;
+    statuses_count: number;
+    translator_type: string;
+    want_retweets: boolean;
+    withheld_in_countries: any[];
+}
+interface Entities4 {
+    description: Description3;
+}
+interface Description3 {
+    urls: any[];
+}
+interface Location3 {
+    location: string;
+}
+interface MediaPermissions3 {
+    can_media_tag: boolean;
+}
+interface ProfileBio3 {
+    description: string;
+}
+interface Privacy3 {
+    protected: boolean;
+}
+interface RelationshipPerspectives3 {
+    followed_by: boolean;
+    following: boolean;
+}
+interface TipjarSettings3 {
+}
+interface Verification3 {
+    verified: boolean;
 }
 interface ClientEventInfo {
     component: string;
@@ -126,17 +425,4 @@ interface NotificationDetails {
     impressionId: string;
     metadata: string;
 }
-interface FeedbackInfo {
-    feedbackKeys: string[];
-    feedbackMetadata: string;
-    clientEventInfo: ClientEventInfo2;
-}
-interface ClientEventInfo2 {
-    element: string;
-}
-interface ClearEntriesUnreadState {
-}
-interface MarkEntriesUnreadGreaterThanSortIndex {
-    sortIndex: string;
-}
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rettiwt-api",
-	"version": "6.1.0",
+	"version": "6.1.2",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"description": "An API for fetching data from TwitterAPI, without any rate limits!",
@@ -54,7 +54,7 @@
 		"https-proxy-agent": "^7.0.6",
 		"jsdom": "^27.2.0",
 		"node-html-parser": "^7.0.1",
-		"x-client-transaction-id": "^0.1.8"
+		"x-client-transaction-id": "^0.1.9"
 	},
 	"workspaces": [
 		"playground",

package/src/models/data/Notification.ts

@@ -1,9 +1,7 @@
 import { NotificationType } from '../../enums/Notification';
-import { RawNotificationType } from '../../enums/raw/Notification';
-import { findKeyByValue } from '../../helper/JsonUtils';
+import { findByFilter } from '../../helper/JsonUtils';
 import { INotification } from '../../types/data/Notification';
 import { INotification as IRawNotification } from '../../types/raw/base/Notification';
-import { IUserNotificationsResponse } from '../../types/raw/user/Notifications';
 
 /**
  * The details of a single notification.
@@ -28,16 +26,16 @@ export class Notification implements INotification {
 		this._raw = { ...notification };
 
 		// Getting the original notification type
-		const notificationType: string | undefined = findKeyByValue(RawNotificationType, notification.icon.id);
+		const notificationType = notification.notification_icon.toString();
 
-		this.from = notification.template?.aggregateUserActionsV1?.fromUsers
-			? notification.template.aggregateUserActionsV1.fromUsers.map((item) => item.user.id)
+		this.from = notification.template.from_users
+			? notification.template.from_users.map((item) => item.user_results.result.rest_id)
 			: [];
 		this.id = notification.id;
-		this.message = notification.message.text;
-		this.receivedAt = new Date(Number(notification.timestampMs)).toISOString();
-		this.target = notification.template?.aggregateUserActionsV1?.targetObjects
-			? notification.template.aggregateUserActionsV1.targetObjects.map((item) => item.tweet.id)
+		this.message = notification.rich_message.text;
+		this.receivedAt = new Date(notification.timestamp_ms).toISOString();
+		this.target = notification.template.target_objects
+			? notification.template.target_objects.map((item) => item.tweet_results.result.rest_id)
 			: [];
 		this.type = notificationType
 			? NotificationType[notificationType as keyof typeof NotificationType]
@@ -59,14 +57,12 @@ export class Notification implements INotification {
 	public static list(response: NonNullable<unknown>): Notification[] {
 		const notifications: Notification[] = [];
 
-		// Extracting notifications
-		if ((response as IUserNotificationsResponse).globalObjects.notifications) {
-			// Iterating over the raw list of notifications
-			for (const [, value] of Object.entries(
-				(response as IUserNotificationsResponse).globalObjects.notifications,
-			)) {
-				notifications.push(new Notification(value as IRawNotification));
-			}
+		// Extracting the matching data
+		const extract = findByFilter<IRawNotification>(response, '__typename', 'TimelineNotification');
+
+		// Deserializing valid data
+		for (const item of extract) {
+			notifications.push(new Notification(item));
 		}
 
 		return notifications;

package/src/services/public/FetcherService.ts

@@ -1,7 +1,7 @@
 import axios, { isAxiosError } from 'axios';
 import { Cookie } from 'cookiejar';
 import { JSDOM } from 'jsdom';
-import { ClientTransaction } from 'x-client-transaction-id-glacier';
+import { ClientTransaction } from 'x-client-transaction-id';
 
 import { AllowGuestAuthenticationGroup, FetchResourcesGroup, PostResourcesGroup } from '../../collections/Groups';
 import { Requests } from '../../collections/Requests';

package/src/types/raw/base/Notification.ts

@@ -1,6 +1,9 @@
 /* eslint-disable */
 
 import { RawNotificationType } from '../../../enums/raw/Notification';
+import { IDataResult } from '../composite/DataResult';
+import { ITweet } from './Tweet';
+import { IUser } from './User';
 
 /**
  * Represents the raw data of a single Notification.
@@ -8,60 +11,56 @@ import { RawNotificationType } from '../../../enums/raw/Notification';
  * @public
  */
 export interface INotification {
+	itemType: string;
+	__typename: string;
 	id: string;
-	timestampMs: string;
-	icon: INotificationIcon;
-	message: INotificationMessage;
-	template: INotificationTemplate;
+	notification_icon: RawNotificationType;
+	rich_message: INotificationRichMessage;
+	notification_url: INotificationUrl;
+	template: INoticiationTemplate;
+	timestamp_ms: string;
 }
 
-export interface INotificationIcon {
-	id: RawNotificationType;
-}
-
-export interface INotificationMessage {
-	text: string;
-	entities: INotificationMessageEntity[];
+export interface INotificationRichMessage {
 	rtl: boolean;
+	text: string;
+	entities: INotificationEntity[];
 }
 
-export interface INotificationMessageEntity {
+export interface INotificationEntity {
 	fromIndex: number;
 	toIndex: number;
-	format: string;
+	ref: INotificationEntityRef;
 }
 
-export interface INotificationTemplate {
-	aggregateUserActionsV1: INotificationUserActions;
+export interface INotificationEntityRef {
+	type: string;
+	user_results: IDataResult<IUser>;
 }
 
-export interface INotificationUserActions {
-	targetObjects: INotificationTargetObject[];
-	fromUsers: INotificationFromUser[];
-	additionalContext: INotificationAdditionalContext;
+export interface INotificationUrl {
+	url: string;
+	urlType: string;
+	urtEndpointOptions?: INotificationUrtEndpointOptions;
 }
 
-export interface INotificationTargetObject {
-	tweet: INotificationTweet;
+export interface INotificationUrtEndpointOptions {
+	cacheId: string;
+	title: string;
 }
 
-export interface INotificationTweet {
-	id: string;
+export interface INoticiationTemplate {
+	__typename: string;
+	target_objects: INotificationTargetObject[];
+	from_users: INotificationFromUser[];
 }
 
-export interface INotificationFromUser {
-	user: INotificationUser;
-}
-
-export interface INotificationUser {
-	id: string;
-}
-
-export interface INotificationAdditionalContext {
-	contextText: INotificationContextText;
+export interface INotificationTargetObject {
+	__typename: string;
+	tweet_results: IDataResult<ITweet>;
 }
 
-export interface INotificationContextText {
-	text: string;
-	entities: any[];
+export interface INotificationFromUser {
+	__typename: string;
+	user_results: IDataResult<IUser>;
 }