Merge remote-tracking branch 'upstream/edge' into edge

math-GH · Apr 26, 2024 · e5bf420 · e5bf420
2 parents bc4c996 + 5ca0b89
commit e5bf420
Show file tree

Hide file tree

Showing 26 changed files with 89 additions and 55 deletions.
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
@@ -573,6 +573,7 @@ public static function actualizeFeeds(?int $feed_id = null, ?string $feed_url =
 						$existingHash = $existingHashForGuids[$entry->guid()];
 						if (strcasecmp($existingHash, $entry->hash()) !== 0) {
 							//This entry already exists but has been updated
+							$entry->_isUpdated(true);
 							//Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->url(false) .
 								//', old hash ' . $existingHash . ', new hash ' . $entry->hash());
 							$entry->_isFavorite(null);	// Do not change favourite state
@@ -587,6 +588,11 @@ public static function actualizeFeeds(?int $feed_id = null, ?string $feed_url =
 								continue;
 							}
 
+							$entry->applyFilterActions($titlesAsRead);
+							if ($readWhenSameTitleInFeed > 0) {
+								$titlesAsRead[$entry->title()] = true;
+							}
+
 							if (!$entry->isRead()) {
 								$needFeedCacheRefresh = true;	//Maybe
 								$nbMarkedUnread++;
@@ -601,6 +607,7 @@ public static function actualizeFeeds(?int $feed_id = null, ?string $feed_url =
 							$entryDAO->updateEntry($entry->toArray());
 						}
 					} else {
+						$entry->_isUpdated(false);
 						$id = uTimeString();
 						$entry->_id($id);
 

diff --git a/app/Models/Entry.php b/app/Models/Entry.php
@@ -24,6 +24,7 @@ class FreshRSS_Entry extends Minz_Model {
 	private string $hash = '';
 	private ?bool $is_read;
 	private ?bool $is_favorite;
+	private bool $is_updated = false;
 	private int $feedId;
 	private ?FreshRSS_Feed $feed;
 	/** @var array<string> */
@@ -394,6 +395,18 @@ public function isFavorite(): ?bool {
 		return $this->is_favorite;
 	}
 
+	/**
+	 * Returns whether the entry has been modified since it was inserted in database.
+	 * @returns bool `true` if the entry already existed (and has been modified), `false` if the entry is new (or unmodified).
+	 */
+	public function isUpdated(): ?bool {
+		return $this->is_updated;
+	}
+
+	public function _isUpdated(bool $value): void {
+		$this->is_updated = $value;
+	}
+
 	public function feed(): ?FreshRSS_Feed {
 		if ($this->feed === null) {
 			$feedDAO = FreshRSS_Factory::createFeedDao();

diff --git a/app/Models/FilterActionsTrait.php b/app/Models/FilterActionsTrait.php
@@ -135,10 +135,16 @@ public function applyFilterActions(FreshRSS_Entry $entry, ?bool &$applyLabel = n
 							}
 							break;
 						case 'star':
-							$entry->_isFavorite(true);
+							if (!$entry->isUpdated()) {
+								// Do not apply to updated articles, to avoid overruling a user manual action
+								$entry->_isFavorite(true);
+							}
 							break;
 						case 'label':
-							$applyLabel = true;
+							if (!$entry->isUpdated()) {
+								// Do not apply to updated articles, to avoid overruling a user manual action
+								$applyLabel = true;
+							}
 							break;
 					}
 				}

diff --git a/p/themes/Alternative-Dark/adark.css b/p/themes/Alternative-Dark/adark.css
@@ -794,9 +794,9 @@ kbd {
 	filter: grayscale(0.8) brightness(1.7);
 }
 
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: var(--font-color-light);
-	font-size: 0.7rem;
 }
 
 .flux .bottom {

diff --git a/p/themes/Alternative-Dark/adark.rtl.css b/p/themes/Alternative-Dark/adark.rtl.css
@@ -794,9 +794,9 @@ kbd {
 	filter: grayscale(0.8) brightness(1.7);
 }
 
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: var(--font-color-light);
-	font-size: 0.7rem;
 }
 
 .flux .bottom {

diff --git a/p/themes/Ansum/_list-view.scss b/p/themes/Ansum/_list-view.scss
@@ -51,7 +51,7 @@
 			}
 		}
 
-		.item.date {
+		.item .date {
 			color: color.scale(variables.$unread-font-color, $alpha: -50%);
 		}
 	}
@@ -77,7 +77,8 @@
 		}
 	}
 
