Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
modification defaultcontact et certains logs retirer
  • Loading branch information
johann morel committed Jun 30, 2022
1 parent 370aeb2 commit a9c85a1
Show file tree
Hide file tree
Showing 6 changed files with 168 additions and 61 deletions.
115 changes: 110 additions & 5 deletions config.json
View file
Expand Up @@ -29,24 +29,129 @@
},
"contactdefault": {
"police": {
"avatar": "",
"display": "L.S.P.D",
"avatar": "https://prod.cloud.rockstargames.com/crews/sc/7874/9340607/publish/emblem/emblem_512.png",
"display": "police",
"jobname": "police",
"number": "911",
"isDisplayed": true
},
"sheriff": {
"avatar": "https://s3-screenshots.int-cdn.lcpdfrusercontent.com/monthly_2021_08/1036792468_BCSOLogo.png.274985975caba446c8f7eadaba3d6cb8.png",
"display": "sheriff",
"jobname": "sheriff",
"number": "912",
"isDisplayed": true
},
"ambulance": {
"avatar": "",
"avatar": "https://nishikoto.github.io/FlashLife/img/ems.png",
"display": "Ambulance",
"jobname": "ambulance",
"number": "912",
"number": "913",
"isDisplayed": true
},
"brinks": {
"avatar": "",
"display": "brinks",
"jobname": "brinks",
"number": "2022454",
"isDisplayed": false
},
"builder": {
"avatar": "",
"display": "builder",
"jobname": "builder",
"number": "2023614",
"isDisplayed": false
},
"courrier": {
"avatar": "",
"display": "courrier",
"jobname": "courrier",
"number": "2028462",
"isDisplayed": false
},
"farmer": {
"avatar": "",
"display": "farmer",
"jobname": "farmer",
"number": "2021169",
"isDisplayed": false
},
"garbage": {
"avatar": "",
"display": "garbage",
"jobname": "garbage",
"number": "2023361",
"isDisplayed": false
},
"gardener": {
"avatar": "",
"display": "gardener",
"jobname": "gardener",
"number": "2022179",
"isDisplayed": false
},
"henHouse": {
"avatar": "",
"display": "henHouse",
"jobname": "henHouse",
"number": "2029478",
"isDisplayed": false
},
"lawyer": {
"avatar": "",
"display": "lawyer",
"jobname": "lawyer",
"number": "2026699",
"isDisplayed": false
},
"mechanic": {
"avatar": "",
"display": "mechanic",
"jobname": "mechanic",
"number": "2021477",
"isDisplayed": false
},
"realestate": {
"avatar": "",
"display": "realestate",
"jobname": "realestate",
"number": "2026941",
"isDisplayed": false
},
"taxi": {
"avatar": "",
"display": "taxi",
"jobname": "taxi",
"number": "555-5555",
"number": "2025555",
"isDisplayed": false
},
"tequilala": {
"avatar": "",
"display": "tequilala",
"jobname": "tequilala",
"number": "2021982",
"isDisplayed": false
},
"unicorn": {
"avatar": "",
"display": "unicorn",
"jobname": "unicorn",
"number": "2027315",
"isDisplayed": false
},
"weazelnews": {
"avatar": "",
"display": "weazelnews",
"jobname": "weazelnews",
"number": "2026948",
"isDisplayed": false
},
"yeallowjack": {
"avatar": "",
"display": "yeallowjack",
"jobname": "yeallowjack",
"number": "2025599",
"isDisplayed": false
}
}
Expand Down
76 changes: 41 additions & 35 deletions resources/server/bridge/sv_exports.ts
View file
Expand Up @@ -10,58 +10,64 @@ import { ChangePhoneNumber } from '../misc/functions';
const exp = global.exports;

const logExport = (exportName: string, msg: string) => {
bridgeLogger.debug(`[${exportName}] ${msg}`);
bridgeLogger.debug(`[${exportName}] ${msg}`);
};

