From 6254ac94ca1bcdd17d1a7c6e4bfc8028bdaa4c15 Mon Sep 17 00:00:00 2001 From: koogua Date: Sun, 16 May 2021 19:19:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?v1.3.5=E9=98=B6=E6=AE=B5=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Admin/Views/setting/point.volt | 27 +++ app/Http/Home/Views/macros/point.volt | 15 ++ app/Http/Home/Views/question/answers.volt | 4 +- app/Models/AnswerLike.php | 19 ++ app/Models/ArticleFavorite.php | 19 ++ app/Models/ArticleLike.php | 19 ++ app/Models/ChapterLike.php | 19 ++ app/Models/CommentLike.php | 19 ++ app/Models/ConsultLike.php | 19 ++ app/Models/CourseFavorite.php | 19 ++ app/Models/PointHistory.php | 8 +- app/Models/QuestionFavorite.php | 19 ++ app/Models/QuestionLike.php | 19 ++ app/Models/ReviewLike.php | 19 ++ app/Services/Logic/Answer/AnswerCreate.php | 16 +- app/Services/Logic/Answer/AnswerDelete.php | 8 - app/Services/Logic/Answer/AnswerLike.php | 43 +++- app/Services/Logic/Answer/AnswerUpdate.php | 9 - app/Services/Logic/Answer/CommentList.php | 4 +- app/Services/Logic/Article/ArticleCreate.php | 14 ++ .../Logic/Article/ArticleFavorite.php | 28 ++- app/Services/Logic/Article/ArticleInfo.php | 10 +- app/Services/Logic/Article/ArticleLike.php | 45 +++- app/Services/Logic/Article/CommentList.php | 4 +- app/Services/Logic/Chapter/ChapterInfo.php | 2 +- app/Services/Logic/Chapter/ChapterLike.php | 19 +- app/Services/Logic/Chapter/CommentList.php | 4 +- .../Logic/Comment/AfterCreateTrait.php | 75 ++++++ app/Services/Logic/Comment/CommentCreate.php | 53 +---- app/Services/Logic/Comment/CommentDelete.php | 2 +- app/Services/Logic/Comment/CommentLike.php | 32 ++- app/Services/Logic/Comment/CommentList.php | 2 +- app/Services/Logic/Comment/CommentReply.php | 41 +--- .../{CommentCountTrait.php => CountTrait.php} | 93 ++++---- .../{CommentListTrait.php => ListTrait.php} | 11 +- app/Services/Logic/Comment/ReplyList.php | 6 +- app/Services/Logic/Consult/ConsultLike.php | 30 ++- app/Services/Logic/Course/CourseFavorite.php | 15 +- app/Services/Logic/Course/CourseInfo.php | 2 +- .../Logic/Notice/System/AnswerCommented.php | 43 ++++ .../Logic/Notice/System/ArticleCommented.php | 21 +- .../Logic/Notice/System/QuestionCommented.php | 31 +++ .../Logic/Point/History/AnswerAccepted.php | 1 + .../Logic/Point/History/AnswerLiked.php | 1 + .../Logic/Point/History/AnswerPost.php | 1 + .../Logic/Point/History/ArticleLiked.php | 81 +++++++ .../Logic/Point/History/ArticlePost.php | 1 + .../Logic/Point/History/ChapterStudy.php | 1 + .../Logic/Point/History/CommentPost.php | 1 + .../Logic/Point/History/CourseReview.php | 1 + .../Logic/Point/History/QuestionLiked.php | 81 +++++++ .../Logic/Point/History/QuestionPost.php | 1 + app/Services/Logic/Question/AnswerList.php | 9 +- app/Services/Logic/Question/CommentList.php | 4 +- .../Logic/Question/QuestionFavorite.php | 28 ++- app/Services/Logic/Question/QuestionInfo.php | 4 +- app/Services/Logic/Question/QuestionLike.php | 43 +++- app/Services/Logic/Review/ReviewLike.php | 26 +- app/Services/Logic/User/ArticleList.php | 2 +- app/Validators/Comment.php | 25 +- db/migrations/20210515063211.php | 224 ++++++++++++++++++ 61 files changed, 1162 insertions(+), 280 deletions(-) create mode 100644 app/Services/Logic/Comment/AfterCreateTrait.php rename app/Services/Logic/Comment/{CommentCountTrait.php => CountTrait.php} (55%) rename app/Services/Logic/Comment/{CommentListTrait.php => ListTrait.php} (85%) create mode 100644 app/Services/Logic/Notice/System/AnswerCommented.php create mode 100644 app/Services/Logic/Notice/System/QuestionCommented.php create mode 100644 app/Services/Logic/Point/History/ArticleLiked.php create mode 100644 app/Services/Logic/Point/History/QuestionLiked.php create mode 100644 db/migrations/20210515063211.php diff --git a/app/Http/Admin/Views/setting/point.volt b/app/Http/Admin/Views/setting/point.volt index 1d645873..51393168 100644 --- a/app/Http/Admin/Views/setting/point.volt +++ b/app/Http/Admin/Views/setting/point.volt @@ -133,6 +133,33 @@ + + 文章被赞 + + + + + + + + + 问题被赞 + + + + + + + + + 回答被赞 + + + + + + +
diff --git a/app/Http/Home/Views/macros/point.volt b/app/Http/Home/Views/macros/point.volt index 19ef5d61..efa3d1ac 100644 --- a/app/Http/Home/Views/macros/point.volt +++ b/app/Http/Home/Views/macros/point.volt @@ -51,6 +51,12 @@ 发布问题 {% elseif value == 12 %} 发布回答 + {% elseif value == 13 %} + 文章被赞 + {% elseif value == 14 %} + 提问被赞 + {% elseif value == 15 %} + 回答被赞 {% endif %} {%- endmacro %} @@ -86,7 +92,16 @@ {% set question_url = url({'for':'home.question.show','id':info.question.id}) %}

{{ info.question.title }}

{% elseif type == 12 %} + {% set question_url = url({'for':'home.question.show','id':info.question.id}) %} +

{{ info.question.title }}

+ {% elseif type == 13 %} + {% set article_url = url({'for':'home.article.show','id':info.article.id}) %} +

{{ info.article.title }}

+ {% elseif type == 14 %} {% set question_url = url({'for':'home.question.show','id':info.question.id}) %}

{{ info.question.title }}

+ {% elseif type == 15 %} + {% set question_url = url({'for':'home.question.show','id':info.question.id}) %} +

{{ info.question.title }}

