franzz/databap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add error message in add_message function + NSFW error message for 9gag

Browse Source
This commit is contained in:
lutranf
2014-12-30 14:09:01 +01:00
parent 71984d3437
commit 81fccaeb44
3 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
inc/databap.php
View File

@@ -432,9 +432,7 @@ class Databap extends PhpObject
'errors'=>array('disconnected'=>self::DISCONNECTED, 'errors'=>array('disconnected'=>self::DISCONNECTED,
'not_authorized'=>self::NOT_AUTH, 'not_authorized'=>self::NOT_AUTH,
'not_found'=>self::NOT_FOUND, 'not_found'=>self::NOT_FOUND,
'insert'=>self::FAIL_INSERT, 'system'=>array(self::FAIL_INSERT, self::FAIL_UPDATE, self::FAIL_DELETE)),
'update'=>self::FAIL_UPDATE,
'delete'=>self::FAIL_DELETE),
'success'=>self::SUCCESS, 'success'=>self::SUCCESS,
'error'=>self::ERROR, 'error'=>self::ERROR,
'keep_alive'=>self::KEEP_ALIVE, 'keep_alive'=>self::KEEP_ALIVE,
@@ -735,15 +733,18 @@ class Databap extends PhpObject
break; break;
} }
} }
$asResult = $this->downloadToTmp($o9gagImage->getAttribute('src'));
$asResult = array();
if(isset($o9gagImage)) $asResult = $this->downloadToTmp($o9gagImage->getAttribute('src'));
else $asResult['error'] = 'Not safe for work';
if($asResult['error']=='') if($asResult['error']=='')
{ {
$asPost['url_img'] = $asResult['out']; $asPost['url_img'] = $asResult['out'];
$asPost['width'] = $asResult['width']; $asPost['width'] = $asResult['width'];
$asPost['height'] = $asResult['height']; $asPost['height'] = $asResult['height'];
} }
else $asPost['error'] = $asResult['error']; $asPost['error'] = $asResult['error'];
return $asPost; return $asPost;
} }
@@ -1793,6 +1794,8 @@ class Databap extends PhpObject
{ {
$sMessage = htmlspecialchars($sMessage); $sMessage = htmlspecialchars($sMessage);
$sType = self::MESSAGE_USER; $sType = self::MESSAGE_USER;
$bSuccess = true;
$sDesc = '';
if(mb_substr($sMessage, 0, 1) == '/') if(mb_substr($sMessage, 0, 1) == '/')
{ {
if(mb_substr($sMessage, 0, 4) == '/me ') if(mb_substr($sMessage, 0, 4) == '/me ')
@@ -1906,17 +1909,25 @@ class Databap extends PhpObject
elseif((mb_substr($sMessage, 0, 5) == '/img ' || mb_substr($sMessage, 0, 5) == '/pic ') && mb_strlen($sMessage)>5) elseif((mb_substr($sMessage, 0, 5) == '/img ' || mb_substr($sMessage, 0, 5) == '/pic ') && mb_strlen($sMessage)>5)
{ {
$sUrl = trim(mb_substr($sMessage, 4)); $sUrl = trim(mb_substr($sMessage, 4));
$asResult = $this->downloadToTmp($sUrl); $asImage = $this->downloadToTmp($sUrl);
if($asResult['error']=='') $bSuccess = ($asImage['error']=='');
if($bSuccess)
{ {
$sMessage = $this->getJsonMessage(array($asResult['out'], $asResult['width'], $asResult['height'], $sUrl)); $sMessage = $this->getJsonMessage(array($asImage['out'], $asImage['width'], $asImage['height'], $sUrl));
$sType = self::MESSAGE_IMG; $sType = self::MESSAGE_IMG;
} }
else $sDesc = $asImage['error'];
} }
elseif(mb_substr($sMessage, 0, 6) == '/9gag ' && mb_strlen($sMessage)>6) elseif(mb_substr($sMessage, 0, 6) == '/9gag ' && mb_strlen($sMessage)>6)
{ {
$sMessage = $this->getJsonMessage($this->get9gagPost(trim(mb_substr($sMessage, 6)))); $asImage = $this->get9gagPost(trim(mb_substr($sMessage, 6)));
$sType = self::MESSAGE_9GAG; $bSuccess = ($asImage['error']=='');
if($bSuccess)
{
$sMessage = $this->getJsonMessage($asImage);
$sType = self::MESSAGE_9GAG;
}
else $sDesc = $asImage['error'];
} }
elseif(mb_substr($sMessage, 0, 7) == '/reboot' && $this->checkUserClearance(self::CLEARANCE_ADMIN)) elseif(mb_substr($sMessage, 0, 7) == '/reboot' && $this->checkUserClearance(self::CLEARANCE_ADMIN))
{ {
@@ -1934,8 +1945,16 @@ class Databap extends PhpObject
{ {
$sType = self::MESSAGE_PRIVATE; $sType = self::MESSAGE_PRIVATE;
} }
$sChanId = $this->getChanId($sChanName);
return $this->addMessage($sMessage, $sType, $sChanId); //Storing message
if($bSuccess)
{
$sChanId = $this->getChanId($sChanName);
$bSuccess = $this->addMessage($sMessage, $sType, $sChanId);
if(!$bSuccess) $sDesc = self::FAIL_INSERT;
}
return $this->getJsonPostResult($bSuccess, $sDesc);
} }
private function getJsonMessage($asData) private function getJsonMessage($asData)

1
jquery/databap.js vendored
View File

@@ -713,6 +713,7 @@ function Databap()
this.feedback = function(sClass, sMsg) this.feedback = function(sClass, sMsg)
{ {
if(sClass=='error' && sMsg=='') sMsg = 'Aïe ! Une erreur inconnue est suvenue'; if(sClass=='error' && sMsg=='') sMsg = 'Aïe ! Une erreur inconnue est suvenue';
else if(sClass=='error' && $.inArray(sMsg, self.consts.errors.system)!=-1) sMsg = 'Une erreur interne est survenue. Merci de contacter l\'admin';
$('<span>', {'class':'feedback '+sClass}) $('<span>', {'class':'feedback '+sClass})
.append($('<i>', {'class':'fa fa-inline fa-c-'+sClass})) .append($('<i>', {'class':'fa fa-inline fa-c-'+sClass}))
.append(self.addPunctuation(sMsg)) .append(self.addPunctuation(sMsg))

8
masks/chat.html
View File

@@ -530,12 +530,14 @@ function add_message(e)
( (
'add_message', 'add_message',
databap.getMainElem('#chat_form'), databap.getMainElem('#chat_form'),
function(id) function(oData)
{ {
databap.tmp('sending_msg', false); databap.tmp('sending_msg', false);
refresh_chat(); if(oData.result==databap.consts.error) databap.feedback('error', oData.desc);
else refresh_chat();
}, },
true true,
'json'
); );
} }
} }