More stuff

This commit is contained in:
DenialMC 2015-04-08 20:19:02 +03:00
parent 7b9174b692
commit 16dfbb003b
3 changed files with 7 additions and 8 deletions

View file

@ -2722,7 +2722,7 @@ dclass DistributedBlackCatMgr : DistributedObject {
}; };
dclass DistributedReportMgr : DistributedObject { dclass DistributedReportMgr : DistributedObject {
sendRequest(uint32, string) airecv; sendReport(uint32, string) airecv clsend;
}; };
dclass DistributedPolarBearMgr : DistributedObject { dclass DistributedPolarBearMgr : DistributedObject {

View file

@ -2,7 +2,7 @@
from pandac.PandaModules import * from pandac.PandaModules import *
hashVal = 3773405074L hashVal = 3611798738L
from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot

View file

@ -1,32 +1,31 @@
from direct.directnotify import DirectNotifyGlobal from direct.directnotify import DirectNotifyGlobal
from direct.distributed.DistributedObjectAI import DistributedObjectAI from direct.distributed.DistributedObjectAI import DistributedObjectAI
from toontown.uberdog.ClientServicesManagerUD import executeHttpRequestAndLog from toontown.uberdog.ClientServicesManagerUD import executeHttpRequestAndLog
import ReportGlobals, threading import ReportGlobals, threading, time
class DistributedReportMgrAI(DistributedObjectAI): class DistributedReportMgrAI(DistributedObjectAI):
notify = DirectNotifyGlobal.directNotify.newCategory("DistributedReportMgrAI") notify = DirectNotifyGlobal.directNotify.newCategory("DistributedReportMgrAI")
def __init__(self, air): def __init__(self, air):
DistributedObjectAI.DistributedObjectAI(self, air) DistributedObjectAI.__init__(self, air)
self.reports = [] self.reports = []
self.interval = config.GetInt('report-interval', 600) self.interval = config.GetInt('report-interval', 600)
self.scheduleReport() self.scheduleReport()
def scheduleReport(self): def scheduleReport(self):
threading.Timer(self.interval, self.sendAllReports) threading.Timer(self.interval, self.sendAllReports).start()
def sendReport(self, avId, category): def sendReport(self, avId, category):
if not ReportGlobals.isValidCategoryName(category) or not len(str(avId)) == 9: if not ReportGlobals.isValidCategoryName(category) or not len(str(avId)) == 9:
return return
reporterId = self.air.getAvatarIdFromSender() reporter = self.air.doId2do.get(self.air.getAvatarIdFromSender())
reporter = self.air.doId2do.get(reporterId)
if not reporter or reporter.isReported(avId): if not reporter or reporter.isReported(avId):
return return
timestamp = int(round(time.time() * 1000)) timestamp = int(round(time.time() * 1000))
self.reports.append('%s|%s|%s|%s' % (timestamp, reporterId, avId, category)) self.reports.append('%s|%s|%s|%s' % (timestamp, reporter.doId, avId, category))
def sendAllReports(self): def sendAllReports(self):
if not self.reports or config.GetString('accountdb-type', 'developer') != 'remote': if not self.reports or config.GetString('accountdb-type', 'developer') != 'remote':