ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed issues with variable types

Browse source 
- False booleans were serialized as NULLs, which lead to problems with
  queries like 'SELECT ... WHERE NOT x'
- Fixed anonymous uploads
- More robust integer and boolean parsing in jobs
This commit is contained in:
Marcin Kurczewski 2014-05-15 23:34:22 +02:00
parent 2a6f047c28
commit c501ccdff1
13 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Api/Jobs/PostJobs/AddPostJob.php
View file

@ -5,8 +5,10 @@ class AddPostJob extends AbstractJob
{
$post = PostModel::spawn();
$anonymous = $this->hasArgument(JobArgs::ARG_ANONYMOUS)
and $this->getArgument(JobArgs::ARG_ANONYMOUS);
$anonymous = false;
if ($this->hasArgument(JobArgs::ARG_ANONYMOUS))
$anonymous = TextHelper::toBoolean($this->getArgument(JobArgs::ARG_ANONYMOUS));
if (Auth::isLoggedIn() and !$anonymous)
$post->setUploader(Auth::getCurrentUser());

6
src/Api/Jobs/PostJobs/FeaturePostJob.php
View file

@ -15,8 +15,12 @@ class FeaturePostJob extends AbstractJob
PropertyModel::set(PropertyModel::FeaturedPostId, $post->getId());
PropertyModel::set(PropertyModel::FeaturedPostUnixTime, time());
$anonymous = false;
if ($this->hasArgument(JobArgs::ARG_ANONYMOUS))
$anonymous = TextHelper::toBoolean($this->getArgument(JobArgs::ARG_ANONYMOUS));
PropertyModel::set(PropertyModel::FeaturedPostUserName,
($this->hasArgument(JobArgs::ARG_ANONYMOUS) and $this->getArgument(JobArgs::ARG_ANONYMOUS))
$anonymous
? null
: Auth::getCurrentUser()->getName());

2
src/Api/Jobs/PostJobs/ScorePostJob.php
View file

@ -11,7 +11,7 @@ class ScorePostJob extends AbstractJob
public function execute()
{
$post = $this->postRetriever->retrieve();
$score = intval($this->getArgument(JobArgs::ARG_NEW_POST_SCORE));
$score = TextHelper::toInteger($this->getArgument(JobArgs::ARG_NEW_POST_SCORE));
UserModel::updateUserScore(Auth::getCurrentUser(), $post, $score);

2
src/Api/Jobs/PostJobs/TogglePostFavoriteJob.php
View file

@ -11,7 +11,7 @@ class TogglePostFavoriteJob extends AbstractJob
public function execute()
{
$post = $this->postRetriever->retrieve();
$favorite = boolval($this->getArgument(JobArgs::ARG_NEW_STATE));
$favorite = TextHelper::toBoolean($this->getArgument(JobArgs::ARG_NEW_STATE));
if ($favorite)
{

2
src/Api/Jobs/PostJobs/TogglePostTagJob.php
View file

@ -11,7 +11,7 @@ class TogglePostTagJob extends AbstractJob
public function execute()
{
$tagName = $this->getArgument(JobArgs::ARG_TAG_NAME);
$enable = boolval($this->getArgument(JobArgs::ARG_NEW_STATE));
$enable = TextHelper::toBoolean($this->getArgument(JobArgs::ARG_NEW_STATE));
$post = $this->postRetriever->retrieve();
$tags = $post->getTags();

2
src/Api/Jobs/PostJobs/TogglePostVisibilityJob.php
View file

@ -11,7 +11,7 @@ class TogglePostVisibilityJob extends AbstractJob
public function execute()
{
$post = $this->postRetriever->retrieve();
$visible = boolval($this->getArgument(JobArgs::ARG_NEW_STATE));
$visible = TextHelper::toBoolean($this->getArgument(JobArgs::ARG_NEW_STATE));
$post->setHidden(!$visible);
PostModel::save($post);

2
src/Api/Jobs/UserJobs/ToggleUserBanJob.php
View file

@ -11,7 +11,7 @@ class ToggleUserBanJob extends AbstractJob
public function execute()
{
$user = $this->userRetriever->retrieve();
$banned = boolval($this->getArgument(JobArgs::ARG_NEW_STATE));
$banned = TextHelper::toBoolean($this->getArgument(JobArgs::ARG_NEW_STATE));
if ($banned)
$user->ban();

16
src/Helpers/TextHelper.php
View file

@ -7,6 +7,14 @@ class TextHelper
return preg_match($emailRegex, $email);
}
public static function toInteger($x)
{
$y = self::toIntegerOrNull($x);
if ($y === null)
return 0;
return $y;
}
public static function toIntegerOrNull($x)
{
if ($x === true or $x === false)
@ -28,6 +36,14 @@ class TextHelper
return null;
}
public static function toBoolean($x)
{
$y = self::toBooleanOrNull($x);
if ($y === null)
return false;
return $y;
}
public static function toBooleanOrNull($x)
{
switch (strtolower($x))

2
src/Models/PostModel.php
View file

@ -25,7 +25,7 @@ final class PostModel extends AbstractCrudModel
'file_size' => $post->getFileSize(),
'mime_type' => $post->getMimeType(),
'safety' => $post->getSafety()->toInteger(),
'hidden' => $post->isHidden(),
'hidden' => $post->isHidden() ? 1 : 0,
'upload_date' => $post->getCreationTime(),
'image_width' => $post->getImageWidth(),
'image_height' => $post->getImageHeight(),

2
src/Models/TokenModel.php
View file

@ -20,7 +20,7 @@ final class TokenModel extends AbstractCrudModel
$bindings = [
'user_id' => $token->getUserId(),
'token' => $token->getText(),
'used' => $token->isUsed(),
'used' => $token->isUsed() ? 1 : 0,
'expires' => $token->getExpirationTime(),
];

4
src/Models/UserModel.php
View file

@ -21,14 +21,14 @@ final class UserModel extends AbstractCrudModel
'name' => $user->getName(),
'pass_salt' => $user->getPasswordSalt(),
'pass_hash' => $user->getPasswordHash(),
'staff_confirmed' => $user->isStaffConfirmed(),
'staff_confirmed' => $user->isStaffConfirmed() ? 1 : 0,
'email_unconfirmed' => $user->getUnconfirmedEmail(),
'email_confirmed' => $user->getConfirmedEmail(),
'join_date' => $user->getJoinTime(),
'last_login_date' => $user->getLastLoginTime(),
'access_rank' => $user->getAccessRank()->toInteger(),
'settings' => $user->getSettings()->getAllAsSerializedString(),
'banned' => $user->isBanned(),
'banned' => $user->isBanned() ? 1 : 0,
];
$stmt = (new Sql\UpdateStatement)

4
tests/Tests/JobTests/AddPostJobTest.php
View file

@ -18,6 +18,7 @@ class AddPostJobTest extends AbstractTest
return Api::run(
new AddPostJob(),
[
JobArgs::ARG_ANONYMOUS => '0',
JobArgs::ARG_NEW_SAFETY => PostSafety::Safe,
JobArgs::ARG_NEW_SOURCE => '',
JobArgs::ARG_NEW_TAG_NAMES => ['kamen', 'raider'],
@ -30,6 +31,7 @@ class AddPostJobTest extends AbstractTest
file_get_contents($post->getFullPath()),
file_get_contents($this->testSupport->getPath('image.jpg')));
$this->assert->areEqual(Auth::getCurrentUser()->getId(), $post->getUploaderId());
$this->assert->isNotNull($post->getUploaderId());
}
public function testAnonymousUploads()
@ -47,7 +49,7 @@ class AddPostJobTest extends AbstractTest
return Api::run(
new AddPostJob(),
[
JobArgs::ARG_ANONYMOUS => true,
JobArgs::ARG_ANONYMOUS => '1',
JobArgs::ARG_NEW_TAG_NAMES => ['kamen', 'raider'],
JobArgs::ARG_NEW_POST_CONTENT =>
new ApiFileInput($this->testSupport->getPath('image.jpg'), 'test.jpg'),

2
tests/Tests/JobTests/FeaturePostJobTest.php
View file

@ -36,7 +36,7 @@ class FeaturePostJobTest extends AbstractTest
new FeaturePostJob(),
[
JobArgs::ARG_POST_ID => $posts[1]->getId(),
JobArgs::ARG_ANONYMOUS => true,
JobArgs::ARG_ANONYMOUS => '1',
]);
});