{% endif %} {%- endmacro %} \ No newline at end of file diff --git a/app/Http/Home/Views/question/answers.volt b/app/Http/Home/Views/question/answers.volt index 11951277..50f320a7 100644 --- a/app/Http/Home/Views/question/answers.volt +++ b/app/Http/Home/Views/question/answers.volt @@ -12,7 +12,9 @@ {{ item.owner.name }} - {{ item.owner.name }} + + {{ item.owner.name }} +
{{ item.content }}
diff --git a/app/Models/AnswerLike.php b/app/Models/AnswerLike.php index ace2399b..afacacc4 100644 --- a/app/Models/AnswerLike.php +++ b/app/Models/AnswerLike.php @@ -26,6 +26,13 @@ class AnswerLike extends Model */ public $user_id = 0; + /** + * 删除标识 + * + * @var int + */ + public $deleted = 0; + /** * 创建时间 * @@ -33,6 +40,13 @@ class AnswerLike extends Model */ public $create_time = 0; + /** + * 更新时间 + * + * @var int + */ + public $update_time = 0; + public function getSource(): string { return 'kg_answer_like'; @@ -43,4 +57,9 @@ class AnswerLike extends Model $this->create_time = time(); } + public function beforeUpdate() + { + $this->update_time = time(); + } + } \ No newline at end of file diff --git a/app/Models/ArticleFavorite.php b/app/Models/ArticleFavorite.php index ce4ed1e1..fb18999d 100644 --- a/app/Models/ArticleFavorite.php +++ b/app/Models/ArticleFavorite.php @@ -26,6 +26,13 @@ class ArticleFavorite extends Model */ public $user_id = 0; + /** + * 删除标识 + * + * @var int + */ + public $deleted = 0; + /** * 创建时间 * @@ -33,6 +40,13 @@ class ArticleFavorite extends Model */ public $create_time = 0; + /** + * 更新时间 + * + * @var int + */ + public $update_time = 0; + public function getSource(): string { return 'kg_article_favorite'; @@ -43,4 +57,9 @@ class ArticleFavorite extends Model $this->create_time = time(); } + public function beforeUpdate() + { + $this->update_time = time(); + } + } \ No newline at end of file diff --git a/app/Models/ArticleLike.php b/app/Models/ArticleLike.php index 9494cdab..86ac5d6e 100644 --- a/app/Models/ArticleLike.php +++ b/app/Models/ArticleLike.php @@ -26,6 +26,13 @@ class ArticleLike extends Model */ public $user_id = 0; + /** + * 删除标识 + * + * @var int + */ + public $deleted = 0; + /** * 创建时间 * @@ -33,6 +40,13 @@ class ArticleLike extends Model */ public $create_time = 0; + /** + * 更新时间 + * + * @var int + */ + public $update_time = 0; + public function getSource(): string { return 'kg_article_like'; @@ -43,4 +57,9 @@ class ArticleLike extends Model $this->create_time = time(); } + public function beforeUpdate() + { + $this->update_time = time(); + } + } \ No newline at end of file diff --git a/app/Models/ChapterLike.php b/app/Models/ChapterLike.php index e3d536e0..51b5bc2c 100644 --- a/app/Models/ChapterLike.php +++ b/app/Models/ChapterLike.php @@ -26,6 +26,13 @@ class ChapterLike extends Model */ public $user_id = 0; + /** + * 删除标识 + * + * @var int + */ + public $deleted = 0; + /** * 创建时间 * @@ -33,6 +40,13 @@ class ChapterLike extends Model */ public $create_time = 0; + /** + * 更新时间 + * + * @var int + */ + public $update_time = 0; + public function getSource(): string { return 'kg_chapter_like'; @@ -43,4 +57,9 @@ class ChapterLike extends Model $this->create_time = time(); } + public function beforeUpdate() + { + $this->update_time = time(); + } + } \ No newline at end of file diff --git a/app/Models/CommentLike.php b/app/Models/CommentLike.php index 16d04059..c4371153 100644 --- a/app/Models/CommentLike.php +++ b/app/Models/CommentLike.php @@ -26,6 +26,13 @@ class CommentLike extends Model */ public $user_id = 0; + /** + * 删除标识 + * + * @var int + */ + public $deleted = 0; + /** * 创建时间 * @@ -33,6 +40,13 @@ class CommentLike extends Model */ public $create_time = 0; + /** + * 更新时间 + * + * @var int + */ + public $update_time = 0; + public function getSource(): string { return 'kg_comment_like'; @@ -43,4 +57,9 @@ class CommentLike extends Model $this->create_time = time(); } + public function beforeUpdate() + { + $this->update_time = time(); + } + } \ No newline at end of file diff --git a/app/Models/ConsultLike.php b/app/Models/ConsultLike.php index 4610efcd..9a4edee3 100644 --- a/app/Models/ConsultLike.php +++ b/app/Models/ConsultLike.php @@ -26,6 +26,13 @@ class ConsultLike extends Model */ public $user_id = 0; + /** + * 删除标识 + * + * @var int + */ + public $deleted = 0; + /** * 创建时间 * @@ -33,6 +40,13 @@ class ConsultLike extends Model */ public $create_time = 0; + /** + * 更新时间 + * + * @var int + */ + public $update_time = 0; + public function getSource(): string { return 'kg_consult_like'; @@ -43,4 +57,9 @@ class ConsultLike extends Model $this->create_time = time(); } + public function beforeUpdate() + { + $this->update_time = time(); + } + } \ No newline at end of file diff --git a/app/Models/CourseFavorite.php b/app/Models/CourseFavorite.php index 4a136fb4..8cd0f6fb 100644 --- a/app/Models/CourseFavorite.php +++ b/app/Models/CourseFavorite.php @@ -26,6 +26,13 @@ class CourseFavorite extends Model */ public $user_id = 0; + /** + * 删除标识 + * + * @var int + */ + public $deleted = 0; + /** * 创建时间 * @@ -33,6 +40,13 @@ class CourseFavorite extends Model */ public $create_time = 0; + /** + * 更新时间 + * + * @var int + */ + public $update_time = 0; + public function getSource(): string { return 'kg_course_favorite'; @@ -43,4 +57,9 @@ class CourseFavorite extends Model $this->create_time = time(); } + public function beforeUpdate() + { + $this->update_time = time(); + } + } \ No newline at end of file diff --git a/app/Models/PointHistory.php b/app/Models/PointHistory.php index e5df34c2..e2688a1b 100644 --- a/app/Models/PointHistory.php +++ b/app/Models/PointHistory.php @@ -20,10 +20,10 @@ class PointHistory extends Model const EVENT_ARTICLE_POST = 10; // 发布文章 const EVENT_QUESTION_POST = 11; // 发布问题 const EVENT_ANSWER_POST = 12; // 发布回答 - const EVENT_ANSWER_ACCEPTED = 13; // 回答被采纳 - const EVENT_ANSWER_LIKED = 14; // 回答被点赞 - const EVENT_ARTICLE_LIKED = 15; // 文章被点赞 - const EVENT_QUESTION_LIKED = 16; // 提问被点赞 + const EVENT_ARTICLE_LIKED = 13; // 文章被点赞 + const EVENT_QUESTION_LIKED = 14; // 提问被点赞 + const EVENT_ANSWER_LIKED = 15; // 回答被点赞 + const EVENT_ANSWER_ACCEPTED = 16; // 回答被采纳 /** * 主键编号 diff --git a/app/Models/QuestionFavorite.php b/app/Models/QuestionFavorite.php index 0a173593..b00fcdea 100644 --- a/app/Models/QuestionFavorite.php +++ b/app/Models/QuestionFavorite.php @@ -26,6 +26,13 @@ class QuestionFavorite extends Model */ public $user_id = 0; + /** + * 删除标识 + * + * @var int + */ + public $deleted = 0; + /** * 创建时间 * @@ -33,6 +40,13 @@ class QuestionFavorite extends Model */ public $create_time = 0; + /** + * 更新时间 + * + * @var int + */ + public $update_time = 0; + public function getSource(): string { return 'kg_question_favorite'; @@ -43,4 +57,9 @@ class QuestionFavorite extends Model $this->create_time = time(); } + public function beforeUpdate() + { + $this->update_time = time(); + } + } \ No newline at end of file diff --git a/app/Models/QuestionLike.php b/app/Models/QuestionLike.php index d4abfdfc..dbfc6648 100644 --- a/app/Models/QuestionLike.php +++ b/app/Models/QuestionLike.php @@ -26,6 +26,13 @@ class QuestionLike extends Model */ public $user_id = 0; + /** + * 删除标识 + * + * @var int + */ + public $deleted = 0; + /** * 创建时间 * @@ -33,6 +40,13 @@ class QuestionLike extends Model */ public $create_time = 0; + /** + * 更新时间 + * + * @var int + */ + public $update_time = 0; + public function getSource(): string { return 'kg_question_like'; @@ -43,4 +57,9 @@ class QuestionLike extends Model $this->create_time = time(); } + public function beforeUpdate() + { + $this->update_time = time(); + } + } \ No newline at end of file diff --git a/app/Models/ReviewLike.php b/app/Models/ReviewLike.php index ce41b023..106ef430 100644 --- a/app/Models/ReviewLike.php +++ b/app/Models/ReviewLike.php @@ -26,6 +26,13 @@ class ReviewLike extends Model */ public $user_id = 0; + /** + * 删除标识 + * + * @var int + */ + public $deleted = 0; + /** * 创建时间 * @@ -33,6 +40,13 @@ class ReviewLike extends Model */ public $create_time = 0; + /** + * 更新时间 + * + * @var int + */ + public $update_time = 0; + public function getSource(): string { return 'kg_review_like'; @@ -43,4 +57,9 @@ class ReviewLike extends Model $this->create_time = time(); } + public function beforeUpdate() + { + $this->update_time = time(); + } + } \ No newline at end of file diff --git a/app/Services/Logic/Answer/AnswerCreate.php b/app/Services/Logic/Answer/AnswerCreate.php index ec848439..7908882c 100644 --- a/app/Services/Logic/Answer/AnswerCreate.php +++ b/app/Services/Logic/Answer/AnswerCreate.php @@ -12,7 +12,6 @@ use App\Services\Logic\Notice\System\QuestionAnswered as QuestionAnsweredNotice; use App\Services\Logic\Point\History\AnswerPost as AnswerPostPointHistory; use App\Services\Logic\QuestionTrait; use App\Services\Logic\Service as LogicService; -use App\Services\Sync\QuestionScore as QuestionScoreSync; use App\Traits\Client as ClientTrait; use App\Validators\Answer as AnswerValidator; @@ -38,7 +37,6 @@ class AnswerCreate extends LogicService $answer = new AnswerModel(); $answer->published = $this->getPublishStatus($user); - $answer->content = $validator->checkContent($post['content']); $answer->client_type = $this->getClientType(); $answer->client_ip = $this->getClientIp(); @@ -58,9 +56,10 @@ class AnswerCreate extends LogicService $question->update(); - $this->syncQuestionScore($question); - $this->handleAnswerPostPoint($answer); - $this->handleQuestionAnsweredNotice($answer); + if ($user->id != $question->owner_id) { + $this->handleAnswerPostPoint($answer); + $this->handleQuestionAnsweredNotice($answer); + } } $this->eventsManager->fire('Answer:afterCreate', $this, $answer); @@ -95,13 +94,6 @@ class AnswerCreate extends LogicService $user->update(); } - protected function syncQuestionScore(QuestionModel $question) - { - $sync = new QuestionScoreSync(); - - $sync->addItem($question->id); - } - protected function handleQuestionAnsweredNotice(AnswerModel $answer) { if ($answer->published != AnswerModel::PUBLISH_APPROVED) return; diff --git a/app/Services/Logic/Answer/AnswerDelete.php b/app/Services/Logic/Answer/AnswerDelete.php index a707efb3..7e06c7bc 100644 --- a/app/Services/Logic/Answer/AnswerDelete.php +++ b/app/Services/Logic/Answer/AnswerDelete.php @@ -9,7 +9,6 @@ use App\Repos\User as UserRepo; use App\Services\Logic\AnswerTrait; use App\Services\Logic\QuestionTrait; use App\Services\Logic\Service as LogicService; -use App\Services\Sync\QuestionScore as QuestionScoreSync; use App\Validators\Answer as AnswerValidator; class AnswerDelete extends LogicService @@ -66,11 +65,4 @@ class AnswerDelete extends LogicService $user->update(); } - protected function syncQuestionScore(QuestionModel $question) - { - $sync = new QuestionScoreSync(); - - $sync->addItem($question->id); - } - } diff --git a/app/Services/Logic/Answer/AnswerLike.php b/app/Services/Logic/Answer/AnswerLike.php index 1b7a7dfb..6b10079d 100644 --- a/app/Services/Logic/Answer/AnswerLike.php +++ b/app/Services/Logic/Answer/AnswerLike.php @@ -8,6 +8,7 @@ use App\Models\User as UserModel; use App\Repos\AnswerLike as AnswerLikeRepo; use App\Services\Logic\AnswerTrait; use App\Services\Logic\Notice\System\AnswerLiked as AnswerLikedNotice; +use App\Services\Logic\Point\History\AnswerLiked as AnswerLikedPointHistory; use App\Services\Logic\Service as LogicService; use App\Validators\UserLimit as UserLimitValidator; @@ -30,9 +31,9 @@ class AnswerLike extends LogicService $answerLike = $likeRepo->findAnswerLike($answer->id, $user->id); - if (!$answerLike) { + $isFirstTime = true; - $action = 'do'; + if (!$answerLike) { $answerLike = new AnswerLikeModel(); @@ -41,9 +42,22 @@ class AnswerLike extends LogicService $answerLike->create(); - $this->incrAnswerLikeCount($answer); + } else { - $this->handleLikeNotice($answer, $user); + $isFirstTime = false; + + $answerLike->deleted = $answerLike->deleted == 1 ? 0 : 1; + + $answerLike->update(); + } + + $this->incrUserDailyAnswerLikeCount($user); + + if ($answerLike->deleted == 0) { + + $action = 'do'; + + $this->incrAnswerLikeCount($answer); $this->eventsManager->fire('Answer:afterLike', $this, $answer); @@ -51,14 +65,20 @@ class AnswerLike extends LogicService $action = 'undo'; - $answerLike->delete(); - $this->decrAnswerLikeCount($answer); $this->eventsManager->fire('Answer:afterUndoLike', $this, $answer); } - $this->incrUserDailyAnswerLikeCount($user); + $isOwner = $user->id == $answer->owner_id; + + /** + * 仅首次点赞发送通知和奖励积分 + */ + if ($isFirstTime && !$isOwner) { + $this->handleAnswerLikedNotice($answer, $user); + $this->handleAnswerLikedPoint($answerLike); + } return [ 'action' => $action, @@ -86,11 +106,18 @@ class AnswerLike extends LogicService $this->eventsManager->fire('UserDailyCounter:incrAnswerLikeCount', $this, $user); } - protected function handleLikeNotice(AnswerModel $answer, UserModel $sender) + protected function handleAnswerLikedNotice(AnswerModel $answer, UserModel $sender) { $notice = new AnswerLikedNotice(); $notice->handle($answer, $sender); } + protected function handleAnswerLikedPoint(AnswerLikeModel $answerLike) + { + $service = new AnswerLikedPointHistory(); + + $service->handle($answerLike); + } + } diff --git a/app/Services/Logic/Answer/AnswerUpdate.php b/app/Services/Logic/Answer/AnswerUpdate.php index 2ecf551b..3cfc159d 100644 --- a/app/Services/Logic/Answer/AnswerUpdate.php +++ b/app/Services/Logic/Answer/AnswerUpdate.php @@ -2,11 +2,9 @@ namespace App\Services\Logic\Answer; -use App\Models\Question as QuestionModel; use App\Services\Logic\AnswerTrait; use App\Services\Logic\QuestionTrait; use App\Services\Logic\Service as LogicService; -use App\Services\Sync\QuestionScore as QuestionScoreSync; use App\Traits\Client as ClientTrait; use App\Validators\Answer as AnswerValidator; @@ -42,11 +40,4 @@ class AnswerUpdate extends LogicService return $answer; } - protected function syncQuestionScore(QuestionModel $question) - { - $sync = new QuestionScoreSync(); - - $sync->addItem($question->id); - } - } diff --git a/app/Services/Logic/Answer/CommentList.php b/app/Services/Logic/Answer/CommentList.php index 175487e1..fd0fc73f 100644 --- a/app/Services/Logic/Answer/CommentList.php +++ b/app/Services/Logic/Answer/CommentList.php @@ -6,14 +6,14 @@ use App\Library\Paginator\Query as PagerQuery; use App\Models\Comment as CommentModel; use App\Repos\Comment as CommentRepo; use App\Services\Logic\AnswerTrait; -use App\Services\Logic\Comment\CommentListTrait; +use App\Services\Logic\Comment\ListTrait; use App\Services\Logic\Service as LogicService; class CommentList extends LogicService { use AnswerTrait; - use CommentListTrait; + use ListTrait; public function handle($id) { diff --git a/app/Services/Logic/Article/ArticleCreate.php b/app/Services/Logic/Article/ArticleCreate.php index f382abad..dfe7c35a 100644 --- a/app/Services/Logic/Article/ArticleCreate.php +++ b/app/Services/Logic/Article/ArticleCreate.php @@ -5,6 +5,7 @@ namespace App\Services\Logic\Article; use App\Models\Article as ArticleModel; use App\Models\User as UserModel; use App\Repos\User as UserRepo; +use App\Services\Logic\Point\History\ArticlePost as ArticlePostPointHistory; use App\Services\Logic\Service as LogicService; class ArticleCreate extends LogicService @@ -34,6 +35,10 @@ class ArticleCreate extends LogicService $this->recountUserArticles($user); + if ($article->published == ArticleModel::PUBLISH_APPROVED) { + $this->handleArticlePostPoint($article); + } + $this->eventsManager->fire('Article:afterCreate', $this, $article); return $article; @@ -55,4 +60,13 @@ class ArticleCreate extends LogicService $user->update(); } + protected function handleArticlePostPoint(ArticleModel $article) + { + if ($article->published != ArticleModel::PUBLISH_APPROVED) return; + + $service = new ArticlePostPointHistory(); + + $service->handle($article); + } + } diff --git a/app/Services/Logic/Article/ArticleFavorite.php b/app/Services/Logic/Article/ArticleFavorite.php index 40c42f68..82b8ba71 100644 --- a/app/Services/Logic/Article/ArticleFavorite.php +++ b/app/Services/Logic/Article/ArticleFavorite.php @@ -32,8 +32,6 @@ class ArticleFavorite extends LogicService if (!$favorite) { - $action = 'do'; - $favorite = new ArticleFavoriteModel(); $favorite->article_id = $article->id; @@ -41,27 +39,41 @@ class ArticleFavorite extends LogicService $favorite->create(); + } else { + + $favorite->deleted = $favorite->deleted == 1 ? 0 : 1; + + $favorite->update(); + } + + if ($favorite->deleted == 0) { + + $action = 'do'; + $this->incrArticleFavoriteCount($article); - $this->incrUserFavoriteCount($user); - $this->handleFavoriteNotice($article, $user); - $this->eventsManager->fire('Article:afterFavorite', $this, $article); } else { $action = 'undo'; - $favorite->delete(); - $this->decrArticleFavoriteCount($article); - $this->decrUserFavoriteCount($user); $this->eventsManager->fire('Article:afterUndoFavorite', $this, $article); } + $isOwner = $user->id == $article->owner_id; + + /** + * 仅首次收藏发送通知 + */ + if (!$favorite && !$isOwner) { + $this->handleFavoriteNotice($article, $user); + } + return [ 'action' => $action, 'count' => $article->favorite_count, diff --git a/app/Services/Logic/Article/ArticleInfo.php b/app/Services/Logic/Article/ArticleInfo.php index 201ff557..c3a68c26 100644 --- a/app/Services/Logic/Article/ArticleInfo.php +++ b/app/Services/Logic/Article/ArticleInfo.php @@ -47,9 +47,6 @@ class ArticleInfo extends LogicService 'summary' => $article->summary, 'tags' => $article->tags, 'content' => $content, - 'category' => $category, - 'owner' => $owner, - 'me' => $me, 'private' => $article->private, 'closed' => $article->closed, 'published' => $article->published, @@ -62,6 +59,9 @@ class ArticleInfo extends LogicService 'favorite_count' => $article->favorite_count, 'create_time' => $article->create_time, 'update_time' => $article->update_time, + 'category' => $category, + 'owner' => $owner, + 'me' => $me, ]; } @@ -87,7 +87,7 @@ class ArticleInfo extends LogicService $like = $likeRepo->findArticleLike($article->id, $user->id); - if ($like) { + if ($like && $like->deleted == 0) { $me['liked'] = 1; } @@ -95,7 +95,7 @@ class ArticleInfo extends LogicService $favorite = $favoriteRepo->findArticleFavorite($article->id, $user->id); - if ($favorite) { + if ($favorite && $favorite->deleted == 0) { $me['favorited'] = 1; } } diff --git a/app/Services/Logic/Article/ArticleLike.php b/app/Services/Logic/Article/ArticleLike.php index 86f8b4c1..09689702 100644 --- a/app/Services/Logic/Article/ArticleLike.php +++ b/app/Services/Logic/Article/ArticleLike.php @@ -8,6 +8,7 @@ use App\Models\User as UserModel; use App\Repos\ArticleLike as ArticleLikeRepo; use App\Services\Logic\ArticleTrait; use App\Services\Logic\Notice\System\ArticleLiked as ArticleLikedNotice; +use App\Services\Logic\Point\History\ArticleLiked as ArticleLikedPointHistory; use App\Services\Logic\Service as LogicService; use App\Validators\UserLimit as UserLimitValidator; @@ -30,9 +31,9 @@ class ArticleLike extends LogicService $articleLike = $likeRepo->findArticleLike($article->id, $user->id); - if (!$articleLike) { + $isFirstTime = true; - $action = 'do'; + if (!$articleLike) { $articleLike = new ArticleLikeModel(); @@ -41,9 +42,22 @@ class ArticleLike extends LogicService $articleLike->create(); - $this->incrArticleLikeCount($article); + } else { - $this->handleLikeNotice($article, $user); + $isFirstTime = false; + + $articleLike->deleted = $articleLike->deleted == 1 ? 0 : 1; + + $articleLike->update(); + } + + $this->incrUserDailyArticleLikeCount($user); + + if ($articleLike->deleted == 0) { + + $action = 'do'; + + $this->incrArticleLikeCount($article); $this->eventsManager->fire('Article:afterLike', $this, $article); @@ -51,14 +65,22 @@ class ArticleLike extends LogicService $action = 'undo'; - $articleLike->delete(); - $this->decrArticleLikeCount($article); $this->eventsManager->fire('Article:afterUndoLike', $this, $article); } - $this->incrUserDailyArticleLikeCount($user); + $isOwner = $user->id == $article->owner_id; + + $logger = $this->getLogger('http'); + + /** + * 仅首次点赞发送通知和奖励积分 + */ + if ($isFirstTime && !$isOwner) { + $this->handleArticleLikedNotice($article, $user); + $this->handleArticleLikedPoint($articleLike); + } return [ 'action' => $action, @@ -86,11 +108,18 @@ class ArticleLike extends LogicService $this->eventsManager->fire('UserDailyCounter:incrArticleLikeCount', $this, $user); } - protected function handleLikeNotice(ArticleModel $article, UserModel $sender) + protected function handleArticleLikedNotice(ArticleModel $article, UserModel $sender) { $notice = new ArticleLikedNotice(); $notice->handle($article, $sender); } + protected function handleArticleLikedPoint(ArticleLikeModel $articleLike) + { + $service = new ArticleLikedPointHistory(); + + $service->handle($articleLike); + } + } diff --git a/app/Services/Logic/Article/CommentList.php b/app/Services/Logic/Article/CommentList.php index 194cec1c..746434f0 100644 --- a/app/Services/Logic/Article/CommentList.php +++ b/app/Services/Logic/Article/CommentList.php @@ -6,14 +6,14 @@ use App\Library\Paginator\Query as PagerQuery; use App\Models\Comment as CommentModel; use App\Repos\Comment as CommentRepo; use App\Services\Logic\ArticleTrait; -use App\Services\Logic\Comment\CommentListTrait; +use App\Services\Logic\Comment\ListTrait; use App\Services\Logic\Service as LogicService; class CommentList extends LogicService { use ArticleTrait; - use CommentListTrait; + use ListTrait; public function handle($id) { diff --git a/app/Services/Logic/Chapter/ChapterInfo.php b/app/Services/Logic/Chapter/ChapterInfo.php index 938d3d16..b5fb0bf7 100644 --- a/app/Services/Logic/Chapter/ChapterInfo.php +++ b/app/Services/Logic/Chapter/ChapterInfo.php @@ -78,7 +78,7 @@ class ChapterInfo extends LogicService $like = $likeRepo->findChapterLike($chapter->id, $user->id); - if ($like) { + if ($like && $like->deleted == 0) { $me['liked'] = 1; } diff --git a/app/Services/Logic/Chapter/ChapterLike.php b/app/Services/Logic/Chapter/ChapterLike.php index 57424145..e1e306b4 100644 --- a/app/Services/Logic/Chapter/ChapterLike.php +++ b/app/Services/Logic/Chapter/ChapterLike.php @@ -31,8 +31,6 @@ class ChapterLike extends LogicService if (!$chapterLike) { - $action = 'do'; - $chapterLike = new ChapterLikeModel(); $chapterLike->chapter_id = $chapter->id; @@ -40,19 +38,28 @@ class ChapterLike extends LogicService $chapterLike->create(); + } else { + + $chapterLike->deleted = $chapterLike->deleted == 1 ? 0 : 1; + + $chapterLike->update(); + } + + $this->incrUserDailyChapterLikeCount($user); + + if ($chapterLike->deleted == 0) { + + $action = 'do'; + $this->incrChapterLikeCount($chapter); } else { $action = 'undo'; - $chapterLike->delete(); - $this->decrChapterLikeCount($chapter); } - $this->incrUserDailyChapterLikeCount($user); - return [ 'action' => $action, 'count' => $chapter->like_count, diff --git a/app/Services/Logic/Chapter/CommentList.php b/app/Services/Logic/Chapter/CommentList.php index f1ebe80e..8a26b831 100644 --- a/app/Services/Logic/Chapter/CommentList.php +++ b/app/Services/Logic/Chapter/CommentList.php @@ -6,14 +6,14 @@ use App\Library\Paginator\Query as PagerQuery; use App\Models\Comment as CommentModel; use App\Repos\Comment as CommentRepo; use App\Services\Logic\ChapterTrait; -use App\Services\Logic\Comment\CommentListTrait; +use App\Services\Logic\Comment\ListTrait; use App\Services\Logic\Service as LogicService; class CommentList extends LogicService { use ChapterTrait; - use CommentListTrait; + use ListTrait; public function handle($id) { diff --git a/app/Services/Logic/Comment/AfterCreateTrait.php b/app/Services/Logic/Comment/AfterCreateTrait.php new file mode 100644 index 00000000..07bdeb69 --- /dev/null +++ b/app/Services/Logic/Comment/AfterCreateTrait.php @@ -0,0 +1,75 @@ +published != CommentModel::PUBLISH_APPROVED) return; + + if ($item instanceof ArticleModel) { + $this->incrArticleCommentCount($item); + if ($user->id != $item->owner_id) { + $this->handleArticleCommentedNotice($item, $comment); + $this->handleCommentPostPoint($comment); + } + } elseif ($item instanceof QuestionModel) { + $this->incrQuestionCommentCount($item); + if ($user->id != $item->owner_id) { + $this->handleQuestionCommentedNotice($item, $comment); + $this->handleCommentPostPoint($comment); + } + } elseif ($item instanceof AnswerModel) { + $this->incrAnswerCommentCount($item); + if ($user->id != $item->owner_id) { + $this->handleAnswerCommentedNotice($item, $comment); + $this->handleCommentPostPoint($comment); + } + } + } + + protected function handleArticleCommentedNotice(ArticleModel $article, CommentModel $comment) + { + $notice = new ArticleCommentedNotice(); + + $notice->handle($article, $comment); + } + + protected function handleQuestionCommentedNotice(QuestionModel $question, CommentModel $comment) + { + $notice = new QuestionCommentedNotice(); + + $notice->handle($question, $comment); + } + + protected function handleAnswerCommentedNotice(AnswerModel $answer, CommentModel $comment) + { + $notice = new AnswerCommentedNotice(); + + $notice->handle($answer, $comment); + } + + protected function handleCommentPostPoint(CommentModel $comment) + { + if ($comment->published != CommentModel::PUBLISH_APPROVED) return; + + $service = new CommentPostPointHistory(); + + $service->handle($comment); + } + +} diff --git a/app/Services/Logic/Comment/CommentCreate.php b/app/Services/Logic/Comment/CommentCreate.php index 0a8ad40b..03451a6c 100644 --- a/app/Services/Logic/Comment/CommentCreate.php +++ b/app/Services/Logic/Comment/CommentCreate.php @@ -3,11 +3,6 @@ namespace App\Services\Logic\Comment; use App\Models\Comment as CommentModel; -use App\Services\Logic\ArticleTrait; -use App\Services\Logic\ChapterTrait; -use App\Services\Logic\Notice\System\ArticleCommented as ArticleCommentedNotice; -use App\Services\Logic\Notice\System\ChapterCommented as ChapterCommentedNotice; -use App\Services\Logic\Point\History\CommentPost as CommentPostPointHistory; use App\Services\Logic\Service as LogicService; use App\Traits\Client as ClientTrait; use App\Validators\Comment as CommentValidator; @@ -16,10 +11,9 @@ use App\Validators\UserLimit as UserLimitValidator; class CommentCreate extends LogicService { - use ArticleTrait; - use ChapterTrait; + use AfterCreateTrait; + use CountTrait; use ClientTrait; - use CommentCountTrait; public function handle() { @@ -33,7 +27,7 @@ class CommentCreate extends LogicService $validator = new CommentValidator(); - $validator->checkItemType($post['item_type']); + $item = $validator->checkItem($post['item_type'], $post['item_id']); $comment = new CommentModel(); @@ -56,48 +50,13 @@ class CommentCreate extends LogicService $this->incrUserDailyCommentCount($user); - $this->incrItemCommentCount($comment); - - $this->handlePostNotice($comment); - - $this->handlePostPoint($comment); + if ($comment->published == CommentModel::PUBLISH_APPROVED) { + $this->handleNoticeAndPoint($item, $comment, $user); + } $this->eventsManager->fire('Comment:afterCreate', $this, $comment); return $comment; } - protected function handlePostNotice(CommentModel $comment) - { - if ($comment->item_type == CommentModel::ITEM_CHAPTER) { - - $chapter = $this->checkChapter($comment->item_id); - - $this->incrChapterCommentCount($chapter); - - $notice = new ChapterCommentedNotice(); - - $notice->handle($comment); - - } elseif ($comment->item_type == CommentModel::ITEM_ARTICLE) { - - $article = $this->checkArticle($comment->item_id); - - $this->incrArticleCommentCount($article); - - $notice = new ArticleCommentedNotice(); - - $notice->handle($comment); - } - } - - protected function handlePostPoint(CommentModel $comment) - { - if ($comment->published != CommentModel::PUBLISH_APPROVED) return; - - $service = new CommentPostPointHistory(); - - $service->handle($comment); - } - } diff --git a/app/Services/Logic/Comment/CommentDelete.php b/app/Services/Logic/Comment/CommentDelete.php index 6aac600b..72297f99 100644 --- a/app/Services/Logic/Comment/CommentDelete.php +++ b/app/Services/Logic/Comment/CommentDelete.php @@ -10,7 +10,7 @@ class CommentDelete extends LogicService { use CommentTrait; - use CommentCountTrait; + use CountTrait; public function handle($id) { diff --git a/app/Services/Logic/Comment/CommentLike.php b/app/Services/Logic/Comment/CommentLike.php index 356265c4..26c28a3c 100644 --- a/app/Services/Logic/Comment/CommentLike.php +++ b/app/Services/Logic/Comment/CommentLike.php @@ -32,8 +32,6 @@ class CommentLike extends LogicService if (!$commentLike) { - $action = 'do'; - $commentLike = new CommentLikeModel(); $commentLike->comment_id = $comment->id; @@ -41,25 +39,41 @@ class CommentLike extends LogicService $commentLike->create(); + } else { + + $commentLike->comment_id = $commentLike->deleted == 1 ? 0 : 1; + + $commentLike->update(); + + $this->decrCommentLikeCount($comment); + } + + if ($commentLike->deleted == 0) { + + $action = 'do'; + $this->incrCommentLikeCount($comment); - $this->incrUserDailyCommentLikeCount($user); - - $this->handleLikeNotice($comment, $user); - $this->eventsManager->fire('Comment:afterLike', $this, $comment); } else { $action = 'undo'; - $commentLike->delete(); - $this->decrCommentLikeCount($comment); $this->eventsManager->fire('Comment:afterUndoLike', $this, $comment); } + $isOwner = $user->id == $comment->owner_id; + + /** + * 仅首次点赞发送通知 + */ + if (!$commentLike && $isOwner) { + $this->handleCommentLikedNotice($comment, $user); + } + return [ 'action' => $action, 'count' => $comment->like_count, @@ -87,7 +101,7 @@ class CommentLike extends LogicService $this->eventsManager->fire('UserDailyCounter:incrCommentLikeCount', $this, $user); } - protected function handleLikeNotice(CommentModel $comment, UserModel $sender) + protected function handleCommentLikedNotice(CommentModel $comment, UserModel $sender) { $notice = new CommentLikedNotice(); diff --git a/app/Services/Logic/Comment/CommentList.php b/app/Services/Logic/Comment/CommentList.php index 5ab878f5..35b26a45 100644 --- a/app/Services/Logic/Comment/CommentList.php +++ b/app/Services/Logic/Comment/CommentList.php @@ -10,7 +10,7 @@ use App\Services\Logic\Service as LogicService; class CommentList extends LogicService { - use CommentListTrait; + use ListTrait; public function handle() { diff --git a/app/Services/Logic/Comment/CommentReply.php b/app/Services/Logic/Comment/CommentReply.php index c21e91ab..33b7bb45 100644 --- a/app/Services/Logic/Comment/CommentReply.php +++ b/app/Services/Logic/Comment/CommentReply.php @@ -4,8 +4,6 @@ namespace App\Services\Logic\Comment; use App\Models\Comment as CommentModel; use App\Services\Logic\CommentTrait; -use App\Services\Logic\Notice\System\CommentReplied as CommentRepliedNotice; -use App\Services\Logic\Point\History\CommentPost as CommentPostPointHistory; use App\Services\Logic\Service as LogicService; use App\Traits\Client as ClientTrait; use App\Validators\Comment as CommentValidator; @@ -14,9 +12,10 @@ use App\Validators\UserLimit as UserLimitValidator; class CommentReply extends LogicService { - use ClientTrait; + use AfterCreateTrait; use CommentTrait; - use CommentCountTrait; + use CountTrait; + use ClientTrait; public function handle($id) { @@ -41,6 +40,11 @@ class CommentReply extends LogicService 'owner_id' => $user->id, ]; + $item = $validator->checkItem($comment->item_type, $comment->item_id); + + /** + * 子评论中回复用户 + */ if ($comment->parent_id > 0) { $parent = $validator->checkParent($comment->parent_id); $data['parent_id'] = $parent->id; @@ -60,37 +64,16 @@ class CommentReply extends LogicService $reply->create($data); - $parent = $this->checkComment($reply->parent_id); - $this->incrUserDailyCommentCount($user); - $this->incrCommentReplyCount($parent); - - $this->incrItemCommentCount($reply); - - $this->handlePostNotice($reply); - - $this->handlePostPoint($reply); + if ($reply->published == CommentModel::PUBLISH_APPROVED) { + $this->incrCommentReplyCount($parent); + $this->handleNoticeAndPoint($item, $reply, $user); + } $this->eventsManager->fire('Comment:afterReply', $this, $reply); return $reply; } - protected function handlePostNotice(CommentModel $comment) - { - $notice = new CommentRepliedNotice(); - - $notice->handle($comment); - } - - protected function handlePostPoint(CommentModel $comment) - { - if ($comment->published != CommentModel::PUBLISH_APPROVED) return; - - $service = new CommentPostPointHistory(); - - $service->handle($comment); - } - } diff --git a/app/Services/Logic/Comment/CommentCountTrait.php b/app/Services/Logic/Comment/CountTrait.php similarity index 55% rename from app/Services/Logic/Comment/CommentCountTrait.php rename to app/Services/Logic/Comment/CountTrait.php index 25ee8079..620ee6ce 100644 --- a/app/Services/Logic/Comment/CommentCountTrait.php +++ b/app/Services/Logic/Comment/CountTrait.php @@ -2,63 +2,19 @@ namespace App\Services\Logic\Comment; +use App\Models\Answer as AnswerModel; use App\Models\Article as ArticleModel; use App\Models\Chapter as ChapterModel; use App\Models\Comment as CommentModel; +use App\Models\Question as QuestionModel; use App\Models\User as UserModel; -use App\Services\Logic\ArticleTrait; -use App\Services\Logic\ChapterTrait; -use App\Services\Logic\Notice\System\ArticleCommented as ArticleCommentedNotice; -use App\Services\Logic\Notice\System\ChapterCommented as ChapterCommentedNotice; +use App\Repos\Chapter as ChapterRepo; use Phalcon\Di as Di; use Phalcon\Events\Manager as EventsManager; -trait CommentCountTrait +trait CountTrait { - use ArticleTrait; - use ChapterTrait; - - protected function incrItemCommentCount(CommentModel $comment) - { - if ($comment->item_type == CommentModel::ITEM_CHAPTER) { - - $chapter = $this->checkChapter($comment->item_id); - - $this->incrChapterCommentCount($chapter); - - $notice = new ChapterCommentedNotice(); - - $notice->handle($comment); - - } elseif ($comment->item_type == CommentModel::ITEM_ARTICLE) { - - $article = $this->checkArticle($comment->item_id); - - $this->incrArticleCommentCount($article); - - $notice = new ArticleCommentedNotice(); - - $notice->handle($comment); - } - } - - protected function decrItemCommentCount(CommentModel $comment) - { - if ($comment->item_type == CommentModel::ITEM_CHAPTER) { - - $chapter = $this->checkChapter($comment->item_id); - - $this->decrChapterCommentCount($chapter); - - } elseif ($comment->item_type == CommentModel::ITEM_ARTICLE) { - - $article = $this->checkArticle($comment->item_id); - - $this->decrArticleCommentCount($article); - } - } - protected function incrCommentReplyCount(CommentModel $comment) { $comment->reply_count += 1; @@ -72,7 +28,7 @@ trait CommentCountTrait $chapter->update(); - $parent = $this->checkChapter($chapter->parent_id); + $parent = $this->findChapter($chapter->parent_id); $parent->comment_count += 1; @@ -86,6 +42,20 @@ trait CommentCountTrait $article->update(); } + protected function incrQuestionCommentCount(QuestionModel $question) + { + $question->comment_count += 1; + + $question->update(); + } + + protected function incrAnswerCommentCount(AnswerModel $answer) + { + $answer->comment_count += 1; + + $answer->update(); + } + protected function decrCommentReplyCount(CommentModel $comment) { if ($comment->reply_count > 0) { @@ -101,7 +71,7 @@ trait CommentCountTrait $chapter->update(); } - $parent = $this->checkChapter($chapter->parent_id); + $parent = $this->findChapter($chapter->parent_id); if ($parent->comment_count > 0) { $parent->comment_count -= 1; @@ -117,6 +87,22 @@ trait CommentCountTrait } } + protected function decrQuestionCommentCount(QuestionModel $question) + { + if ($question->comment_count > 0) { + $question->comment_count -= 1; + $question->update(); + } + } + + protected function decrAnswerCommentCount(AnswerModel $answer) + { + if ($answer->comment_count > 0) { + $answer->comment_count += 1; + $answer->update(); + } + } + protected function incrUserDailyCommentCount(UserModel $user) { /** @@ -127,4 +113,11 @@ trait CommentCountTrait $eventsManager->fire('UserDailyCounter:incrCommentCount', $this, $user); } + protected function findChapter($id) + { + $chapterRepo = new ChapterRepo(); + + return $chapterRepo->findById($id); + } + } diff --git a/app/Services/Logic/Comment/CommentListTrait.php b/app/Services/Logic/Comment/ListTrait.php similarity index 85% rename from app/Services/Logic/Comment/CommentListTrait.php rename to app/Services/Logic/Comment/ListTrait.php index 908b5d4f..4cc365c2 100644 --- a/app/Services/Logic/Comment/CommentListTrait.php +++ b/app/Services/Logic/Comment/ListTrait.php @@ -5,7 +5,7 @@ namespace App\Services\Logic\Comment; use App\Builders\CommentList as CommentListBuilder; use App\Repos\CommentLike as CommentLikeRepo; -trait CommentListTrait +trait ListTrait { public function handleComments($pager) @@ -58,8 +58,13 @@ trait CommentListTrait $likedIds = []; if ($user->id > 0) { - $likes = $likeRepo->findByUserId($user->id); - $likedIds = array_column($likes->toArray(), 'comment_id'); + $likes = $likeRepo->findByUserId($user->id) + ->filter(function ($like) { + if ($like->deleted == 0) { + return $like; + } + }); + $likedIds = array_column($likes, 'comment_id'); } $result = []; diff --git a/app/Services/Logic/Comment/ReplyList.php b/app/Services/Logic/Comment/ReplyList.php index eac5b67a..bdff164f 100644 --- a/app/Services/Logic/Comment/ReplyList.php +++ b/app/Services/Logic/Comment/ReplyList.php @@ -12,15 +12,17 @@ class ReplyList extends LogicService { use CommentTrait; - use CommentListTrait; + use ListTrait; public function handle($id) { + $comment = $this->checkComment($id); + $pagerQuery = new PagerQuery(); $params = $pagerQuery->getParams(); - $params['parent_id'] = $id; + $params['parent_id'] = $comment->id; $params['published'] = CommentModel::PUBLISH_APPROVED; $params['deleted'] = 0; diff --git a/app/Services/Logic/Consult/ConsultLike.php b/app/Services/Logic/Consult/ConsultLike.php index 636eb623..f609a8be 100644 --- a/app/Services/Logic/Consult/ConsultLike.php +++ b/app/Services/Logic/Consult/ConsultLike.php @@ -32,8 +32,6 @@ class ConsultLike extends LogicService if (!$consultLike) { - $action = 'do'; - $consultLike = new ConsultLikeModel(); $consultLike->consult_id = $consult->id; @@ -41,9 +39,20 @@ class ConsultLike extends LogicService $consultLike->create(); - $this->incrConsultLikeCount($consult); + } else { - $this->handleLikeNotice($consult, $user); + $consultLike->deleted = $consultLike->deleted == 1 ? 0 : 1; + + $consultLike->update(); + } + + $this->incrUserDailyConsultLikeCount($user); + + if ($consultLike->deleted == 0) { + + $action = 'do'; + + $this->incrConsultLikeCount($consult); $this->eventsManager->fire('Consult:afterLike', $this, $consult); @@ -51,14 +60,19 @@ class ConsultLike extends LogicService $action = 'undo'; - $consultLike->delete(); - $this->decrConsultLikeCount($consult); $this->eventsManager->fire('Consult:afterUndoLike', $this, $consult); } - $this->incrUserDailyConsultLikeCount($user); + $isOwner = $user->id == $consult->owner_id; + + /** + * 仅首次点赞发送通知 + */ + if (!$consultLike && !$isOwner) { + $this->handleConsultLikedNotice($consult, $user); + } return [ 'action' => $action, @@ -86,7 +100,7 @@ class ConsultLike extends LogicService $this->eventsManager->fire('UserDailyCounter:incrConsultLikeCount', $this, $user); } - protected function handleLikeNotice(ConsultModel $consult, UserModel $sender) + protected function handleConsultLikedNotice(ConsultModel $consult, UserModel $sender) { $notice = new ConsultLikedNotice(); diff --git a/app/Services/Logic/Course/CourseFavorite.php b/app/Services/Logic/Course/CourseFavorite.php index 42515d43..f7c18624 100644 --- a/app/Services/Logic/Course/CourseFavorite.php +++ b/app/Services/Logic/Course/CourseFavorite.php @@ -31,8 +31,6 @@ class CourseFavorite extends LogicService if (!$favorite) { - $action = 'do'; - $favorite = new CourseFavoriteModel(); $favorite->course_id = $course->id; @@ -40,6 +38,17 @@ class CourseFavorite extends LogicService $favorite->create(); + } else { + + $favorite->deleted = $favorite->deleted == 1 ? 0 : 1; + + $favorite->update(); + } + + if ($favorite->deleted == 0) { + + $action = 'do'; + $this->incrCourseFavoriteCount($course); $this->incrUserFavoriteCount($user); @@ -47,8 +56,6 @@ class CourseFavorite extends LogicService $action = 'undo'; - $favorite->delete(); - $this->decrCourseFavoriteCount($course); $this->decrUserFavoriteCount($user); } diff --git a/app/Services/Logic/Course/CourseInfo.php b/app/Services/Logic/Course/CourseInfo.php index 8109b84e..b262bbe9 100644 --- a/app/Services/Logic/Course/CourseInfo.php +++ b/app/Services/Logic/Course/CourseInfo.php @@ -48,7 +48,7 @@ class CourseInfo extends LogicService $favorite = $favoriteRepo->findCourseFavorite($course->id, $user->id); - if ($favorite) { + if ($favorite && $favorite->deleted == 0) { $me['favorited'] = 1; } diff --git a/app/Services/Logic/Notice/System/AnswerCommented.php b/app/Services/Logic/Notice/System/AnswerCommented.php new file mode 100644 index 00000000..0af20157 --- /dev/null +++ b/app/Services/Logic/Notice/System/AnswerCommented.php @@ -0,0 +1,43 @@ +summary, 0, 32); + $commentContent = kg_substr($comment->content, 0, 32); + + $question = $this->findQuestion($answer->question_id); + + $notification = new NotificationModel(); + + $notification->sender_id = $comment->owner_id; + $notification->receiver_id = $answer->owner_id; + $notification->event_id = $comment->id; + $notification->event_type = NotificationModel::TYPE_ANSWER_COMMENTED; + $notification->event_info = [ + 'question' => ['id' => $question->id, 'title' => $question->title], + 'answer' => ['id' => $answer->id, 'summary' => $answerSummary], + 'comment' => ['id' => $comment->id, 'content' => $commentContent], + ]; + + $notification->create(); + } + + protected function findQuestion($id) + { + $questionRepo = new QuestionRepo(); + + return $questionRepo->findById($id); + } + +} diff --git a/app/Services/Logic/Notice/System/ArticleCommented.php b/app/Services/Logic/Notice/System/ArticleCommented.php index 7f5927e7..db2d8cf7 100644 --- a/app/Services/Logic/Notice/System/ArticleCommented.php +++ b/app/Services/Logic/Notice/System/ArticleCommented.php @@ -2,21 +2,18 @@ namespace App\Services\Logic\Notice\System; +use App\Models\Article as ArticleModel; use App\Models\Comment as CommentModel; use App\Models\Notification as NotificationModel; -use App\Repos\Article as ArticleRepo; -use App\Repos\User as UserRepo; use App\Services\Logic\Service as LogicService; class ArticleCommented extends LogicService { - public function handle(CommentModel $comment) + public function handle(ArticleModel $article, CommentModel $comment) { $commentContent = kg_substr($comment->content, 0, 32); - $article = $this->findArticle($comment->item_id); - $notification = new NotificationModel(); $notification->sender_id = $comment->owner_id; @@ -31,18 +28,4 @@ class ArticleCommented extends LogicService $notification->create(); } - protected function findArticle($id) - { - $articleRepo = new ArticleRepo(); - - return $articleRepo->findById($id); - } - - protected function findUser($id) - { - $userRepo = new UserRepo(); - - return $userRepo->findById($id); - } - } diff --git a/app/Services/Logic/Notice/System/QuestionCommented.php b/app/Services/Logic/Notice/System/QuestionCommented.php new file mode 100644 index 00000000..fc7e47d2 --- /dev/null +++ b/app/Services/Logic/Notice/System/QuestionCommented.php @@ -0,0 +1,31 @@ +content, 0, 32); + + $notification = new NotificationModel(); + + $notification->sender_id = $comment->owner_id; + $notification->receiver_id = $question->owner_id; + $notification->event_id = $comment->id; + $notification->event_type = NotificationModel::TYPE_QUESTION_COMMENTED; + $notification->event_info = [ + 'question' => ['id' => $question->id, 'title' => $question->title], + 'comment' => ['id' => $comment->id, 'content' => $commentContent], + ]; + + $notification->create(); + } + +} diff --git a/app/Services/Logic/Point/History/AnswerAccepted.php b/app/Services/Logic/Point/History/AnswerAccepted.php index 927a9e1c..d57b75c4 100644 --- a/app/Services/Logic/Point/History/AnswerAccepted.php +++ b/app/Services/Logic/Point/History/AnswerAccepted.php @@ -31,6 +31,7 @@ class AnswerAccepted extends PointHistory if ($eventPoint <= 0) return; $eventId = $answer->id; + $eventType = PointHistoryModel::EVENT_ANSWER_ACCEPTED; $historyRepo = new PointHistoryRepo(); diff --git a/app/Services/Logic/Point/History/AnswerLiked.php b/app/Services/Logic/Point/History/AnswerLiked.php index 1c1451a1..b68c2644 100644 --- a/app/Services/Logic/Point/History/AnswerLiked.php +++ b/app/Services/Logic/Point/History/AnswerLiked.php @@ -36,6 +36,7 @@ class AnswerLiked extends PointHistory if ($dailyPointLimit <= 0) return; $eventId = $answerLike->id; + $eventType = PointHistoryModel::EVENT_ANSWER_LIKED; $historyRepo = new PointHistoryRepo(); diff --git a/app/Services/Logic/Point/History/AnswerPost.php b/app/Services/Logic/Point/History/AnswerPost.php index 6bf957c1..2566c12a 100644 --- a/app/Services/Logic/Point/History/AnswerPost.php +++ b/app/Services/Logic/Point/History/AnswerPost.php @@ -35,6 +35,7 @@ class AnswerPost extends PointHistory if ($dailyPointLimit <= 0) return; $eventId = $answer->id; + $eventType = PointHistoryModel::EVENT_ANSWER_POST; $historyRepo = new PointHistoryRepo(); diff --git a/app/Services/Logic/Point/History/ArticleLiked.php b/app/Services/Logic/Point/History/ArticleLiked.php new file mode 100644 index 00000000..80c43cfe --- /dev/null +++ b/app/Services/Logic/Point/History/ArticleLiked.php @@ -0,0 +1,81 @@ +getSettings('point'); + + $pointEnabled = $setting['enabled'] ?? 0; + + if ($pointEnabled == 0) return; + + $eventRule = json_decode($setting['event_rule'], true); + + $eventEnabled = $eventRule['article_liked']['enabled'] ?? 0; + + if ($eventEnabled == 0) return; + + $eventPoint = $eventRule['article_liked']['point'] ?? 0; + + if ($eventPoint <= 0) return; + + $dailyPointLimit = $eventRule['article_liked']['limit'] ?? 0; + + if ($dailyPointLimit <= 0) return; + + $eventId = $articleLike->id; + + $eventType = PointHistoryModel::EVENT_ARTICLE_LIKED; + + $historyRepo = new PointHistoryRepo(); + + $history = $historyRepo->findEventHistory($eventId, $eventType); + + if ($history) return; + + $articleRepo = new ArticleRepo(); + + $article = $articleRepo->findById($articleLike->article_id); + + /** + * @todo 使用缓存优化 + */ + $dailyPoints = $historyRepo->sumUserDailyEventPoints($article->owner_id, $eventType, date('Ymd')); + + if ($dailyPoints >= $dailyPointLimit) return; + + $userRepo = new UserRepo(); + + $user = $userRepo->findById($article->owner_id); + + $eventInfo = [ + 'article' => [ + 'id' => $article->id, + 'title' => $article->title, + ] + ]; + + $history = new PointHistoryModel(); + + $history->user_id = $user->id; + $history->user_name = $user->name; + $history->event_id = $eventId; + $history->event_type = $eventType; + $history->event_info = $eventInfo; + $history->event_point = $eventPoint; + + $this->handlePointHistory($history); + } + +} diff --git a/app/Services/Logic/Point/History/ArticlePost.php b/app/Services/Logic/Point/History/ArticlePost.php index f0fb3d69..0d6cd87f 100644 --- a/app/Services/Logic/Point/History/ArticlePost.php +++ b/app/Services/Logic/Point/History/ArticlePost.php @@ -34,6 +34,7 @@ class ArticlePost extends PointHistory if ($dailyPointLimit <= 0) return; $eventId = $article->id; + $eventType = PointHistoryModel::EVENT_ARTICLE_POST; $historyRepo = new PointHistoryRepo(); diff --git a/app/Services/Logic/Point/History/ChapterStudy.php b/app/Services/Logic/Point/History/ChapterStudy.php index e4927f83..ff60e2ee 100644 --- a/app/Services/Logic/Point/History/ChapterStudy.php +++ b/app/Services/Logic/Point/History/ChapterStudy.php @@ -32,6 +32,7 @@ class ChapterStudy extends PointHistory if ($eventPoint <= 0) return; $eventId = $chapterUser->id; + $eventType = PointHistoryModel::EVENT_CHAPTER_STUDY; $historyRepo = new PointHistoryRepo(); diff --git a/app/Services/Logic/Point/History/CommentPost.php b/app/Services/Logic/Point/History/CommentPost.php index 827db1e1..26476d67 100644 --- a/app/Services/Logic/Point/History/CommentPost.php +++ b/app/Services/Logic/Point/History/CommentPost.php @@ -34,6 +34,7 @@ class CommentPost extends PointHistory if ($dailyPointLimit <= 0) return; $eventId = $comment->id; + $eventType = PointHistoryModel::EVENT_COMMENT_POST; $historyRepo = new PointHistoryRepo(); diff --git a/app/Services/Logic/Point/History/CourseReview.php b/app/Services/Logic/Point/History/CourseReview.php index 8a888d35..1c6fcf2d 100644 --- a/app/Services/Logic/Point/History/CourseReview.php +++ b/app/Services/Logic/Point/History/CourseReview.php @@ -31,6 +31,7 @@ class CourseReview extends PointHistory if ($eventPoint <= 0) return; $eventId = $review->id; + $eventType = PointHistoryModel::EVENT_COURSE_REVIEW; $historyRepo = new PointHistoryRepo(); diff --git a/app/Services/Logic/Point/History/QuestionLiked.php b/app/Services/Logic/Point/History/QuestionLiked.php new file mode 100644 index 00000000..d5f752dc --- /dev/null +++ b/app/Services/Logic/Point/History/QuestionLiked.php @@ -0,0 +1,81 @@ +getSettings('point'); + + $pointEnabled = $setting['enabled'] ?? 0; + + if ($pointEnabled == 0) return; + + $eventRule = json_decode($setting['event_rule'], true); + + $eventEnabled = $eventRule['question_liked']['enabled'] ?? 0; + + if ($eventEnabled == 0) return; + + $eventPoint = $eventRule['question_liked']['point'] ?? 0; + + if ($eventPoint <= 0) return; + + $dailyPointLimit = $eventRule['question_liked']['limit'] ?? 0; + + if ($dailyPointLimit <= 0) return; + + $eventId = $questionLike->id; + + $eventType = PointHistoryModel::EVENT_QUESTION_LIKED; + + $historyRepo = new PointHistoryRepo(); + + $history = $historyRepo->findEventHistory($eventId, $eventType); + + if ($history) return; + + $questionRepo = new QuestionRepo(); + + $question = $questionRepo->findById($questionLike->question_id); + + /** + * @todo 使用缓存优化 + */ + $dailyPoints = $historyRepo->sumUserDailyEventPoints($question->owner_id, $eventType, date('Ymd')); + + if ($dailyPoints >= $dailyPointLimit) return; + + $userRepo = new UserRepo(); + + $user = $userRepo->findById($question->owner_id); + + $eventInfo = [ + 'question' => [ + 'id' => $question->id, + 'title' => $question->title, + ] + ]; + + $history = new PointHistoryModel(); + + $history->user_id = $user->id; + $history->user_name = $user->name; + $history->event_id = $eventId; + $history->event_type = $eventType; + $history->event_info = $eventInfo; + $history->event_point = $eventPoint; + + $this->handlePointHistory($history); + } + +} diff --git a/app/Services/Logic/Point/History/QuestionPost.php b/app/Services/Logic/Point/History/QuestionPost.php index 3434dc14..f48af25f 100644 --- a/app/Services/Logic/Point/History/QuestionPost.php +++ b/app/Services/Logic/Point/History/QuestionPost.php @@ -34,6 +34,7 @@ class QuestionPost extends PointHistory if ($dailyPointLimit <= 0) return; $eventId = $question->id; + $eventType = PointHistoryModel::EVENT_QUESTION_POST; $historyRepo = new PointHistoryRepo(); diff --git a/app/Services/Logic/Question/AnswerList.php b/app/Services/Logic/Question/AnswerList.php index 04e42a8e..5359a0fe 100644 --- a/app/Services/Logic/Question/AnswerList.php +++ b/app/Services/Logic/Question/AnswerList.php @@ -90,8 +90,13 @@ class AnswerList extends LogicService $likedIds = []; if ($user->id > 0) { - $likes = $likeRepo->findByUserId($user->id); - $likedIds = array_column($likes->toArray(), 'answer_id'); + $likes = $likeRepo->findByUserId($user->id) + ->filter(function ($like) { + if ($like->deleted == 0) { + return $like; + } + }); + $likedIds = array_column($likes, 'answer_id'); } $result = []; diff --git a/app/Services/Logic/Question/CommentList.php b/app/Services/Logic/Question/CommentList.php index 30fac4d9..7d64f1bb 100644 --- a/app/Services/Logic/Question/CommentList.php +++ b/app/Services/Logic/Question/CommentList.php @@ -5,7 +5,7 @@ namespace App\Services\Logic\Question; use App\Library\Paginator\Query as PagerQuery; use App\Models\Comment as CommentModel; use App\Repos\Comment as CommentRepo; -use App\Services\Logic\Comment\CommentListTrait; +use App\Services\Logic\Comment\ListTrait; use App\Services\Logic\QuestionTrait; use App\Services\Logic\Service as LogicService; @@ -13,7 +13,7 @@ class CommentList extends LogicService { use QuestionTrait; - use CommentListTrait; + use ListTrait; public function handle($id) { diff --git a/app/Services/Logic/Question/QuestionFavorite.php b/app/Services/Logic/Question/QuestionFavorite.php index 1350fed9..4fe05644 100644 --- a/app/Services/Logic/Question/QuestionFavorite.php +++ b/app/Services/Logic/Question/QuestionFavorite.php @@ -32,8 +32,6 @@ class QuestionFavorite extends LogicService if (!$favorite) { - $action = 'do'; - $favorite = new QuestionFavoriteModel(); $favorite->question_id = $question->id; @@ -41,27 +39,41 @@ class QuestionFavorite extends LogicService $favorite->create(); + } else { + + $favorite->deleted = $favorite->deleted == 1 ? 0 : 1; + + $favorite->update(); + } + + if ($favorite->deleted == 0) { + + $action = 'do'; + $this->incrQuestionFavoriteCount($question); - $this->incrUserFavoriteCount($user); - $this->handleFavoriteNotice($question, $user); - $this->eventsManager->fire('Question:afterFavorite', $this, $question); } else { $action = 'undo'; - $favorite->delete(); - $this->decrQuestionFavoriteCount($question); - $this->decrUserFavoriteCount($user); $this->eventsManager->fire('Question:afterUndoFavorite', $this, $question); } + $isOwner = $user->id == $question->owner_id; + + /** + * 仅首次收藏发送通知 + */ + if (!$favorite && !$isOwner) { + $this->handleFavoriteNotice($question, $user); + } + return [ 'action' => $action, 'count' => $question->favorite_count, diff --git a/app/Services/Logic/Question/QuestionInfo.php b/app/Services/Logic/Question/QuestionInfo.php index 3ec8e782..6cba13fa 100644 --- a/app/Services/Logic/Question/QuestionInfo.php +++ b/app/Services/Logic/Question/QuestionInfo.php @@ -108,7 +108,7 @@ class QuestionInfo extends LogicService $like = $likeRepo->findQuestionLike($question->id, $user->id); - if ($like) { + if ($like && $like->deleted == 0) { $me['liked'] = 1; } @@ -116,7 +116,7 @@ class QuestionInfo extends LogicService $favorite = $favoriteRepo->findQuestionFavorite($question->id, $user->id); - if ($favorite) { + if ($favorite && $favorite->deleted == 0) { $me['favorited'] = 1; } diff --git a/app/Services/Logic/Question/QuestionLike.php b/app/Services/Logic/Question/QuestionLike.php index 5e5c27f2..8afee608 100644 --- a/app/Services/Logic/Question/QuestionLike.php +++ b/app/Services/Logic/Question/QuestionLike.php @@ -7,6 +7,7 @@ use App\Models\QuestionLike as QuestionLikeModel; use App\Models\User as UserModel; use App\Repos\QuestionLike as QuestionLikeRepo; use App\Services\Logic\Notice\System\QuestionLiked as QuestionLikedNotice; +use App\Services\Logic\Point\History\QuestionLiked as QuestionLikedPointHistory; use App\Services\Logic\QuestionTrait; use App\Services\Logic\Service as LogicService; use App\Validators\UserLimit as UserLimitValidator; @@ -30,9 +31,9 @@ class QuestionLike extends LogicService $questionLike = $likeRepo->findQuestionLike($question->id, $user->id); - if (!$questionLike) { + $isFirstTime = true; - $action = 'do'; + if (!$questionLike) { $questionLike = new QuestionLikeModel(); @@ -41,9 +42,22 @@ class QuestionLike extends LogicService $questionLike->create(); - $this->incrQuestionLikeCount($question); + } else { - $this->handleLikeNotice($question, $user); + $isFirstTime = false; + + $questionLike->deleted = $questionLike->deleted == 1 ? 0 : 1; + + $questionLike->update(); + } + + $this->incrUserDailyQuestionLikeCount($user); + + if ($questionLike->deleted == 0) { + + $action = 'do'; + + $this->incrQuestionLikeCount($question); $this->eventsManager->fire('Question:afterLike', $this, $question); @@ -51,14 +65,20 @@ class QuestionLike extends LogicService $action = 'undo'; - $questionLike->delete(); - $this->decrQuestionLikeCount($question); $this->eventsManager->fire('Question:afterUndoLike', $this, $question); } - $this->incrUserDailyQuestionLikeCount($user); + $isOwner = $user->id == $question->owner_id; + + /** + * 仅首次点赞发送通知和奖励积分 + */ + if ($isFirstTime && !$isOwner) { + $this->handleQuestionLikedNotice($question, $user); + $this->handleQuestionLikedPoint($questionLike); + } return [ 'action' => $action, @@ -86,11 +106,18 @@ class QuestionLike extends LogicService $this->eventsManager->fire('UserDailyCounter:incrQuestionLikeCount', $this, $user); } - protected function handleLikeNotice(QuestionModel $question, UserModel $sender) + protected function handleQuestionLikedNotice(QuestionModel $question, UserModel $sender) { $notice = new QuestionLikedNotice(); $notice->handle($question, $sender); } + protected function handleQuestionLikedPoint(QuestionLikeModel $questionLike) + { + $service = new QuestionLikedPointHistory(); + + $service->handle($questionLike); + } + } diff --git a/app/Services/Logic/Review/ReviewLike.php b/app/Services/Logic/Review/ReviewLike.php index 36d1f334..0d589937 100644 --- a/app/Services/Logic/Review/ReviewLike.php +++ b/app/Services/Logic/Review/ReviewLike.php @@ -32,8 +32,6 @@ class ReviewLike extends LogicService if (!$reviewLike) { - $action = 'do'; - $reviewLike = new ReviewLikeModel(); $reviewLike->review_id = $review->id; @@ -41,6 +39,19 @@ class ReviewLike extends LogicService $reviewLike->create(); + } else { + + $reviewLike->deleted = $reviewLike->deleted == 1 ? 0 : 1; + + $reviewLike->update(); + } + + $this->incrUserDailyReviewLikeCount($user); + + if ($reviewLike->deleted == 0) { + + $action = 'do'; + $this->incrReviewLikeCount($review); $this->handleLikeNotice($review, $user); @@ -51,14 +62,19 @@ class ReviewLike extends LogicService $action = 'undo'; - $reviewLike->delete(); - $this->decrReviewLikeCount($review); $this->eventsManager->fire('Review:afterUndoLike', $this, $review); } - $this->incrUserDailyReviewLikeCount($user); + $isOwner = $user->id == $review->owner_id; + + /** + * 仅首次点赞发送通知 + */ + if (!$reviewLike && !$isOwner) { + $this->handleLikeNotice($review, $user); + } return [ 'action' => $action, diff --git a/app/Services/Logic/User/ArticleList.php b/app/Services/Logic/User/ArticleList.php index b5364b05..ad596aa8 100644 --- a/app/Services/Logic/User/ArticleList.php +++ b/app/Services/Logic/User/ArticleList.php @@ -5,7 +5,7 @@ namespace App\Services\Logic\User; use App\Library\Paginator\Query as PagerQuery; use App\Models\Article as ArticleModel; use App\Repos\Article as ArticleRepo; -use App\Services\Logic\Article\QuestionList as ArticleListService; +use App\Services\Logic\Article\ArticleList as ArticleListService; use App\Services\Logic\Service as LogicService; use App\Services\Logic\UserTrait; diff --git a/app/Validators/Comment.php b/app/Validators/Comment.php index 091ff909..e8d6895b 100644 --- a/app/Validators/Comment.php +++ b/app/Validators/Comment.php @@ -49,13 +49,34 @@ class Comment extends Validator return $user; } - public function checkItemType($itemType) + public function checkItem($itemType, $itemId) { if (!array_key_exists($itemType, CommentModel::itemTypes())) { throw new BadRequestException('comment.invalid_item_type'); } - return $itemType; + $result = null; + + switch ($itemType) { + case CommentModel::ITEM_CHAPTER: + $validator = new Chapter(); + $result = $validator->checkChapter($itemId); + break; + case CommentModel::ITEM_ARTICLE: + $validator = new Article(); + $result = $validator->checkArticle($itemId); + break; + case CommentModel::ITEM_QUESTION: + $validator = new Question(); + $result = $validator->checkQuestion($itemId); + break; + case CommentModel::ITEM_ANSWER: + $validator = new Answer(); + $result = $validator->checkAnswer($itemId); + break; + } + + return $result; } public function checkContent($content) diff --git a/db/migrations/20210515063211.php b/db/migrations/20210515063211.php new file mode 100644 index 00000000..9cf73c9f --- /dev/null +++ b/db/migrations/20210515063211.php @@ -0,0 +1,224 @@ +modifyArticleFavoriteTable(); + $this->modifyArticleLikeTable(); + $this->modifyChapterLikeTable(); + $this->modifyCommentLikeTable(); + $this->modifyConsultLikeTable(); + $this->modifyCourseFavoriteTable(); + $this->handlePointEventRules(); + } + + protected function modifyArticleFavoriteTable() + { + $this->table('kg_article_favorite') + ->addColumn('deleted', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '删除标识', + 'after' => 'user_id', + ]) + ->changeColumn('create_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '创建时间', + 'after' => 'deleted', + ]) + ->addColumn('update_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '更新时间', + 'after' => 'create_time', + ]) + ->save(); + } + + protected function modifyArticleLikeTable() + { + $this->table('kg_article_like') + ->addColumn('deleted', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '删除标识', + 'after' => 'user_id', + ]) + ->changeColumn('create_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '创建时间', + 'after' => 'deleted', + ]) + ->addColumn('update_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '更新时间', + 'after' => 'create_time', + ]) + ->save(); + } + + protected function modifyChapterLikeTable() + { + $this->table('kg_chapter_like') + ->addColumn('deleted', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '删除标识', + 'after' => 'user_id', + ]) + ->changeColumn('create_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '创建时间', + 'after' => 'deleted', + ]) + ->addColumn('update_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '更新时间', + 'after' => 'create_time', + ]) + ->save(); + } + + protected function modifyCommentLikeTable() + { + $this->table('kg_comment_like') + ->addColumn('deleted', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '删除标识', + 'after' => 'user_id', + ]) + ->changeColumn('create_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '创建时间', + 'after' => 'deleted', + ]) + ->addColumn('update_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '更新时间', + 'after' => 'create_time', + ]) + ->save(); + } + + protected function modifyConsultLikeTable() + { + $this->table('kg_consult_like') + ->addColumn('deleted', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '删除标识', + 'after' => 'user_id', + ]) + ->changeColumn('create_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '创建时间', + 'after' => 'deleted', + ]) + ->addColumn('update_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '更新时间', + 'after' => 'create_time', + ]) + ->save(); + } + + protected function modifyCourseFavoriteTable() + { + $this->table('kg_course_favorite') + ->addColumn('deleted', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '删除标识', + 'after' => 'user_id', + ]) + ->changeColumn('create_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '创建时间', + 'after' => 'deleted', + ]) + ->addColumn('update_time', 'integer', [ + 'null' => false, + 'default' => '0', + 'limit' => MysqlAdapter::INT_REGULAR, + 'signed' => false, + 'comment' => '更新时间', + 'after' => 'create_time', + ]) + ->save(); + } + + protected function handlePointEventRules() + { + $setting = $this->getQueryBuilder() + ->select('*') + ->from('kg_setting') + ->where(['section' => 'point', 'item_key' => 'event_rule']) + ->execute()->fetch('assoc'); + + if (!$setting) return; + + $itemValue = json_decode($setting['item_value'], true); + + $itemValue['article_liked'] = ['point' => 1, 'enabled' => 1, 'limit' => 50]; + $itemValue['question_liked'] = ['point' => 1, 'enabled' => 1, 'limit' => 50]; + $itemValue['answer_liked'] = ['point' => 1, 'enabled' => 1, 'limit' => 50]; + + $itemValue = json_encode($itemValue); + + $this->getQueryBuilder() + ->update('kg_setting') + ->where(['id' => $setting['id']]) + ->set('item_value', $itemValue) + ->execute(); + } + +} From b58cb44f04f2b34bc47e8f0e81041d5edd1c60d9 Mon Sep 17 00:00:00 2001 From: koogua Date: Thu, 20 May 2021 18:50:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?v1.3.5=E9=98=B6=E6=AE=B5=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 16 ++ README.md | 4 +- app/Builders/ReportList.php | 41 +++++ app/Caches/UserDailyCounter.php | 7 +- .../Admin/Controllers/AnswerController.php | 42 ++++- .../Admin/Controllers/ArticleController.php | 36 +++- .../Admin/Controllers/CommentController.php | 58 +++++++ .../Admin/Controllers/IndexController.php | 2 + .../Controllers/ModerationController.php | 12 ++ .../Admin/Controllers/QuestionController.php | 36 +++- .../Admin/Controllers/ReportController.php | 61 +++++++ app/Http/Admin/Services/Answer.php | 75 +++++++- app/Http/Admin/Services/Article.php | 95 ++++++++-- app/Http/Admin/Services/AuthNode.php | 73 +++++++- app/Http/Admin/Services/Comment.php | 114 ++++++++++++ app/Http/Admin/Services/Index.php | 17 ++ app/Http/Admin/Services/Moderation.php | 39 +++++ app/Http/Admin/Services/Question.php | 95 ++++++++-- app/Http/Admin/Services/Report.php | 162 ++++++++++++++++++ app/Http/Admin/Views/answer/add.volt | 2 +- app/Http/Admin/Views/answer/edit.volt | 2 +- app/Http/Admin/Views/answer/list.volt | 6 +- .../{review.volt => publish_review.volt} | 4 +- .../Admin/Views/answer/report_review.volt | 115 +++++++++++++ app/Http/Admin/Views/article/list.volt | 4 +- .../{review.volt => publish_review.volt} | 24 +-- .../Admin/Views/article/report_review.volt | 128 ++++++++++++++ .../Admin/Views/comment/publish_review.volt | 84 +++++++++ .../Admin/Views/comment/report_review.volt | 114 ++++++++++++ app/Http/Admin/Views/index/main.volt | 3 +- app/Http/Admin/Views/index/main_mod_stat.volt | 2 +- .../Admin/Views/index/main_report_stat.volt | 39 +++++ .../Admin/Views/index/main_today_stat.volt | 12 +- app/Http/Admin/Views/macros/comment.volt | 11 ++ app/Http/Admin/Views/moderation/answers.volt | 2 +- app/Http/Admin/Views/moderation/articles.volt | 2 +- app/Http/Admin/Views/moderation/comments.volt | 51 ++++++ .../Admin/Views/moderation/questions.volt | 2 +- app/Http/Admin/Views/question/list.volt | 4 +- .../{review.volt => publish_review.volt} | 4 +- .../Admin/Views/question/report_review.volt | 122 +++++++++++++ app/Http/Admin/Views/report/answers.volt | 58 +++++++ app/Http/Admin/Views/report/articles.volt | 63 +++++++ app/Http/Admin/Views/report/comments.volt | 54 ++++++ app/Http/Admin/Views/report/questions.volt | 62 +++++++ app/Http/Admin/Views/user/online.volt | 4 +- .../Home/Controllers/AnswerController.php | 69 ++++---- .../Home/Controllers/ArticleController.php | 25 +-- .../Home/Controllers/CommentController.php | 8 - .../Home/Controllers/QuestionController.php | 25 +-- .../Home/Controllers/ReportController.php | 41 +++++ app/Http/Home/Services/Article.php | 6 + app/Http/Home/Views/answer/add.volt | 30 +--- app/Http/Home/Views/answer/edit.volt | 3 +- app/Http/Home/Views/answer/info.volt | 3 + app/Http/Home/Views/article/edit.volt | 125 +++++++------- app/Http/Home/Views/article/show.volt | 27 +-- app/Http/Home/Views/article/show_owner.volt | 16 ++ app/Http/Home/Views/comment/info.volt | 6 +- app/Http/Home/Views/comment/list.volt | 6 +- app/Http/Home/Views/comment/replies.volt | 5 +- app/Http/Home/Views/macros/answer.volt | 53 ++++++ app/Http/Home/Views/question/answers.volt | 49 +----- app/Http/Home/Views/question/edit.volt | 57 +++--- app/Http/Home/Views/question/show.volt | 45 ++--- .../Home/Views/question/show_answers.volt | 11 ++ app/Http/Home/Views/question/show_owner.volt | 16 ++ app/Http/Home/Views/report/add.volt | 37 ++++ app/Http/Home/Views/user/console/answers.volt | 6 +- app/Library/AppInfo.php | 2 +- app/Listeners/Report.php | 26 +++ app/Listeners/UserDailyCounter.php | 20 +++ app/Models/Reason.php | 23 +++ app/Models/Report.php | 36 +++- app/Repos/Answer.php | 4 + app/Repos/Article.php | 4 + app/Repos/Comment.php | 4 + app/Repos/Question.php | 4 + app/Repos/Report.php | 106 ++++++++++++ app/Repos/Stat.php | 28 +++ app/Services/Logic/Answer/AnswerCreate.php | 11 ++ app/Services/Logic/Answer/AnswerInfo.php | 29 +++- app/Services/Logic/Article/ArticleCreate.php | 11 ++ app/Services/Logic/Article/ArticleInfo.php | 4 +- app/Services/Logic/Article/ArticleLike.php | 2 - app/Services/Logic/Comment/CommentCreate.php | 2 +- .../Logic/Question/QuestionCreate.php | 11 ++ app/Services/Logic/Report/CountTrait.php | 54 ++++++ app/Services/Logic/Report/ReasonList.php | 16 ++ app/Services/Logic/Report/ReportCreate.php | 60 +++++++ app/Validators/Comment.php | 10 +- app/Validators/Report.php | 90 ++++++++++ app/Validators/UserLimit.php | 44 +++++ config/errors.php | 20 ++- config/events.php | 2 + db/migrations/20210515063211.php | 37 +++- public/static/admin/js/common.js | 7 +- public/static/home/css/common.css | 40 +++-- public/static/home/js/answer.edit.js | 16 ++ public/static/home/js/answer.js | 13 -- public/static/home/js/article.edit.js | 16 ++ public/static/home/js/article.show.js | 14 +- public/static/home/js/common.js | 20 ++- public/static/home/js/question.edit.js | 16 ++ public/static/home/js/question.show.js | 11 +- public/static/home/js/report.js | 27 +++ public/static/home/js/vditor.js | 5 + 107 files changed, 3022 insertions(+), 455 deletions(-) create mode 100644 app/Builders/ReportList.php create mode 100644 app/Http/Admin/Controllers/ReportController.php create mode 100644 app/Http/Admin/Services/Report.php rename app/Http/Admin/Views/answer/{review.volt => publish_review.volt} (95%) create mode 100644 app/Http/Admin/Views/answer/report_review.volt rename app/Http/Admin/Views/article/{review.volt => publish_review.volt} (81%) create mode 100644 app/Http/Admin/Views/article/report_review.volt create mode 100644 app/Http/Admin/Views/comment/publish_review.volt create mode 100644 app/Http/Admin/Views/comment/report_review.volt create mode 100644 app/Http/Admin/Views/index/main_report_stat.volt create mode 100644 app/Http/Admin/Views/macros/comment.volt create mode 100644 app/Http/Admin/Views/moderation/comments.volt rename app/Http/Admin/Views/question/{review.volt => publish_review.volt} (95%) create mode 100644 app/Http/Admin/Views/question/report_review.volt create mode 100644 app/Http/Admin/Views/report/answers.volt create mode 100644 app/Http/Admin/Views/report/articles.volt create mode 100644 app/Http/Admin/Views/report/comments.volt create mode 100644 app/Http/Admin/Views/report/questions.volt create mode 100644 app/Http/Home/Controllers/ReportController.php create mode 100644 app/Http/Home/Views/answer/info.volt create mode 100644 app/Http/Home/Views/article/show_owner.volt create mode 100644 app/Http/Home/Views/question/show_answers.volt create mode 100644 app/Http/Home/Views/question/show_owner.volt create mode 100644 app/Http/Home/Views/report/add.volt create mode 100644 app/Listeners/Report.php create mode 100644 app/Repos/Report.php create mode 100644 app/Services/Logic/Report/CountTrait.php create mode 100644 app/Services/Logic/Report/ReasonList.php create mode 100644 app/Services/Logic/Report/ReportCreate.php create mode 100644 app/Validators/Report.php create mode 100644 public/static/home/js/answer.edit.js create mode 100644 public/static/home/js/report.js diff --git a/CHANGELOG.md b/CHANGELOG.md index c1b2c565..ca93d9a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +### [v1.3.5](https://gitee.com/koogua/course-tencent-cloud/releases/v1.3.5)(2021-05-20) + +### 更新 + +- 更新演示数据 +- 优化安装脚本install.sh +- 升级脚本upgrade.sh中加入更新导航缓存 +- 撰写文章和提问markdown编辑器通栏显示 +- 完善文章和问题的浏览权限 +- 优化通用ajax表单提交 +- 文章，提问，回答点赞作者有提醒和积分奖励 +- 前台增加针对回答的预览访问地址 +- 前台增加文章，问题，回答，评论加入举报功能 +- 后台增加文章，问题，回答，评论的举报审核功能 +- 后台首页增加审核队列统计 + ### [v1.3.4](https://gitee.com/koogua/course-tencent-cloud/releases/v1.3.4)(2021-05-13) ### 更新 diff --git a/README.md b/README.md index df3f0303..a9d3c94d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## 酷瓜云课堂 -![酷瓜云网课GPL协议开源](https://images.gitee.com/uploads/images/2020/1127/092621_3805cf8f_23592.png) +![酷瓜云网课GPL协议开源](https://images.gitee.com/uploads/images/2021/0520/091646_a94e4e7c_23592.png) ### 项目介绍 @@ -14,7 +14,7 @@ ### 系统功能 -实现了点播、直播、专栏、面授、会员、群组、积分、秒杀等，全功能无阉割，100%真开源在线教育解决方案。 +实现了点播、直播、专栏、面授、问答、会员、群组、积分、秒杀等，100%真开源在线教育解决方案。 友情提示： diff --git a/app/Builders/ReportList.php b/app/Builders/ReportList.php new file mode 100644 index 00000000..2c647e93 --- /dev/null +++ b/app/Builders/ReportList.php @@ -0,0 +1,41 @@ +getUsers($reports); + + foreach ($reports as $key => $report) { + $reports[$key]['owner'] = $users[$report['owner_id']] ?? new \stdClass(); + } + + return $reports; + } + + public function getUsers(array $reports) + { + $ids = kg_array_column($reports, 'owner_id'); + + $userRepo = new UserRepo(); + + $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); + + $baseUrl = kg_cos_url(); + + $result = []; + + foreach ($users->toArray() as $user) { + $user['avatar'] = $baseUrl . $user['avatar']; + $result[$user['id']] = $user; + } + + return $result; + } + +} diff --git a/app/Caches/UserDailyCounter.php b/app/Caches/UserDailyCounter.php index 6af20260..b5d7493e 100644 --- a/app/Caches/UserDailyCounter.php +++ b/app/Caches/UserDailyCounter.php @@ -22,13 +22,18 @@ class UserDailyCounter extends Counter public function getContent($id = null) { return [ - 'danmu_count' => 0, + 'article_count' => 0, + 'question_count' => 0, + 'answer_count' => 0, + 'comment_count' => 0, 'consult_count' => 0, 'order_count' => 0, 'chapter_like_count' => 0, 'consult_like_count' => 0, 'review_like_count' => 0, 'article_like_count' => 0, + 'question_like_count' => 0, + 'answer_like_count' => 0, 'comment_like_count' => 0, ]; } diff --git a/app/Http/Admin/Controllers/AnswerController.php b/app/Http/Admin/Controllers/AnswerController.php index 42f0af5d..70b8d34a 100644 --- a/app/Http/Admin/Controllers/AnswerController.php +++ b/app/Http/Admin/Controllers/AnswerController.php @@ -46,10 +46,7 @@ class AnswerController extends Controller $question = $questionService->getQuestion($id); - $referer = $this->request->getHTTPReferer(); - $this->view->setVar('question', $question); - $this->view->setVar('referer', $referer); } /** @@ -65,9 +62,6 @@ class AnswerController extends Controller $question = $questionService->getQuestion($answer->question_id); - $referer = $this->request->getHTTPReferer(); - - $this->view->setVar('referer', $referer); $this->view->setVar('question', $question); $this->view->setVar('answer', $answer); } @@ -165,15 +159,15 @@ class AnswerController extends Controller } /** - * @Route("/{id:[0-9]+}/review", name="admin.answer.review") + * @Route("/{id:[0-9]+}/publish/review", name="admin.answer.publish_review") */ - public function reviewAction($id) + public function publishReviewAction($id) { $answerService = new AnswerService(); if ($this->request->isPost()) { - $answerService->reviewAnswer($id); + $answerService->publishReview($id); $location = $this->url->get(['for' => 'admin.mod.answers']); @@ -188,8 +182,38 @@ class AnswerController extends Controller $reasons = $answerService->getReasons(); $answer = $answerService->getAnswerInfo($id); + $this->view->pick('answer/publish_review'); $this->view->setVar('reasons', $reasons); $this->view->setVar('answer', $answer); } + /** + * @Route("/{id:[0-9]+}/report/review", name="admin.answer.report_review") + */ + public function reportReviewAction($id) + { + $answerService = new AnswerService(); + + if ($this->request->isPost()) { + + $answerService->reportReview($id); + + $location = $this->url->get(['for' => 'admin.report.answers']); + + $content = [ + 'location' => $location, + 'msg' => '审核举报成功', + ]; + + return $this->jsonSuccess($content); + } + + $answer = $answerService->getAnswerInfo($id); + $reports = $answerService->getReports($id); + + $this->view->pick('answer/report_review'); + $this->view->setVar('answer', $answer); + $this->view->setVar('reports', $reports); + } + } diff --git a/app/Http/Admin/Controllers/ArticleController.php b/app/Http/Admin/Controllers/ArticleController.php index a849d35e..b7661e27 100644 --- a/app/Http/Admin/Controllers/ArticleController.php +++ b/app/Http/Admin/Controllers/ArticleController.php @@ -169,15 +169,15 @@ class ArticleController extends Controller } /** - * @Route("/{id:[0-9]+}/review", name="admin.article.review") + * @Route("/{id:[0-9]+}/publish/review", name="admin.article.publish_review") */ - public function reviewAction($id) + public function publishReviewAction($id) { $articleService = new ArticleService(); if ($this->request->isPost()) { - $articleService->reviewArticle($id); + $articleService->publishReview($id); $location = $this->url->get(['for' => 'admin.mod.articles']); @@ -192,8 +192,38 @@ class ArticleController extends Controller $reasons = $articleService->getReasons(); $article = $articleService->getArticleInfo($id); + $this->view->pick('article/publish_review'); $this->view->setVar('reasons', $reasons); $this->view->setVar('article', $article); } + /** + * @Route("/{id:[0-9]+}/report/review", name="admin.article.report_review") + */ + public function reportReviewAction($id) + { + $articleService = new ArticleService(); + + if ($this->request->isPost()) { + + $articleService->reportReview($id); + + $location = $this->url->get(['for' => 'admin.report.articles']); + + $content = [ + 'location' => $location, + 'msg' => '审核举报成功', + ]; + + return $this->jsonSuccess($content); + } + + $article = $articleService->getArticleInfo($id); + $reports = $articleService->getReports($id); + + $this->view->pick('article/report_review'); + $this->view->setVar('reports', $reports); + $this->view->setVar('article', $article); + } + } diff --git a/app/Http/Admin/Controllers/CommentController.php b/app/Http/Admin/Controllers/CommentController.php index c67e875e..57872dfa 100644 --- a/app/Http/Admin/Controllers/CommentController.php +++ b/app/Http/Admin/Controllers/CommentController.php @@ -78,4 +78,62 @@ class CommentController extends Controller return $this->jsonSuccess($content); } + /** + * @Route("/{id:[0-9]+}/publish/review", name="admin.comment.publish_review") + */ + public function publishReviewAction($id) + { + $commentService = new CommentService(); + + if ($this->request->isPost()) { + + $commentService->publishReview($id); + + $location = $this->url->get(['for' => 'admin.mod.comments']); + + $content = [ + 'location' => $location, + 'msg' => '审核回答成功', + ]; + + return $this->jsonSuccess($content); + } + + $reasons = $commentService->getReasons(); + $comment = $commentService->getCommentInfo($id); + + $this->view->pick('comment/publish_review'); + $this->view->setVar('reasons', $reasons); + $this->view->setVar('comment', $comment); + } + + /** + * @Route("/{id:[0-9]+}/report/review", name="admin.comment.report_review") + */ + public function reportReviewAction($id) + { + $commentService = new CommentService(); + + if ($this->request->isPost()) { + + $commentService->reportReview($id); + + $location = $this->url->get(['for' => 'admin.report.comments']); + + $content = [ + 'location' => $location, + 'msg' => '审核举报成功', + ]; + + return $this->jsonSuccess($content); + } + + $comment = $commentService->getCommentInfo($id); + $reports = $commentService->getReports($id); + + $this->view->pick('comment/report_review'); + $this->view->setVar('comment', $comment); + $this->view->setVar('reports', $reports); + } + } diff --git a/app/Http/Admin/Controllers/IndexController.php b/app/Http/Admin/Controllers/IndexController.php index 72e5071b..4e14f929 100644 --- a/app/Http/Admin/Controllers/IndexController.php +++ b/app/Http/Admin/Controllers/IndexController.php @@ -38,11 +38,13 @@ class IndexController extends Controller $globalStat = $indexService->getGlobalStat(); $todayStat = $indexService->getTodayStat(); $modStat = $indexService->getModerationStat(); + $reportStat = $indexService->getReportStat(); $appInfo = $indexService->getAppInfo(); $serverInfo = $indexService->getServerInfo(); $this->view->setVar('global_stat', $globalStat); $this->view->setVar('today_stat', $todayStat); + $this->view->setVar('report_stat', $reportStat); $this->view->setVar('mod_stat', $modStat); $this->view->setVar('app_info', $appInfo); $this->view->setVar('server_info', $serverInfo); diff --git a/app/Http/Admin/Controllers/ModerationController.php b/app/Http/Admin/Controllers/ModerationController.php index 0ec36a01..72dd2cfc 100644 --- a/app/Http/Admin/Controllers/ModerationController.php +++ b/app/Http/Admin/Controllers/ModerationController.php @@ -46,4 +46,16 @@ class ModerationController extends Controller $this->view->setVar('pager', $pager); } + /** + * @Get("/comments", name="admin.mod.comments") + */ + public function commentsAction() + { + $modService = new ModerationService(); + + $pager = $modService->getComments(); + + $this->view->setVar('pager', $pager); + } + } diff --git a/app/Http/Admin/Controllers/QuestionController.php b/app/Http/Admin/Controllers/QuestionController.php index 082139dd..45f9b0c2 100644 --- a/app/Http/Admin/Controllers/QuestionController.php +++ b/app/Http/Admin/Controllers/QuestionController.php @@ -165,15 +165,15 @@ class QuestionController extends Controller } /** - * @Route("/{id:[0-9]+}/review", name="admin.question.review") + * @Route("/{id:[0-9]+}/publish/review", name="admin.question.publish_review") */ - public function reviewAction($id) + public function publishReviewAction($id) { $questionService = new QuestionService(); if ($this->request->isPost()) { - $questionService->reviewQuestion($id); + $questionService->publishReview($id); $location = $this->url->get(['for' => 'admin.mod.questions']); @@ -188,8 +188,38 @@ class QuestionController extends Controller $reasons = $questionService->getReasons(); $question = $questionService->getQuestionInfo($id); + $this->view->pick('question/publish_review'); $this->view->setVar('reasons', $reasons); $this->view->setVar('question', $question); } + /** + * @Route("/{id:[0-9]+}/report/review", name="admin.question.report_review") + */ + public function reportReviewAction($id) + { + $questionService = new QuestionService(); + + if ($this->request->isPost()) { + + $questionService->reportReview($id); + + $location = $this->url->get(['for' => 'admin.report.questions']); + + $content = [ + 'location' => $location, + 'msg' => '审核举报成功', + ]; + + return $this->jsonSuccess($content); + } + + $question = $questionService->getQuestionInfo($id); + $reports = $questionService->getReports($id); + + $this->view->pick('question/report_review'); + $this->view->setVar('question', $question); + $this->view->setVar('reports', $reports); + } + } diff --git a/app/Http/Admin/Controllers/ReportController.php b/app/Http/Admin/Controllers/ReportController.php new file mode 100644 index 00000000..bc660089 --- /dev/null +++ b/app/Http/Admin/Controllers/ReportController.php @@ -0,0 +1,61 @@ +getArticles(); + + $this->view->setVar('pager', $pager); + } + + /** + * @Get("/questions", name="admin.report.questions") + */ + public function questionsAction() + { + $reportService = new ReportService(); + + $pager = $reportService->getQuestions(); + + $this->view->setVar('pager', $pager); + } + + /** + * @Get("/answers", name="admin.report.answers") + */ + public function answersAction() + { + $reportService = new ReportService(); + + $pager = $reportService->getAnswers(); + + $this->view->setVar('pager', $pager); + } + + /** + * @Get("/comments", name="admin.report.comments") + */ + public function commentsAction() + { + $reportService = new ReportService(); + + $pager = $reportService->getComments(); + + $this->view->setVar('pager', $pager); + } + +} diff --git a/app/Http/Admin/Services/Answer.php b/app/Http/Admin/Services/Answer.php index abaf914e..4eda7f57 100644 --- a/app/Http/Admin/Services/Answer.php +++ b/app/Http/Admin/Services/Answer.php @@ -3,13 +3,16 @@ namespace App\Http\Admin\Services; use App\Builders\AnswerList as AnswerListBuilder; +use App\Builders\ReportList as ReportListBuilder; use App\Library\Paginator\Query as PagerQuery; use App\Models\Answer as AnswerModel; use App\Models\Question as QuestionModel; use App\Models\Reason as ReasonModel; +use App\Models\Report as ReportModel; use App\Models\User as UserModel; use App\Repos\Answer as AnswerRepo; use App\Repos\Question as QuestionRepo; +use App\Repos\Report as ReportRepo; use App\Repos\User as UserRepo; use App\Services\Logic\Answer\AnswerInfo as AnswerInfoService; use App\Services\Logic\Notice\System\AnswerApproved as AnswerApprovedNotice; @@ -62,6 +65,23 @@ class Answer extends Service return $service->handle($id); } + public function getReports($id) + { + $reportRepo = new ReportRepo(); + + $where = [ + 'item_id' => $id, + 'item_type' => ReportModel::ITEM_ANSWER, + 'reviewed' => 0, + ]; + + $pager = $reportRepo->paginate($where); + + $pager = $this->handleReports($pager); + + return $pager->items; + } + public function createAnswer() { $post = $this->request->getPost(); @@ -167,7 +187,7 @@ class Answer extends Service return $answer; } - public function reviewAnswer($id) + public function publishReview($id) { $type = $this->request->getPost('type', ['trim', 'string']); $reason = $this->request->getPost('reason', ['trim', 'string']); @@ -218,6 +238,42 @@ class Answer extends Service return $answer; } + public function reportReview($id) + { + $accepted = $this->request->getPost('accepted', 'int', 0); + $deleted = $this->request->getPost('deleted', 'int', 0); + + $answer = $this->findOrFail($id); + + $reportRepo = new ReportRepo(); + + $reports = $reportRepo->findItemPendingReports($answer->id, ReportModel::ITEM_ANSWER); + + if ($reports->count() > 0) { + foreach ($reports as $report) { + $report->accepted = $accepted; + $report->reviewed = 1; + $report->update(); + } + } + + $answer->report_count = 0; + + if ($deleted == 1) { + $answer->deleted = 1; + } + + $answer->update(); + + $question = $this->findQuestion($answer->question_id); + + $this->recountQuestionAnswers($question); + + $user = $this->findUser($answer->owner_id); + + $this->recountUserAnswers($user); + } + protected function findOrFail($id) { $validator = new AnswerValidator(); @@ -257,6 +313,23 @@ class Answer extends Service return $pager; } + protected function handleReports($pager) + { + if ($pager->total_items > 0) { + + $builder = new ReportListBuilder(); + + $items = $pager->items->toArray(); + + $pipeA = $builder->handleUsers($items); + $pipeB = $builder->objects($pipeA); + + $pager->items = $pipeB; + } + + return $pager; + } + protected function recountQuestionAnswers(QuestionModel $question) { $questionRepo = new QuestionRepo(); diff --git a/app/Http/Admin/Services/Article.php b/app/Http/Admin/Services/Article.php index c8b96086..5af24563 100644 --- a/app/Http/Admin/Services/Article.php +++ b/app/Http/Admin/Services/Article.php @@ -3,15 +3,18 @@ namespace App\Http\Admin\Services; use App\Builders\ArticleList as ArticleListBuilder; +use App\Builders\ReportList as ReportListBuilder; use App\Caches\Article as ArticleCache; use App\Library\Paginator\Query as PagerQuery; use App\Library\Utils\Word as WordUtil; use App\Models\Article as ArticleModel; use App\Models\Category as CategoryModel; use App\Models\Reason as ReasonModel; +use App\Models\Report as ReportModel; use App\Models\User as UserModel; use App\Repos\Article as ArticleRepo; use App\Repos\Category as CategoryRepo; +use App\Repos\Report as ReportRepo; use App\Repos\Tag as TagRepo; use App\Repos\User as UserRepo; use App\Services\Logic\Article\ArticleDataTrait; @@ -119,6 +122,23 @@ class Article extends Service return $service->handle($id); } + public function getReports($id) + { + $reportRepo = new ReportRepo(); + + $where = [ + 'item_id' => $id, + 'item_type' => ReportModel::ITEM_ARTICLE, + 'reviewed' => 0, + ]; + + $pager = $reportRepo->paginate($where); + + $pager = $this->handleReports($pager); + + return $pager->items; + } + public function createArticle() { $post = $this->request->getPost(); @@ -251,7 +271,7 @@ class Article extends Service return $article; } - public function reviewArticle($id) + public function publishReview($id) { $type = $this->request->getPost('type', ['trim', 'string']); $reason = $this->request->getPost('reason', ['trim', 'string']); @@ -282,12 +302,8 @@ class Article extends Service if ($type == 'approve') { $this->rebuildArticleIndex($article); - - $this->handlePostPoint($article); - - $notice = new ArticleApprovedNotice(); - - $notice->handle($article, $sender); + $this->handleArticlePostPoint($article); + $this->handleArticleApprovedNotice($article, $sender); $this->eventsManager->fire('Article:afterApprove', $this, $article); @@ -299,9 +315,7 @@ class Article extends Service $reason = $options[$reason]; } - $notice = new ArticleRejectedNotice(); - - $notice->handle($article, $sender, $reason); + $this->handleArticleRejectedNotice($article, $sender, $reason); $this->eventsManager->fire('Article:afterReject', $this, $article); } @@ -309,6 +323,34 @@ class Article extends Service return $article; } + public function reportReview($id) + { + $accepted = $this->request->getPost('accepted', 'int', 0); + $deleted = $this->request->getPost('deleted', 'int', 0); + + $article = $this->findOrFail($id); + + $reportRepo = new ReportRepo(); + + $reports = $reportRepo->findItemPendingReports($article->id, ReportModel::ITEM_ARTICLE); + + if ($reports->count() > 0) { + foreach ($reports as $report) { + $report->accepted = $accepted; + $report->reviewed = 1; + $report->update(); + } + } + + $article->report_count = 0; + + if ($deleted == 1) { + $article->deleted = 1; + } + + $article->update(); + } + protected function findOrFail($id) { $validator = new ArticleValidator(); @@ -342,6 +384,23 @@ class Article extends Service return $pager; } + protected function handleReports($pager) + { + if ($pager->total_items > 0) { + + $builder = new ReportListBuilder(); + + $items = $pager->items->toArray(); + + $pipeA = $builder->handleUsers($items); + $pipeB = $builder->objects($pipeA); + + $pager->items = $pipeB; + } + + return $pager; + } + protected function recountUserArticles(UserModel $user) { $userRepo = new UserRepo(); @@ -367,7 +426,7 @@ class Article extends Service $sync->addItem($article->id); } - protected function handlePostPoint(ArticleModel $article) + protected function handleArticlePostPoint(ArticleModel $article) { if ($article->published != ArticleModel::PUBLISH_APPROVED) return; @@ -376,4 +435,18 @@ class Article extends Service $service->handle($article); } + protected function handleArticleApprovedNotice(ArticleModel $article, UserModel $sender) + { + $notice = new ArticleApprovedNotice(); + + $notice->handle($article, $sender); + } + + protected function handleArticleRejectedNotice(ArticleModel $article, UserModel $sender, $reason) + { + $notice = new ArticleRejectedNotice(); + + $notice->handle($article, $sender, $reason); + } + } diff --git a/app/Http/Admin/Services/AuthNode.php b/app/Http/Admin/Services/AuthNode.php index 2ed2d003..952d795b 100644 --- a/app/Http/Admin/Services/AuthNode.php +++ b/app/Http/Admin/Services/AuthNode.php @@ -325,7 +325,13 @@ class AuthNode extends Service 'id' => '1-7-10', 'title' => '审核文章', 'type' => 'button', - 'route' => 'admin.article.review', + 'route' => 'admin.article.publish_review', + ], + [ + 'id' => '1-7-11', + 'title' => '审核举报', + 'type' => 'button', + 'route' => 'admin.article.report_review', ], ], ], @@ -374,7 +380,13 @@ class AuthNode extends Service 'id' => '1-10-10', 'title' => '审核问题', 'type' => 'button', - 'route' => 'admin.question.review', + 'route' => 'admin.question.publish_review', + ], + [ + 'id' => '1-10-11', + 'title' => '审核举报', + 'type' => 'button', + 'route' => 'admin.question.report_review', ], ], ], @@ -423,7 +435,13 @@ class AuthNode extends Service 'id' => '1-11-10', 'title' => '审核回答', 'type' => 'button', - 'route' => 'admin.answer.review', + 'route' => 'admin.answer.publish_review', + ], + [ + 'id' => '1-11-11', + 'title' => '审核举报', + 'type' => 'button', + 'route' => 'admin.answer.report_review', ], ], ], @@ -456,6 +474,18 @@ class AuthNode extends Service 'type' => 'button', 'route' => 'admin.comment.delete', ], + [ + 'id' => '1-9-5', + 'title' => '评论审核', + 'type' => 'button', + 'route' => 'admin.comment.publish_review', + ], + [ + 'id' => '1-9-6', + 'title' => '举报审核', + 'type' => 'button', + 'route' => 'admin.comment.report_review', + ], ], ], ], @@ -491,6 +521,43 @@ class AuthNode extends Service 'type' => 'menu', 'route' => 'admin.mod.answers', ], + [ + 'id' => '2-10-4', + 'title' => '评论审核', + 'type' => 'menu', + 'route' => 'admin.mod.comments', + ], + ], + ], + [ + 'id' => '2-10', + 'title' => '举报队列', + 'type' => 'menu', + 'children' => [ + [ + 'id' => '2-11-1', + 'title' => '文章举报', + 'type' => 'menu', + 'route' => 'admin.report.articles', + ], + [ + 'id' => '2-11-2', + 'title' => '问题举报', + 'type' => 'menu', + 'route' => 'admin.report.questions', + ], + [ + 'id' => '2-11-3', + 'title' => '回答举报', + 'type' => 'menu', + 'route' => 'admin.report.answers', + ], + [ + 'id' => '2-11-4', + 'title' => '评论举报', + 'type' => 'menu', + 'route' => 'admin.report.comments', + ], ], ], [ diff --git a/app/Http/Admin/Services/Comment.php b/app/Http/Admin/Services/Comment.php index 1410587a..3f0c59dc 100644 --- a/app/Http/Admin/Services/Comment.php +++ b/app/Http/Admin/Services/Comment.php @@ -3,13 +3,24 @@ namespace App\Http\Admin\Services; use App\Builders\CommentList as CommentListBuilder; +use App\Builders\ReportList as ReportListBuilder; use App\Library\Paginator\Query as PagerQuery; +use App\Models\Comment as CommentModel; +use App\Models\Reason as ReasonModel; +use App\Models\Report as ReportModel; use App\Repos\Comment as CommentRepo; +use App\Repos\Report as ReportRepo; +use App\Services\Logic\Comment\CommentInfo as CommentInfoService; use App\Validators\Comment as CommentValidator; class Comment extends Service { + public function getReasons() + { + return ReasonModel::commentRejectOptions(); + } + public function getComments() { $pagerQuery = new PagerQuery(); @@ -34,6 +45,30 @@ class Comment extends Service return $this->findOrFail($id); } + public function getCommentInfo($id) + { + $service = new CommentInfoService(); + + return $service->handle($id); + } + + public function getReports($id) + { + $reportRepo = new ReportRepo(); + + $where = [ + 'item_id' => $id, + 'item_type' => ReportModel::ITEM_COMMENT, + 'reviewed' => 0, + ]; + + $pager = $reportRepo->paginate($where); + + $pager = $this->handleReports($pager); + + return $pager->items; + } + public function updateComment($id) { $comment = $this->findOrFail($id); @@ -79,6 +114,68 @@ class Comment extends Service return $page; } + public function publishReview($id) + { + $type = $this->request->getPost('type', ['trim', 'string']); + $reason = $this->request->getPost('reason', ['trim', 'string']); + + $comment = $this->findOrFail($id); + + $validator = new CommentValidator(); + + if ($type == 'approve') { + + $comment->published = CommentModel::PUBLISH_APPROVED; + + } elseif ($type == 'reject') { + + $validator->checkRejectReason($reason); + + $comment->published = CommentModel::PUBLISH_REJECTED; + } + + $comment->update(); + + if ($type == 'approve') { + + $this->eventsManager->fire('Comment:afterApprove', $this, $comment); + + } elseif ($type == 'reject') { + + $this->eventsManager->fire('Comment:afterReject', $this, $comment); + } + + return $comment; + } + + public function reportReview($id) + { + $accepted = $this->request->getPost('accepted', 'int', 0); + $deleted = $this->request->getPost('deleted', 'int', 0); + + $comment = $this->findOrFail($id); + + $reportRepo = new ReportRepo(); + + $reports = $reportRepo->findItemPendingReports($comment->id, ReportModel::ITEM_COMMENT); + + if ($reports->count() > 0) { + foreach ($reports as $report) { + $report->accepted = $accepted; + $report->reviewed = 1; + $report->update(); + } + } + + $comment->report_count = 0; + + if ($deleted == 1) { + $comment->deleted = 1; + } + + $comment->update(); + } + protected function findOrFail($id) { $validator = new CommentValidator(); @@ -102,4 +199,21 @@ class Comment extends Service return $pager; } + protected function handleReports($pager) + { + if ($pager->total_items > 0) { + + $builder = new ReportListBuilder(); + + $items = $pager->items->toArray(); + + $pipeA = $builder->handleUsers($items); + $pipeB = $builder->objects($pipeA); + + $pager->items = $pipeB; + } + + return $pager; + } + } diff --git a/app/Http/Admin/Services/Index.php b/app/Http/Admin/Services/Index.php index 4749042a..32e0e39b 100644 --- a/app/Http/Admin/Services/Index.php +++ b/app/Http/Admin/Services/Index.php @@ -71,6 +71,23 @@ class Index extends Service ]; } + public function getReportStat() + { + $statRepo = new StatRepo(); + + $articleCount = $statRepo->countReportedArticles(); + $questionCount = $statRepo->countReportedQuestions(); + $answerCount = $statRepo->countReportedAnswers(); + $commentCount = $statRepo->countReportedComments(); + + return [ + 'article_count' => $articleCount, + 'question_count' => $questionCount, + 'answer_count' => $answerCount, + 'comment_count' => $commentCount, + ]; + } + public function getReleases() { $url = 'https://koogua.com/api-releases.json'; diff --git a/app/Http/Admin/Services/Moderation.php b/app/Http/Admin/Services/Moderation.php index fbf3cfa7..5cd23d57 100644 --- a/app/Http/Admin/Services/Moderation.php +++ b/app/Http/Admin/Services/Moderation.php @@ -8,9 +8,11 @@ use App\Builders\QuestionList as QuestionListBuilder; use App\Library\Paginator\Query as PagerQuery; use App\Models\Answer as AnswerModel; use App\Models\Article as ArticleModel; +use App\Models\Comment as CommentModel; use App\Models\Question as QuestionModel; use App\Repos\Answer as AnswerRepo; use App\Repos\Article as ArticleRepo; +use App\Repos\Comment as CommentRepo; use App\Repos\Question as QuestionRepo; class Moderation extends Service @@ -76,6 +78,26 @@ class Moderation extends Service return $this->handleAnswers($pager); } + public function getComments() + { + $pagerQuery = new PagerQuery(); + + $params = $pagerQuery->getParams(); + + $params['published'] = CommentModel::PUBLISH_PENDING; + $params['deleted'] = 0; + + $sort = $pagerQuery->getSort(); + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $commentRepo = new CommentRepo(); + + $pager = $commentRepo->paginate($params, $sort, $page, $limit); + + return $this->handleComments($pager); + } + protected function handleArticles($pager) { if ($pager->total_items > 0) { @@ -132,4 +154,21 @@ class Moderation extends Service return $pager; } + protected function handleComments($pager) + { + if ($pager->total_items > 0) { + + $builder = new AnswerListBuilder(); + + $items = $pager->items->toArray(); + + $pipeA = $builder->handleUsers($items); + $pipeB = $builder->objects($pipeA); + + $pager->items = $pipeB; + } + + return $pager; + } + } diff --git a/app/Http/Admin/Services/Question.php b/app/Http/Admin/Services/Question.php index a83914fd..61d7f368 100644 --- a/app/Http/Admin/Services/Question.php +++ b/app/Http/Admin/Services/Question.php @@ -3,14 +3,17 @@ namespace App\Http\Admin\Services; use App\Builders\QuestionList as QuestionListBuilder; +use App\Builders\ReportList as ReportListBuilder; use App\Caches\Question as QuestionCache; use App\Library\Paginator\Query as PagerQuery; use App\Models\Category as CategoryModel; use App\Models\Question as QuestionModel; use App\Models\Reason as ReasonModel; +use App\Models\Report as ReportModel; use App\Models\User as UserModel; use App\Repos\Category as CategoryRepo; use App\Repos\Question as QuestionRepo; +use App\Repos\Report as ReportRepo; use App\Repos\Tag as TagRepo; use App\Repos\User as UserRepo; use App\Services\Logic\Notice\System\QuestionApproved as QuestionApprovedNotice; @@ -113,6 +116,23 @@ class Question extends Service return $service->handle($id); } + public function getReports($id) + { + $reportRepo = new ReportRepo(); + + $where = [ + 'item_id' => $id, + 'item_type' => ReportModel::ITEM_QUESTION, + 'reviewed' => 0, + ]; + + $pager = $reportRepo->paginate($where); + + $pager = $this->handleReports($pager); + + return $pager->items; + } + public function createQuestion() { $post = $this->request->getPost(); @@ -233,7 +253,7 @@ class Question extends Service return $question; } - public function reviewQuestion($id) + public function publishReview($id) { $type = $this->request->getPost('type', ['trim', 'string']); $reason = $this->request->getPost('reason', ['trim', 'string']); @@ -260,12 +280,8 @@ class Question extends Service if ($type == 'approve') { $this->rebuildQuestionIndex($question); - - $this->handlePostPoint($question); - - $notice = new QuestionApprovedNotice(); - - $notice->handle($question, $sender); + $this->handleQuestionPostPoint($question); + $this->handleQuestionApprovedNotice($question, $sender); $this->eventsManager->fire('Question:afterApprove', $this, $question); @@ -277,9 +293,7 @@ class Question extends Service $reason = $options[$reason]; } - $notice = new QuestionRejectedNotice(); - - $notice->handle($question, $sender, $reason); + $this->handleQuestionRejectedNotice($question, $sender, $reason); $this->eventsManager->fire('Question:afterReject', $this, $question); } @@ -287,6 +301,34 @@ class Question extends Service return $question; } + public function reportReview($id) + { + $accepted = $this->request->getPost('accepted', 'int', 0); + $deleted = $this->request->getPost('deleted', 'int', 0); + + $question = $this->findOrFail($id); + + $reportRepo = new ReportRepo(); + + $reports = $reportRepo->findItemPendingReports($question->id, ReportModel::ITEM_QUESTION); + + if ($reports->count() > 0) { + foreach ($reports as $report) { + $report->accepted = $accepted; + $report->reviewed = 1; + $report->update(); + } + } + + $question->report_count = 0; + + if ($deleted == 1) { + $question->deleted = 1; + } + + $question->update(); + } + protected function findOrFail($id) { $validator = new QuestionValidator(); @@ -320,6 +362,23 @@ class Question extends Service return $pager; } + protected function handleReports($pager) + { + if ($pager->total_items > 0) { + + $builder = new ReportListBuilder(); + + $items = $pager->items->toArray(); + + $pipeA = $builder->handleUsers($items); + $pipeB = $builder->objects($pipeA); + + $pager->items = $pipeB; + } + + return $pager; + } + protected function recountUserQuestions(UserModel $user) { $userRepo = new UserRepo(); @@ -345,7 +404,7 @@ class Question extends Service $sync->addItem($question->id); } - protected function handlePostPoint(QuestionModel $question) + protected function handleQuestionPostPoint(QuestionModel $question) { if ($question->published != QuestionModel::PUBLISH_APPROVED) return; @@ -354,4 +413,18 @@ class Question extends Service $service->handle($question); } + protected function handleQuestionApprovedNotice(QuestionModel $question, UserModel $sender) + { + $notice = new QuestionApprovedNotice(); + + $notice->handle($question, $sender); + } + + protected function handleQuestionRejectedNotice(QuestionModel $question, UserModel $sender, $reason) + { + $notice = new QuestionRejectedNotice(); + + $notice->handle($question, $sender, $reason); + } + } diff --git a/app/Http/Admin/Services/Report.php b/app/Http/Admin/Services/Report.php new file mode 100644 index 00000000..1a7a70c9 --- /dev/null +++ b/app/Http/Admin/Services/Report.php @@ -0,0 +1,162 @@ +getParams(); + + $params['deleted'] = 0; + + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $articleRepo = new ArticleRepo(); + + $pager = $articleRepo->paginate($params, 'reported', $page, $limit); + + return $this->handleArticles($pager); + } + + public function getQuestions() + { + $pagerQuery = new PagerQuery(); + + $params = $pagerQuery->getParams(); + + $params['deleted'] = 0; + + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $questionRepo = new QuestionRepo(); + + $pager = $questionRepo->paginate($params, 'reported', $page, $limit); + + return $this->handleQuestions($pager); + } + + public function getAnswers() + { + $pagerQuery = new PagerQuery(); + + $params = $pagerQuery->getParams(); + + $params['deleted'] = 0; + + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $answerRepo = new AnswerRepo(); + + $pager = $answerRepo->paginate($params, 'reported', $page, $limit); + + return $this->handleAnswers($pager); + } + + public function getComments() + { + $pagerQuery = new PagerQuery(); + + $params = $pagerQuery->getParams(); + + $params['deleted'] = 0; + + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $commentRepo = new CommentRepo(); + + $pager = $commentRepo->paginate($params, 'reported', $page, $limit); + + return $this->handleComments($pager); + } + + protected function handleArticles($pager) + { + if ($pager->total_items > 0) { + + $builder = new ArticleListBuilder(); + + $items = $pager->items->toArray(); + + $pipeA = $builder->handleArticles($items); + $pipeB = $builder->handleCategories($pipeA); + $pipeC = $builder->handleUsers($pipeB); + $pipeD = $builder->objects($pipeC); + + $pager->items = $pipeD; + } + + return $pager; + } + + protected function handleQuestions($pager) + { + if ($pager->total_items > 0) { + + $builder = new QuestionListBuilder(); + + $items = $pager->items->toArray(); + + $pipeA = $builder->handleQuestions($items); + $pipeB = $builder->handleCategories($pipeA); + $pipeC = $builder->handleUsers($pipeB); + $pipeD = $builder->objects($pipeC); + + $pager->items = $pipeD; + } + + return $pager; + } + + protected function handleAnswers($pager) + { + if ($pager->total_items > 0) { + + $builder = new AnswerListBuilder(); + + $items = $pager->items->toArray(); + + $pipeA = $builder->handleQuestions($items); + $pipeB = $builder->handleUsers($pipeA); + $pipeC = $builder->objects($pipeB); + + $pager->items = $pipeC; + } + + return $pager; + } + + protected function handleComments($pager) + { + if ($pager->total_items > 0) { + + $builder = new AnswerListBuilder(); + + $items = $pager->items->toArray(); + + $pipeA = $builder->handleUsers($items); + $pipeB = $builder->objects($pipeA); + + $pager->items = $pipeB; + } + + return $pager; + } + +} diff --git a/app/Http/Admin/Views/answer/add.volt b/app/Http/Admin/Views/answer/add.volt index 4b6a5dcf..d0e4792d 100644 --- a/app/Http/Admin/Views/answer/add.volt +++ b/app/Http/Admin/Views/answer/add.volt @@ -20,7 +20,7 @@
- +
diff --git a/app/Http/Admin/Views/answer/edit.volt b/app/Http/Admin/Views/answer/edit.volt index d11df81c..4812e5c8 100644 --- a/app/Http/Admin/Views/answer/edit.volt +++ b/app/Http/Admin/Views/answer/edit.volt @@ -20,7 +20,7 @@
- +
diff --git a/app/Http/Admin/Views/answer/list.volt b/app/Http/Admin/Views/answer/list.volt index 697a5f19..80d3c81c 100644 --- a/app/Http/Admin/Views/answer/list.volt +++ b/app/Http/Admin/Views/answer/list.volt @@ -24,15 +24,16 @@ {% for item in pager.items %} {% set question_url = url({'for':'home.question.show','id':item.question.id}) %} + {% set answer_url = url({'for':'home.answer.show','id':item.id}) %} {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %} - {% set review_url = url({'for':'admin.answer.review','id':item.id}) %} {% set edit_url = url({'for':'admin.answer.edit','id':item.id}) %} {% set delete_url = url({'for':'admin.answer.delete','id':item.id}) %} {% set restore_url = url({'for':'admin.answer.restore','id':item.id}) %} + {% set review_url = url({'for':'admin.answer.publish_review','id':item.id}) %}

