mirror of
https://codeberg.org/timelimit/timelimit-server.git
synced 2025-10-03 17:59:24 +02:00
Fix lint warnings
This commit is contained in:
parent
1f8f713059
commit
61d34c88f8
19 changed files with 24 additions and 24 deletions
|
@ -15,13 +15,13 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Router } from 'express'
|
|
||||||
import { Database } from '../database'
|
|
||||||
import { WebsocketApi } from '../websocket'
|
|
||||||
import { setStatusMessage, getStatusMessage } from '../function/statusmessage'
|
|
||||||
import * as escape from 'escape-html'
|
|
||||||
import { json } from 'body-parser'
|
import { json } from 'body-parser'
|
||||||
|
import * as escape from 'escape-html'
|
||||||
|
import { Router } from 'express'
|
||||||
import { BadRequest } from 'http-errors'
|
import { BadRequest } from 'http-errors'
|
||||||
|
import { Database } from '../database'
|
||||||
|
import { getStatusMessage, setStatusMessage } from '../function/statusmessage'
|
||||||
|
import { WebsocketApi } from '../websocket'
|
||||||
|
|
||||||
export const createAdminRouter = ({ database, websocket }: {
|
export const createAdminRouter = ({ database, websocket }: {
|
||||||
database: Database
|
database: Database
|
||||||
|
@ -57,7 +57,7 @@ export const createAdminRouter = ({ database, websocket }: {
|
||||||
|
|
||||||
websocket.triggerImportantSyncAtAllDevicesInBackground()
|
websocket.triggerImportantSyncAtAllDevicesInBackground()
|
||||||
|
|
||||||
res.json({ok: true})
|
res.json({ ok: true })
|
||||||
} catch (ex) {
|
} catch (ex) {
|
||||||
next(ex)
|
next(ex)
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,4 +41,4 @@ export const attributes: SequelizeAttributes<AddDeviceTokenAttributes> = {
|
||||||
createdAt: { ...timestampColumn }
|
createdAt: { ...timestampColumn }
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createAddDeviceTokenModel = (sequelize: Sequelize.Sequelize): AddDeviceTokenModelStatic => <AddDeviceTokenModelStatic>sequelize.define('AddDeviceToken', attributes)
|
export const createAddDeviceTokenModel = (sequelize: Sequelize.Sequelize): AddDeviceTokenModelStatic => sequelize.define('AddDeviceToken', attributes) as AddDeviceTokenModelStatic
|
||||||
|
|
|
@ -56,4 +56,4 @@ export const attributes: SequelizeAttributes<AppAttributes> = {
|
||||||
recommendation: createEnumColumn(appRecommendationValues)
|
recommendation: createEnumColumn(appRecommendationValues)
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createAppModel = (sequelize: Sequelize.Sequelize): AppModelStatic => <AppModelStatic>sequelize.define('App', attributes)
|
export const createAppModel = (sequelize: Sequelize.Sequelize): AppModelStatic => sequelize.define('App', attributes) as AppModelStatic
|
||||||
|
|
|
@ -60,4 +60,4 @@ export const attributes: SequelizeAttributes<AppActivityAttributes> = {
|
||||||
title: { ...optionalLabelColumn }
|
title: { ...optionalLabelColumn }
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createAppActivityModel = (sequelize: Sequelize.Sequelize): AppActivityModelStatic => <AppActivityModelStatic>sequelize.define('AppActivity', attributes)
|
export const createAppActivityModel = (sequelize: Sequelize.Sequelize): AppActivityModelStatic => sequelize.define('AppActivity', attributes) as AppActivityModelStatic
|
||||||
|
|
|
@ -45,4 +45,4 @@ export const attributes: SequelizeAttributes<AuthTokenAttributes> = {
|
||||||
createdAt: { ...timestampColumn }
|
createdAt: { ...timestampColumn }
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createAuthtokenModel = (sequelize: Sequelize.Sequelize): AuthTokenModelStatic => <AuthTokenModelStatic>sequelize.define('AuthToken', attributes)
|
export const createAuthtokenModel = (sequelize: Sequelize.Sequelize): AuthTokenModelStatic => sequelize.define('AuthToken', attributes) as AuthTokenModelStatic
|
||||||
|
|
|
@ -126,4 +126,4 @@ export const attributes: SequelizeAttributes<CategoryAttributes> = {
|
||||||
...attributesVersion4
|
...attributesVersion4
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createCategoryModel = (sequelize: Sequelize.Sequelize): CategoryModelStatic => <CategoryModelStatic>sequelize.define('Category', attributes)
|
export const createCategoryModel = (sequelize: Sequelize.Sequelize): CategoryModelStatic => sequelize.define('Category', attributes) as CategoryModelStatic
|
||||||
|
|
|
@ -49,4 +49,4 @@ export const attributes: SequelizeAttributes<CategoryAppAttributes> = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createCategoryAppModel = (sequelize: Sequelize.Sequelize): CategoryAppModelStatic => <CategoryAppModelStatic>sequelize.define('CategoryApp', attributes)
|
export const createCategoryAppModel = (sequelize: Sequelize.Sequelize): CategoryAppModelStatic => sequelize.define('CategoryApp', attributes) as CategoryAppModelStatic
|
||||||
|
|
|
@ -43,7 +43,7 @@ export const attributes: SequelizeAttributes<ConfigAttributes> = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createConfigModel = (sequelize: Sequelize.Sequelize): ConfigModelStatic => <ConfigModelStatic>sequelize.define('Config', attributes)
|
export const createConfigModel = (sequelize: Sequelize.Sequelize): ConfigModelStatic => sequelize.define('Config', attributes) as ConfigModelStatic
|
||||||
|
|
||||||
export const configItemIds = {
|
export const configItemIds = {
|
||||||
statusMessage: 'status_message'
|
statusMessage: 'status_message'
|
||||||
|
|
|
@ -246,7 +246,7 @@ export const attributes: SequelizeAttributes<DeviceAttributes> = {
|
||||||
...attributesVersion10
|
...attributesVersion10
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createDeviceModel = (sequelize: Sequelize.Sequelize): DeviceModelStatic => <DeviceModelStatic>sequelize.define('Device', attributes)
|
export const createDeviceModel = (sequelize: Sequelize.Sequelize): DeviceModelStatic => sequelize.define('Device', attributes) as DeviceModelStatic
|
||||||
export const hasDeviceManipulation = (device: DeviceAttributes) => {
|
export const hasDeviceManipulation = (device: DeviceAttributes) => {
|
||||||
const manipulationOfProtectionLevel = device.currentProtectionLevel !== device.highestProtectionLevel
|
const manipulationOfProtectionLevel = device.currentProtectionLevel !== device.highestProtectionLevel
|
||||||
const manipulationOfUsageStats = device.currentUsageStatsPermission !== device.highestUsageStatsPermission
|
const manipulationOfUsageStats = device.currentUsageStatsPermission !== device.highestUsageStatsPermission
|
||||||
|
|
|
@ -47,4 +47,4 @@ export const attributes: SequelizeAttributes<FamilyAttributes> = {
|
||||||
hasFullVersion: { ...booleanColumn }
|
hasFullVersion: { ...booleanColumn }
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createFamilyModel = (sequelize: Sequelize.Sequelize): FamilyModelStatic => <FamilyModelStatic>sequelize.define('Family', attributes)
|
export const createFamilyModel = (sequelize: Sequelize.Sequelize): FamilyModelStatic => sequelize.define('Family', attributes) as FamilyModelStatic
|
||||||
|
|
|
@ -61,4 +61,4 @@ export const attributes: SequelizeAttributes<MailLoginTokenAttributes> = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createMailLoginTokenModel = (sequelize: Sequelize.Sequelize): MailLoginTokenModelStatic => <MailLoginTokenModelStatic>sequelize.define('MailLoginToken', attributes)
|
export const createMailLoginTokenModel = (sequelize: Sequelize.Sequelize): MailLoginTokenModelStatic => sequelize.define('MailLoginToken', attributes) as MailLoginTokenModelStatic
|
||||||
|
|
|
@ -35,4 +35,4 @@ export const attributes: SequelizeAttributes<OldDeviceAttributes> = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createOldDeviceModel = (sequelize: Sequelize.Sequelize): OldDeviceModelStatic => <OldDeviceModelStatic>sequelize.define('OldDevice', attributes)
|
export const createOldDeviceModel = (sequelize: Sequelize.Sequelize): OldDeviceModelStatic => sequelize.define('OldDevice', attributes) as OldDeviceModelStatic
|
||||||
|
|
|
@ -50,4 +50,4 @@ export const attributes: SequelizeAttributes<PurchaseAttributes> = {
|
||||||
newFullVersionEndTime: timestampColumn
|
newFullVersionEndTime: timestampColumn
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createPurchaseModel = (sequelize: Sequelize.Sequelize): PurchaseModelStatic => <PurchaseModelStatic>sequelize.define('Purchase', attributes)
|
export const createPurchaseModel = (sequelize: Sequelize.Sequelize): PurchaseModelStatic => sequelize.define('Purchase', attributes) as PurchaseModelStatic
|
||||||
|
|
|
@ -61,4 +61,4 @@ export const attributes: SequelizeAttributes<TimelimitRuleAttributes> = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createTimelimitRuleModel = (sequelize: Sequelize.Sequelize): TimelimitRuleModelStatic => <TimelimitRuleModelStatic>sequelize.define('TimelimitRule', attributes)
|
export const createTimelimitRuleModel = (sequelize: Sequelize.Sequelize): TimelimitRuleModelStatic => sequelize.define('TimelimitRule', attributes) as TimelimitRuleModelStatic
|
||||||
|
|
|
@ -75,4 +75,4 @@ export const attributes = {
|
||||||
...attributesVersion2
|
...attributesVersion2
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createUsedTimeModel = (sequelize: Sequelize.Sequelize): UsedTimeModelStatic => <UsedTimeModelStatic>sequelize.define('UsedTime', attributes)
|
export const createUsedTimeModel = (sequelize: Sequelize.Sequelize): UsedTimeModelStatic => sequelize.define('UsedTime', attributes) as UsedTimeModelStatic
|
||||||
|
|
|
@ -130,4 +130,4 @@ export const attributes: SequelizeAttributes<UserAttributes> = {
|
||||||
...attributesVersion4
|
...attributesVersion4
|
||||||
}
|
}
|
||||||
|
|
||||||
export const createUserModel = (sequelize: Sequelize.Sequelize): UserModelStatic => <UserModelStatic>sequelize.define('User', attributes)
|
export const createUserModel = (sequelize: Sequelize.Sequelize): UserModelStatic => sequelize.define('User', attributes) as UserModelStatic
|
||||||
|
|
|
@ -15,9 +15,9 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import * as Sequelize from 'sequelize'
|
||||||
import { Database } from '../../database'
|
import { Database } from '../../database'
|
||||||
import { configItemIds } from '../../database/config'
|
import { configItemIds } from '../../database/config'
|
||||||
import * as Sequelize from 'sequelize'
|
|
||||||
|
|
||||||
export const getStatusMessage = async ({ database, transaction }: {
|
export const getStatusMessage = async ({ database, transaction }: {
|
||||||
database: Database
|
database: Database
|
||||||
|
|
|
@ -18,13 +18,13 @@
|
||||||
import { difference, filter, intersection } from 'lodash'
|
import { difference, filter, intersection } from 'lodash'
|
||||||
import * as Sequelize from 'sequelize'
|
import * as Sequelize from 'sequelize'
|
||||||
import { Database } from '../../database'
|
import { Database } from '../../database'
|
||||||
|
import { getStatusMessage } from '../../function/statusmessage'
|
||||||
import { ClientDataStatus } from '../../object/clientdatastatus'
|
import { ClientDataStatus } from '../../object/clientdatastatus'
|
||||||
import {
|
import {
|
||||||
ServerDataStatus, ServerInstalledAppsData, ServerUpdatedCategoryAssignedApps,
|
ServerDataStatus, ServerInstalledAppsData, ServerUpdatedCategoryAssignedApps,
|
||||||
ServerUpdatedCategoryBaseData, ServerUpdatedCategoryUsedTimes,
|
ServerUpdatedCategoryBaseData, ServerUpdatedCategoryUsedTimes,
|
||||||
ServerUpdatedTimeLimitRules
|
ServerUpdatedTimeLimitRules
|
||||||
} from '../../object/serverdatastatus'
|
} from '../../object/serverdatastatus'
|
||||||
import { getStatusMessage } from '../../function/statusmessage'
|
|
||||||
|
|
||||||
export const generateServerDataStatus = async ({ database, clientStatus, familyId, transaction }: {
|
export const generateServerDataStatus = async ({ database, clientStatus, familyId, transaction }: {
|
||||||
database: Database,
|
database: Database,
|
||||||
|
|
|
@ -15,11 +15,11 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import * as EventEmitter from 'events'
|
||||||
import * as io from 'socket.io'
|
import * as io from 'socket.io'
|
||||||
import { ConnectedDevicesManager, VisibleConnectedDevicesManager } from '../connected-devices'
|
import { ConnectedDevicesManager, VisibleConnectedDevicesManager } from '../connected-devices'
|
||||||
import { Database } from '../database'
|
import { Database } from '../database'
|
||||||
import { deviceByAuthTokenRoom } from './rooms'
|
import { deviceByAuthTokenRoom } from './rooms'
|
||||||
import * as EventEmitter from 'events'
|
|
||||||
|
|
||||||
export const createWebsocketHandler = ({ connectedDevicesManager, database }: {
|
export const createWebsocketHandler = ({ connectedDevicesManager, database }: {
|
||||||
connectedDevicesManager: VisibleConnectedDevicesManager
|
connectedDevicesManager: VisibleConnectedDevicesManager
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue