Skip to content

Commit

Permalink
spouts: Remove instapaper
Browse files Browse the repository at this point in the history
It has long been broken, switch those feeds to Graby.
  • Loading branch information
jtojnar committed Jan 26, 2021
1 parent 8345621 commit 2d41ce3
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 82 deletions.
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
- PHP startup errors are now logged, instead of having F3 crash with Error 500 ([#1195](https://github.com/fossar/selfoss/pull/1195))
- In order to support offline mode, we moved much of the UI to the browser. ([#1150](https://github.com/fossar/selfoss/pull/1150), [#1184](https://github.com/fossar/selfoss/pull/1184), [#1215](https://github.com/fossar/selfoss/pull/1215), [#1216](https://github.com/fossar/selfoss/pull/1216))
- We carried out a significant internal refactoring ([#1164](https://github.com/fossar/selfoss/pull/1164), [#1190](https://github.com/fossar/selfoss/pull/1190))
- Removed Instapaper spout since it has been broken since its acquisition. Sources using it were migrated to “RSS Feed (with content extraction)”. ([#1245](https://github.com/fossar/selfoss/pull/1245))
- Placeholders are now used for images before they are loaded to avoid content jumping around ([#1204](https://github.com/fossar/selfoss/pull/1204))
- Search button is now always on the screen, avoiding the need to scroll to top to be able to use it. ([#1231](https://github.com/fossar/selfoss/issues/1231))
- Button for opening articles, tags, sources and filters in the sidebar, as well as the source and tag links in articles are now real links, allowing to open them in a new tab by middle-clicking them. ([#1216](https://github.com/fossar/selfoss/issues/1216), [#695](https://github.com/fossar/selfoss/issues/695))
Expand Down
6 changes: 6 additions & 0 deletions src/daos/mysql/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,12 @@ public function __construct(\DB\SQL $connection, Logger $logger) {
'INSERT INTO ' . \F3::get('db_prefix') . 'version (version) VALUES (12)'
]);
}
if (strnatcmp($version, '13') < 0) {
$this->exec([
'UPDATE ' . \F3::get('db_prefix') . "sources SET spout = 'spouts\\\\rss\\\\fulltextrss' WHERE spout = 'spouts\\\\rss\\\\instapaper'",
'INSERT INTO ' . \F3::get('db_prefix') . 'version (version) VALUES (13)'
]);
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions src/daos/pgsql/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,12 @@ public function __construct(\DB\SQL $connection, Logger $logger) {
'INSERT INTO version (version) VALUES (12)'
]);
}
if (strnatcmp($version, '13') < 0) {
$this->exec([
"UPDATE sources SET spout = 'spouts\\rss\\fulltextrss' WHERE spout = 'spouts\\rss\\instapaper'",
'INSERT INTO ' . \F3::get('db_prefix') . 'version (version) VALUES (13)'
]);
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions src/daos/sqlite/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,12 @@ public function __construct(\DB\SQL $connection, Logger $logger) {
'INSERT INTO version (version) VALUES (11)'
]);
}
if (strnatcmp($version, '13') < 0) {
$this->exec([
"UPDATE sources SET spout = 'spouts\\rss\\fulltextrss' WHERE spout = 'spouts\\rss\\instapaper'",
'INSERT INTO version (version) VALUES (13)'
]);
}
}
}

Expand Down
82 changes: 0 additions & 82 deletions src/spouts/rss/instapaper.php

This file was deleted.

0 comments on commit 2d41ce3

Please sign in to comment.