问题：{{ item.question.title }}

-

回答：{{ item.summary }}

+

回答：{{ substr(item.summary,0,32) }}

作者：{{ item.owner.name }}　创建：{{ date('Y-m-d',item.create_time) }}

{{ item.comment_count }} @@ -42,6 +43,7 @@
    +
  • 预览回答
    • {% if item.published == 1 %}
  • 审核回答
    • {% endif %} diff --git a/app/Http/Admin/Views/answer/review.volt b/app/Http/Admin/Views/answer/publish_review.volt similarity index 95% rename from app/Http/Admin/Views/answer/review.volt rename to app/Http/Admin/Views/answer/publish_review.volt index f93a7162..024ef011 100644 --- a/app/Http/Admin/Views/answer/review.volt +++ b/app/Http/Admin/Views/answer/publish_review.volt @@ -21,7 +21,9 @@ 审核意见 -
    + {% set review_url = url({'for':'admin.answer.publish_review','id':answer.id}) %} + +
    diff --git a/app/Http/Admin/Views/answer/report_review.volt b/app/Http/Admin/Views/answer/report_review.volt new file mode 100644 index 00000000..edf284ab --- /dev/null +++ b/app/Http/Admin/Views/answer/report_review.volt @@ -0,0 +1,115 @@ +{% extends 'templates/main.volt' %} + +{% block content %} + + {{ partial('macros/question') }} + + {% set owner_url = url({'for':'home.user.show','id':answer.owner.id}) %} + {% set review_url = url({'for':'admin.answer.report_review','id':answer.id}) %} + +
    + 审核举报 +
    + +
    +
      +
    • 问答信息
      • +
    • 举报信息
      • +
    • 审核意见
      • +
    +
    +
    +
    +
    {{ answer.question.title }}
    +
    + {{ answer.owner.name }} + {{ date('Y-m-d H:i',answer.create_time) }} +
    +
    {{ answer.content }}
    +
    +
    +
    + + + + + + + + + + + + + + + {% for item in reports %} + {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %} + + + + + + {% endfor %} + +
    举报用户举报理由举报时间
    {{ item.owner.name }}{{ item.reason }}{{ date('Y-m-d',item.create_time) }}
    +
    +
    + +
    + +
    + + +
    +
    + +
    + +
    + + +
    +
    + +
    +
    +
    + +{% endblock %} + +{% block link_css %} + + {{ css_link('home/css/markdown.css') }} + +{% endblock %} + +{% block inline_js %} + + + +{% endblock %} \ No newline at end of file diff --git a/app/Http/Admin/Views/article/list.volt b/app/Http/Admin/Views/article/list.volt index 272c8348..44b4c2b1 100644 --- a/app/Http/Admin/Views/article/list.volt +++ b/app/Http/Admin/Views/article/list.volt @@ -50,13 +50,13 @@ {% for item in pager.items %} - {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %} {% set preview_url = url({'for':'home.article.show','id':item.id}) %} - {% set review_url = url({'for':'admin.article.review','id':item.id}) %} + {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %} {% set edit_url = url({'for':'admin.article.edit','id':item.id}) %} {% set update_url = url({'for':'admin.article.update','id':item.id}) %} {% set delete_url = url({'for':'admin.article.delete','id':item.id}) %} {% set restore_url = url({'for':'admin.article.restore','id':item.id}) %} + {% set review_url = url({'for':'admin.article.publish_review','id':item.id}) %} {% set comment_url = url({'for':'admin.comment.list'},{'item_id':item.id,'item_type':2}) %} diff --git a/app/Http/Admin/Views/article/review.volt b/app/Http/Admin/Views/article/publish_review.volt similarity index 81% rename from app/Http/Admin/Views/article/review.volt rename to app/Http/Admin/Views/article/publish_review.volt index 67187d96..cf78cee5 100644 --- a/app/Http/Admin/Views/article/review.volt +++ b/app/Http/Admin/Views/article/publish_review.volt @@ -36,7 +36,9 @@ 审核意见 -
    + {% set review_url = url({'for':'admin.article.publish_review','id':article.id}) %} + +
    @@ -44,17 +46,15 @@
    -