Skip to content

Replace the URL matcher everywhere #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from Jan 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions app/Article.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace App;

use Illuminate\Database\Eloquent\Model;
use Decoda\Decoda;
use App\Helpers\Bbcode;

class Article extends Model
{
Expand Down Expand Up @@ -84,12 +84,6 @@ public function getBrief($length = 100, $ellipses = true, $strip_html = false)
*/
public function getContentHtml()
{
$code = new Decoda($this->content);
$code->defaults();
$code->removeHook('Censor');
$code->setXhtml(false);
$code->setStrict(false);
$code->setLineBreaks(true);
return $code->parse();
return Bbcode::parse($this->content);
}
}
10 changes: 2 additions & 8 deletions app/Comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace App;

use Illuminate\Database\Eloquent\Model;
use Decoda\Decoda;
use App\Helpers\Bbcode;

class Comment extends Model
{
Expand Down Expand Up @@ -60,13 +60,7 @@ public function user()
*/
public function getContentHtml()
{
$code = new Decoda($this->content);
$code->defaults();
$code->removeHook('Censor');
$code->setXhtml(false);
$code->setStrict(false);
$code->setLineBreaks(true);
return $code->parse();
return Bbcode::parse($this->content);
}

}
44 changes: 44 additions & 0 deletions app/Helpers/Bbcode.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php
/**
* NOTICE OF LICENSE
*
* UNIT3D is open-sourced software licensed under the GNU General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D
* @license https://choosealicense.com/licenses/gpl-3.0/ GNU General Public License v3.0
* @author Ryuu
*/

namespace App\Helpers;

use Decoda\Decoda;
use App\Hook\ClickableHook;
use Illuminate\Database\Eloquent\Model;

use Config;

class Bbcode {
private function __construct()
{

}

public static function decodaWithDefaults($data)
{
$code = new Decoda($data);
$code->defaults();
$code->removeHook('Censor');
$code->removeHook('Clickable');
$code->addHook(new ClickableHook());
$code->setXhtml(false);
$code->setStrict(false);
$code->setLineBreaks(true);
return $code;
}

public static function parse($data)
{
return self::decodaWithDefaults($data)->parse();
}
}
10 changes: 2 additions & 8 deletions app/Page.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace App;

use Illuminate\Database\Eloquent\Model;
use Decoda\Decoda;
use App\Helpers\Bbcode;

/**
* Model responsible for managing pages (as on Wordpress)
Expand All @@ -28,12 +28,6 @@ class Page extends Model
*/
public function getContentHtml()
{
$code = new Decoda($this->content);
$code->defaults();
$code->removeHook('Censor');
$code->setXhtml(false);
$code->setStrict(false);
$code->setLineBreaks(true);
return $code->parse();
return Bbcode::parse($this->content);
}
}
13 changes: 2 additions & 11 deletions app/Post.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@

namespace App;

use Decoda\Decoda;
use Illuminate\Database\Eloquent\Model;
use App\Hook\ClickableHook;
use App\Helpers\Bbcode;

/**
* Post new topic Reply to topic
Expand Down Expand Up @@ -67,15 +66,7 @@ public function likes()
*/
public function getContentHtml()
{
$code = new Decoda($this->content);
$code->defaults();
$code->removeHook('Censor');
$code->removeHook('Clickable');
$code->addHook(new ClickableHook());
$code->setXhtml(false);
$code->setStrict(false);
$code->setLineBreaks(true);
return $code->parse();
return Bbcode::parse($this->content);
}

/**
Expand Down
10 changes: 2 additions & 8 deletions app/PrivateMessage.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use Illuminate\Database\Eloquent\Model;
use App\User;
use Carbon\Carbon;
use Decoda\Decoda;
use App\Helpers\Bbcode;

class PrivateMessage extends Model
{
Expand Down Expand Up @@ -47,12 +47,6 @@ public function receiver()
*/
public function getMessageHtml()
{
$code = new Decoda($this->message);
$code->defaults();
$code->removeHook('Censor');
$code->setXhtml(false);
$code->setStrict(false);
$code->setLineBreaks(true);
return $code->parse();
return Bbcode::parse($this->message);
}
}
10 changes: 2 additions & 8 deletions app/Requests.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace App;

use Illuminate\Database\Eloquent\Model;
use Decoda\Decoda;
use App\Helpers\Bbcode;

/**
* Torrent Requests
Expand Down Expand Up @@ -142,12 +142,6 @@ public function requestBounty()
*/
public function getDescriptionHtml()
{
$code = new Decoda($this->description);
$code->defaults();
$code->removeHook('Censor');
$code->setXhtml(false);
$code->setStrict(false);
$code->setLineBreaks(true);
return $code->parse();
return Bbcode::parse($this->description);
}
}
12 changes: 2 additions & 10 deletions app/Shoutbox.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

use Illuminate\Database\Eloquent\Model;
use Decoda\Decoda;
use App\Hook\ClickableHook;
use App\Helpers\Bbcode;

class Shoutbox extends Model
{
Expand All @@ -39,14 +39,6 @@ public function poster()
*/
public static function getMessageHtml($message)
{
$code = new Decoda($message);
$code->defaults();
$code->removeHook('Censor');
$code->removeHook('Clickable');
$code->addHook(new ClickableHook());
$code->setXhtml(false);
$code->setStrict(false);
$code->setLineBreaks(true);
return $code->parse();
return Bbcode::parse($message);
}
}
10 changes: 2 additions & 8 deletions app/Torrent.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

namespace App;

use Decoda\Decoda;
use Illuminate\Database\Eloquent\Model;
use Hootlex\Moderation\Moderatable;
use Kyslik\ColumnSortable\Sortable;

use App\Helpers\MediaInfo;
use App\Helpers\StringHelper;
use App\Helpers\Bbcode;

/**
* Torrent model
Expand Down Expand Up @@ -151,13 +151,7 @@ public function moderated()
*/
public function getDescriptionHtml()
{
$code = new Decoda($this->description);
$code->defaults();
$code->removeHook('Censor');
$code->setXhtml(false);
$code->setStrict(false);
$code->setLineBreaks(true);
return $code->parse();
return Bbcode::parse($this->description);
}

/**
Expand Down
18 changes: 3 additions & 15 deletions app/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
use App\Peer;
use App\History;

use Decoda\Decoda;
use Cache;

use Gstt\Achievements\Achiever;
Expand All @@ -27,6 +26,7 @@
use function theodorejb\polycast\to_int;

use App\Helpers\StringHelper;
use App\Helpers\Bbcode;

/**
* User-Related Template
Expand Down Expand Up @@ -410,13 +410,7 @@ public function untilRatio($ratio)
*/
public function getSignature()
{
$code = new Decoda($this->signature);
$code->defaults();
$code->removeHook('Censor');
$code->setXhtml(false);
$code->setStrict(false);
$code->setLineBreaks(true);
return $code->parse();
return Bbcode::parse($this->signature);
}

/**
Expand All @@ -425,13 +419,7 @@ public function getSignature()
*/
public function getAboutHtml()
{
$code = new Decoda($this->about);
$code->defaults();
$code->removeHook('Censor');
$code->setXhtml(false);
$code->setStrict(false);
$code->setLineBreaks(true);
return $code->parse();
return Bbcode::parse($this->about);
}

/**
Expand Down