rettiwt-api 5.1.0-alpha.0 → 6.0.1

package/src/models/data/Notification.ts

@@ -1,5 +1,5 @@
-import { ENotificationType } from '../../enums/Notification';
-import { ERawNotificationType } from '../../enums/raw/Notification';
+import { NotificationType } from '../../enums/Notification';
+import { RawNotificationType } from '../../enums/raw/Notification';
 import { findKeyByValue } from '../../helper/JsonUtils';
 import { INotification } from '../../types/data/Notification';
 import { INotification as IRawNotification } from '../../types/raw/base/Notification';
@@ -19,7 +19,7 @@ export class Notification implements INotification {
 	public message: string;
 	public receivedAt: string;
 	public target: string[];
-	public type?: ENotificationType;
+	public type?: NotificationType;
 
 	/**
 	 * @param notification - The raw notification details.
@@ -28,7 +28,7 @@ export class Notification implements INotification {
 		this._raw = { ...notification };
 
 		// Getting the original notification type
-		const notificationType: string | undefined = findKeyByValue(ERawNotificationType, notification.icon.id);
+		const notificationType: string | undefined = findKeyByValue(RawNotificationType, notification.icon.id);
 
 		this.from = notification.template?.aggregateUserActionsV1?.fromUsers
 			? notification.template.aggregateUserActionsV1.fromUsers.map((item) => item.user.id)
@@ -40,8 +40,8 @@ export class Notification implements INotification {
 			? notification.template.aggregateUserActionsV1.targetObjects.map((item) => item.tweet.id)
 			: [];
 		this.type = notificationType
-			? ENotificationType[notificationType as keyof typeof ENotificationType]
-			: ENotificationType.UNDEFINED;
+			? NotificationType[notificationType as keyof typeof NotificationType]
+			: NotificationType.UNDEFINED;
 	}
 
 	/** The raw notification details. */

package/src/models/data/Tweet.ts

@@ -1,6 +1,6 @@
-import { ELogActions } from '../../enums/Logging';
-import { EMediaType } from '../../enums/Media';
-import { ERawMediaType } from '../../enums/raw/Media';
+import { LogActions } from '../../enums/Logging';
+import { MediaType } from '../../enums/Media';
+import { RawMediaType } from '../../enums/raw/Media';
 import { findByFilter } from '../../helper/JsonUtils';
 
 import { LogService } from '../../services/internal/LogService';
@@ -52,7 +52,7 @@ export class Tweet implements ITweet {
 		this.tweetBy = new User(tweet.core.user_results.result);
 		this.entities = new TweetEntities(tweet.legacy.entities);
 		this.media = tweet.legacy.extended_entities?.media?.map((media) => new TweetMedia(media));
-		this.quoted = this.getQuotedTweet(tweet);
+		this.quoted = this._getQuotedTweet(tweet);
 		this.fullText = tweet.note_tweet ? tweet.note_tweet.note_tweet_results.result.text : tweet.legacy.full_text;
 		this.replyTo = tweet.legacy.in_reply_to_status_id_str;
 		this.lang = tweet.legacy.lang;
@@ -62,7 +62,7 @@ export class Tweet implements ITweet {
 		this.likeCount = tweet.legacy.favorite_count;
 		this.viewCount = tweet.views.count ? parseInt(tweet.views.count) : 0;
 		this.bookmarkCount = tweet.legacy.bookmark_count;
-		this.retweetedTweet = this.getRetweetedTweet(tweet);
+		this.retweetedTweet = this._getRetweetedTweet(tweet);
 		this.url = `https://x.com/${this.tweetBy.userName}/status/${this.id}`;
 	}
 
@@ -78,7 +78,7 @@ export class Tweet implements ITweet {
 	 *
 	 * @returns - The deserialized original quoted tweet.
 	 */
-	private getQuotedTweet(tweet: IRawTweet): Tweet | undefined {
+	private _getQuotedTweet(tweet: IRawTweet): Tweet | undefined {
 		// If tweet with limited visibility
 		if (
 			tweet.quoted_status_result &&
@@ -104,7 +104,7 @@ export class Tweet implements ITweet {
 	 *
 	 * @returns - The deserialized original retweeted tweet.
 	 */
-	private getRetweetedTweet(tweet: IRawTweet): Tweet | undefined {
+	private _getRetweetedTweet(tweet: IRawTweet): Tweet | undefined {
 		// If retweet with limited visibility
 		if (
 			tweet.legacy?.retweeted_status_result &&
@@ -141,13 +141,13 @@ export class Tweet implements ITweet {
 		for (const item of extract) {
 			if (item.legacy) {
 				// Logging
-				LogService.log(ELogActions.DESERIALIZE, { id: item.rest_id });
+				LogService.log(LogActions.DESERIALIZE, { id: item.rest_id });
 
 				tweets.push(new Tweet(item));
 			} else {
 				// Logging
-				LogService.log(ELogActions.WARNING, {
-					action: ELogActions.DESERIALIZE,
+				LogService.log(LogActions.WARNING, {
+					action: LogActions.DESERIALIZE,
 					message: `Tweet not found, skipping`,
 				});
 			}
@@ -179,13 +179,13 @@ export class Tweet implements ITweet {
 		for (const item of extract) {
 			if (item.legacy) {
 				// Logging
-				LogService.log(ELogActions.DESERIALIZE, { id: item.rest_id });
+				LogService.log(LogActions.DESERIALIZE, { id: item.rest_id });
 
 				tweets.push(new Tweet(item));
 			} else {
 				// Logging
-				LogService.log(ELogActions.WARNING, {
-					action: ELogActions.DESERIALIZE,
+				LogService.log(LogActions.WARNING, {
+					action: LogActions.DESERIALIZE,
 					message: `Tweet not found, skipping`,
 				});
 			}
@@ -221,15 +221,15 @@ export class Tweet implements ITweet {
 			// If normal tweet
 			else if ((item.tweet_results?.result as IRawTweet)?.legacy) {
 				// Logging
-				LogService.log(ELogActions.DESERIALIZE, { id: (item.tweet_results.result as IRawTweet).rest_id });
+				LogService.log(LogActions.DESERIALIZE, { id: (item.tweet_results.result as IRawTweet).rest_id });
 
 				tweets.push(new Tweet(item.tweet_results.result as IRawTweet));
 			}
 			// If invalid/unrecognized tweet
 			else {
 				// Logging
-				LogService.log(ELogActions.WARNING, {
-					action: ELogActions.DESERIALIZE,
+				LogService.log(LogActions.WARNING, {
+					action: LogActions.DESERIALIZE,
 					message: `Tweet not found, skipping`,
 				});
 			}
@@ -328,7 +328,7 @@ export class TweetMedia {
 	public thumbnailUrl?: string;
 
 	/** The type of media. */
-	public type: EMediaType;
+	public type: MediaType;
 
 	/** The direct URL to the media. */
 	public url = '';
@@ -338,18 +338,18 @@ export class TweetMedia {
 	 */
 	public constructor(media: IRawExtendedMedia) {
 		// If the media is a photo
-		if (media.type == ERawMediaType.PHOTO) {
-			this.type = EMediaType.PHOTO;
+		if (media.type == RawMediaType.PHOTO) {
+			this.type = MediaType.PHOTO;
 			this.url = media.media_url_https;
 		}
 		// If the media is a gif
-		else if (media.type == ERawMediaType.GIF) {
-			this.type = EMediaType.GIF;
+		else if (media.type == RawMediaType.GIF) {
+			this.type = MediaType.GIF;
 			this.url = media.video_info?.variants[0].url as string;
 		}
 		// If the media is a video
 		else {
-			this.type = EMediaType.VIDEO;
+			this.type = MediaType.VIDEO;
 			this.thumbnailUrl = media.media_url_https;
 
 			/** The highest bitrate of all variants. */

package/src/models/data/User.ts

@@ -1,4 +1,4 @@
-import { ELogActions } from '../../enums/Logging';
+import { LogActions } from '../../enums/Logging';
 import { findByFilter } from '../../helper/JsonUtils';
 import { LogService } from '../../services/internal/LogService';
 import { IUser } from '../../types/data/User';
@@ -73,13 +73,13 @@ export class User implements IUser {
 		for (const item of extract) {
 			if (item.legacy && item.legacy.created_at) {
 				// Logging
-				LogService.log(ELogActions.DESERIALIZE, { id: item.rest_id });
+				LogService.log(LogActions.DESERIALIZE, { id: item.rest_id });
 
 				users.push(new User(item));
 			} else {
 				// Logging
-				LogService.log(ELogActions.WARNING, {
-					action: ELogActions.DESERIALIZE,
+				LogService.log(LogActions.WARNING, {
+					action: LogActions.DESERIALIZE,
 					message: `User not found, skipping`,
 				});
 			}
@@ -110,13 +110,13 @@ export class User implements IUser {
 		for (const item of extract) {
 			if (item.legacy && item.legacy.created_at) {
 				// Logging
-				LogService.log(ELogActions.DESERIALIZE, { id: item.rest_id });
+				LogService.log(LogActions.DESERIALIZE, { id: item.rest_id });
 
 				users.push(new User(item));
 			} else {
 				// Logging
-				LogService.log(ELogActions.WARNING, {
-					action: ELogActions.DESERIALIZE,
+				LogService.log(LogActions.WARNING, {
+					action: LogActions.DESERIALIZE,
 					message: `User not found, skipping`,
 				});
 			}
@@ -142,13 +142,13 @@ export class User implements IUser {
 		for (const item of extract) {
 			if (item.user_results?.result?.legacy) {
 				// Logging
-				LogService.log(ELogActions.DESERIALIZE, { id: item.user_results.result.rest_id });
+				LogService.log(LogActions.DESERIALIZE, { id: item.user_results.result.rest_id });
 
 				users.push(new User(item.user_results.result));
 			} else {
 				// Logging
-				LogService.log(ELogActions.WARNING, {
-					action: ELogActions.DESERIALIZE,
+				LogService.log(LogActions.WARNING, {
+					action: LogActions.DESERIALIZE,
 					message: `User not found, skipping`,
 				});
 			}

package/src/requests/Tweet.ts

@@ -1,6 +1,6 @@
 import { AxiosRequestConfig } from 'axios';
 
-import { ERawTweetRepliesSortType, ERawTweetSearchResultType } from '../enums/raw/Tweet';
+import { RawTweetRepliesSortType, RawTweetSearchResultType } from '../enums/raw/Tweet';
 import { TweetFilter } from '../models/args/FetchArgs';
 import { NewTweet } from '../models/args/PostArgs';
 import { MediaVariable, ReplyVariable } from '../models/params/Variables';
@@ -266,7 +266,7 @@ export class TweetRequests {
 	 * @param id - The id of the tweet whose replies are to be fetched.
 	 * @param cursor - The cursor to the batch of replies to fetch.
 	 */
-	public static replies(id: string, cursor?: string, sortBy?: ERawTweetRepliesSortType): AxiosRequestConfig {
+	public static replies(id: string, cursor?: string, sortBy?: RawTweetRepliesSortType): AxiosRequestConfig {
 		return {
 			method: 'get',
 			url: 'https://x.com/i/api/graphql/_8aYOgEDz35BrBcBal1-_w/TweetDetail',
@@ -277,7 +277,7 @@ export class TweetRequests {
 					cursor: cursor,
 					referrer: 'tweet',
 					with_rux_injections: false,
-					rankingMode: sortBy ?? ERawTweetRepliesSortType.RELEVACE,
+					rankingMode: sortBy ?? RawTweetRepliesSortType.RELEVACE,
 					includePromotedContent: true,
 					withCommunity: true,
 					withQuickPromoteEligibilityTweetFields: true,
@@ -451,7 +451,7 @@ export class TweetRequests {
 					count: count,
 					cursor: cursor,
 					querySource: 'typed_query',
-					product: parsedFilter.top ? ERawTweetSearchResultType.TOP : ERawTweetSearchResultType.LATEST,
+					product: parsedFilter.top ? RawTweetSearchResultType.TOP : RawTweetSearchResultType.LATEST,
 					withAuxiliaryUserLabels: false,
 					withArticleRichContentState: false,
 					withArticlePlainText: false,

package/src/requests/User.ts

@@ -2,7 +2,7 @@ import qs from 'querystring';
 
 import { AxiosRequestConfig } from 'axios';
 
-import { ERawAnalyticsGranularity, ERawAnalyticsMetric } from '../enums/raw/Analytics';
+import { RawAnalyticsGranularity, RawAnalyticsMetric } from '../enums/raw/Analytics';
 
 /**
  * Collection of requests related to users.
@@ -77,8 +77,8 @@ export class UserRequests {
 	public static analytics(
 		fromTime: Date,
 		toTime: Date,
-		granularity: ERawAnalyticsGranularity,
-		requestedMetrics: ERawAnalyticsMetric[],
+		granularity: RawAnalyticsGranularity,
+		requestedMetrics: RawAnalyticsMetric[],
 	): AxiosRequestConfig {
 		return {
 			method: 'get',

package/src/services/internal/AuthService.ts

@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-import { EApiErrors } from '../../enums/Api';
+import { ApiErrors } from '../../enums/Api';
 import { AuthCredential } from '../../models/auth/AuthCredential';
 import { RettiwtConfig } from '../../models/RettiwtConfig';
 
@@ -67,7 +67,7 @@ export class AuthService {
 		}
 		// If user id was not found
 		else {
-			throw new Error(EApiErrors.BAD_AUTHENTICATION);
+			throw new Error(ApiErrors.BAD_AUTHENTICATION);
 		}
 	}
 

package/src/services/internal/ErrorService.ts

@@ -15,14 +15,14 @@ export class ErrorService implements IErrorHandler {
 	 *
 	 * @param error - The error response received from Twitter.
 	 */
-	private handleAxiosError(error: AxiosError<IRawErrorData | IRawErrorDetails>): void {
+	private _handleAxiosError(error: AxiosError<IRawErrorData | IRawErrorDetails>): void {
 		throw new TwitterError(error);
 	}
 
 	/**
 	 * Handle unknown error.
 	 */
-	private handleUnknownError(): void {
+	private _handleUnknownError(): void {
 		throw new Error('Unknown error');
 	}
 
@@ -33,9 +33,9 @@ export class ErrorService implements IErrorHandler {
 	 */
 	public handle(error: unknown): void {
 		if (isAxiosError(error)) {
-			this.handleAxiosError(error as AxiosError<IRawErrorData | IRawErrorDetails>);
+			this._handleAxiosError(error as AxiosError<IRawErrorData | IRawErrorDetails>);
 		} else {
-			this.handleUnknownError();
+			this._handleUnknownError();
 		}
 	}
 }

package/src/services/internal/LogService.ts

@@ -1,4 +1,4 @@
-import { ELogActions } from '../../enums/Logging';
+import { LogActions } from '../../enums/Logging';
 
 /**
  * Handles logging of data for debug purpose.
@@ -16,7 +16,7 @@ export class LogService {
 	 *
 	 * @param data - The data to be logged.
 	 */
-	public static log(action: ELogActions, data: NonNullable<unknown>): void {
+	public static log(action: LogActions, data: NonNullable<unknown>): void {
 		// Proceed to log only if logging is enabled
 		if (this.enabled) {
 			// Preparing the log message

package/src/services/public/FetcherService.ts

@@ -1,25 +1,25 @@
-import axios from 'axios';
+/* eslint-disable import/no-unresolved */
+import { ClientTransaction, handleXMigration } from '@lami/x-client-transaction-id';
+import axios, { isAxiosError } from 'axios';
 import { Cookie } from 'cookiejar';
 
-import { allowGuestAuthentication, fetchResources, postResources } from '../../collections/Groups';
-import { requests } from '../../collections/Requests';
-import { EApiErrors } from '../../enums/Api';
-import { ELogActions } from '../../enums/Logging';
-import { EResourceType } from '../../enums/Resource';
+import { AllowGuestAuthenticationGroup, FetchResourcesGroup, PostResourcesGroup } from '../../collections/Groups';
+import { Requests } from '../../collections/Requests';
+import { ApiErrors } from '../../enums/Api';
+import { LogActions } from '../../enums/Logging';
+import { ResourceType } from '../../enums/Resource';
 import { FetchArgs } from '../../models/args/FetchArgs';
 import { PostArgs } from '../../models/args/PostArgs';
 import { AuthCredential } from '../../models/auth/AuthCredential';
 import { RettiwtConfig } from '../../models/RettiwtConfig';
 import { IFetchArgs } from '../../types/args/FetchArgs';
 import { IPostArgs } from '../../types/args/PostArgs';
-import { ITidHeader } from '../../types/auth/TidHeader';
-import { ITidProvider } from '../../types/auth/TidProvider';
+import { ITransactionHeader } from '../../types/auth/TransactionHeader';
 import { IErrorHandler } from '../../types/ErrorHandler';
 
 import { AuthService } from '../internal/AuthService';
 import { ErrorService } from '../internal/ErrorService';
 import { LogService } from '../internal/LogService';
-import { TidService } from '../internal/TidService';
 
 /**
  * The base service that handles all HTTP requests.
@@ -36,9 +36,6 @@ export class FetcherService {
 	/** The service used to handle HTTP and API errors */
 	private readonly _errorHandler: IErrorHandler;
 
-	/** Service responsible for generating the `x-client-transaction-id` header. */
-	private readonly _tidProvider: ITidProvider;
-
 	/** The max wait time for a response. */
 	private readonly _timeout: number;
 
@@ -53,7 +50,6 @@ export class FetcherService {
 		this.config = config;
 		this._delay = config.delay;
 		this._errorHandler = config.errorHandler ?? new ErrorService();
-		this._tidProvider = config.tidProvider ?? new TidService(config);
 		this._timeout = config.timeout ?? 0;
 		this._auth = new AuthService(config);
 	}
@@ -65,13 +61,13 @@ export class FetcherService {
 	 *
 	 * @throws An error if not authorized to access the requested resource.
 	 */
-	private checkAuthorization(resource: EResourceType): void {
+	private _checkAuthorization(resource: ResourceType): void {
 		// Logging
-		LogService.log(ELogActions.AUTHORIZATION, { authenticated: this.config.userId != undefined });
+		LogService.log(LogActions.AUTHORIZATION, { authenticated: this.config.userId != undefined });
 
 		// Checking authorization status
-		if (!allowGuestAuthentication.includes(resource) && this.config.userId == undefined) {
-			throw new Error(EApiErrors.RESOURCE_NOT_ALLOWED);
+		if (!AllowGuestAuthenticationGroup.includes(resource) && this.config.userId == undefined) {
+			throw new Error(ApiErrors.RESOURCE_NOT_ALLOWED);
 		}
 	}
 
@@ -80,10 +76,10 @@ export class FetcherService {
 	 *
 	 * @returns The generated AuthCredential
 	 */
-	private async getCredential(): Promise<AuthCredential> {
+	private async _getCredential(): Promise<AuthCredential> {
 		if (this.config.apiKey) {
 			// Logging
-			LogService.log(ELogActions.GET, { target: 'USER_CREDENTIAL' });
+			LogService.log(LogActions.GET, { target: 'USER_CREDENTIAL' });
 
 			return new AuthCredential(
 				AuthService.decodeCookie(this.config.apiKey)
@@ -92,7 +88,7 @@ export class FetcherService {
 			);
 		} else {
 			// Logging
-			LogService.log(ELogActions.GET, { target: 'NEW_GUEST_CREDENTIAL' });
+			LogService.log(LogActions.GET, { target: 'NEW_GUEST_CREDENTIAL' });
 
 			return this._auth.guest();
 		}
@@ -106,22 +102,24 @@ export class FetcherService {
 	 *
 	 * @returns The header containing the transaction ID.
 	 */
-	private async getTransactionHeader(method: string, url: string): Promise<ITidHeader | undefined> {
+	private async _getTransactionHeader(method: string, url: string): Promise<ITransactionHeader> {
+		// Get the X homepage HTML document (using utility function)
+		const document = await handleXMigration();
+
+		// Create and initialize ClientTransaction instance
+		const transaction = await ClientTransaction.create(document);
+
 		// Getting the URL path excluding all params
 		const path = new URL(url).pathname.split('?')[0].trim();
 
 		// Generating the transaction ID
-		const tid = await this._tidProvider.generate(method.toUpperCase(), path);
-
-		if (tid) {
-			return {
-				/* eslint-disable @typescript-eslint/naming-convention */
-				'x-client-transaction-id': tid,
-				/* eslint-enable @typescript-eslint/naming-convention */
-			};
-		} else {
-			return undefined;
-		}
+		const tid = await transaction.generateTransactionId(method.toUpperCase(), path);
+
+		return {
+			/* eslint-disable @typescript-eslint/naming-convention */
+			'x-client-transaction-id': tid,
+			/* eslint-enable @typescript-eslint/naming-convention */
+		};
 	}
 
 	/**
@@ -132,15 +130,15 @@ export class FetcherService {
 	 *
 	 * @returns The validated args.
 	 */
-	private validateArgs(resource: EResourceType, args: IFetchArgs | IPostArgs): FetchArgs | PostArgs | undefined {
-		if (fetchResources.includes(resource)) {
+	private _validateArgs(resource: ResourceType, args: IFetchArgs | IPostArgs): FetchArgs | PostArgs | undefined {
+		if (FetchResourcesGroup.includes(resource)) {
 			// Logging
-			LogService.log(ELogActions.VALIDATE, { target: 'FETCH_ARGS' });
+			LogService.log(LogActions.VALIDATE, { target: 'FETCH_ARGS' });
 
 			return new FetchArgs(args);
-		} else if (postResources.includes(resource)) {
+		} else if (PostResourcesGroup.includes(resource)) {
 			// Logging
-			LogService.log(ELogActions.VALIDATE, { target: 'POST_ARGS' });
+			LogService.log(LogActions.VALIDATE, { target: 'POST_ARGS' });
 
 			return new PostArgs(args);
 		}
@@ -149,7 +147,7 @@ export class FetcherService {
 	/**
 	 * Introduces a delay using the configured delay/delay function.
 	 */
-	private async wait(): Promise<void> {
+	private async _wait(): Promise<void> {
 		// If no delay is set, skip
 		if (this._delay == undefined) {
 			return;
@@ -198,44 +196,71 @@ export class FetcherService {
 	 * });
 	 * ```
 	 */
-	public async request<T = unknown>(resource: EResourceType, args: IFetchArgs | IPostArgs): Promise<T> {
+	public async request<T = unknown>(resource: ResourceType, args: IFetchArgs | IPostArgs): Promise<T> {
+		/** The current retry number. */
+		let retry = 0;
+
+		/** The error, if any. */
+		let error: unknown = undefined;
+
 		// Logging
-		LogService.log(ELogActions.REQUEST, { resource: resource, args: args });
+		LogService.log(LogActions.REQUEST, { resource: resource, args: args });
 
 		// Checking authorization for the requested resource
-		this.checkAuthorization(resource);
+		this._checkAuthorization(resource);
 
 		// Validating args
-		args = this.validateArgs(resource, args)!;
+		args = this._validateArgs(resource, args)!;
 
 		// Getting credentials from key
-		const cred: AuthCredential = await this.getCredential();
+		const cred: AuthCredential = await this._getCredential();
 
 		// Getting request configuration
-		const config = requests[resource](args);
+		const config = Requests[resource](args);
 
 		// Setting additional request parameters
 		config.headers = {
 			...config.headers,
 			...cred.toHeader(),
-			...(await this.getTransactionHeader(config.method ?? '', config.url ?? '')),
 			...this.config.headers,
 		};
 		config.httpAgent = this.config.httpsAgent;
 		config.httpsAgent = this.config.httpsAgent;
 		config.timeout = this._timeout;
 
-		// Sending the request
-		try {
-			// Introducing a delay
-			await this.wait();
-
-			// Returning the reponse body
-			return (await axios<T>(config)).data;
-		} catch (error) {
-			// If error, delegate handling to error handler
-			this._errorHandler.handle(error);
-			throw error;
-		}
+		// Using retries for error 404
+		do {
+			// Sending the request
+			try {
+				// Getting and appending transaction information
+				config.headers = {
+					...config.headers,
+					...(await this._getTransactionHeader(config.method ?? '', config.url ?? '')),
+				};
+
+				// Introducing a delay
+				await this._wait();
+
+				// Returning the reponse body
+				return (await axios<T>(config)).data;
+			} catch (err) {
+				// If it's an error 404, retry
+				if (isAxiosError(err) && err.status === 404) {
+					error = err;
+					continue;
+				}
+				// Else, delegate error handling
+				else {
+					this._errorHandler.handle(err);
+					throw err;
+				}
+			} finally {
+				// Incrementing the number of retries done
+				retry++;
+			}
+		} while (retry < this.config.maxRetries);
+
+		/** If request not successful even after retries, throw the error */
+		throw error;
 	}
 }

package/src/services/public/ListService.ts

@@ -1,5 +1,5 @@
-import { extractors } from '../../collections/Extractors';
-import { EResourceType } from '../../enums/Resource';
+import { Extractors } from '../../collections/Extractors';
+import { ResourceType } from '../../enums/Resource';
 import { CursoredData } from '../../models/data/CursoredData';
 import { Tweet } from '../../models/data/Tweet';
 import { User } from '../../models/data/User';
@@ -49,7 +49,7 @@ export class ListService extends FetcherService {
 	 * @remarks Due a bug in Twitter API, the count is ignored when no cursor is provided and defaults to 100.
 	 */
 	public async members(id: string, count?: number, cursor?: string): Promise<CursoredData<User>> {
-		const resource: EResourceType = EResourceType.LIST_MEMBERS;
+		const resource: ResourceType = ResourceType.LIST_MEMBERS;
 
 		// Fetching the raw list of members
 		const response = await this.request<IListMembersResponse>(resource, {
@@ -59,7 +59,7 @@ export class ListService extends FetcherService {
 		});
 
 		// Deserializing response
-		const data = extractors[resource](response);
+		const data = Extractors[resource](response);
 
 		return data;
 	}
@@ -94,7 +94,7 @@ export class ListService extends FetcherService {
 	 * @remarks Due a bug in Twitter API, the count is ignored when no cursor is provided and defaults to 100.
 	 */
 	public async tweets(id: string, count?: number, cursor?: string): Promise<CursoredData<Tweet>> {
-		const resource = EResourceType.LIST_TWEETS;
+		const resource = ResourceType.LIST_TWEETS;
 
 		// Fetching raw list tweets
 		const response = await this.request<IListTweetsResponse>(resource, {
@@ -104,7 +104,7 @@ export class ListService extends FetcherService {
 		});
 
 		// Deserializing response
-		const data = extractors[resource](response);
+		const data = Extractors[resource](response);
 
 		// Sorting the tweets by date, from recent to oldest
 		data.list.sort((a, b) => new Date(b.createdAt).valueOf() - new Date(a.createdAt).valueOf());