Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project overview
  • Repository
  • Issues 275
  • Merge Requests 33
  • CI / CD
  • Security & Compliance
  • Packages
  • Analytics
  • Wiki
  • Snippets
  • Members
  • Collapse sidebar
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !374

Open
Opened 4 months ago by Ben Hayward@benhayward.ben
Report abuse

[Sprint/PinkPanther](fix): Delete activity after moderation queue rejection #504

  • Overview 13
  • Commits 9
  • Pipelines 8
  • Changes 6
4/5 threads resolved

Closes #504

Summary

On production right now, if you reject a post in a group you moderate, the post no longer appears in the queue, but still shows up in the feed for mods only like so:

image

Testing

  1. Make a group, make it moderated.
  2. Login to a secondary account, create posts numbered 1, 2, 3, 4, 5.
  3. Log-in to primary account, look at the group, see the posts with "awaiting moderation"
  4. Go to the moderation queue and reject the post numbered 3.
  5. Check that the activity with the content '3' is not visible on the feed with its "awaiting moderation"
Request to merge fix/delete-activity-mod-queue-504 into master
The source branch is 11 commits behind the target branch
Open in Web IDE
Pipeline #117644643 passed for a80ad7dc on fix/delete-activity-mod-queue-504
          Requires approval from QA. Approved by
          Emiliano Balbuena
          Martin Santangelo Guy Thouret Mark Harding Marcelo Rivera Brian Hatchet
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Closes #504

          Deletes source branch

          • Ben Hayward @benhayward.ben added MR::Awaiting Review Squad::Yellow scoped labels 4 months ago

            added scoped labels

          • Ben Hayward @benhayward.ben added 69 commits 3 months ago

            added 69 commits

            • 52f5c842...a8a3fed6 - 68 commits from branch master
            • 009351e2 - Merge branch 'master' of gitlab.com:minds/engine into fix/delete-activity-mod-queue-504

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 3 months ago

            added 1 commit

            • cbd860b3 - Update

            Compare with previous version

          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 3 months ago
            Resolved by Ben Hayward 3 months ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 3 months ago
            Resolved by Ben Hayward 3 months ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 3 months ago
            Resolved by Ben Hayward 3 months ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 3 months ago
            Resolved by Ben Hayward 2 months ago
          • Mark Harding @markeharding added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label 3 months ago

            added scoped label and automatically removed label

          • Ben Hayward @benhayward.ben added 2 commits 3 months ago

            added 2 commits

            • 00f211af - Working with new feedback
            • b1f82ae1 - Fixed tests and inconsistant naming pattern

            Compare with previous version

          • Ben Hayward @benhayward.ben added MR::Awaiting Review scoped label and automatically removed MR::Requires Changes label 3 months ago

            added scoped label and automatically removed label

          • Ben Hayward @benhayward.ben added 3 commits 3 months ago

            added 3 commits

            • b1f82ae1...52a592b9 - 2 commits from branch master
            • 5d25f8fe - Merge branch 'master' of gitlab.com:minds/engine into fix/delete-activity-mod-queue-504

            Compare with previous version

          • Ben Hayward @benhayward.ben resolved all threads 2 months ago

            resolved all threads

          • Ben Hayward
            Ben Hayward @benhayward.ben · 1 week ago
            Developer

            Need to pull master in and get this reviewed.

          • Ben Hayward @benhayward.ben added 139 commits 1 week ago

            added 139 commits

            • 5d25f8fe...dd03087f - 138 commits from branch master
            • d34b0c09 - Merge branch 'master' of gitlab.com:minds/engine into fix/delete-activity-mod-queue-504

            Compare with previous version

          • Ben Hayward @benhayward.ben added Status::Blocked scoped label and automatically removed Status::Awaiting Review label 1 week ago

            added scoped label and automatically removed label

          • Ben Hayward
            Ben Hayward @benhayward.ben · 1 week ago
            Developer

            pipeline failing for me

          • Ben Hayward @benhayward.ben added Status::InProgress scoped label and automatically removed Status::Blocked label 6 days ago

            added scoped label and automatically removed label

          • Ben Hayward @benhayward.ben added Status::Awaiting Review scoped label and automatically removed Status::InProgress label 6 days ago

            added scoped label and automatically removed label

          • Ben Hayward @benhayward.ben added Status::Blocked scoped label and automatically removed Status::Awaiting Review label 6 days ago

            added scoped label and automatically removed label

          • Ben Hayward
            Ben Hayward @benhayward.ben · 6 days ago
            Developer

            Restarted pipeline multiple more times, others have passed, this one does not.

          • Ben Hayward @benhayward.ben added 3 commits 6 days ago

            added 3 commits

            • d34b0c09...b08a0e7b - 2 commits from branch master
            • 339fb3de - Merge branch 'master' of gitlab.com:minds/engine into fix/delete-activity-mod-queue-504

            Compare with previous version

          • Ben Hayward
            Ben Hayward @benhayward.ben · 6 days ago
            Developer

            Gonna give it one more try.

          • Ben Hayward @benhayward.ben added 4 commits 6 days ago

            added 4 commits

            • 339fb3de...6e96d473 - 3 commits from branch master
            • a80ad7dc - Merge branch 'master' of gitlab.com:minds/engine into fix/delete-activity-mod-queue-504

            Compare with previous version

          • Ben Hayward
            Ben Hayward @benhayward.ben · 6 days ago
            Developer

            Restarted twice through the day (once pulling master), going again and moving to blocked as I do not anticipate it to work.

          • Emiliano Balbuena @edgebal added Status::Review scoped label and automatically removed Status::Blocked label 5 days ago

            added scoped label and automatically removed label

          • Emiliano Balbuena
            Emiliano Balbuena @edgebal · 5 days ago
            Developer

            Sandbox site worked OK. I was able to test and the outcome was the expected one.

          • Emiliano Balbuena @edgebal assigned to @benhayward.ben, @markeharding, and @brianhatchet 5 days ago

            assigned to @benhayward.ben, @markeharding, and @brianhatchet

          • Emiliano Balbuena @edgebal approved this merge request 5 days ago

            approved this merge request

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 7 minutes ago
            Core/Feeds/Activity/Actions/Delete.php
            15 protected $eventsDispatcher;
            16
            17 /** @var mixed */
            18 protected $activity;
            19
            20 /**
            21 * Save constructor.
            22 * @param null $eventsDispatcher
            23 */
            24 public function __construct(
            25 $eventsDispatcher = null
            26 ) {
            27 $this->eventsDispatcher = $eventsDispatcher ?: Di::_()->get('EventsDispatcher');
            28 }
            29
            30 /**
            • Brian Hatchet
              Brian Hatchet :speech_balloon: @brianhatchet · 7 minutes ago
              Developer

              Awesome

            • Please register or sign in to reply
          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet · 4 minutes ago
            Developer

            Code looks great @benhayward.ben I just need to resurrect your pod since it got purged

          Please register or sign in to reply
          3 Assignees
          Mark Harding's avatar
          Brian Hatchet's avatar
          Ben Hayward's avatar
          None
          Milestone
          None
          Time tracking
          No estimate or time spent
          2
          Labels
          Squad::Yellow Status::Review
          Lock merge request
          Unlocked
          10
          10 participants
          user avatar
          user avatar
          user avatar
          user avatar
          user avatar
          user avatar
          user avatar
          Reference: minds/engine!374