From cd363db76b64db26f34776bb522cdf0b60903e13 Mon Sep 17 00:00:00 2001
From: Nyo <to@nyo.zz.mu>
Date: Wed, 8 Jun 2016 11:33:27 +0200
Subject: [PATCH] .BANCHO. Log bans in RAP

---
 constants/fokabotCommands.py |  6 +++++-
 helpers/userHelper.py        | 10 ++++------
 objects/osuToken.py          |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/constants/fokabotCommands.py b/constants/fokabotCommands.py
index 08a5453..d9a7267 100644
--- a/constants/fokabotCommands.py
+++ b/constants/fokabotCommands.py
@@ -172,7 +172,7 @@ def silence(fro, chan, message):
 		targetToken.silence(silenceTime, reason, userID)
 	else:
 		# User offline, silence user only in db
-		userHelper.silence(targetUserID, int(time.time())+silenceTime, reason, userID)
+		userHelper.silence(targetUserID, silenceTime, reason, userID)
 
 	# Log message
 	msg = "{} has been silenced for the following reason: {}".format(target, reason)
@@ -209,6 +209,7 @@ def ban(fro, chan, message):
 
 	# Make sure the user exists
 	targetUserID = userHelper.getID(target)
+	userID = userHelper.getID(fro)
 	if targetUserID == False:
 		return "{}: user not found".format(target)
 
@@ -220,6 +221,7 @@ def ban(fro, chan, message):
 	if targetToken != None:
 		targetToken.enqueue(serverPackets.loginBanned())
 
+	log.rap(userID, "has banned {}".format(target), True)
 	return "RIP {}. You will not be missed.".format(target)
 
 def unban(fro, chan, message):
@@ -230,12 +232,14 @@ def unban(fro, chan, message):
 
 	# Make sure the user exists
 	targetUserID = userHelper.getID(target)
+	userID = userHelper.getID(fro)
 	if targetUserID == False:
 		return "{}: user not found".format(target)
 
 	# Set allowed to 1
 	userHelper.setAllowed(targetUserID, 1)
 
+	log.rap(userID, "has unbanned {}".format(target), True)
 	return "Welcome back {}!".format(target)
 
 def restartShutdown(restart):
diff --git a/helpers/userHelper.py b/helpers/userHelper.py
index 85870cd..c310d2b 100644
--- a/helpers/userHelper.py
+++ b/helpers/userHelper.py
@@ -100,22 +100,20 @@ def getSilenceEnd(userID):
 	return glob.db.fetch("SELECT silence_end FROM users WHERE id = %s", [userID])["silence_end"]
 
 
-def silence(userID, silenceEndTime, silenceReason, author = 999):
-	# TODO: user seconds insteaf od silenceEndTime
+def silence(userID, seconds, silenceReason, author = 999):
 	"""
-	Set userID's **ABSOLUTE** silence end UNIX time
-	Remember to add time.time() to the silence length
+	Silence someone
 
 	userID -- userID
-	silenceEndtime -- UNIX time when the silence ends
+	seconds -- silence length in seconds
 	silenceReason -- Silence reason shown on website
 	author -- userID of who silenced the user. Default: 999
 	"""
 	# db qurey
+	silenceEndTime = int(time.time())+seconds
 	glob.db.execute("UPDATE users SET silence_end = %s, silence_reason = %s WHERE id = %s", [silenceEndTime, silenceReason, userID])
 
 	# Loh
-	seconds = silenceEndTime-int(time.time())
 	targetUsername = getUsername(userID)
 	# TODO: exists check im drunk rn i need to sleep (stampa piede ubriaco confirmed)
 	if seconds > 0:
diff --git a/objects/osuToken.py b/objects/osuToken.py
index c67759f..88f86b9 100644
--- a/objects/osuToken.py
+++ b/objects/osuToken.py
@@ -251,7 +251,7 @@ class token:
 		author -- userID of who has silenced the target. Optional. Default: 999 (fokabot)
 		"""
 		# Silence user in db
-		userHelper.silence(self.userID, int(time.time())+seconds, reason, author)
+		userHelper.silence(self.userID, seconds, reason, author)
 
 		# Send silence packet to target
 		self.enqueue(serverPackets.silenceEndTime(seconds))