-	.item.date {
+	.flux_header .date,
+	.flux_content .bottom .date {
 		color: color.scale(variables.$main-font-color, $alpha: -50%);
 		font-size: 0.85rem;
 	}

diff --git a/p/themes/Ansum/ansum.css b/p/themes/Ansum/ansum.css
@@ -1011,7 +1011,7 @@ main.prompt {
 .flux.not_read .item.website a {
 	color: #161a38;
 }
-.flux.not_read .item.date {
+.flux.not_read .item .date {
 	color: rgba(22, 26, 56, 0.5);
 }
 .flux.favorite {
@@ -1028,7 +1028,8 @@ main.prompt {
 	color: #363330;
 	opacity: 0.75;
 }
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: rgba(54, 51, 48, 0.5);
 	font-size: 0.85rem;
 }

diff --git a/p/themes/Ansum/ansum.rtl.css b/p/themes/Ansum/ansum.rtl.css
@@ -1011,7 +1011,7 @@ main.prompt {
 .flux.not_read .item.website a {
 	color: #161a38;
 }
-.flux.not_read .item.date {
+.flux.not_read .item .date {
 	color: rgba(22, 26, 56, 0.5);
 }
 .flux.favorite {
@@ -1028,7 +1028,8 @@ main.prompt {
 	color: #363330;
 	opacity: 0.75;
 }
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: rgba(54, 51, 48, 0.5);
 	font-size: 0.85rem;
 }

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
@@ -456,7 +456,8 @@ button.as-link[disabled] {
 	color: var(--dark-font-color8);
 }
 
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: var(--dark-font-color6);
 }
 

diff --git a/p/themes/Dark/dark.rtl.css b/p/themes/Dark/dark.rtl.css
@@ -456,7 +456,8 @@ button.as-link[disabled] {
 	color: var(--dark-font-color8);
 }
 
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: var(--dark-font-color6);
 }
 

diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
@@ -729,9 +729,9 @@ th {
 	font-size: 0.9rem;
 }
 
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: #666;
-	font-size: 0.7rem;
 }
 
 .flux .bottom {

diff --git a/p/themes/Flat/flat.rtl.css b/p/themes/Flat/flat.rtl.css
@@ -729,9 +729,9 @@ th {
 	font-size: 0.9rem;
 }
 
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: #666;
-	font-size: 0.7rem;
 }
 
 .flux .bottom {

diff --git a/p/themes/Mapco/_list-view.scss b/p/themes/Mapco/_list-view.scss
@@ -47,7 +47,7 @@
 			}
 		}
 
-		.item.date {
+		.item .date {
 			color: color.scale(variables.$unread-font-color, $alpha: -50%);
 		}
 	}
@@ -73,7 +73,8 @@
 		}
 	}
 
