add ttrss_filters2.last_triggered (bump schema version)

remotes/origin/json-viewfeed
Andrew Dolgov 4 years ago
parent a01c33d654
commit 3e4326e34d
  1. 1
      classes/pref/filters.php
  2. 6
      classes/rssutils.php
  3. 4
      include/functions.php
  4. 4
      js/PrefFilterTree.js
  5. 3
      schema/ttrss_schema_mysql.sql
  6. 3
      schema/ttrss_schema_pgsql.sql
  7. 8
      schema/versions/mysql/135.sql
  8. 8
      schema/versions/pgsql/135.sql

@ -333,6 +333,7 @@ class Pref_Filters extends Handler_Protected {
$filter['name'] = $name[0];
$filter['param'] = $name[1];
$filter['checkbox'] = false;
$filter['last_triggered'] = $line["last_triggered"] ? make_local_datetime($line["last_triggered"], false) : null;
$filter['enabled'] = $line["enabled"];
$filter['rules'] = $this->getfilterrules_concise($line['id']);

@ -781,6 +781,12 @@ class RSSUtils {
$plugin->hook_filter_triggered($feed, $owner_uid, $article, $matched_filters, $matched_rules, $article_filters);
}
$matched_filter_ids = implode(",", array_map(function($f) { return $f['id']; }, $matched_filters));
$fsth = $pdo->prepare("UPDATE ttrss_filters2 SET last_triggered = NOW() WHERE
id IN (?) AND owner_uid = ?");
$fsth->execute([$matched_filter_ids, $owner_uid]);
if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
Debug::log("matched filters: ", Debug::$LOG_VERBOSE);

@ -1,6 +1,6 @@
<?php
define('EXPECTED_CONFIG_VERSION', 26);
define('SCHEMA_VERSION', 134);
define('SCHEMA_VERSION', 135);
define('LABEL_BASE_INDEX', -1024);
define('PLUGIN_FEED_BASE_INDEX', -128);
@ -2589,4 +2589,4 @@
}
return $ts;
}
}

@ -39,6 +39,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
const feed = this.model.store.getValue(item, 'feed');
const inverse = this.model.store.getValue(item, 'inverse');
const last_triggered = this.model.store.getValue(item, 'last_triggered');
if (feed)
label += " (" + __("in") + " " + feed + ")";
@ -46,6 +47,9 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
if (inverse)
label += " (" + __("Inverse") + ")";
if (last_triggered)
label += " — " + last_triggered;
return label;
},
getIconClass: function (item, opened) {

@ -244,6 +244,7 @@ create table ttrss_filters2(id integer primary key auto_increment,
inverse bool not null default false,
title varchar(250) not null default '',
order_id integer not null default 0,
last_triggered datetime default null,
foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
create table ttrss_filters2_rules(id integer primary key auto_increment,
@ -284,7 +285,7 @@ create table ttrss_tags (id integer primary key auto_increment,
create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
insert into ttrss_version values (134);
insert into ttrss_version values (135);
create table ttrss_enclosures (id integer primary key auto_increment,
content_url text not null,

@ -239,6 +239,7 @@ create table ttrss_filters2(id serial not null primary key,
inverse boolean not null default false,
title varchar(250) not null default '',
order_id integer not null default 0,
last_triggered timestamp default null,
enabled boolean not null default true);
create table ttrss_filters2_rules(id serial not null primary key,
@ -266,7 +267,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
create table ttrss_version (schema_version int not null);
insert into ttrss_version values (134);
insert into ttrss_version values (135);
create table ttrss_enclosures (id serial not null primary key,
content_url text not null,

@ -0,0 +1,8 @@
begin;
alter table ttrss_filters2 add column last_triggered datetime;
alter table ttrss_filters2 alter column last_triggered set default null;
update ttrss_version set schema_version = 135;
commit;

@ -0,0 +1,8 @@
begin;
alter table ttrss_filters2 add column last_triggered timestamp;
alter table ttrss_filters2 alter column last_triggered set default null;
update ttrss_version set schema_version = 135;
commit;
Loading…
Cancel
Save