Merge branch 'dev-master' of git.076.ne.jp:TechnicalSuwako/076server into mail
このコミットが含まれているのは:
コミット
b5c279b343
|
@ -98,6 +98,7 @@ class Prayer extends Engine {
|
||||||
|
|
||||||
if (!$get) return $err;
|
if (!$get) return $err;
|
||||||
$get = json_decode($get);
|
$get = json_decode($get);
|
||||||
|
if (isset($get->status) && $get->status == 404) return [];
|
||||||
|
|
||||||
$come = array();
|
$come = array();
|
||||||
$come['come'] = array();
|
$come['come'] = array();
|
||||||
|
@ -116,7 +117,7 @@ class Prayer extends Engine {
|
||||||
$g->comments->id = $g->id;
|
$g->comments->id = $g->id;
|
||||||
$g->comments->name = $g->account->displayName;
|
$g->comments->name = $g->account->displayName;
|
||||||
$g->comments->channel = $g->account->url;
|
$g->comments->channel = $g->account->url;
|
||||||
$g->comments->icon = env('PEER_URI').$g->account->avatar->path;
|
$g->comments->icon = !is_null($g->account->avatar) ? env('PEER_URI').$g->account->avatar->path : '/img/noicon.jpg';
|
||||||
$g->comments->message = strip_tags($g->text, array('<br />'));
|
$g->comments->message = strip_tags($g->text, array('<br />'));
|
||||||
$g->comments->createdTS = strtotime($g->createdAt);
|
$g->comments->createdTS = strtotime($g->createdAt);
|
||||||
$g->comments->created = date('Y年m月d日 H:i:s', strtotime($g->createdAt));
|
$g->comments->created = date('Y年m月d日 H:i:s', strtotime($g->createdAt));
|
||||||
|
|
|
@ -8,21 +8,21 @@
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.2.5",
|
"php": "^8.0",
|
||||||
"fideloper/proxy": "^4.2",
|
"fideloper/proxy": "^4.4.1",
|
||||||
"fruitcake/laravel-cors": "^1.0",
|
"fruitcake/laravel-cors": "^2.0.4",
|
||||||
"guzzlehttp/guzzle": "^6.3",
|
"guzzlehttp/guzzle": "^7.4.0",
|
||||||
"laravel/framework": "^7.0",
|
"laravel/framework": "^8.74.0",
|
||||||
"laravel/tinker": "^2.0",
|
"laravel/tinker": "^2.6.2",
|
||||||
"phpmailer/phpmailer": "^6.2",
|
"phpmailer/phpmailer": "^6.5.3",
|
||||||
"predis/predis": "^1.1"
|
"predis/predis": "^1.1.9"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"facade/ignition": "^2.0",
|
"facade/ignition": "^2.17.2",
|
||||||
"fzaninotto/faker": "^1.9.1",
|
"fzaninotto/faker": "^1.9.2",
|
||||||
"mockery/mockery": "^1.3.1",
|
"mockery/mockery": "^1.4.4",
|
||||||
"nunomaduro/collision": "^4.1",
|
"nunomaduro/collision": "^5.10.0",
|
||||||
"phpunit/phpunit": "^8.5"
|
"phpunit/phpunit": "^9.5.10"
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
"optimize-autoloader": true,
|
"optimize-autoloader": true,
|
||||||
|
|
新しいイシューから参照