Merge branch 'main' into filterFee
This commit is contained in:
@@ -24,18 +24,20 @@ function showFeeds() {
|
||||
}
|
||||
|
||||
function tweetCell(tweet) {
|
||||
const date = new Date(tweet.created_at);
|
||||
var cell = document.createElement("div");
|
||||
cell.innerHTML =
|
||||
`<div class="tweet">
|
||||
<a href ="https://www.twitter.com/${tweet.user.screen_name}"><img src="${tweet.user.profile_image_url}" onerror="this.src='media/logo.png';" class="tweet-profilepicture"></a>
|
||||
<div class="tweet-content">
|
||||
<div class="tweet-name">
|
||||
<a class="tweet-nickname" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">${tweet.user.name}</a>
|
||||
<a class="tweet-username" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">@${tweet.user.screen_name}</a>
|
||||
<!-- add tweet date called created_at-->
|
||||
<p class="tweet-date">${tweet.created_at}</p>
|
||||
<div>
|
||||
<a class="tweet-nickname" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">${tweet.user.name}</a>
|
||||
<a class="tweet-username" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">@${tweet.user.screen_name}</a>
|
||||
</div>
|
||||
<span class="tweet-date"><em>${date.getHours()}:${date.getMinutes()}</em></span>
|
||||
</div>
|
||||
<span class="tweet-text">${tweet.text}</span>
|
||||
<a class="tweet-text" href = "https://www.twitter.com/${tweet.user.screen_name}/status/${tweet.id_str}" target = "_blank">${tweet.text}</a>
|
||||
<div class="tweet-interactions">
|
||||
<div class="tweet-interaction tweet-likes">
|
||||
<span class="material-symbols-outlined">favorite</span>
|
||||
@@ -123,7 +125,7 @@ function sortTweets(tweets, sort){
|
||||
tweets.sort(function(a,b){return a.reply_count-b.reply_count})
|
||||
}
|
||||
}
|
||||
if (sort.sortby == "date"){
|
||||
if (sort.sortby == "time"){
|
||||
if(sort.order == 'asc'){
|
||||
tweets.sort(function(a,b){return Date(b.created_at)-Date(a.reply_count)})
|
||||
} else{
|
||||
|
||||
@@ -43,7 +43,6 @@ let root = document.querySelector(":root")
|
||||
|
||||
$(".logo").on("click", function() {
|
||||
if (root.style.getPropertyValue("--main-bg") === 'snow') {
|
||||
console.log("IM here")
|
||||
var audio = new Audio("../media/Chicken.mp3");
|
||||
audio.play();
|
||||
root.style.setProperty('--main-medium-dark', '#1E1E1E');
|
||||
@@ -66,16 +65,19 @@ $(".logo").on("click", function() {
|
||||
|
||||
$(window).on("filter", function() {
|
||||
var parent = document.querySelector("#filtered")
|
||||
parent.replaceChildren();
|
||||
var lastTweet = parent.firstChild
|
||||
|
||||
tweets = window.sessionStorage.getItem('tweets');
|
||||
tweets = JSON.parse(tweets);
|
||||
tweets = filterTweets(tweets, filters.blockedWords, filters.searchedWords.concat(filters.sports), filters.sorted, filters.order);
|
||||
tweets = sortTweets(tweets, [filters.sorted, filters.order]);
|
||||
tweets = sortTweets(tweets, {"sortby":filters.sorted, "order":filters.order});
|
||||
var displayTweets = tweets.reverse().slice(0, 20).reverse();
|
||||
for (i = 0; i < Math.min(19, displayTweets.length); i++){
|
||||
tweet = displayTweets[i];
|
||||
parent.prepend(tweetCell(tweet));
|
||||
if(tweetCell(displayTweets[0]) != lastTweet){
|
||||
parent.replaceChildren();
|
||||
for (i = 0; i < Math.min(19, displayTweets.length); i++){
|
||||
tweet = displayTweets[i];
|
||||
parent.prepend(tweetCell(tweet));
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user