Merge branch 'master' of https://github.com/syuilo/misskey
This commit is contained in:
		@@ -75,6 +75,7 @@
 | 
			
		||||
		"@types/showdown": "1.7.5",
 | 
			
		||||
		"@types/single-line-log": "1.1.0",
 | 
			
		||||
		"@types/speakeasy": "2.0.2",
 | 
			
		||||
		"@types/systeminformation": "3.23.0",
 | 
			
		||||
		"@types/tmp": "0.0.33",
 | 
			
		||||
		"@types/uuid": "3.4.3",
 | 
			
		||||
		"@types/webpack": "4.4.8",
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
import * as os from 'os';
 | 
			
		||||
const sysUtils = require('systeminformation');
 | 
			
		||||
import * as sysUtils from 'systeminformation';
 | 
			
		||||
import * as diskusage from 'diskusage';
 | 
			
		||||
import Xev from 'xev';
 | 
			
		||||
 | 
			
		||||
@@ -61,6 +61,7 @@ async function usedMem() {
 | 
			
		||||
		return data.active;
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		console.error(error);
 | 
			
		||||
		throw error;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -71,5 +72,6 @@ async function totalMem() {
 | 
			
		||||
		return data.total;
 | 
			
		||||
	} catch (error) {
 | 
			
		||||
		console.error(error);
 | 
			
		||||
		throw error;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user