@@ -15,7 +15,6 @@ |
||
| 15 | 15 | use App\Message; |
| 16 | 16 | use Carbon\Carbon; |
| 17 | 17 | use App\Gitter\Support\AttributeMapper; |
| 18 | -use Illuminate\Database\Eloquent\Model; |
|
| 19 | 18 | |
| 20 | 19 | /** |
| 21 | 20 | * Class MessageMapperTrait |
@@ -36,19 +36,19 @@ discard block |
||
| 36 | 36 | $values = (new AttributeMapper($attributes)) |
| 37 | 37 | ->rename('readBy', 'read_by') |
| 38 | 38 | ->rename('id', 'gitter_id') |
| 39 | - ->value('editedAt', function ($val) { |
|
| 39 | + ->value('editedAt', function($val) { |
|
| 40 | 40 | return !!$val; |
| 41 | 41 | }, 'edited') |
| 42 | - ->value('fromUser', function ($user) { |
|
| 42 | + ->value('fromUser', function($user) { |
|
| 43 | 43 | return User::fromGitterObject($user); |
| 44 | 44 | }, 'user') |
| 45 | - ->value('sent', function ($date) { |
|
| 45 | + ->value('sent', function($date) { |
|
| 46 | 46 | return (new Carbon($date))->setTimezone('Europe/Moscow'); |
| 47 | 47 | }, 'created_at') |
| 48 | - ->value('editedAt', function ($date) { |
|
| 48 | + ->value('editedAt', function($date) { |
|
| 49 | 49 | return (new Carbon($date))->setTimezone('Europe/Moscow'); |
| 50 | 50 | }, 'updated_at') |
| 51 | - ->value('mentions', function ($mentions) { |
|
| 51 | + ->value('mentions', function($mentions) { |
|
| 52 | 52 | return static::parseMentions($mentions); |
| 53 | 53 | }) |
| 54 | 54 | ->only($fields) |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | $values['room_id'] = \App::make(Room::class)->id; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - return static::unguarded(function () use ($values) { |
|
| 61 | + return static::unguarded(function() use ($values) { |
|
| 62 | 62 | return new static($values); |
| 63 | 63 | }); |
| 64 | 64 | } |
@@ -19,7 +19,6 @@ |
||
| 19 | 19 | use Illuminate\Console\Command; |
| 20 | 20 | use Illuminate\Contracts\Config\Repository; |
| 21 | 21 | use Illuminate\Contracts\Container\Container; |
| 22 | -use Illuminate\Support\Facades\Log; |
|
| 23 | 22 | |
| 24 | 23 | |
| 25 | 24 | /** |
@@ -84,7 +84,7 @@ |
||
| 84 | 84 | */ |
| 85 | 85 | protected function makePidFile() |
| 86 | 86 | { |
| 87 | - $this->pid = storage_path('pids/' . date('Y_m_d_tis_') . microtime(1) . '.pid'); |
|
| 87 | + $this->pid = storage_path('pids/'.date('Y_m_d_tis_').microtime(1).'.pid'); |
|
| 88 | 88 | file_put_contents($this->pid, getmypid()); |
| 89 | 89 | } |
| 90 | 90 | |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | public function map(Router $router) |
| 39 | 39 | { |
| 40 | - $router->group(['namespace' => $this->namespace], function ($router) { |
|
| 40 | + $router->group(['namespace' => $this->namespace], function($router) { |
|
| 41 | 41 | require app_path('Http/routes.php'); |
| 42 | 42 | }); |
| 43 | 43 | } |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | { |
| 59 | 59 | parent::boot(); |
| 60 | 60 | |
| 61 | - static::creating(function (Karma $karma) { |
|
| 61 | + static::creating(function(Karma $karma) { |
|
| 62 | 62 | if (!$karma->created_at) { |
| 63 | 63 | $karma->created_at = $karma->freshTimestamp(); |
| 64 | 64 | } |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | { |
| 70 | 70 | parent::boot(); |
| 71 | 71 | |
| 72 | - static::creating(function (Achieve $achieve) { |
|
| 72 | + static::creating(function(Achieve $achieve) { |
|
| 73 | 73 | if (!$achieve->created_at) { |
| 74 | 74 | $achieve->created_at = $achieve->freshTimestamp(); |
| 75 | 75 | } |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | $this->headers['Connection'] = 'Keep-Alive'; |
| 87 | 87 | |
| 88 | - $this->buffer->subscribe(function ($message) { |
|
| 88 | + $this->buffer->subscribe(function($message) { |
|
| 89 | 89 | $message = trim($message); |
| 90 | 90 | |
| 91 | 91 | if ($message) { |
@@ -117,20 +117,20 @@ discard block |
||
| 117 | 117 | ->getHttpClient() |
| 118 | 118 | ->request($this->method, $this->url, $this->headers); |
| 119 | 119 | |
| 120 | - $request->on('response', function (Response $response) { |
|
| 121 | - $response->on('data', function ($data, Response $response) { |
|
| 120 | + $request->on('response', function(Response $response) { |
|
| 121 | + $response->on('data', function($data, Response $response) { |
|
| 122 | 122 | $data = (string)$data; |
| 123 | 123 | $this->events->fire(static::EVENT_CHUNK, [$this, $data, $response]); |
| 124 | 124 | $this->buffer->add($data); |
| 125 | 125 | }); |
| 126 | 126 | }); |
| 127 | 127 | |
| 128 | - $request->on('end', function () { |
|
| 128 | + $request->on('end', function() { |
|
| 129 | 129 | $this->buffer->clear(); |
| 130 | 130 | $this->events->fire(static::EVENT_END, [$this]); |
| 131 | 131 | }); |
| 132 | 132 | |
| 133 | - $request->on('error', function ($exception) { |
|
| 133 | + $request->on('error', function($exception) { |
|
| 134 | 134 | $this->events->fire(static::EVENT_ERROR, [$this, $exception]); |
| 135 | 135 | }); |
| 136 | 136 | |
@@ -27,20 +27,20 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | public function index() |
| 29 | 29 | { |
| 30 | - return \Cache::remember('achievements', 10, function () { |
|
| 30 | + return \Cache::remember('achievements', 10, function() { |
|
| 31 | 31 | $achieveStorage = []; |
| 32 | 32 | |
| 33 | 33 | (new Achieve()) |
| 34 | 34 | ->selectRaw('name, count(user_id) as count') |
| 35 | 35 | ->groupBy('name') |
| 36 | 36 | ->get() |
| 37 | - ->each(function ($item) use (&$achieveStorage) { |
|
| 37 | + ->each(function($item) use (&$achieveStorage) { |
|
| 38 | 38 | $achieveStorage[$item->name] = $item->count; |
| 39 | 39 | }); |
| 40 | 40 | |
| 41 | 41 | return (new AchieveSubscriber()) |
| 42 | 42 | ->toCollection() |
| 43 | - ->each(function (AbstractAchieve $achieve) use ($achieveStorage) { |
|
| 43 | + ->each(function(AbstractAchieve $achieve) use ($achieveStorage) { |
|
| 44 | 44 | $achieve->users = $achieveStorage[$achieve->name] ?? 0; |
| 45 | 45 | }) |
| 46 | 46 | ->toArray(); |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function index() |
| 28 | 28 | { |
| 29 | - return \Cache::remember('users', 1, function () { |
|
| 29 | + return \Cache::remember('users', 1, function() { |
|
| 30 | 30 | $karmaStorage = []; |
| 31 | 31 | $thanksStorage = []; |
| 32 | 32 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | ->selectRaw('user_target_id, count(user_id) as count') |
| 35 | 35 | ->groupBy('user_target_id') |
| 36 | 36 | ->get() |
| 37 | - ->each(function ($item) use (&$karmaStorage) { |
|
| 37 | + ->each(function($item) use (&$karmaStorage) { |
|
| 38 | 38 | $karmaStorage[$item->user_target_id] = $item->count; |
| 39 | 39 | }); |
| 40 | 40 | |
@@ -42,14 +42,14 @@ discard block |
||
| 42 | 42 | ->selectRaw('user_id, count(user_target_id) as count') |
| 43 | 43 | ->groupBy('user_id') |
| 44 | 44 | ->get() |
| 45 | - ->each(function ($item) use (&$thanksStorage) { |
|
| 45 | + ->each(function($item) use (&$thanksStorage) { |
|
| 46 | 46 | $thanksStorage[$item->user_id] = $item->count; |
| 47 | 47 | }); |
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | return (new User()) |
| 51 | 51 | ->get(['id', 'login', 'name', 'gitter_id', 'avatar', 'url']) |
| 52 | - ->each(function (User $user) use ($karmaStorage, $thanksStorage) { |
|
| 52 | + ->each(function(User $user) use ($karmaStorage, $thanksStorage) { |
|
| 53 | 53 | $user->karma_count = $karmaStorage[$user->id] ?? 0; |
| 54 | 54 | $user->thanks_count = $thanksStorage[$user->id] ?? 0; |
| 55 | 55 | }); |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | public function getUsersTop() |
| 63 | 63 | { |
| 64 | - return \Cache::remember('top.karma', 1, function () { |
|
| 64 | + return \Cache::remember('top.karma', 1, function() { |
|
| 65 | 65 | $karmaStorage = []; |
| 66 | 66 | |
| 67 | 67 | $karma = (new Karma()) |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | ->orderBy('count', 'desc') |
| 71 | 71 | ->take(10) |
| 72 | 72 | ->get() |
| 73 | - ->each(function ($item) use (&$karmaStorage) { |
|
| 73 | + ->each(function($item) use (&$karmaStorage) { |
|
| 74 | 74 | $karmaStorage[$item->user_target_id] = $item->count; |
| 75 | 75 | }); |
| 76 | 76 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | return (new User()) |
| 79 | 79 | ->whereIn('id', $karma->pluck('user_target_id')) |
| 80 | 80 | ->get(['id', 'login', 'name', 'gitter_id', 'avatar', 'url']) |
| 81 | - ->each(function (User $user) use ($karmaStorage) { |
|
| 81 | + ->each(function(User $user) use ($karmaStorage) { |
|
| 82 | 82 | $user->karma_count = $karmaStorage[$user->id] ?? 0; |
| 83 | 83 | }); |
| 84 | 84 | }); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | public function getUser($gitterId) |
| 91 | 91 | { |
| 92 | - $formatRelations = function (HasMany $query) { |
|
| 92 | + $formatRelations = function(HasMany $query) { |
|
| 93 | 93 | return $query->orderBy('created_at', 'desc'); |
| 94 | 94 | }; |
| 95 | 95 | |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | Route::get('/achievements', 'HomeController@index'); |
| 9 | 9 | |
| 10 | 10 | |
| 11 | -Route::group(['prefix' => 'api', 'namespace' => 'Api'], function () { |
|
| 11 | +Route::group(['prefix' => 'api', 'namespace' => 'Api'], function() { |
|
| 12 | 12 | // Users |
| 13 | 13 | Route::get('users.json', 'UsersController@index'); |
| 14 | 14 | Route::get('users/top.json', 'UsersController@getUsersTop'); |
@@ -18,12 +18,12 @@ discard block |
||
| 18 | 18 | Route::get('achievements.json', 'AchievementsController@index'); |
| 19 | 19 | |
| 20 | 20 | |
| 21 | - Route::any('/{any}', function () { |
|
| 21 | + Route::any('/{any}', function() { |
|
| 22 | 22 | return ['error' => 'Not found']; |
| 23 | 23 | })->where('any', '.*?'); |
| 24 | 24 | }); |
| 25 | 25 | |
| 26 | 26 | |
| 27 | -Route::any('/{any}', function () { |
|
| 27 | +Route::any('/{any}', function() { |
|
| 28 | 28 | return Redirect::to('/'); |
| 29 | 29 | })->where('any', '.*?'); |
| 30 | 30 | \ No newline at end of file |