Skip to content

fixes #1252

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.

Sign up for GitHub

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 3 commits into from
May 8, 2025
Merged

fixes #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee49319
fixes
ScuffedNewt Mar 27, 2025
9c05c7e
refactor: fix PHP styling
ScuffedNewt Mar 27, 2025
ff1f9c4
fix: character encoding in search
ScuffedNewt May 8, 2025
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
2 changes: 1 addition & 1 deletion app/Http/Controllers/Auth/LoginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function getAuthCallback(LinkService $service, $provider) {
$socialite->redirectUrl(str_replace('auth', 'login', url(config('services.'.$provider.'.redirect'))));
$result = $socialite->user();

$user = UserAlias::where('user_snowflake', $result->id)->first();
$user = UserAlias::where('site', $provider)->where('user_snowflake', $result->id)->first();
if (!$user) {
return redirect('/register/'.$provider)->with(['userData' => $result]);
}
Expand Down
4 changes: 4 additions & 0 deletions app/Models/Shop/ShopLog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ public function getBaseCostAttribute() {

if (isset($this->cost['user']) && isset($this->cost['character'])) {
$assets = mergeAssetsArrays(parseAssetData($this->cost['user']), parseAssetData($this->cost['character']));
} elseif (isset($this->cost['user']) || isset($this->cost['character'])) {
$assets = isset($this->cost['user']) ? parseAssetData($this->cost['user']) : parseAssetData($this->cost['character']);
} else {
$assets = parseAssetData($this->cost);
}
Expand All @@ -160,6 +162,8 @@ public function getBaseCostAttribute() {
public function getDisplayCostAttribute() {
if (isset($this->cost['user']) && isset($this->cost['character'])) {
$assets = mergeAssetsArrays(parseAssetData($this->cost['user']), parseAssetData($this->cost['character']));
} elseif (isset($this->cost['user']) || isset($this->cost['character'])) {
$assets = isset($this->cost['user']) ? parseAssetData($this->cost['user']) : parseAssetData($this->cost['character']);
} else {
$assets = parseAssetData($this->cost);
}
Expand Down
4 changes: 2 additions & 2 deletions app/Services/InventoryManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ public function creditItem($sender, $recipient, $type, $data, $item, $quantity)
$recipient_stack = UserItem::where([
['user_id', '=', $recipient->id],
['item_id', '=', $item->id],
['data', '=', $data],
['data', '=', json_encode($data)], // this must be encoded since eloquent hasn't casted it yet
])->first();

if (!$recipient_stack) {
Expand All @@ -487,7 +487,7 @@ public function creditItem($sender, $recipient, $type, $data, $item, $quantity)
$recipient_stack = CharacterItem::where([
['character_id', '=', $recipient->id],
['item_id', '=', $item->id],
['data', '=', $data],
['data', '=', json_encode($data)],
])->first();

if (!$recipient_stack) {
Expand Down