Skip to content
Merged
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
26 changes: 13 additions & 13 deletions src/Gorse.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ function insertUser(User $user): RowAffected
*/
function getUser(string $user_id): User
{
return User::fromJSON($this->request('GET', '/api/user/' . $user_id, null));
return User::fromJSON($this->request('GET', '/api/user/' . urlencode($user_id), null));
}

/**
* @throws GuzzleException
*/
function deleteUser(string $user_id): RowAffected
{
return RowAffected::fromJSON($this->request('DELETE', '/api/user/' . $user_id, null));
return RowAffected::fromJSON($this->request('DELETE', '/api/user/' . urlencode($user_id), null));
}

/**
Expand All @@ -62,23 +62,23 @@ function insertItem(Item $item): RowAffected
*/
function getItem(string $item_id): Item
{
return Item::fromJSON($this->request('GET', '/api/item/' . $item_id, null));
return Item::fromJSON($this->request('GET', '/api/item/' . urlencode($item_id), null));
}

/**
* @throws GuzzleException
*/
function deleteItem(string $item_id): RowAffected
{
return RowAffected::fromJSON($this->request('DELETE', '/api/item/' . $item_id, null));
return RowAffected::fromJSON($this->request('DELETE', '/api/item/' . urlencode($item_id), null));
}

/**
* @throws GuzzleException
*/
function updateItem(string $item_id, Item $item): RowAffected
{
return RowAffected::fromJSON($this->request('PATCH', '/api/item/' . $item_id, $item));
return RowAffected::fromJSON($this->request('PATCH', '/api/item/' . urlencode($item_id), $item));
}

/**
Expand All @@ -94,31 +94,31 @@ function insertFeedback(array $feedback): RowAffected
*/
function listFeedback(string $feedback_type, string $user_id, string $item_id): array
{
return $this->request('GET', '/api/feedback/' . $feedback_type . '/' . $user_id . '/' . $item_id, null);
return $this->request('GET', '/api/feedback/' . urlencode($feedback_type) . '/' . urlencode($user_id) . '/' . urlencode($item_id), null);
}

/**
* @throws GuzzleException
*/
function getFeedback(string $user_id, string $item_id): array
{
return $this->request('GET', '/api/feedback/' . $user_id . '/' . $item_id, null);
return $this->request('GET', '/api/feedback/' . urlencode($user_id) . '/' . urlencode($item_id), null);
}

/**
* @throws GuzzleException
*/
function getFeedbackByType(string $feedback_type): array
{
return $this->request('GET', '/api/feedback/' . $feedback_type, null);
return $this->request('GET', '/api/feedback/' . urlencode($feedback_type), null);
}

/**
* @throws GuzzleException
*/
function deleteFeedback(string $feedback_type, string $user_id, string $item_id): RowAffected
{
return RowAffected::fromJSON($this->request('DELETE', '/api/feedback/' . $feedback_type . '/' . $user_id . '/' . $item_id, null));
return RowAffected::fromJSON($this->request('DELETE', '/api/feedback/' . urlencode($feedback_type) . '/' . urlencode($user_id) . '/' . urlencode($item_id), null));
}

/**
Expand All @@ -130,7 +130,7 @@ function getRecommend(string $user_id, ?string $write_back_type = null, ?string
if ($write_back_type) $params['write-back-type'] = $write_back_type;
if ($write_back_delay) $params['write-back-delay'] = $write_back_delay;

return $this->request('GET', '/api/recommend/' . $user_id, null, $params);
return $this->request('GET', '/api/recommend/' . urlencode($user_id), null, $params);
}

/**
Expand Down Expand Up @@ -160,7 +160,7 @@ function getNeighbors(string $item_id, int $n = 10, int $offset = 0): array
function getItemNeighbors(string $name, string $item_id, int $n = 10, int $offset = 0): array
{
$scores = [];
$response = $this->request('GET', "/api/item-to-item/$name/$item_id", null, ['n' => $n, 'offset' => $offset]);
$response = $this->request('GET', "/api/item-to-item/" . urlencode($name) . "/" . urlencode($item_id), null, ['n' => $n, 'offset' => $offset]);
foreach ($response as $score) {
$scores[] = Score::fromJSON($score);
}
Expand All @@ -173,7 +173,7 @@ function getItemNeighbors(string $name, string $item_id, int $n = 10, int $offse
function getUserNeighbors(string $name, string $user_id, int $n = 10, int $offset = 0): array
{
$scores = [];
$response = $this->request('GET', "/api/user-to-user/$name/$user_id", null, ['n' => $n, 'offset' => $offset]);
$response = $this->request('GET', "/api/user-to-user/" . urlencode($name) . "/" . urlencode($user_id), null, ['n' => $n, 'offset' => $offset]);
foreach ($response as $score) {
$scores[] = Score::fromJSON($score);
}
Expand All @@ -189,7 +189,7 @@ function getNonPersonalized(string $name, ?string $user_id = null, int $n = 10,
if ($user_id) $params['user-id'] = $user_id;

$scores = [];
$response = $this->request('GET', "/api/non-personalized/$name", null, $params);
$response = $this->request('GET', "/api/non-personalized/" . urlencode($name), null, $params);
foreach ($response as $score) {
$scores[] = Score::fromJSON($score);
}
Expand Down