From f97b193c5e3b4d8de3a8632e3c34c6014d1306c7 Mon Sep 17 00:00:00 2001 From: Offray Luna Date: Thu, 14 Apr 2022 17:40:41 -0500 Subject: [PATCH] Renaming methods for clarity. --- .../instance/collectRawTweetsForPages..st | 10 +++++----- .../NitterUser.class/instance/getLocalMessages.st | 11 +++++------ .../NitterUser.class/instance/getMessages.st | 2 +- .../instance/getRemoteMessagesFromRss.st | 2 +- .../NitterUser.class/instance/storeContents.st | 2 +- .../NitterUser.class/instance/tweets.st | 6 ++++++ .../NitterUser.class/instance/writeWordsFile.st | 4 ++-- .../TweetsCollection.class/instance/add..st | 2 +- .../TweetsCollection.class/instance/gtTweetsFor..st | 2 +- .../TweetsCollection.class/instance/messages..st | 3 +++ .../TweetsCollection.class/instance/messages.st | 3 +++ .../TweetsCollection.class/instance/newest.st | 7 +++++++ .../TweetsCollection.class/instance/oldest.st | 3 +++ .../TweetsCollection.class/instance/size.st | 2 +- .../TweetsCollection.class/instance/store.st | 2 +- .../TweetsCollection.class/instance/tweets..st | 3 --- .../TweetsCollection.class/instance/tweets.st | 3 --- .../instance/messagesAuthors.st | 2 +- .../TwitterUser.class/instance/messages..st | 3 +++ .../TwitterUser.class/instance/messages.st | 3 +++ .../TwitterUser.class/instance/tweets..st | 3 --- .../TwitterUser.class/instance/tweets.st | 3 --- .../TwitterUser.class/properties.json | 4 ++-- .../instance/gtTwitterUsersGroupOn..st | 2 +- 24 files changed, 51 insertions(+), 36 deletions(-) create mode 100644 Socialmetrica.package/NitterUser.class/instance/tweets.st create mode 100644 Socialmetrica.package/TweetsCollection.class/instance/messages..st create mode 100644 Socialmetrica.package/TweetsCollection.class/instance/messages.st create mode 100644 Socialmetrica.package/TweetsCollection.class/instance/newest.st create mode 100644 Socialmetrica.package/TweetsCollection.class/instance/oldest.st delete mode 100644 Socialmetrica.package/TweetsCollection.class/instance/tweets..st delete mode 100644 Socialmetrica.package/TweetsCollection.class/instance/tweets.st create mode 100644 Socialmetrica.package/TwitterUser.class/instance/messages..st create mode 100644 Socialmetrica.package/TwitterUser.class/instance/messages.st delete mode 100644 Socialmetrica.package/TwitterUser.class/instance/tweets..st delete mode 100644 Socialmetrica.package/TwitterUser.class/instance/tweets.st diff --git a/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsForPages..st b/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsForPages..st index a96608f..7a09827 100644 --- a/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsForPages..st +++ b/Socialmetrica.package/NitterUser.class/instance/collectRawTweetsForPages..st @@ -17,14 +17,14 @@ collectRawTweetsForPages: anInteger tempTweet metadata at: DateAndTime now asString put: key; yourself. - response tweets add: tempTweet. + response messages add: tempTweet. ] ]. - response tweets doWithIndex: [ :tweet :i | + response messages doWithIndex: [ :tweet :i | | current previous | - current := response tweets at: i. - i < response tweets size ifTrue: [ - previous := response tweets at: i + 1. + current := response messages at: i. + i < response messages size ifTrue: [ + previous := response messages at: i + 1. current timelines at: self userName put: previous id; yourself ]]. diff --git a/Socialmetrica.package/NitterUser.class/instance/getLocalMessages.st b/Socialmetrica.package/NitterUser.class/instance/getLocalMessages.st index ecbe26d..1e85890 100644 --- a/Socialmetrica.package/NitterUser.class/instance/getLocalMessages.st +++ b/Socialmetrica.package/NitterUser.class/instance/getLocalMessages.st @@ -1,15 +1,14 @@ accessing getLocalMessages "TO DO! This method should return messages from the local database" - | allTweets myTweets tempTweets tempUsername | + | allTweets myTweets tweetsWithAntecesor | - tempUsername := self userName. TweetsCollection storeDB. allTweets := Tweet storedInstances asOrderedCollection. allTweets ifNil: [ ^ nil ]. myTweets := TweetsCollection new. - tempTweets := allTweets select: [ :each | each timelines isNotEmpty and: [each timelines keys first = tempUsername] ]. - myTweets tweets: tempTweets. - self tweets: myTweets. - ^ {self tweets. self userName. tempTweets} + tweetsWithAntecesor := allTweets select: [ :each | each timelines isNotEmpty and: [ each timelines keys first = self userName ]]. + myTweets messages: tweetsWithAntecesor. + self messages: myTweets. + ^ self messages \ No newline at end of file diff --git a/Socialmetrica.package/NitterUser.class/instance/getMessages.st b/Socialmetrica.package/NitterUser.class/instance/getMessages.st index f33b045..d6d77c6 100644 --- a/Socialmetrica.package/NitterUser.class/instance/getMessages.st +++ b/Socialmetrica.package/NitterUser.class/instance/getMessages.st @@ -1,4 +1,4 @@ accessing getMessages self getLocalMessages ifNil: [ self getRemoteMessagesFromRss ]. - ^ self tweets \ No newline at end of file + ^ self messages \ No newline at end of file diff --git a/Socialmetrica.package/NitterUser.class/instance/getRemoteMessagesFromRss.st b/Socialmetrica.package/NitterUser.class/instance/getRemoteMessagesFromRss.st index 1e29c10..849ab59 100644 --- a/Socialmetrica.package/NitterUser.class/instance/getRemoteMessagesFromRss.st +++ b/Socialmetrica.package/NitterUser.class/instance/getRemoteMessagesFromRss.st @@ -19,4 +19,4 @@ getRemoteMessagesFromRss yourself ]. current queries add: customQuery. lastTweets add: current ]. - self tweets: lastTweets \ No newline at end of file + self messages: lastTweets \ No newline at end of file diff --git a/Socialmetrica.package/NitterUser.class/instance/storeContents.st b/Socialmetrica.package/NitterUser.class/instance/storeContents.st index 3889172..bd529e9 100644 --- a/Socialmetrica.package/NitterUser.class/instance/storeContents.st +++ b/Socialmetrica.package/NitterUser.class/instance/storeContents.st @@ -4,7 +4,7 @@ storeContents | objectString directory tempFile oldFile dehidratated | dehidratated := self copy. - dehidratated tweets: nil. + dehidratated messages: nil. objectString := STON toStringPretty: dehidratated. directory := self folder ensureCreateDirectory. oldFile := directory / 'profile', 'ston'. diff --git a/Socialmetrica.package/NitterUser.class/instance/tweets.st b/Socialmetrica.package/NitterUser.class/instance/tweets.st new file mode 100644 index 0000000..6e8ee04 --- /dev/null +++ b/Socialmetrica.package/NitterUser.class/instance/tweets.st @@ -0,0 +1,6 @@ +accessing +tweets + self messages ifNil: [ ^ nil ]. + ^ TweetsCollection new + messages: (self messages messages select: [ :each | each authorId = self id ]); + yourself \ No newline at end of file diff --git a/Socialmetrica.package/NitterUser.class/instance/writeWordsFile.st b/Socialmetrica.package/NitterUser.class/instance/writeWordsFile.st index c8bf97c..a981edf 100644 --- a/Socialmetrica.package/NitterUser.class/instance/writeWordsFile.st +++ b/Socialmetrica.package/NitterUser.class/instance/writeWordsFile.st @@ -2,8 +2,8 @@ accessing writeWordsFile | rawTweets rawWords collectionsWords count | - self tweets ifNil: [ ^ self ]. - rawTweets := self tweets tweets. + self messages ifNil: [ ^ self ]. + rawTweets := self messages messages. rawWords := OrderedCollection new. collectionsWords := ((rawTweets select: diff --git a/Socialmetrica.package/TweetsCollection.class/instance/add..st b/Socialmetrica.package/TweetsCollection.class/instance/add..st index 2bd096e..c55646f 100644 --- a/Socialmetrica.package/TweetsCollection.class/instance/add..st +++ b/Socialmetrica.package/TweetsCollection.class/instance/add..st @@ -1,3 +1,3 @@ accessing add: aTweet - self tweets add: aTweet \ No newline at end of file + self messages add: aTweet \ No newline at end of file diff --git a/Socialmetrica.package/TweetsCollection.class/instance/gtTweetsFor..st b/Socialmetrica.package/TweetsCollection.class/instance/gtTweetsFor..st index 98fdc7f..88d5f83 100644 --- a/Socialmetrica.package/TweetsCollection.class/instance/gtTweetsFor..st +++ b/Socialmetrica.package/TweetsCollection.class/instance/gtTweetsFor..st @@ -11,7 +11,7 @@ gtTweetsFor: aView c vertical fitContent. c horizontal matchParent ]; padding: (BlInsets all: 10). - self tweets do: [ :each | + self messages do: [ :each | imageContainer := BrAsyncWidget new aptitude: BrShadowAptitude new; background: Color white; diff --git a/Socialmetrica.package/TweetsCollection.class/instance/messages..st b/Socialmetrica.package/TweetsCollection.class/instance/messages..st new file mode 100644 index 0000000..bcb1b20 --- /dev/null +++ b/Socialmetrica.package/TweetsCollection.class/instance/messages..st @@ -0,0 +1,3 @@ +accessing +messages: aTweetsCollection + ^ tweets := aTweetsCollection \ No newline at end of file diff --git a/Socialmetrica.package/TweetsCollection.class/instance/messages.st b/Socialmetrica.package/TweetsCollection.class/instance/messages.st new file mode 100644 index 0000000..55dcb18 --- /dev/null +++ b/Socialmetrica.package/TweetsCollection.class/instance/messages.st @@ -0,0 +1,3 @@ +accessing +messages + ^ tweets ifNil: [ tweets := OrderedCollection new] \ No newline at end of file diff --git a/Socialmetrica.package/TweetsCollection.class/instance/newest.st b/Socialmetrica.package/TweetsCollection.class/instance/newest.st new file mode 100644 index 0000000..c54134c --- /dev/null +++ b/Socialmetrica.package/TweetsCollection.class/instance/newest.st @@ -0,0 +1,7 @@ +accessing +newest + self messages ifNil: [ ^ nil ]. + self messages ifNilEmpty: [ ^ nil ]. + self pinned created > self messages second created + ifTrue: [ ^ self pinned ] + ifFalse: [ ^ self messages second ] \ No newline at end of file diff --git a/Socialmetrica.package/TweetsCollection.class/instance/oldest.st b/Socialmetrica.package/TweetsCollection.class/instance/oldest.st new file mode 100644 index 0000000..4c2e193 --- /dev/null +++ b/Socialmetrica.package/TweetsCollection.class/instance/oldest.st @@ -0,0 +1,3 @@ +accessing +oldest + ^ self messages last \ No newline at end of file diff --git a/Socialmetrica.package/TweetsCollection.class/instance/size.st b/Socialmetrica.package/TweetsCollection.class/instance/size.st index c2cdbcc..80f4676 100644 --- a/Socialmetrica.package/TweetsCollection.class/instance/size.st +++ b/Socialmetrica.package/TweetsCollection.class/instance/size.st @@ -1,3 +1,3 @@ accessing size - ^ self tweets size \ No newline at end of file + ^ self messages size \ No newline at end of file diff --git a/Socialmetrica.package/TweetsCollection.class/instance/store.st b/Socialmetrica.package/TweetsCollection.class/instance/store.st index 623dba7..34ec044 100644 --- a/Socialmetrica.package/TweetsCollection.class/instance/store.st +++ b/Socialmetrica.package/TweetsCollection.class/instance/store.st @@ -1,7 +1,7 @@ accessing store ReStore isConnected ifFalse: [ self class storeDB]. "Starting the ReStore singleton." - self tweets do: [:each | ReStore evaluateAsTransaction: [ + self messages do: [:each | ReStore evaluateAsTransaction: [ each store. each user isInDB ifFalse: [ each user store ] ] diff --git a/Socialmetrica.package/TweetsCollection.class/instance/tweets..st b/Socialmetrica.package/TweetsCollection.class/instance/tweets..st deleted file mode 100644 index 1361d1b..0000000 --- a/Socialmetrica.package/TweetsCollection.class/instance/tweets..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -tweets: aTweetsCollection - ^ tweets := aTweetsCollection \ No newline at end of file diff --git a/Socialmetrica.package/TweetsCollection.class/instance/tweets.st b/Socialmetrica.package/TweetsCollection.class/instance/tweets.st deleted file mode 100644 index b2a337f..0000000 --- a/Socialmetrica.package/TweetsCollection.class/instance/tweets.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -tweets - ^ tweets ifNil: [ tweets := OrderedCollection new] \ No newline at end of file diff --git a/Socialmetrica.package/TwitterAPIResponse.class/instance/messagesAuthors.st b/Socialmetrica.package/TwitterAPIResponse.class/instance/messagesAuthors.st index 3eff33f..08d73de 100644 --- a/Socialmetrica.package/TwitterAPIResponse.class/instance/messagesAuthors.st +++ b/Socialmetrica.package/TwitterAPIResponse.class/instance/messagesAuthors.st @@ -8,7 +8,7 @@ messagesAuthors (groupedTweets at: (user id)) do: [:tweetDict | | currentTweet | currentTweet := Tweet new fromDictionary: tweetDict. currentTweet user: user. - user tweets add: currentTweet. + user messages add: currentTweet. ]. user. ] \ No newline at end of file diff --git a/Socialmetrica.package/TwitterUser.class/instance/messages..st b/Socialmetrica.package/TwitterUser.class/instance/messages..st new file mode 100644 index 0000000..5d10de8 --- /dev/null +++ b/Socialmetrica.package/TwitterUser.class/instance/messages..st @@ -0,0 +1,3 @@ +accessing +messages: aTweetsCollection + messages := aTweetsCollection \ No newline at end of file diff --git a/Socialmetrica.package/TwitterUser.class/instance/messages.st b/Socialmetrica.package/TwitterUser.class/instance/messages.st new file mode 100644 index 0000000..0943f57 --- /dev/null +++ b/Socialmetrica.package/TwitterUser.class/instance/messages.st @@ -0,0 +1,3 @@ +accessing +messages + ^ messages ifNil: [ messages := OrderedCollection new ] \ No newline at end of file diff --git a/Socialmetrica.package/TwitterUser.class/instance/tweets..st b/Socialmetrica.package/TwitterUser.class/instance/tweets..st deleted file mode 100644 index 27e07ae..0000000 --- a/Socialmetrica.package/TwitterUser.class/instance/tweets..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -tweets: aTweetsCollection - tweets := aTweetsCollection \ No newline at end of file diff --git a/Socialmetrica.package/TwitterUser.class/instance/tweets.st b/Socialmetrica.package/TwitterUser.class/instance/tweets.st deleted file mode 100644 index 7f01686..0000000 --- a/Socialmetrica.package/TwitterUser.class/instance/tweets.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -tweets - ^ tweets ifNil: [ tweets := OrderedCollection new ] \ No newline at end of file diff --git a/Socialmetrica.package/TwitterUser.class/properties.json b/Socialmetrica.package/TwitterUser.class/properties.json index 4f67606..4d519f2 100644 --- a/Socialmetrica.package/TwitterUser.class/properties.json +++ b/Socialmetrica.package/TwitterUser.class/properties.json @@ -12,11 +12,11 @@ "profileImageUrl", "description", "metrics", - "tweets", "createdAt", "groups", "url", - "profileBio" + "profileBio", + "messages" ], "name" : "TwitterUser", "type" : "normal" diff --git a/Socialmetrica.package/TwitterUsersGroup.class/instance/gtTwitterUsersGroupOn..st b/Socialmetrica.package/TwitterUsersGroup.class/instance/gtTwitterUsersGroupOn..st index 4b855ff..c6741f5 100644 --- a/Socialmetrica.package/TwitterUsersGroup.class/instance/gtTwitterUsersGroupOn..st +++ b/Socialmetrica.package/TwitterUsersGroup.class/instance/gtTwitterUsersGroupOn..st @@ -10,4 +10,4 @@ gtTwitterUsersGroupOn: aView width: 75; column: 'User Name' text: [ :aTwitterUser | '@', aTwitterUser userName ]; column: 'Name' text: [ :aTwitterUser | aTwitterUser name ]; - column: 'Mentions' text: [ :aTwitterUser | aTwitterUser tweets size asString ] \ No newline at end of file + column: 'Mentions' text: [ :aTwitterUser | aTwitterUser messages size asString ] \ No newline at end of file