From f467129c42c349731e3c877e2a16bd96858de7c6 Mon Sep 17 00:00:00 2001 From: ruidajo Date: Sun, 15 May 2022 13:56:39 -0500 Subject: [PATCH] Fixing tweets by date filtering and replies. --- .../NitterUser.class/instance/newestTweet.st | 2 +- .../NitterUser.class/instance/oldestTweet.st | 2 +- .../NitterUser.class/instance/replies.st | 3 +-- .../TweetsCollection.class/instance/newestOf..st | 8 +++++--- .../TweetsCollection.class/instance/oldestOf..st | 8 +++++--- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Socialmetrica.package/NitterUser.class/instance/newestTweet.st b/Socialmetrica.package/NitterUser.class/instance/newestTweet.st index 5a5dec1..c2bda05 100644 --- a/Socialmetrica.package/NitterUser.class/instance/newestTweet.st +++ b/Socialmetrica.package/NitterUser.class/instance/newestTweet.st @@ -1,4 +1,4 @@ accessing newestTweet - ^ self messages newestOf: self id \ No newline at end of file + ^ self messages newestOf: self userName \ No newline at end of file diff --git a/Socialmetrica.package/NitterUser.class/instance/oldestTweet.st b/Socialmetrica.package/NitterUser.class/instance/oldestTweet.st index b97379a..cfc926b 100644 --- a/Socialmetrica.package/NitterUser.class/instance/oldestTweet.st +++ b/Socialmetrica.package/NitterUser.class/instance/oldestTweet.st @@ -1,4 +1,4 @@ accessing oldestTweet - ^ self messages oldestOf: self id \ No newline at end of file + ^ self messages oldestOf: self userName \ No newline at end of file diff --git a/Socialmetrica.package/NitterUser.class/instance/replies.st b/Socialmetrica.package/NitterUser.class/instance/replies.st index 04d73ea..f64657d 100644 --- a/Socialmetrica.package/NitterUser.class/instance/replies.st +++ b/Socialmetrica.package/NitterUser.class/instance/replies.st @@ -3,6 +3,5 @@ replies self messages ifEmpty: [ self getMessages ]. ^ TweetsCollection new - messages: (self messages select: [ :each | (each metadata at: 'replie to') isNotEmpty - and: [ each authorId = self id ]]); + messages: (self tweets select: [ :each | (each metadata at: 'replie to') isNotEmpty]); yourself \ No newline at end of file diff --git a/Socialmetrica.package/TweetsCollection.class/instance/newestOf..st b/Socialmetrica.package/TweetsCollection.class/instance/newestOf..st index 0a5e5ee..560d74d 100644 --- a/Socialmetrica.package/TweetsCollection.class/instance/newestOf..st +++ b/Socialmetrica.package/TweetsCollection.class/instance/newestOf..st @@ -1,7 +1,9 @@ accessing -newestOf: userId +newestOf: userName + | user | + user := (TwitterUser storedInstances select: [ :each | each userName = userName ]) first. self messages ifNil: [ ^ nil ]. self messages ifEmpty: [ ^ nil ]. - ^ ((self select: [ :tweet | tweet authorId = userId ]) - select: [ :tweet | tweet created = (((self select: [ :each | each authorId = userId ]) collect: [ :each | each created ]) asSortedCollection last)]) first \ No newline at end of file + ^ ((user messages: self; yourself; tweets) + select: [ :tweet | tweet created = ((self collect: [ :each | each created ]) asSortedCollection last)]) first. \ No newline at end of file diff --git a/Socialmetrica.package/TweetsCollection.class/instance/oldestOf..st b/Socialmetrica.package/TweetsCollection.class/instance/oldestOf..st index f03757f..95c9bca 100644 --- a/Socialmetrica.package/TweetsCollection.class/instance/oldestOf..st +++ b/Socialmetrica.package/TweetsCollection.class/instance/oldestOf..st @@ -1,7 +1,9 @@ accessing -oldestOf: userId +oldestOf: userName + | user | + user := (TwitterUser storedInstances select: [ :each | each userName = userName ]) first. self messages ifNil: [ ^ nil ]. self messages ifEmpty: [ ^ nil ]. - ^ ((self select: [ :tweet | tweet authorId = userId ]) - select: [ :tweet | tweet created = (((self select: [ :each | each authorId = userId ]) collect: [ :each | each created ]) asSortedCollection first)]) first \ No newline at end of file + ^ ((user messages: self; yourself; tweets) + select: [ :tweet | tweet created = ((self collect: [ :each | each created ]) asSortedCollection first)]) first. \ No newline at end of file