-	.item.date {
+	.flux_header .date,
+	.flux_content .bottom .date {
 		color: color.scale(variables.$main-font-color, $alpha: -50%);
 		font-size: 0.85rem;
 	}

diff --git a/p/themes/Mapco/mapco.css b/p/themes/Mapco/mapco.css
@@ -1026,7 +1026,7 @@ main.prompt {
 .flux.not_read .item.website a {
 	color: #36c;
 }
-.flux.not_read .item.date {
+.flux.not_read .item .date {
 	color: rgba(51, 102, 204, 0.5);
 }
 .flux.favorite {
@@ -1043,7 +1043,8 @@ main.prompt {
 	color: #303136;
 	opacity: 0.75;
 }
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: rgba(48, 49, 54, 0.5);
 	font-size: 0.85rem;
 }

diff --git a/p/themes/Mapco/mapco.rtl.css b/p/themes/Mapco/mapco.rtl.css
@@ -1026,7 +1026,7 @@ main.prompt {
 .flux.not_read .item.website a {
 	color: #36c;
 }
-.flux.not_read .item.date {
+.flux.not_read .item .date {
 	color: rgba(51, 102, 204, 0.5);
 }
 .flux.favorite {
@@ -1043,7 +1043,8 @@ main.prompt {
 	color: #303136;
 	opacity: 0.75;
 }
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: rgba(48, 49, 54, 0.5);
 	font-size: 0.85rem;
 }

diff --git a/p/themes/Nord/nord.css b/p/themes/Nord/nord.css
@@ -791,10 +791,6 @@ li.item.active {
 	padding: 0.25rem;
 }
 
-.flux .item.date {
-	font-size: 0.7rem;
-}
-
 .flux .bottom {
 	font-size: 0.8rem;
 	text-align: center;

diff --git a/p/themes/Nord/nord.rtl.css b/p/themes/Nord/nord.rtl.css
@@ -791,10 +791,6 @@ li.item.active {
 	padding: 0.25rem;
 }
 
-.flux .item.date {
-	font-size: 0.7rem;
-}
-
 .flux .bottom {
 	font-size: 0.8rem;
 	text-align: center;

diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
@@ -849,9 +849,9 @@ a.signin {
 	padding: 0.425rem;
 }
 
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: var(--font-color-grey);
-	font-size: 0.7rem;
 }
 
 .flux .bottom {

diff --git a/p/themes/Pafat/pafat.rtl.css b/p/themes/Pafat/pafat.rtl.css
@@ -849,9 +849,9 @@ a.signin {
 	padding: 0.425rem;
 }
 
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: var(--font-color-grey);
-	font-size: 0.7rem;
 }
 
 .flux .bottom {

diff --git a/p/themes/Swage/swage.css b/p/themes/Swage/swage.css
@@ -767,9 +767,9 @@ form th {
 .flux.not_read:not(.current):hover .item .title {
 	background-color: var(--color-background-unread);
 }
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: var(--color-text-light-darker);
-	font-size: 0.7rem;
 }
 .flux .bottom {
 	font-size: 0.8rem;

diff --git a/p/themes/Swage/swage.rtl.css b/p/themes/Swage/swage.rtl.css
@@ -767,9 +767,9 @@ form th {
 .flux.not_read:not(.current):hover .item .title {
 	background-color: var(--color-background-unread);
 }
-.flux .item.date {
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
 	color: var(--color-text-light-darker);
-	font-size: 0.7rem;
 }
 .flux .bottom {
 	font-size: 0.8rem;

diff --git a/p/themes/Swage/swage.scss b/p/themes/Swage/swage.scss
@@ -990,11 +990,9 @@ form {
 		}
 	}
 
-	.item {
-		&.date {
-			color: var(--color-text-light-darker);
-			font-size: 0.7rem;
-		}
+	.flux_header .date,
+	.flux_content .bottom .date {
+		color: var(--color-text-light-darker);
 	}
 
 	.bottom {

diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
@@ -555,10 +555,6 @@ th {
 	padding: 5px;
 }
 
-.flux .item.date {
-	font-size: 0.7rem;
-}
-
 .flux:not(.current):hover .item.title {
 }
 

diff --git a/p/themes/base-theme/base.rtl.css b/p/themes/base-theme/base.rtl.css
@@ -555,10 +555,6 @@ th {
 	padding: 5px;
 }
 
-.flux .item.date {
-	font-size: 0.7rem;
-}
-
 .flux:not(.current):hover .item.title {
 }
 

diff --git a/p/themes/base-theme/frss.css b/p/themes/base-theme/frss.css
@@ -1411,6 +1411,11 @@ a.website:hover .favicon {
 	overflow: hidden;
 }
 
+.flux .flux_header .date,
+.flux .flux_content .bottom .date {
+	font-size: 0.7rem;
+}
+
 .item.query > a {
 	display: list-item;
 	list-style-position: inside;
@@ -2205,7 +2210,7 @@ html.slider-active {
 	}
 
 	.flux_header .item.website span,
-	.item.date, .day .date,
+	.item .date, .day .date,
 	.dropdown-menu > .no-mobile,
 	.no-mobile {
 		display: none;
@@ -2248,6 +2253,10 @@ html.slider-active {
 		text-align: center;
 	}
 
+	.flux .flux_header .item .title:has(~.date) {
+		padding-right: 1rem;
+	}
+
 	#overlay .close {
 		position: relative;
 	}