Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 142
    • Issues 142
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 28
    • Merge Requests 28
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !185

Open
Opened 23 minutes ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/FunnyFrog](bug): Fixed bug that was stopping blocking from working #488

Closes #488

if (is_array($response['participants']) && false) {

meant that checking whether a user was blocked was never being attempted by the server - regardless the old code behind it no longer functioned, so I refactored it using

                    $blocked = Core\Security\ACL\Block::_()->isBlocked($participant['guid']);//check whether user is blocked    

By my tests, this allows users to block bidirectionally (e.g. bob can block alice, then alice can block pop), and is respected when the window is reloaded.

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.com/benhayward.ben/engine.git messenger-blocking-fix-488
git checkout -b benhayward.ben/engine-messenger-blocking-fix-488 FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff benhayward.ben/engine-messenger-blocking-fix-488

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Request to merge benhayward.ben:messenger-blocking-fix-488 into master
The source branch is 160 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #64479607 passed for 741b4f7c on benhayward.ben:messenger-blocking-fix-488
      Requires 2 more approvals from Devs.
      Martin Santangelo
      Martin Santangelo
      Rami Albatal
      Rami Albatal
      Mark Harding
      Mark Harding
      Brian Hatchet
      Brian Hatchet
      Marcelo Rivera
      Marcelo Rivera
      Ready to be merged automatically. Ask someone with write access to this repository to merge this request
      Allows commits from members who can merge to the target branch

      Closes #488

      Deletes source branch

      • Discussion 0
      • Commits 1
      • Pipelines 1
      • Changes 1
      • Loading...
      • Ben Hayward @benhayward.ben changed milestone to %sprint: Funny Frog 23 minutes ago

        changed milestone to %sprint: Funny Frog

      • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
      Please register or sign in to reply
      Assignee
      None
      Assign to
      sprint: Funny Frog
      Milestone
      sprint: Funny Frog
      Assign milestone
      None
      Time tracking
      No estimate or time spent
      0
      Labels
      None
      Assign labels
      • View project labels
      Lock merge request
      Unlocked
      7
      7 participants
      user avatar
      Martin Santangelo
      user avatar
      Rami Albatal
      user avatar
      Mark Harding
      user avatar
      Brian Hatchet
      user avatar
      Marcelo Rivera
      user avatar
      Emiliano Balbuena
      user avatar
      Ben Hayward
      Reference: minds/engine!185