forked from Outils-PeerTube/peertube-plugin-auto-import-ytb
		
	Merge remote-tracking branch 'origin/testing' into testing
This commit is contained in:
		
							
								
								
									
										12
									
								
								src/main.ts
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								src/main.ts
									
									
									
									
									
								
							@@ -1,8 +1,16 @@
 | 
			
		||||
import { ListenerRssAggregator } from "listener-rss-agregator";
 | 
			
		||||
<<<<<<< HEAD
 | 
			
		||||
 | 
			
		||||
type ListenerData = {
 | 
			
		||||
  ChannelId: number;
 | 
			
		||||
};
 | 
			
		||||
=======
 | 
			
		||||
import { ListenerRSSInfos } from "listener-rss";
 | 
			
		||||
type ListenerData = {
 | 
			
		||||
  ChannelId: number;
 | 
			
		||||
  firstUpdate: boolean;
 | 
			
		||||
} & ListenerRSSInfos;
 | 
			
		||||
>>>>>>> origin/testing
 | 
			
		||||
 | 
			
		||||
let myManager: ListenerRssAggregator;
 | 
			
		||||
let listenersDataBinding = new Map<string, ListenerData>();
 | 
			
		||||
@@ -26,7 +34,11 @@ async function register({
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  logger.warn("setting register");
 | 
			
		||||
<<<<<<< HEAD
 | 
			
		||||
  fs.appendFileSync(path.join(basePath, "/storage.bd"), "");
 | 
			
		||||
=======
 | 
			
		||||
  fs.appendFileSync(path.join(basePath, "/storage.bd"), ""); // append
 | 
			
		||||
>>>>>>> origin/testing
 | 
			
		||||
 | 
			
		||||
  const configAggregator = await ListenerRssAggregator.instantiateAggregator(
 | 
			
		||||
    path.join(basePath, "/storage.bd")
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user