From 89a73603a3a8aad93b4d04e568c2ebd00cce40fd Mon Sep 17 00:00:00 2001 From: Offray Luna Date: Mon, 11 Apr 2022 10:05:21 -0500 Subject: [PATCH] Spliting between local and remote messages. Minor UI improvements. --- .../instance/getLocalMessages.st | 4 ++++ .../NitterUser.class/instance/getMessages.st | 24 ++----------------- .../instance/getRemoteMessages.st | 22 +++++++++++++++++ .../instance/gtTweetsFor..st | 2 +- 4 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 Socialmetrica.package/NitterUser.class/instance/getLocalMessages.st create mode 100644 Socialmetrica.package/NitterUser.class/instance/getRemoteMessages.st diff --git a/Socialmetrica.package/NitterUser.class/instance/getLocalMessages.st b/Socialmetrica.package/NitterUser.class/instance/getLocalMessages.st new file mode 100644 index 0000000..22f1e8d --- /dev/null +++ b/Socialmetrica.package/NitterUser.class/instance/getLocalMessages.st @@ -0,0 +1,4 @@ +accessing +getLocalMessages + "TO DO! This method should return messages from the local database" + ^ nil \ 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 d775842..e87fd33 100644 --- a/Socialmetrica.package/NitterUser.class/instance/getMessages.st +++ b/Socialmetrica.package/NitterUser.class/instance/getMessages.st @@ -1,24 +1,4 @@ accessing getMessages - | lastTweetsRaw customQuery lastTweets | - lastTweetsRaw := self rssFeed xmlDocument xpath: '//item'. - lastTweets := TweetsCollection new. - customQuery := Dictionary new - at: 'parameters' put: self userNameLink; - at: 'date' put: DateAndTime now; - yourself. - lastTweets query: customQuery. - lastTweetsRaw doWithIndex: [ :rssTweet :i | | current previous | - current := Tweet new fromNitterRssItem: rssTweet. - i < lastTweetsRaw size ifTrue: [ - previous := Tweet new fromNitterRssItem: (lastTweetsRaw at: i + 1). - current timelines - at: self userName put: previous id; - yourself. - ]. - current queries add: customQuery. - lastTweets add: current. - ]. - self tweets: lastTweets. - ^ self tweets - \ No newline at end of file + self getLocalMessages ifNil: [ self getRemoteMessages ]. + ^ self tweets \ No newline at end of file diff --git a/Socialmetrica.package/NitterUser.class/instance/getRemoteMessages.st b/Socialmetrica.package/NitterUser.class/instance/getRemoteMessages.st new file mode 100644 index 0000000..c278a47 --- /dev/null +++ b/Socialmetrica.package/NitterUser.class/instance/getRemoteMessages.st @@ -0,0 +1,22 @@ +accessing +getRemoteMessages + + | customQuery lastTweetsRaw lastTweets | + lastTweetsRaw := self rssFeed xmlDocument xpath: '//item'. + lastTweets := TweetsCollection new. + customQuery := Dictionary new + at: 'parameters' put: self userNameLink; + at: 'date' put: DateAndTime now; + yourself. + lastTweets query: customQuery. + lastTweetsRaw doWithIndex: [ :rssTweet :i | + | current previous | + current := Tweet new fromNitterRssItem: rssTweet. + i < lastTweetsRaw size ifTrue: [ + previous := Tweet new fromNitterRssItem: (lastTweetsRaw at: i + 1). + current timelines + at: self userName put: previous id; + yourself ]. + current queries add: customQuery. + lastTweets add: current ]. + self tweets: lastTweets \ 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 0132c09..98fdc7f 100644 --- a/Socialmetrica.package/TweetsCollection.class/instance/gtTweetsFor..st +++ b/Socialmetrica.package/TweetsCollection.class/instance/gtTweetsFor..st @@ -17,7 +17,7 @@ gtTweetsFor: aView background: Color white; margin: (BlInsets all: 10); constraintsDo: [ :c | - c vertical exact: 275. + c vertical exact: 200. c horizontal exact: 480 ]; stencil: [ each asCardElement margin: (BlInsets all: 15) ]. container addChild: imageContainer