merge
This commit is contained in:
parent
ce19792a28
commit
4f6587e1f6
12
src/main.ts
12
src/main.ts
|
@ -1,16 +1,8 @@
|
||||||
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>();
|
||||||
|
@ -34,11 +26,7 @@ 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")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user