mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-04-23 11:39:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
HDVinnie
2018-12-29 19:19:31 +00:00
committed by StyleCI Bot
parent e4cd6a30cb
commit 1b1c798379
13 changed files with 305 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Clients/IgdbClient.php
+207 -215
View File
@@ -29,7 +29,7 @@ class IgdbClient
protected $httpClient;
/**
* @var integer
* @var int
*/
protected $cache;
@@ -62,7 +62,6 @@ class IgdbClient
'pages' => 'pages',
];
/**
* IgdbClient constructor.
*
@@ -72,11 +71,11 @@ class IgdbClient
*/
public function __construct($key, $url, $cache)
{
if (!is_string($key) || empty($key)) {
if (! is_string($key) || empty($key)) {
throw new \Exception('IGDB API key is required, please visit https://api.igdb.com/ to request a key');
}
if (!is_string($url) || empty($url)) {
if (! is_string($url) || empty($url)) {
throw new \Exception('IGDB Request URL is required, please visit https://api.igdb.com/ to get your Request URL');
}
@@ -89,28 +88,25 @@ class IgdbClient
/**
* Get character information.
*
* @param integer $characterId
* @param int $characterId
* @param array $fields
* @return \StdClass
* @throws \Exception
*/
public function getCharacter($characterId, $fields = ['*'])
{
$apiUrl = $this->getEndpoint('characters');
$apiUrl .= $characterId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
/**
@@ -118,8 +114,8 @@ class IgdbClient
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -128,20 +124,19 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('characters');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'search' => $search,
'order' => $order,
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
/**
@@ -149,8 +144,8 @@ class IgdbClient
*
* @param array $filters
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -159,27 +154,26 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('release_dates');
$params = array(
$params = [
'fields' => implode(',', $fields),
'filters' => $filters,
'limit' => $limit,
'offset' => $offset,
'order' => $order,
'expand' => implode(',', $expand)
);
'expand' => implode(',', $expand),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
/**
* Get company information by ID.
*
* @param integer $companyId
* @param int $companyId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -189,13 +183,13 @@ class IgdbClient
$apiUrl = $this->getEndpoint('companies');
$apiUrl .= $companyId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
@@ -205,8 +199,8 @@ class IgdbClient
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -215,17 +209,17 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('companies');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'search' => $search,
'order' => $order,
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
@@ -233,7 +227,7 @@ class IgdbClient
/**
* Get franchise information.
*
* @param integer $franchiseId
* @param int $franchiseId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -243,13 +237,13 @@ class IgdbClient
$apiUrl = $this->getEndpoint('franchises');
$apiUrl .= $franchiseId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
@@ -259,8 +253,8 @@ class IgdbClient
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -269,17 +263,17 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('franchises');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'search' => $search,
'order' => $order,
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
@@ -287,7 +281,7 @@ class IgdbClient
/**
* Get game mode information by ID.
*
* @param integer $gameModeId
* @param int $gameModeId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -297,13 +291,13 @@ class IgdbClient
$apiUrl = $this->getEndpoint('game_modes');
$apiUrl .= $gameModeId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
@@ -313,8 +307,8 @@ class IgdbClient
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -323,17 +317,17 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('game_modes');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'search' => $search,
'order' => $order,
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
@@ -341,7 +335,7 @@ class IgdbClient
/**
* Get game information by ID.
*
* @param integer $gameId
* @param int $gameId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -351,13 +345,13 @@ class IgdbClient
$apiUrl = $this->getEndpoint('games');
$apiUrl .= $gameId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
@@ -367,8 +361,8 @@ class IgdbClient
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @param array $filters
* @return \StdClass
@@ -378,19 +372,21 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('games');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'filters' => $filters,
'order' => $order,
'search' => $search,
);
if ($search == '') unset($params['search']);
];
if ($search == '') {
unset($params['search']);
}
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
@@ -398,7 +394,7 @@ class IgdbClient
/**
* Get genre information by ID.
*
* @param integer $genreId
* @param int $genreId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -408,13 +404,13 @@ class IgdbClient
$apiUrl = $this->getEndpoint('genres');
$apiUrl .= $genreId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
@@ -424,8 +420,8 @@ class IgdbClient
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -434,17 +430,17 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('genres');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'search' => $search,
'order' => $order,
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
@@ -452,7 +448,7 @@ class IgdbClient
/**
* Get keyword information by ID.
*
* @param integer $keywordId
* @param int $keywordId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -462,24 +458,24 @@ class IgdbClient
$apiUrl = $this->getEndpoint('keywords');
$apiUrl .= $keywordId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
/**
* Search keywords by name
* Search keywords by name.
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -488,25 +484,25 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('keywords');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'search' => $search,
'order' => $order,
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
/**
* Get people information by ID
* Get people information by ID.
*
* @param integer $personId
* @param int $personId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -516,24 +512,24 @@ class IgdbClient
$apiUrl = $this->getEndpoint('people');
$apiUrl .= $personId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
/**
* Search people by name
* Search people by name.
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -542,25 +538,25 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('people');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'search' => $search,
'order' => $order,
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
/**
* Get platform information by ID
* Get platform information by ID.
*
* @param integer $platformId
* @param int $platformId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -570,24 +566,24 @@ class IgdbClient
$apiUrl = $this->getEndpoint('platforms');
$apiUrl .= $platformId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
/**
* Search platforms by name
* Search platforms by name.
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -596,25 +592,25 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('platforms');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'search' => $search,
'order' => $order,
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
/**
* Get player perspective information by ID
* Get player perspective information by ID.
*
* @param integer $perspectiveId
* @param int $perspectiveId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -624,24 +620,24 @@ class IgdbClient
$apiUrl = $this->getEndpoint('player_perspectives');
$apiUrl .= $perspectiveId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
/**
* Search player perspective by name
* Search player perspective by name.
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -650,26 +646,25 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('player_perspectives');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'search' => $search,
'order' => $order,
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
/**
* Get page information by ID
* Get page information by ID.
*
* @param integer $pageId
* @param int $pageId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -679,23 +674,21 @@ class IgdbClient
$apiUrl = $this->getEndpoint('pages');
$apiUrl .= $pageId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
/**
* Get pulse information by ID
* Get pulse information by ID.
*
* @param integer $pulseId
* @param int $pulseId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -705,21 +698,21 @@ class IgdbClient
$apiUrl = $this->getEndpoint('pulses');
$apiUrl .= $pulseId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
/**
* Get pulse information by ID
* Get pulse information by ID.
*
* @param integer $pulseId
* @param int $pulseId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -729,23 +722,23 @@ class IgdbClient
$apiUrl = $this->getEndpoint('pulse_sources');
$apiUrl .= $sourceId;
$params = array(
$params = [
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
/**
* Search pulses by title
* Search pulses by title.
*
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @return \StdClass
* @throws \Exception
*/
@@ -753,25 +746,25 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('pulses');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'filters' => $filters,
'order' => $order,
'offset' => $offset
);
'offset' => $offset,
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
/**
* Get collection information by ID
* Get collection information by ID.
*
* @param integer $collectionId
* @param int $collectionId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -781,24 +774,24 @@ class IgdbClient
$apiUrl = $this->getEndpoint('collections');
$apiUrl .= $collectionId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
/**
* Search collections by name
* Search collections by name.
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -807,25 +800,25 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('collections');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'search' => $search,
'order' => $order,
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
/**
* Get themes information by ID
* Get themes information by ID.
*
* @param integer $themeId
* @param int $themeId
* @param array $fields
* @return \StdClass
* @throws \Exception
@@ -835,24 +828,24 @@ class IgdbClient
$apiUrl = $this->getEndpoint('themes');
$apiUrl .= $themeId;
$params = array(
'fields' => implode(',', $fields)
);
$params = [
'fields' => implode(',', $fields),
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeSingle($apiData);
});
}
/**
* Search themes by name
* Search themes by name.
*
* @param string $search
* @param array $fields
* @param integer $limit
* @param integer $offset
* @param int $limit
* @param int $offset
* @param string $order
* @return \StdClass
* @throws \Exception
@@ -861,25 +854,25 @@ class IgdbClient
{
$apiUrl = $this->getEndpoint('themes');
$params = array(
$params = [
'fields' => implode(',', $fields),
'limit' => $limit,
'offset' => $offset,
'search' => $search,
'order' => $order,
);
];
return Cache::remember(md5($apiUrl . json_encode($params)), $this->cache, function () use ($apiUrl, $params)
{
return Cache::remember(md5($apiUrl.json_encode($params)), $this->cache, function () use ($apiUrl, $params) {
$apiData = $this->apiGet($apiUrl, $params);
return $this->decodeMultiple($apiData);
});
}
/*
* Internally used Methods, set visibility to public to enable more flexibility
*/
/**
* @param $name
* @return mixed
@@ -891,7 +884,7 @@ class IgdbClient
/**
* Decode the response from IGDB, extract the single resource object.
* (Don't use this to decode the response containing list of objects)
* (Don't use this to decode the response containing list of objects).
*
* @param string $apiData the api response from IGDB
* @throws \Exception
@@ -902,11 +895,11 @@ class IgdbClient
$resObj = json_decode($apiData);
if (isset($resObj->status)) {
$msg = "Error " . $resObj->status . " " . $resObj->message;
$msg = 'Error '.$resObj->status.' '.$resObj->message;
throw new \Exception($msg);
}
if (!is_array($resObj) || count($resObj) == 0) {
if (! is_array($resObj) || count($resObj) == 0) {
return false;
}
@@ -925,11 +918,11 @@ class IgdbClient
$resObj = json_decode($apiData);
if (isset($resObj->status)) {
$msg = "Error " . $resObj->status . " " . $resObj->message;
$msg = 'Error '.$resObj->status.' '.$resObj->message;
throw new \Exception($msg);
} else {
//$itemsArray = $resObj->items;
if (!is_array($resObj)) {
if (! is_array($resObj)) {
return false;
} else {
return $resObj;
@@ -938,7 +931,7 @@ class IgdbClient
}
/**
* Using CURL to issue a GET request
* Using CURL to issue a GET request.
*
* @param $url
* @param $params
@@ -955,14 +948,14 @@ class IgdbClient
unset($params['filters']);
}
$url = $url . (strpos($url, '?') === false ? '?' : '') . http_build_query($params);
$url = $url.(strpos($url, '?') === false ? '?' : '').http_build_query($params);
try {
$response = $this->httpClient->request('GET', $url, [
'headers' => [
'user-key' => $this->igdbKey,
'Accept' => 'application/json'
]
'Accept' => 'application/json',
],
]);
} catch (RequestException $exception) {
if ($response = $exception->getResponse()) {
@@ -975,5 +968,4 @@ class IgdbClient
return $response->getBody();
}
}
}
app/User.php
+2 -1
View File
@@ -56,7 +56,8 @@ class User extends Authenticatable
return $this->belongsTo(Group::class)->withDefault([
'color' => '#FF9966',
'icon' => 'fal fa-robot',
]); }
]);
}
/**
* Belongs To A Chatroom.
config/api-keys.php
+2 -2
View File
@@ -46,7 +46,7 @@ return [
*/
'igdb' => [
'key' => env('IGDB_KEY', ''),
'url' => env('IGDB_URL', '')
]
'url' => env('IGDB_URL', ''),
],
];
resources/js/components/BookmarkButton.vue
+5 -3
View File
@@ -1,7 +1,9 @@
<template>
<button @click="bookmarked ? unBookmark(id) : bookmark(id)"
:class="['btn', bookmarked ? 'btn-md btn-danger' : 'btn-md btn-primary']">
<i class="fal fa-bookmark"></i> {{ bookmarked ? 'Unbookmark' : 'Bookmark'}}
<button
@click="bookmarked ? unBookmark(id) : bookmark(id)"
:class="['btn', bookmarked ? 'btn-md btn-danger' : 'btn-md btn-primary']"
>
<i class="fal fa-bookmark"></i> {{ bookmarked ? 'Unbookmark' : 'Bookmark' }}
</button>
</template>
resources/js/components/Example.vue
+1 -3
View File
@@ -5,9 +5,7 @@
<div class="card card-default">
<div class="card-header">Example Component</div>
<div class="card-body">
I'm an example component.
</div>
<div class="card-body">I'm an example component.</div>
</div>
</div>
</div>
resources/js/components/SmallBookmarkButton.vue
+4 -2
View File
@@ -1,6 +1,8 @@
<template>
<button @click="bookmarked ? unBookmark(id) : bookmark(id)"
:class="['btn', bookmarked ? 'btn-circle btn-danger' : 'btn-circle btn-primary']">
<button
@click="bookmarked ? unBookmark(id) : bookmark(id)"
:class="['btn', bookmarked ? 'btn-circle btn-danger' : 'btn-circle btn-primary']"
>
<i class="fal fa-bookmark"></i>
</button>
</template>
resources/js/components/Trans.vue
+1 -3
View File
@@ -1,7 +1,5 @@
<template>
<div id="tran">
{{ result }}
</div>
<div id="tran">{{ result }}</div>
</template>
<script>
export default {
resources/js/components/chat/ChatForm.vue
+20 -29
View File
@@ -1,54 +1,45 @@
<template>
<div class="message-input">
<div class="wrap">
<div class="row info">
<div class="col-md-6">
<span class="badge-extra">
<strong>SHIFT + ENTER</strong> to insert new line
</span>
<span class="badge-extra"> <strong>SHIFT + ENTER</strong> to insert new line </span>
<span class="badge-extra">
Type <strong>:</strong> for emoji
</span>
<span class="badge-extra"> Type <strong>:</strong> for emoji </span>
<span class="badge-extra">
BBcode Allowed
</span>
<span class="badge-extra"> BBcode Allowed </span>
</div>
<div class="col-md-3">
<div class="pull-right">
<span>Status: </span>
<i v-for="status in $parent.statuses"
v-tooltip="status.name"
@click="$emit('changedStatus', status.id)"
:class="status.icon ? status.icon : 'fa fa-dot-circle-o'"
:style="`color: ${status.color}`">&nbsp;</i>
<i
v-for="status in $parent.statuses"
v-tooltip="status.name"
@click="$emit('changedStatus', status.id)"
:class="status.icon ? status.icon : 'fa fa-dot-circle-o'"
:style="`color: ${status.color}`"
>&nbsp;</i
>
</div>
</div>
<div class="col-md-3">
<chatrooms-dropdown :current="user.chatroom.id"
:chatrooms="$parent.chatrooms"
v-tooltip="`Chatrooms`"
class="pull-right"
@changedRoom="$parent.changeRoom">
<chatrooms-dropdown
:current="user.chatroom.id"
:chatrooms="$parent.chatrooms"
v-tooltip="`Chatrooms`"
class="pull-right"
@changedRoom="$parent.changeRoom"
>
</chatrooms-dropdown>
</div>
</div>
<div class="row">
<div class="col-md-12">
<textarea id="chat-message"
name="message"
placeholder="Write your message..."
cols="30"
rows="5">
</textarea>
<textarea id="chat-message" name="message" placeholder="Write your message..." cols="30" rows="5">
</textarea>
</div>
</div>
</div>
resources/js/components/chat/ChatMessages.vue
+29 -27
View File
@@ -2,45 +2,47 @@
<div class="messages">
<ul class="list-group">
<li class="sent" v-for="message in messages">
<a target="_blank"
v-tooltip="`${message.user.username}${message.user.title ? ' ('+ message.user.title +')' : '\'s Profile'}`"
:href="`/${message.user.username}.${message.user.id}`">
<img v-if="message.user.id !== 1"
class="chat-user-image"
:style="`border: 3px solid ${message.user.chat_status.color};`"
:src="message.user.image ? `/files/img/${message.user.image}` : '/img/profile.png'"
alt=""/>
<a
target="_blank"
v-tooltip="
`${message.user.username}${
message.user.title ? ' (' + message.user.title + ')' : '\'s Profile'
}`
"
:href="`/${message.user.username}.${message.user.id}`"
>
<img
v-if="message.user.id !== 1"
class="chat-user-image"
:style="`border: 3px solid ${message.user.chat_status.color};`"
:src="message.user.image ? `/files/img/${message.user.image}` : '/img/profile.png'"
alt=""
/>
</a>
<h4 v-if="message.user.id !== 1" class="list-group-item-heading">
<span class="badge-user text-bold" :style="userEffect(message.user)">
<a data-toggle="tooltip" :style="userColor(message.user)">
<i v-tooltip="`${message.user.group.name}`" :class="message.user.group.icon"></i> {{ message.user.username }}
<i v-tooltip="`${message.user.group.name}`" :class="message.user.group.icon"></i>
{{ message.user.username }}
</a>
<i v-if="canMod(message)"
v-tooltip="`Delete Message`"
@click="deleteMessage(message.id)"
class="fa fa-times text-red">
<i
v-if="canMod(message)"
v-tooltip="`Delete Message`"
@click="deleteMessage(message.id)"
class="fa fa-times text-red"
>
</i>
</span>
<span class="text-muted">
{{ message.created_at | fromNow }}
</span>
<span class="text-muted"> {{ message.created_at | fromNow }} </span>
</h4>
<div :class="['messages-container', message.user.id === 1 ? 'system' : null]"
v-html="message.message">
</div>
<div
:class="['messages-container', message.user.id === 1 ? 'system' : null]"
v-html="message.message"
></div>
</li>
</ul>
</div>
resources/js/components/chat/Chatbox.vue
+12 -20
View File
@@ -2,36 +2,27 @@
<div class="col-md-10 col-sm-10 col-md-offset-1 chatbox">
<div class="clearfix visible-sm-block"></div>
<div class="panel panel-chat">
<div class="panel-heading">
<h4>
Chatbox
</h4>
</div>
<div class="panel-heading"><h4>Chatbox</h4></div>
<div class="panel-body">
<div v-if="showDevMsg">
<h2 class="text-center text-red text-bold">Chat Box Is Currently In Beta</h2>
<p class="text-center">
Please understand that <strong>Beta</strong> refers to software undergoing testing.
Is released to a certain group of peers for real world testing.
</p>
<p class="text-center">
We are working hard to address all your concerns and issues.
Please understand that <strong>Beta</strong> refers to software undergoing testing. Is released
to a certain group of peers for real world testing.
</p>
<p class="text-center">We are working hard to address all your concerns and issues.</p>
<p class="text-center">
Please be patient and be as detailed as possible when describing an issue you may be having!
</p>
<p class="text-center">
<button @click="showDevMsg = false" class="btn btn-danger">Hide</button>
</p>
<p class="text-center"><button @click="showDevMsg = false" class="btn btn-danger">Hide</button></p>
</div>
<div id="frame">
<div class="content">
<div class="text-center">
<h4 v-if="state.connecting" class='text-red'>Connecting ...</h4>
<h4 v-else class='text-green'>Connected with {{users.length}} users</h4>
<h4 v-if="state.connecting" class="text-red">Connecting ...</h4>
<h4 v-else class="text-green">Connected with {{ users.length }} users</h4>
</div>
<chat-messages v-if="!state.connecting" :messages="messages"></chat-messages>
@@ -44,10 +35,11 @@
</div>
<chat-form
@changedStatus="changeStatus"
@message-sent="(o) => createMessage(o.message, o.save, o.user_id)"
@typing="isTyping"
:user="auth"></chat-form>
@changedStatus="changeStatus"
@message-sent="o => createMessage(o.message, o.save, o.user_id)"
@typing="isTyping"
:user="auth"
></chat-form>
</div>
</div>
</div>
resources/js/components/chat/ChatroomsDropdown.vue
+2 -6
View File
@@ -1,11 +1,7 @@
<template>
<div class="input-group chat-dropdown">
<select id='currentChatroom'
v-model="selected"
class="form-control"
@change='changedRoom'>
<option v-for="chatroom in chatrooms" :value='chatroom.id'>{{ chatroom.name }}</option>
<select id="currentChatroom" v-model="selected" class="form-control" @change="changedRoom">
<option v-for="chatroom in chatrooms" :value="chatroom.id">{{ chatroom.name }}</option>
</select>
</div>
</template>
resources/sass/main/_custom.scss
+1 -1
View File
@@ -8899,7 +8899,7 @@ section.tall_categories div.category.trailer {
background-image: url('/img/trailer.png');
background-repeat: no-repeat;
background-position: 50%;
background-size: cover
background-size: cover;
}
@media only screen and (min-resolution: 2dppx) {
webpack.mix.js
+19 -19
View File
@@ -18,17 +18,17 @@ mix.version()
},
})
/*
* Sourced asset dependencies via node_modules and JS bootstrapping
*/
* Sourced asset dependencies via node_modules and JS bootstrapping
*/
.js('resources/js/app.js', 'public/js')
.sass('resources/sass/app.scss', 'public/css')
/*
* Themes
*
* Note: Default wysibb theme is compiled into public/css/app.css from resources/sass/app.scss
*
*/
* Themes
*
* Note: Default wysibb theme is compiled into public/css/app.css from resources/sass/app.scss
*
*/
.sass('resources/sass/themes/galactic.scss', 'public/css/themes/galactic.css')
.sass('resources/sass/themes/dark-blue.scss', 'public/css/themes/dark-blue.css')
.sass('resources/sass/themes/dark-green.scss', 'public/css/themes/dark-green.css')
@@ -39,26 +39,26 @@ mix.version()
.sass('resources/sass/themes/dark-yellow.scss', 'public/css/themes/dark-yellow.css')
/*
* Login and TwoStep Auth styles
*
* We compile each of these separately since they should only be loaded with the certain views
*
* Note: These will likely be reworked into VueJS component(s)
*/
* Login and TwoStep Auth styles
*
* We compile each of these separately since they should only be loaded with the certain views
*
* Note: These will likely be reworked into VueJS component(s)
*/
.sass('resources/sass/main/login.scss', 'public/css/main/login.css')
.sass('resources/sass/main/twostep.scss', 'public/css/main/twostep.css')
.babel('resources/js/unit3d/twostep.js', 'public/js/twostep.js')
/*
* Here we take all these scripts and compile them into a single 'unit3d.js' file that will be loaded after 'app.js'
*
* Note: The order of this array will matter, no different then linking these assets manually in the html
*/
* Here we take all these scripts and compile them into a single 'unit3d.js' file that will be loaded after 'app.js'
*
* Note: The order of this array will matter, no different then linking these assets manually in the html
*/
.babel(['resources/js/unit3d/hoe.js', 'resources/js/unit3d/blutopia.js'], 'public/js/unit3d.js')
/*
* Copy emojione assets
*/
* Copy emojione assets
*/
.copy('node_modules/emojione-assets/png/64', 'public/img/emojione');
// Full API