diff --git a/BaselineOfSocialmetrica.package/BaselineOfSocialmetrica.class/instance/baseline..st b/BaselineOfSocialmetrica.package/BaselineOfSocialmetrica.class/instance/baseline..st index 059a0a2..729cfe2 100644 --- a/BaselineOfSocialmetrica.package/BaselineOfSocialmetrica.class/instance/baseline..st +++ b/BaselineOfSocialmetrica.package/BaselineOfSocialmetrica.class/instance/baseline..st @@ -5,14 +5,13 @@ baseline: spec for: #common do: [ "Dependencies" - "self rssTools: spec." "<-- We need to fix the XMLWriter dependency." self xmlParserHTML: spec. self reStore: spec. "self roassal3Exporters: spec." self mustache: spec. - "self tiddlyWikiPharo: spec." + self tiddlyWikiPharo: spec. "Packages" spec package: 'Socialmetrica' - with: [ spec requires: #("'RSSTools'" 'XMLParserHTML' 'ReStore' "'Roassal3Exporters'" 'Mustache' "'TiddlyWikiPharo'") ] + with: [ spec requires: #('XMLParserHTML' 'ReStore' "'Roassal3Exporters'" 'Mustache' 'TiddlyWikiPharo') ] ] \ No newline at end of file diff --git a/BaselineOfSocialmetrica.package/BaselineOfSocialmetrica.class/instance/rssTools..st b/BaselineOfSocialmetrica.package/BaselineOfSocialmetrica.class/instance/rssTools..st deleted file mode 100644 index 87c03d0..0000000 --- a/BaselineOfSocialmetrica.package/BaselineOfSocialmetrica.class/instance/rssTools..st +++ /dev/null @@ -1,11 +0,0 @@ -baselines -rssTools: spec - Metacello new - repository: 'github://brackendev/RSSTools-Pharo/src'; - baseline: 'RSSTools'; - onConflict: [ :ex | ex useLoaded ]; - "onUpgrade: [ :ex | ex useLoaded ]; - onDowngrade: [ :ex | ex useLoaded ];" - onWarningLog; - load. - spec baseline: 'RSSTools' with: [ spec repository: 'github://brackendev/RSSTools-Pharo/src'] \ No newline at end of file diff --git a/BaselineOfSocialmetrica.package/BaselineOfSocialmetrica.class/instance/tiddlyWikiPharo..st b/BaselineOfSocialmetrica.package/BaselineOfSocialmetrica.class/instance/tiddlyWikiPharo..st index 9dcfc59..15d0936 100644 --- a/BaselineOfSocialmetrica.package/BaselineOfSocialmetrica.class/instance/tiddlyWikiPharo..st +++ b/BaselineOfSocialmetrica.package/BaselineOfSocialmetrica.class/instance/tiddlyWikiPharo..st @@ -1,7 +1,8 @@ baselines tiddlyWikiPharo: spec - ExoRepo new - repository: 'https://code.tupale.co/Offray/TiddlyWikiPharo'; - load. - spec baseline: 'TiddlyWikiPharo' \ No newline at end of file + | repo | + repo := ExoRepo new + repository: 'https://code.tupale.co/Offray/TiddlyWikiPharo'. + repo load. + spec baseline: 'TiddlyWikiPharo' with: [ spec repository: 'gitlocal://', repo local fullName ] \ No newline at end of file diff --git a/Socialmetrica.package/NitterUser.class/instance/getRemoteMessagesFromRss.st b/Socialmetrica.package/NitterUser.class/instance/getRemoteMessagesFromRss.st deleted file mode 100644 index 849ab59..0000000 --- a/Socialmetrica.package/NitterUser.class/instance/getRemoteMessagesFromRss.st +++ /dev/null @@ -1,22 +0,0 @@ -accessing -getRemoteMessagesFromRss - - | 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 messages: lastTweets \ No newline at end of file diff --git a/Socialmetrica.package/NitterUser.class/instance/name.st b/Socialmetrica.package/NitterUser.class/instance/name.st index e17d843..4bf1018 100644 --- a/Socialmetrica.package/NitterUser.class/instance/name.st +++ b/Socialmetrica.package/NitterUser.class/instance/name.st @@ -1,3 +1,6 @@ accessing name - ^ name ifNil: [ name := ((self rssFeed requiredItems title) splitOn: '/') first ] \ No newline at end of file + + | documentTree | + documentTree := [ self documentTree ] onErrorDo: [ ^ nil ]. + ^ name ifNil: [ name := (documentTree xpath: '//div[@class="profile-card-tabs-name"]//a[@class="profile-card-fullname"]') stringValue ] \ No newline at end of file diff --git a/Socialmetrica.package/NitterUser.class/instance/profileImageUrl.st b/Socialmetrica.package/NitterUser.class/instance/profileImageUrl.st index 890bf95..2adbeda 100644 --- a/Socialmetrica.package/NitterUser.class/instance/profileImageUrl.st +++ b/Socialmetrica.package/NitterUser.class/instance/profileImageUrl.st @@ -1,7 +1,6 @@ accessing profileImageUrl - | userFeed | - ^ profileImageUrl ifNil: [ - userFeed := self rssFeed xmlDocument. - (userFeed xpath: '//div[@class="error-panel"]') size = 1 ifTrue: [ ^ nil]. - profileImageUrl := ((self rssFeed xmlDocument xpath: '//image/url') stringValue copyReplaceAll: '%2F' with: '/') ] \ No newline at end of file + + | documentTree | + documentTree := [ self documentTree ] onErrorDo: [ ^ nil ]. + ^ self class nitterProvider, (((documentTree xpath: '//div[@class="profile-card-info"]//a[@class="profile-card-avatar"]') @ 'href') stringValue copyReplaceAll: '%2F' with: '/') copyWithoutFirst \ No newline at end of file diff --git a/Socialmetrica.package/NitterUser.class/instance/rssFeed.st b/Socialmetrica.package/NitterUser.class/instance/rssFeed.st deleted file mode 100644 index e3f6d47..0000000 --- a/Socialmetrica.package/NitterUser.class/instance/rssFeed.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -rssFeed - - ^ RSSTools createRSSFeedFor: self userNameLink , '/rss' \ No newline at end of file