Outils-PeerTube/peertube-plugin-auto-import-ytb
2
0
Fork 1
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/testing' into testing

Browse Source
This commit is contained in:
Amaury
2021-07-09 12:17:50 +02:00
parent ea6adfc1fc db856aa6e2
commit ce19792a28
1 changed files with 110 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.ts
View File

@@ -1,8 +1,16 @@
import { ListenerRssAggregator } from "listener-rss-agregator"; import { ListenerRssAggregator } from "listener-rss-agregator";
<<<<<<< HEAD
type ListenerData = { type ListenerData = {
ChannelId: number; ChannelId: number;
}; };
=======
import { ListenerRSSInfos } from "listener-rss";
type ListenerData = {
ChannelId: number;
firstUpdate: boolean;
} & ListenerRSSInfos;
>>>>>>> origin/testing
let myManager: ListenerRssAggregator; let myManager: ListenerRssAggregator;
let listenersDataBinding = new Map<string, ListenerData>(); let listenersDataBinding = new Map<string, ListenerData>();
@@ -26,7 +34,11 @@ async function register({
}); });
logger.warn("setting register"); logger.warn("setting register");
<<<<<<< HEAD
fs.appendFileSync(path.join(basePath, "/storage.bd"), ""); fs.appendFileSync(path.join(basePath, "/storage.bd"), "");
=======
fs.appendFileSync(path.join(basePath, "/storage.bd"), ""); // append
>>>>>>> origin/testing
const configAggregator = await ListenerRssAggregator.instantiateAggregator( const configAggregator = await ListenerRssAggregator.instantiateAggregator(
path.join(basePath, "/storage.bd") path.join(basePath, "/storage.bd")