rettiwt-api 2.6.2 → 2.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/models/data/Tweet.d.ts +2 -0
- package/dist/models/data/Tweet.js +4 -1
- package/dist/models/data/Tweet.js.map +1 -1
- package/dist/services/internal/FetcherService.js +2 -2
- package/dist/services/internal/FetcherService.js.map +1 -1
- package/package.json +1 -1
- package/src/models/data/Tweet.ts +6 -0
- package/src/services/internal/FetcherService.ts +2 -2
|
@@ -36,6 +36,8 @@ export declare class Tweet {
|
|
|
36
36
|
viewCount: number;
|
|
37
37
|
/** The number of bookmarks of a tweet. */
|
|
38
38
|
bookmarkCount: number;
|
|
39
|
+
/** The tweet which was retweeted in this tweet (if any). */
|
|
40
|
+
retweetedTweet?: Tweet;
|
|
39
41
|
/**
|
|
40
42
|
* Initializes a new Tweet from the given raw tweet data.
|
|
41
43
|
*
|
|
@@ -17,7 +17,7 @@ var Tweet = /** @class */ (function () {
|
|
|
17
17
|
* @param tweet - The raw tweet data.
|
|
18
18
|
*/
|
|
19
19
|
function Tweet(tweet) {
|
|
20
|
-
var _a, _b;
|
|
20
|
+
var _a, _b, _c, _d;
|
|
21
21
|
this.id = tweet.rest_id;
|
|
22
22
|
this.createdAt = tweet.legacy.created_at;
|
|
23
23
|
this.tweetBy = new User_1.User(tweet.core.user_results.result);
|
|
@@ -33,6 +33,9 @@ var Tweet = /** @class */ (function () {
|
|
|
33
33
|
this.likeCount = tweet.legacy.favorite_count;
|
|
34
34
|
this.viewCount = parseInt(tweet.views.count);
|
|
35
35
|
this.bookmarkCount = tweet.legacy.bookmark_count;
|
|
36
|
+
this.retweetedTweet = ((_d = (_c = tweet.legacy.retweeted_status_result) === null || _c === void 0 ? void 0 : _c.result) === null || _d === void 0 ? void 0 : _d.rest_id)
|
|
37
|
+
? new Tweet(tweet.legacy.retweeted_status_result.result)
|
|
38
|
+
: undefined;
|
|
36
39
|
}
|
|
37
40
|
return Tweet;
|
|
38
41
|
}());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tweet.js","sourceRoot":"","sources":["../../../src/models/data/Tweet.ts"],"names":[],"mappings":";;;AAAA,WAAW;AACX,6CAKsB;AAEtB,SAAS;AACT,+BAA8B;AAE9B;;;;GAIG;AACH;
|
|
1
|
+
{"version":3,"file":"Tweet.js","sourceRoot":"","sources":["../../../src/models/data/Tweet.ts"],"names":[],"mappings":"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"}
|
|
@@ -249,14 +249,14 @@ var FetcherService = /** @class */ (function () {
|
|
|
249
249
|
for (var _i = 0, extractedData_1 = extractedData; _i < extractedData_1.length; _i++) {
|
|
250
250
|
var item = extractedData_1[_i];
|
|
251
251
|
// If the item is a valid raw tweet
|
|
252
|
-
if (item && item.__typename == 'Tweet' && item.rest_id) {
|
|
252
|
+
if (item && item.__typename == 'Tweet' && item.rest_id && item.legacy) {
|
|
253
253
|
// Logging
|
|
254
254
|
this.logger.log(Logging_1.ELogActions.DESERIALIZE, { type: item.__typename, id: item.rest_id });
|
|
255
255
|
// Adding deserialized Tweet to list
|
|
256
256
|
deserializedList.push(new Tweet_1.Tweet(item));
|
|
257
257
|
}
|
|
258
258
|
// If the item is a valid raw user
|
|
259
|
-
else if (item && item.__typename == 'User' && item.rest_id && item.id) {
|
|
259
|
+
else if (item && item.__typename == 'User' && item.rest_id && item.id && item.legacy) {
|
|
260
260
|
// Logging
|
|
261
261
|
this.logger.log(Logging_1.ELogActions.DESERIALIZE, { type: item.__typename, id: item.rest_id });
|
|
262
262
|
// Adding deserialized User to list
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetcherService.js","sourceRoot":"","sources":["../../../src/services/internal/FetcherService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FetcherService.js","sourceRoot":"","sources":["../../../src/services/internal/FetcherService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/models/data/Tweet.ts
CHANGED
|
@@ -60,6 +60,9 @@ export class Tweet {
|
|
|
60
60
|
/** The number of bookmarks of a tweet. */
|
|
61
61
|
public bookmarkCount: number;
|
|
62
62
|
|
|
63
|
+
/** The tweet which was retweeted in this tweet (if any). */
|
|
64
|
+
public retweetedTweet?: Tweet;
|
|
65
|
+
|
|
63
66
|
/**
|
|
64
67
|
* Initializes a new Tweet from the given raw tweet data.
|
|
65
68
|
*
|
|
@@ -81,6 +84,9 @@ export class Tweet {
|
|
|
81
84
|
this.likeCount = tweet.legacy.favorite_count;
|
|
82
85
|
this.viewCount = parseInt(tweet.views.count);
|
|
83
86
|
this.bookmarkCount = tweet.legacy.bookmark_count;
|
|
87
|
+
this.retweetedTweet = tweet.legacy.retweeted_status_result?.result?.rest_id
|
|
88
|
+
? new Tweet(tweet.legacy.retweeted_status_result.result)
|
|
89
|
+
: undefined;
|
|
84
90
|
}
|
|
85
91
|
}
|
|
86
92
|
|
|
@@ -248,7 +248,7 @@ export class FetcherService {
|
|
|
248
248
|
// Deserializing the extracted raw data and storing it in the list
|
|
249
249
|
for (const item of extractedData) {
|
|
250
250
|
// If the item is a valid raw tweet
|
|
251
|
-
if (item && item.__typename == 'Tweet' && item.rest_id) {
|
|
251
|
+
if (item && item.__typename == 'Tweet' && item.rest_id && item.legacy) {
|
|
252
252
|
// Logging
|
|
253
253
|
this.logger.log(ELogActions.DESERIALIZE, { type: item.__typename, id: item.rest_id });
|
|
254
254
|
|
|
@@ -256,7 +256,7 @@ export class FetcherService {
|
|
|
256
256
|
deserializedList.push(new Tweet(item as IRawTweet) as OutType);
|
|
257
257
|
}
|
|
258
258
|
// If the item is a valid raw user
|
|
259
|
-
else if (item && item.__typename == 'User' && item.rest_id && (item as IRawUser).id) {
|
|
259
|
+
else if (item && item.__typename == 'User' && item.rest_id && (item as IRawUser).id && item.legacy) {
|
|
260
260
|
// Logging
|
|
261
261
|
this.logger.log(ELogActions.DESERIALIZE, { type: item.__typename, id: item.rest_id });
|
|
262
262
|
|