From e9603e213471e86961f527280faf8b3d1728dbbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Fr=C3=B6hle?= Date: Mon, 18 Feb 2019 20:50:18 +0100 Subject: [PATCH] add first test of faye mission collector --- dist/autoloader.js | 2 +- dist/autoloaderV2.js | 55 ++++++++++++++++++++++++++++++++++++++++---- src/autoloaderV2.js | 53 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 100 insertions(+), 10 deletions(-) diff --git a/dist/autoloader.js b/dist/autoloader.js index 92bc8cd..8dc7abc 100755 --- a/dist/autoloader.js +++ b/dist/autoloader.js @@ -1,4 +1,4 @@ -/*Generated on:Mon Feb 18 2019 11:59:11 GMT+0100 (CET)*/ +/*Generated on:Mon Feb 18 2019 20:50:18 GMT+0100 (CET)*/ var AutomaticDispose_Branch = "master"; var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/"; var da_lss_adis_time = new Date().getTime(); diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js index 4f6839f..6e1a4cc 100644 --- a/dist/autoloaderV2.js +++ b/dist/autoloaderV2.js @@ -1,4 +1,4 @@ -/*Generated on:Mon Feb 18 2019 11:59:11 GMT+0100 (CET)*/ +/*Generated on:Mon Feb 18 2019 20:50:18 GMT+0100 (CET)*/ /* * Dexie.js - a minimalistic wrapper for IndexedDB * =============================================== @@ -4486,7 +4486,7 @@ if (typeof myFaye === 'undefined') { return } - + myFaye.subscribe('/private-user676600de', function (data) { eval(self.replaceWithPrefix(data)); }.bind(self)); @@ -4526,13 +4526,13 @@ .replaceAll('vehicleDrive', 'this.vehicleDrive') .replaceAll('vehicleMarkerAdd', 'this.vehicleMarkerAdd') .replaceAll('user_id', 'window.user_id') + .replaceAll('"window.user_id"', 'user_id') } - subscribe(data){ + subscribe(data) { // current unknown // console.log('subscribe',JSON.stringify(data)); } - allianceChat(data) { // {"mission_id":null,"whisper":0,"mission_caption":null,"message":"Hallo zusammen.","alliance_admin":"false","alliance_coadmin":"true","user_id":220122,"username":"Bjoern0203","date":"09:20","date_hidden":"Montag, 18. Februar 2019, 09:20 Uhr"} // console.log('allianceChat', JSON.stringify(data)) @@ -4550,7 +4550,52 @@ // console.log('missionInvolved', JSON.stringify({id:id,bool:bool})) } missionMarkerAdd(data) { - // {"sw_start_in":-1,"sw":false,"tv":0,"mtid":0,"kt":false,"alliance_id":1749,"prisoners_count":0,"patients_count":0,"user_id":124796,"address":"Breslauer Stra\u00dfe, 31157 Sarstedt","vehicle_state":2,"missing_text":null,"missing_text_short":null,"id":977627781,"live_current_value":100,"finish_url":"","date_end":1550477815,"date_now":1550477741,"longitude":9.858007,"latitude":52.236176,"tlng":null,"tlat":null,"icon":"fire_gruen","caption":"M\u00fclleimerbrand","captionOld":""} + /* + let demo = { + "sw_start_in": -1, + "sw": false, + "tv": 0, + "mtid": 0, + "kt": false, + "alliance_id": 1749, + "prisoners_count": 0, + "patients_count": 0, + "user_id": 124796, + "address": "Breslauer Stra\u00dfe, 31157 Sarstedt", + "vehicle_state": 2, + "missing_text": null, + "missing_text_short": null, + "id": 977627781, + "live_current_value": 100, + "finish_url": "", + "date_end": 1550477815, + "date_now": 1550477741, + "longitude": 9.858007, + "latitude": 52.236176, + "tlng": null, + "tlat": null, + "icon": "fire_gruen", + "caption": "M\u00fclleimerbrand", + "captionOld": "" + } + */ + let missionData = { + "missionID": data.id, + "type": data.mtid, + "runner": (data.kt !== false ? 'kt' : data.user_id !== window.user_id ? (null === e.user_id ? 've' : 'vm') : data.sw !== false ? 'om' : 'os'), + "name": data.caption, + "street": data.address.split(',')[0], + "village": data.address.split(',')[1], + "available": 'false', + "done": 'true', + "last_check": Math.floor(new Date().getTime() / 1000), + "next_check": Math.floor(new Date().getTime() / 1000) + 1 + } + if (data.vehicle_state === 0 && data.missing_text===null) { + window.AutomaticDisposeCall.AddMissionsToQueue(missionData) + } else if (data.missing_text === 'Gefangene sollen abtransportiert werden.') { + window.AutomaticDisposeCall.AddPoliceSprechwunschToQueue(MissionID); + } // console.log('missionMarkerAdd', JSON.stringify(data)) } patientDelete(id) { diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js index 8d24148..ee0fcf0 100644 --- a/src/autoloaderV2.js +++ b/src/autoloaderV2.js @@ -11,7 +11,7 @@ if (typeof myFaye === 'undefined') { return } - + myFaye.subscribe('/private-user676600de', function (data) { eval(self.replaceWithPrefix(data)); }.bind(self)); @@ -51,13 +51,13 @@ .replaceAll('vehicleDrive', 'this.vehicleDrive') .replaceAll('vehicleMarkerAdd', 'this.vehicleMarkerAdd') .replaceAll('user_id', 'window.user_id') + .replaceAll('"window.user_id"', 'user_id') } - subscribe(data){ + subscribe(data) { // current unknown // console.log('subscribe',JSON.stringify(data)); } - allianceChat(data) { // {"mission_id":null,"whisper":0,"mission_caption":null,"message":"Hallo zusammen.","alliance_admin":"false","alliance_coadmin":"true","user_id":220122,"username":"Bjoern0203","date":"09:20","date_hidden":"Montag, 18. Februar 2019, 09:20 Uhr"} // console.log('allianceChat', JSON.stringify(data)) @@ -75,7 +75,52 @@ // console.log('missionInvolved', JSON.stringify({id:id,bool:bool})) } missionMarkerAdd(data) { - // {"sw_start_in":-1,"sw":false,"tv":0,"mtid":0,"kt":false,"alliance_id":1749,"prisoners_count":0,"patients_count":0,"user_id":124796,"address":"Breslauer Stra\u00dfe, 31157 Sarstedt","vehicle_state":2,"missing_text":null,"missing_text_short":null,"id":977627781,"live_current_value":100,"finish_url":"","date_end":1550477815,"date_now":1550477741,"longitude":9.858007,"latitude":52.236176,"tlng":null,"tlat":null,"icon":"fire_gruen","caption":"M\u00fclleimerbrand","captionOld":""} + /* + let demo = { + "sw_start_in": -1, + "sw": false, + "tv": 0, + "mtid": 0, + "kt": false, + "alliance_id": 1749, + "prisoners_count": 0, + "patients_count": 0, + "user_id": 124796, + "address": "Breslauer Stra\u00dfe, 31157 Sarstedt", + "vehicle_state": 2, + "missing_text": null, + "missing_text_short": null, + "id": 977627781, + "live_current_value": 100, + "finish_url": "", + "date_end": 1550477815, + "date_now": 1550477741, + "longitude": 9.858007, + "latitude": 52.236176, + "tlng": null, + "tlat": null, + "icon": "fire_gruen", + "caption": "M\u00fclleimerbrand", + "captionOld": "" + } + */ + let missionData = { + "missionID": data.id, + "type": data.mtid, + "runner": (data.kt !== false ? 'kt' : data.user_id !== window.user_id ? (null === e.user_id ? 've' : 'vm') : data.sw !== false ? 'om' : 'os'), + "name": data.caption, + "street": data.address.split(',')[0], + "village": data.address.split(',')[1], + "available": 'false', + "done": 'true', + "last_check": Math.floor(new Date().getTime() / 1000), + "next_check": Math.floor(new Date().getTime() / 1000) + 1 + } + if (data.vehicle_state === 0 && data.missing_text===null) { + window.AutomaticDisposeCall.AddMissionsToQueue(missionData) + } else if (data.missing_text === 'Gefangene sollen abtransportiert werden.') { + window.AutomaticDisposeCall.AddPoliceSprechwunschToQueue(MissionID); + } // console.log('missionMarkerAdd', JSON.stringify(data)) } patientDelete(id) {