-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #815 from shikorism/develop
Release 20220122.1500
- Loading branch information
Showing
66 changed files
with
20,190 additions
and
14,434 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| <?php | ||
|
|
||
| namespace App\Http\Controllers\Api\V1; | ||
|
|
||
| use App\Ejaculation; | ||
| use App\Events\LinkDiscovered; | ||
| use App\Http\Controllers\Controller; | ||
| use App\Http\Requests\Api\V1\CheckinStoreRequest; | ||
| use App\Http\Resources\EjaculationResource; | ||
| use App\Tag; | ||
| use Carbon\Carbon; | ||
| use Illuminate\Http\Request; | ||
| use Illuminate\Support\Facades\Auth; | ||
| use Illuminate\Support\Facades\DB; | ||
| use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; | ||
| use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException; | ||
|
|
||
| class CheckinController extends Controller | ||
| { | ||
| public function store(CheckinStoreRequest $request) | ||
| { | ||
| $inputs = $request->validated(); | ||
|
|
||
| $ejaculatedDate = empty($inputs['checked_in_at']) ? now() : new Carbon($inputs['checked_in_at']); | ||
| $ejaculatedDate = $ejaculatedDate->setTimezone(date_default_timezone_get())->startOfMinute(); | ||
| if (Ejaculation::where(['user_id' => Auth::id(), 'ejaculated_date' => $ejaculatedDate])->count()) { | ||
| throw new UnprocessableEntityHttpException('Checkin already exists in this time'); | ||
| } | ||
|
|
||
| $ejaculation = DB::transaction(function () use ($inputs, $ejaculatedDate) { | ||
| $ejaculation = Ejaculation::create([ | ||
| 'user_id' => Auth::id(), | ||
| 'ejaculated_date' => $ejaculatedDate, | ||
| 'note' => $inputs['note'] ?? '', | ||
| 'link' => $inputs['link'] ?? '', | ||
| 'source' => Ejaculation::SOURCE_API, | ||
| 'is_private' => (bool)($inputs['is_private'] ?? false), | ||
| 'is_too_sensitive' => (bool)($inputs['is_too_sensitive'] ?? false), | ||
| 'discard_elapsed_time' => (bool)($inputs['discard_elapsed_time'] ?? false), | ||
| 'oauth_access_token_id' => Auth::user()->token()->id, | ||
| ]); | ||
|
|
||
| $tagIds = []; | ||
| if (!empty($inputs['tags'])) { | ||
| foreach ($inputs['tags'] as $tag) { | ||
| $tag = trim($tag); | ||
| if ($tag === '') { | ||
| continue; | ||
| } | ||
|
|
||
| $tag = Tag::firstOrCreate(['name' => $tag]); | ||
| $tagIds[] = $tag->id; | ||
| } | ||
| } | ||
| $ejaculation->tags()->sync($tagIds); | ||
|
|
||
| return $ejaculation; | ||
| }); | ||
|
|
||
| if (!empty($ejaculation->link)) { | ||
| event(new LinkDiscovered($ejaculation->link)); | ||
| } | ||
|
|
||
| return new EjaculationResource($ejaculation); | ||
| } | ||
|
|
||
| public function show(Ejaculation $checkin) | ||
| { | ||
| $owner = $checkin->user; | ||
| if (!$owner->isMe()) { | ||
| if ($owner->is_protected) { | ||
| throw new AccessDeniedHttpException('このユーザはチェックイン履歴を公開していません'); | ||
| } | ||
| if ($checkin->is_private) { | ||
| throw new AccessDeniedHttpException('非公開チェックインのため、表示できません'); | ||
| } | ||
| } | ||
|
|
||
| return new EjaculationResource($checkin); | ||
| } | ||
|
|
||
| public function update(CheckinStoreRequest $request, Ejaculation $checkin) | ||
| { | ||
| $inputs = $request->validated(); | ||
|
|
||
| if (isset($inputs['checked_in_at'])) { | ||
| $ejaculatedDate = new Carbon($inputs['checked_in_at']); | ||
| $ejaculatedDate = $ejaculatedDate->setTimezone(date_default_timezone_get())->startOfMinute(); | ||
| if (Ejaculation::where(['user_id' => Auth::id(), 'ejaculated_date' => $ejaculatedDate])->where('id', '<>', $checkin->id)->count()) { | ||
| throw new UnprocessableEntityHttpException('Checkin already exists in this time'); | ||
| } | ||
|
|
||
| $checkin->ejaculated_date = $ejaculatedDate; | ||
| } | ||
| if (isset($inputs['note'])) { | ||
| $checkin->note = $inputs['note']; | ||
| } | ||
| if (isset($inputs['link'])) { | ||
| $checkin->link = $inputs['link']; | ||
| } | ||
| if (isset($inputs['is_private'])) { | ||
| $checkin->is_private = (bool)($inputs['is_private'] ?? false); | ||
| } | ||
| if (isset($inputs['is_too_sensitive'])) { | ||
| $checkin->is_too_sensitive = (bool)($inputs['is_too_sensitive'] ?? false); | ||
| } | ||
| if (isset($inputs['discard_elapsed_time'])) { | ||
| $checkin->discard_elapsed_time = (bool)($inputs['discard_elapsed_time'] ?? false); | ||
| } | ||
|
|
||
| DB::transaction(function () use ($inputs, $checkin) { | ||
| $checkin->save(); | ||
|
|
||
| if (isset($inputs['tags'])) { | ||
| $tagIds = []; | ||
| if (!empty($inputs['tags'])) { | ||
| foreach ($inputs['tags'] as $tag) { | ||
| $tag = trim($tag); | ||
| if ($tag === '') { | ||
| continue; | ||
| } | ||
|
|
||
| $tag = Tag::firstOrCreate(['name' => $tag]); | ||
| $tagIds[] = $tag->id; | ||
| } | ||
| } | ||
| $checkin->tags()->sync($tagIds); | ||
| } | ||
| }); | ||
|
|
||
| if (!empty($checkin->link)) { | ||
| event(new LinkDiscovered($checkin->link)); | ||
| } | ||
|
|
||
| return new EjaculationResource($checkin); | ||
| } | ||
|
|
||
| public function destroy($checkin) | ||
| { | ||
| $ejaculation = Ejaculation::find($checkin); | ||
|
|
||
| if ($ejaculation !== null) { | ||
| $this->authorize('edit', $ejaculation); | ||
|
|
||
| DB::transaction(function () use ($ejaculation) { | ||
| $ejaculation->tags()->detach(); | ||
| $ejaculation->delete(); | ||
| }); | ||
| } | ||
|
|
||
| return response()->noContent(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <?php | ||
|
|
||
| namespace App\Http\Controllers\Api\V1; | ||
|
|
||
| use App\Http\Controllers\Controller; | ||
| use App\Http\Resources\UserResource; | ||
| use Illuminate\Http\Request; | ||
| use Illuminate\Support\Facades\Auth; | ||
|
|
||
| class MeController extends Controller | ||
| { | ||
| public function show() | ||
| { | ||
| return new UserResource(Auth::user()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <?php | ||
|
|
||
| namespace App\Http\Controllers\Api\V1; | ||
|
|
||
| use App\Ejaculation; | ||
| use App\Http\Controllers\Controller; | ||
| use App\Http\Resources\EjaculationResource; | ||
| use App\User; | ||
| use Illuminate\Http\Request; | ||
| use Illuminate\Support\Facades\Auth; | ||
| use Illuminate\Support\Facades\DB; | ||
| use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; | ||
|
|
||
| class UserCheckinController extends Controller | ||
| { | ||
| public function index(Request $request, User $user) | ||
| { | ||
| if (!$user->isMe() && $user->is_protected) { | ||
| throw new AccessDeniedHttpException('このユーザはチェックイン履歴を公開していません'); | ||
| } | ||
|
|
||
| $inputs = $request->validate([ | ||
| 'per_page' => 'nullable|integer|between:10,100', | ||
| ]); | ||
|
|
||
| $query = Ejaculation::select(DB::raw( | ||
| <<<'SQL' | ||
| ejaculations.id, | ||
| ejaculated_date, | ||
| note, | ||
| is_private, | ||
| is_too_sensitive, | ||
| link, | ||
| source, | ||
| discard_elapsed_time | ||
| SQL | ||
| )) | ||
| ->where('user_id', $user->id); | ||
| if (!Auth::check() || $user->id !== Auth::id()) { | ||
| $query = $query->where('is_private', false); | ||
| } | ||
| $ejaculations = $query->orderBy('ejaculated_date', 'desc') | ||
| ->with('tags') | ||
| ->withLikes() | ||
| ->withMutedStatus() | ||
| ->paginate($inputs['per_page'] ?? 20); | ||
|
|
||
| return response()->fromPaginator($ejaculations, EjaculationResource::class); | ||
| } | ||
| } |
Oops, something went wrong.