olinpin/twitter-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FINALY WORKING FILTERED FEED, kinda

Browse Source
This commit is contained in:
Oliver Hnát
2022-11-03 12:51:15 +01:00
parent 1309809045
commit d445036c1a
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dashboard_static/js/code.js
View File

@@ -82,14 +82,13 @@ function searchForWords(searchWords, tweets){
for (let i = 0; i < tweets.length; i++) { for (let i = 0; i < tweets.length; i++) {
var tweet = tweets[i] var tweet = tweets[i]
for(let i=0; i < searchWords.length; i++){ for(let i=0; i < searchWords.length; i++){
console.log(tweet.text.toLowerCase().includes(searchWords[i].toLowerCase())) var text = tweet.text.toLowerCase()
if (!tweet.text.toLowerCase().includes(searchWords[i].toLowerCase())) { var word = searchWords[i].toLowerCase()
tweets.splice(i, 1) if (text.includes(word)) {
filteredTweets.push(tweet)
break break
} }
} }
console.log(tweet, searchWords)
filteredTweets.push(tweet)
} }
return filteredTweets.reverse() return filteredTweets.reverse()
} }

4
dashboard_static/js/events.js
View File

@@ -66,8 +66,8 @@ $(".logo").on("click", function() {
}) })
$(window).on("filter", function() { $(window).on("filter", function() {
var parent = $("div.filtered") var parent = document.querySelector("#filtered")
$("div.filtered").innerHTML = "" parent.replaceChildren();
console.debug(filters); console.debug(filters);

10
dashboard_static/lib/tweets.js
View File

@@ -77,6 +77,7 @@ block.fn.tweets = function(config) {
// register default handler for handling tweet data // register default handler for handling tweet data
this.actions(function(e, tweet){ this.actions(function(e, tweet){
$(window).trigger("filter");
tweets = window.sessionStorage.getItem('tweets'); tweets = window.sessionStorage.getItem('tweets');
tweets = JSON.parse(tweets); tweets = JSON.parse(tweets);
tweets.push(tweet); tweets.push(tweet);
@@ -86,15 +87,8 @@ block.fn.tweets = function(config) {
} }
window.sessionStorage.setItem('tweets', JSON.stringify(tweets)); window.sessionStorage.setItem('tweets', JSON.stringify(tweets));
// remove stale tweets // remove tweets
// if ($list.childElementCount > options.memory) {
// console.log("Deleted")
// // delete last child element
// // $list.removeChild($list.lastChild);
// }
$list.replaceChildren(); $list.replaceChildren();
// tweets = filterTweets(tweets, filters.blockedWords, filters.searchedWords + filters.sports, filters.sorted, filters.order);
// tweets = sortTweets(tweets);
var displayTweets = tweets.reverse().slice(0, options.memory).reverse(); var displayTweets = tweets.reverse().slice(0, options.memory).reverse();
for (i = 0; i < options.memory-1; i++){ for (i = 0; i < options.memory-1; i++){
$list.prepend(tweetCell(displayTweets[i])); $list.prepend(tweetCell(displayTweets[i]));