// Will generate and return a unique phone number
exp('generatePhoneNumber', async () => {
const num = await generateUniquePhoneNumber();
logExport('generatePhoneNumber', num);
return num;
const num = await generateUniquePhoneNumber();
logExport('generatePhoneNumber', num);
return num;
});

exp(
'ChangePhoneNumber',
async (src: string, phonenumber: string, playerDTO: PlayerAddData, src2: number) => {
exp("DeletePhoneNumber", async (src: string, src2: number) => {
const player = PlayerService.getPlayerFromIdentifier(src);
player.setPhoneNumber(phonenumber);
ChangePhoneNumber(src, phonenumber);

if (typeof src2 !== 'number') {
return playerLogger.error('Source must be passed as a number when unloading a player');
}
playerLogger.debug(`Received unloadPlayer event for ${src2}`);
player.setPhoneNumber('');
ChangePhoneNumber(src, null);
await PlayerService.handleUnloadPlayerEvent(src2);
});

if (typeof playerDTO.source !== 'number') {
return playerLogger.error('Source must be passed as a number when loading a player');
}
await PlayerService.handleNewPlayerEvent(playerDTO);
emitNet('npwd:setPlayerLoaded' /* SET_PLAYER_LOADED */, playerDTO.source, true);
},
exp('ChangePhoneNumber',
async (src: string, phonenumber: string, playerDTO: PlayerAddData, src2: number) => {
const player = PlayerService.getPlayerFromIdentifier(src);
if (player != null) {
player.setPhoneNumber(phonenumber);
ChangePhoneNumber(src, phonenumber);
if (typeof src2 !== 'number') {
return playerLogger.error('Source must be passed as a number when unloading a player');
}
playerLogger.debug(`Received unloadPlayer event for ${src2}`);
await PlayerService.handleUnloadPlayerEvent(src2);
}
if (typeof playerDTO.source !== 'number') {
return playerLogger.error('Source must be passed as a number when loading a player');
}
await PlayerService.handleNewPlayerEvent(playerDTO);
emitNet('npwd:setPlayerLoaded' /* SET_PLAYER_LOADED */, playerDTO.source, true);
},
);

// For multicharacter frameworks, we enable these events for
// instantiating/deleting a player. The config option must be set to true
// for these to be available
if (config.general.useResourceIntegration) {
exp('newPlayer', async (playerDTO: PlayerAddData) => {
if (typeof playerDTO.source !== 'number') {
return playerLogger.error('Source must be passed as a number when loading a player');
}
await PlayerService.handleNewPlayerEvent(playerDTO);
emitNet(PhoneEvents.SET_PLAYER_LOADED, playerDTO.source, true);
});
exp('newPlayer', async (playerDTO: PlayerAddData) => {
if (typeof playerDTO.source !== 'number') {
return playerLogger.error('Source must be passed as a number when loading a player');
}
await PlayerService.handleNewPlayerEvent(playerDTO);
emitNet(PhoneEvents.SET_PLAYER_LOADED, playerDTO.source, true);
});

exp('unloadPlayer', async (src: number) => {
if (typeof src !== 'number') {
return playerLogger.error('Source must be passed as a number when unloading a player');
}
playerLogger.debug(`Received unloadPlayer event for ${src}`);
await PlayerService.handleUnloadPlayerEvent(src);
});
exp('unloadPlayer', async (src: number) => {
if (typeof src !== 'number') {
return playerLogger.error('Source must be passed as a number when unloading a player');
}
playerLogger.debug(`Received unloadPlayer event for ${src}`);
await PlayerService.handleUnloadPlayerEvent(src);
});
}

exp('getPhoneNumber', (src: number): string => {
return PlayerService.getPlayer(src).getPhoneNumber();
return PlayerService.getPlayer(src).getPhoneNumber();
});
4 changes: 0 additions & 4 deletions resources/server/contacts/contacts.service.ts
View file
Expand Up @@ -85,8 +85,6 @@ class _ContactService {
newcontact.isreadonly = 1;
let isDisplayed = true
Object.entries(item[1]).map((item2) => {
contactsLogger.error(item2[0]);

switch (item2[0]) {
case 'avatar': {
newcontact.avatar = item2[1];
Expand All @@ -102,13 +100,11 @@ class _ContactService {
}
}
});
contactsLogger.error(isDisplayed);
if (isDisplayed == true) {
index++;
contacts.push(newcontact);
}
});

resp({ status: 'ok', data: contacts });
} catch (e) {
resp({ status: 'error', errorMsg: 'GENERIC_DB_ERROR' });
Expand Down
2 changes: 1 addition & 1 deletion resources/server/match/match.service.ts
View file
Expand Up @@ -159,7 +159,7 @@ class _MatchService {
const profile = await this.matchDB.getOrCreateProfile(identifier);
return formatProfile(profile);
} catch (e) {
matchLogger.error(`Failed to get player profile, ${e.message}`);
// matchLogger.error(`Failed to get player profile, ${e.message}`);
}
}

