-
Notifications
You must be signed in to change notification settings - Fork 471
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
24 additions
and
14 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -84,7 +84,9 @@ public function getPinnedFeeds(Request $request, FeedModel $feedModel, FeedRepos | |
->get(); | ||
|
||
$user = $request->user('api')->id ?? 0; | ||
|
||
$ids = $feeds->pluck('id'); | ||
$feedModel->whereIn('id', $ids)->increment('feed_view_count'); | ||
|
||
return $feedModel->getConnection()->transaction(function () use ($feeds, $repository, $user) { | ||
return $feeds->map(function (FeedModel $feed) use ($repository, $user) { | ||
$repository->setModel($feed); | ||
|
@@ -115,7 +117,7 @@ public function new(Request $request, FeedModel $feedModel, FeedRepository $repo | |
$after = $request->query('after'); | ||
$user = $request->user('api')->id ?? 0; | ||
$search = $request->query('search'); | ||
|
||
$feeds = $feedModel->when($after, function ($query) use ($after) { | ||
return $query->where('id', '<', $after); | ||
})->when(isset($search), function ($query) use ($search) { | ||
|
@@ -131,6 +133,9 @@ public function new(Request $request, FeedModel $feedModel, FeedRepository $repo | |
->limit($limit) | ||
->get(); | ||
|
||
$ids = $feeds->pluck('id'); | ||
$feedModel->whereIn('id', $ids)->increment('feed_view_count'); | ||
|
||
return $feedModel->getConnection()->transaction(function () use ($feeds, $repository, $user) { | ||
return $feeds->map(function (FeedModel $feed) use ($repository, $user) { | ||
$repository->setModel($feed); | ||
|
@@ -140,7 +145,7 @@ public function new(Request $request, FeedModel $feedModel, FeedRepository $repo | |
|
||
$feed->has_collect = $feed->collected($user); | ||
$feed->has_like = $feed->liked($user); | ||
|
||
return $feed; | ||
}); | ||
}); | ||
|
@@ -186,12 +191,13 @@ public function hot(Request $request, LikeModel $model, FeedRepository $reposito | |
->orderBy('id', 'desc') | ||
->get(); | ||
|
||
return $model->getConnection()->transaction(function () use ($feeds, $repository, $user) { | ||
$feedModel->whereIn('id', $ids)->increment('feed_view_count'); | ||
|
||
return $model->getConnection()->transaction(function () use ($feeds, $repository, $user, $ids, $feedModel) { | ||
return $feeds->map(function ($feed) use ($repository, $user) { | ||
if (! $feed) { | ||
return null; | ||
} | ||
|
||
$repository->setModel($feed); | ||
$repository->images(); | ||
$repository->format($user); | ||
|
@@ -244,8 +250,11 @@ public function follow(Request $request, FeedModel $model, FeedRepository $repos | |
->orderBy('feeds.id', 'desc') | ||
->limit($limit) | ||
->get(); | ||
$ids = $feeds->pluck('id'); | ||
$feedModel->whereIn('id', $ids)->increment('feed_view_count'); | ||
|
||
return $model->getConnection()->transaction(function () use ($repository, $user, $feeds) { | ||
|
||
return $feeds->map(function (FeedModel $feed) use ($repository, $user) { | ||
$repository->setModel($feed); | ||
$repository->images(); | ||
|
@@ -465,10 +474,11 @@ protected function fillFeedBaseData(Request $request, FeedModel $feed): FeedMode | |
* @return mixed | ||
* @author Seven Du <[email protected]> | ||
*/ | ||
public function destroy(Request $request, | ||
ResponseContract $response, | ||
FeedModel $feed) | ||
{ | ||
public function destroy( | ||
Request $request, | ||
ResponseContract $response, | ||
FeedModel $feed | ||
) { | ||
$user = $request->user(); | ||
|
||
if ($user->id !== $feed->user_id) { | ||
|
@@ -508,10 +518,11 @@ public function destroy(Request $request, | |
* @return mixed | ||
* @author BS <[email protected]> | ||
*/ | ||
public function newDestroy(Request $request, | ||
ResponseContract $response, | ||
FeedModel $feed) | ||
{ | ||
public function newDestroy( | ||
Request $request, | ||
ResponseContract $response, | ||
FeedModel $feed | ||
) { | ||
$user = $request->user(); | ||
|
||
if ($user->id !== $feed->user_id) { | ||
|
@@ -520,7 +531,6 @@ public function newDestroy(Request $request, | |
|
||
$feed->getConnection()->transaction(function () use ($feed, $user) { | ||
if ($pinned = $feed->pinned()->where('user_id', $user->id)->where('expires_at', null)->first()) { // 存在未审核的置顶申请时退款 | ||
|
||
$process = new UserProcess(); | ||
$process->reject(0, $pinned->amount, $user->id, '动态申请置顶退款', sprintf('退还申请置顶动态《%s》的款项', str_limit($feed->feed_content, 100))); | ||
} | ||
|