Expand Down
26 changes: 13 additions & 13 deletions resources/server/misc/functions.ts
View file
Expand Up @@ -17,24 +17,24 @@ export async function findOrGeneratePhoneNumber(identifier: string): Promise<str
return castRes[0][config.database.phoneNumberColumn] as string;
}

playerLogger.debug('Phone number was returned as null, generating new number');
const gennedNumber = await generateUniquePhoneNumber();
//playerLogger.debug('Phone number was returned as null, generating new number');
//const gennedNumber = await generateUniquePhoneNumber();

playerLogger.debug(`Phone number generated > ${gennedNumber}`);
//playerLogger.debug(`Phone number generated > ${gennedNumber}`);

const updateQuery = `UPDATE ${config.database.playerTable} SET ${config.database.phoneNumberColumn} = ? WHERE ${config.database.identifierColumn} = ?`;
// const updateQuery = `UPDATE ${config.database.playerTable} SET ${config.database.phoneNumberColumn} = ? WHERE ${config.database.identifierColumn} = ?`;
// Update profile with new generated number
const result = await DbInterface._rawExec(updateQuery, [gennedNumber, identifier]);
//const result = await DbInterface._rawExec(updateQuery, [gennedNumber, identifier]);

// Temporary bad typing, need to update dbInterface
if (!result || !result[0] || !(result[0] as ResultSetHeader).affectedRows) {
playerLogger.error(`Failed to store phone number in database`);
playerLogger.error(
`UPDATE ${config.database.playerTable} SET ${config.database.phoneNumberColumn} = ${gennedNumber} WHERE ${config.database.identifierColumn} = ${identifier}`,
);
}

return gennedNumber;
//if (!result || !result[0] || !(result[0] as ResultSetHeader).affectedRows) {
// playerLogger.error(`Failed to store phone number in database`);
// playerLogger.error(
// `UPDATE ${config.database.playerTable} SET ${config.database.phoneNumberColumn} = ${gennedNumber} WHERE ${config.database.identifierColumn} = ${identifier}`,
// );
//}

return '';
}

export async function ChangePhoneNumber(identifier: string, phonenumber: string) {
Expand Down
6 changes: 3 additions & 3 deletions resources/server/twitter/twitter.service.ts
View file
Expand Up @@ -41,9 +41,9 @@ class _TwitterService {
}
} catch (e) {
resp({ status: 'error', errorMsg: e.message });
twitterLogger.error(`Failed to get or create profile, ${e.message}`, {
source: reqObj.source,
});
//twitterLogger.error(`Failed to get or create profile, ${e.message}`, {
// source: reqObj.source,
// });
}
}

Expand Down

0 comments on commit a9c85a1

Please sign in to comment.