Skip to content

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

Merged
Opened 1 month ago by Ben Hayward@benhayward.ben
Report abuse

[Sprint/QuietQuail](fix): Blog & media edit updated to new nsfw system #1936

Closes front#1936 (closed)

Depends on front!613 (merged)

Summary

This change moves future blogs and media posts from the mature blog system, to the NSFW blog system. When creating a new blog. When editing existing values must be shown.

  • The selection should propagate to the media entity.
  • Changes via edit should also propegate

Testing

  1. Make video post with NSFW
  2. Edit the activity and change the NSFW tags to other, so that the mask goes away
  3. Refresh, see no mask
  4. Go to the media page for the actiity, and edit to Pornography.
  5. Checking back widgets, activity and blog post should have updated with flag.

Repeat for posting standard text posts, images and blogs.

Issues I'm aware of

  • The pre-existing value for the NSFW selector is not respected, it must be clicked before it will register something as NSFW.
  • Live update of NSFW in sidebar widgets - I would prefer to leave this out of this, and add that in at a later date. With the amount of testing involved change-detection fixes are not something I want to add into the mix.
  • Image posts are not propagating to sidebar widget; handled here #1150 Blogs and Video should be
  • Comments are still on the mature system - that is out of scope of this change.
Edited 1 day ago by Ben Hayward
Request to merge fix/blog-media-nsfw-update-1936 into master
Pipeline #100736732 passed for ace8426f on fix/blog-media-nsfw-update-1936
          Merge request approved. Approved by
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Marcelo Rivera
          Marcelo Rivera
          Emiliano Balbuena
          Emiliano Balbuena
          Brian Hatchet
          Brian Hatchet
          Guy Thouret
          Guy Thouret

          Merged by Xander Miller 2 hours ago

          The changes were merged into master with 6a88c337

          The source branch has been deleted

          Closed front#1936 (closed)

          Mentions #1150

          Pipeline #101201647 waiting for manual action for 6a88c337 on master
                        • Discussion 25
                        • Commits 20
                        • Pipelines 18
                        • Changes 9
                        10/11 threads resolved
                        • Ben Hayward @benhayward.ben added MR::Awaiting Review Squad::Yellow scoped labels 1 month ago

                          added scoped labels

                        • Ben Hayward @benhayward.ben changed the description 1 month ago

                          changed the description

                        • Ben Hayward @benhayward.ben mentioned in merge request front!613 (merged) 1 month ago

                          mentioned in merge request front!613 (merged)

                        • Ben Hayward @benhayward.ben added 6 commits 1 month ago

                          added 6 commits

                          • c58d6ffc...4d188166 - 4 commits from branch master
                          • 14a2be02 - Merge branch 'master' of gitlab.com:minds/engine into fix/blog-media-nsfw-update-1936
                          • 1825a459 - Blog to activity propegation fix.

                          Compare with previous version

                        • Ben Hayward @benhayward.ben marked as a Work In Progress 1 month ago

                          marked as a Work In Progress

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

                          added scoped label and automatically removed label

                        • Ben Hayward @benhayward.ben added 1 commit 1 month ago

                          added 1 commit

                          • 51de081b - Fixed up

                          Compare with previous version

                        • Ben Hayward @benhayward.ben unmarked as a Work In Progress 1 month ago

                          unmarked as a Work In Progress

                        • Ben Hayward @benhayward.ben changed the description 1 month ago

                          changed the description

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

                          added scoped label and automatically removed label

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

                          added scoped label and automatically removed label

                        • Ben Hayward @benhayward.ben added 1 commit 1 month ago

                          added 1 commit

                          • d58012e8 - Fixed bug with SFW media

                          Compare with previous version

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

                          added scoped label and automatically removed label

                        • Ben Hayward @benhayward.ben added 1 commit 1 month ago

                          added 1 commit

                          • ecb84755 - Lint

                          Compare with previous version

                        • Mark Harding @markeharding assigned to @xander-miller 1 month ago

                          assigned to @xander-miller

                        • Mark Harding
                          Mark Harding @markeharding · 1 month ago
                          Owner

                          @xander-miller please give approval when you are happy with this.

                        • Xander Miller @xander-miller approved this merge request 3 weeks ago

                          approved this merge request

                        • Xander Miller @xander-miller unapproved this merge request 3 weeks ago

                          unapproved this merge request

                        • Xander Miller @xander-miller approved this merge request 3 weeks ago

                          approved this merge request

                        • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

                          added 1 commit

                          • 315c1c92 - Update Image.php

                          Compare with previous version

                        • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

                          added 1 commit

                          • 7c02251e - Lint

                          Compare with previous version

                        • Xander Miller @xander-miller approved this merge request 2 weeks ago

                          approved this merge request

                          • Mark Harding
                            Mark Harding @markeharding · 2 weeks ago
                            Owner

                            I am unable to test as I have a 500 error.

                            [19-Nov-2019 09:49:30] WARNING: [pool www] child 10 said into stderr: "NOTICE: PHP message: Exception #1574156970: Error: Call to a member function getContext() on boolean in /var/www/Minds/front/dist/en/index.php:4"
                            [19-Nov-2019 09:49:30] WARNING: [pool www] child 10 said into stderr: "Stack trace:"
                            [19-Nov-2019 09:49:30] WARNING: [pool www] child 10 said into stderr: "#0 /var/www/Minds/engine/Core/I18n/I18n.php(123): include()"
                            [19-Nov-2019 09:49:30] WARNING: [pool www] child 10 said into stderr: "#1 /var/www/Minds/engine/Core/Router.php(166): Minds\Core\I18n\I18n->serveIndex()"
                            [19-Nov-2019 09:49:30] WARNING: [pool www] child 10 said into stderr: "#2 /var/www/Minds/engine/index.php(9): Minds\Core\Router->route()"
                            [19-Nov-2019 09:49:30] WARNING: [pool www] child 10 said into stderr: "#3 {main}"
                            127.0.0.1 -  19/Nov/2019:09:49:30 +0000 "GET /index.php" 500
                            
                          • Collapse replies
                          • Brian Hatchet
                            Brian Hatchet :speech_balloon: @brianhatchet · 1 day ago
                            Developer

                            This was a sandbox issue that got sorted out.

                          • Please register or sign in to reply
                        • Mark Harding @markeharding added MR::Requires Changes scoped label and automatically removed MR::Awaiting Review label 2 weeks ago

                          added scoped label and automatically removed label

                        • Ben Hayward @benhayward.ben added 61 commits 2 weeks ago

                          added 61 commits

                          • 7c02251e...52a592b9 - 59 commits from branch master
                          • 7cedf6a3 - Merge branch 'master' of gitlab.com:minds/engine into fix/blog-media-nsfw-update-1936
                          • cf9b88dc - Merge branch 'master' of gitlab.com:minds/engine into fix/blog-media-nsfw-update-1936

                          Compare with previous version

                        • Ben Hayward
                          Ben Hayward @benhayward.ben · 2 weeks ago
                          Developer

                          Pulled in master, should reset the backend and resolve that.

                        • Xander Miller
                          Xander Miller @xander-miller · 2 weeks ago
                          Developer

                          @markeharding test sandbox is back up. You can try reviewing again.

                        • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

                          added 1 commit

                          • d888d9c9 - Fixed breaking media and blogs

                          Compare with previous version

                        • Ben Hayward @benhayward.ben added 1 commit 2 weeks ago

                          added 1 commit

                          • 4f78a38e - Updated to support old-style mature flagged blogs

                          Compare with previous version

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

                          added scoped label and automatically removed label

                        • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 1 week ago

                          approved this merge request

                        • Brian Hatchet
                          Brian Hatchet :speech_balloon: @brianhatchet · 1 week ago
                          Developer

                          I tested this with Ben's latest changes and am pleased to report it works. I can edit a blog, mark it NSFW and have it propagate changes. On Monday, we'll get it up on of the Beatles servers and give it a proper test with live data.

                        • Xander Miller @xander-miller approved this merge request 1 week ago

                          approved this merge request

                        • Xander Miller
                          Xander Miller @xander-miller · 3 days ago
                          Developer

                          Hi @markeharding, during yellow squad meeting today, we heard you have some concerns about the NSFW changes. I think that is in reference to this merge request. Could you add some review notes so we know what to fix / look out for when testing?

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

                          added scoped label and automatically removed label

                        • Ben Hayward @benhayward.ben added 35 commits 2 days ago

                          added 35 commits

                          • 4f78a38e...4fb65001 - 34 commits from branch master
                          • ba297a25 - Merge branch 'master' of gitlab.com:minds/engine into fix/blog-media-nsfw-update-1936

                          Compare with previous version

                        • Ben Hayward @benhayward.ben added 1 commit 2 days ago

                          added 1 commit

                          • 256265c6 - Update for feedback

                          Compare with previous version

                        • Ben Hayward @benhayward.ben added 1 commit 2 days ago

                          added 1 commit

                          • 3a6eb800 - minor change

                          Compare with previous version

                        • Ben Hayward @benhayward.ben added 1 commit 2 days ago

                          added 1 commit

                          • 572a567e - Lint

                          Compare with previous version

                        • Brian Hatchet
                          Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 day ago
                          Resolved by Brian Hatchet 1 day ago
                        • Brian Hatchet
                          Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 1 day ago
                          Resolved by Ben Hayward 1 day ago
                        • Ben Hayward @benhayward.ben added 1 commit 1 day ago

                          added 1 commit

                          • 5a510bff - Update for feedback

                          Compare with previous version

                        • Brian Hatchet
                          Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 day ago
                          Resolved by Ben Hayward 1 day ago
                        • Brian Hatchet
                          Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 1 day ago
                          Resolved by Ben Hayward 1 day ago
                        • Brian Hatchet
                          Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 day ago
                          Resolved by Brian Hatchet 1 day ago
                        • Brian Hatchet
                          Brian Hatchet :speech_balloon: @brianhatchet started a thread on the diff 1 day ago
                          Resolved by Brian Hatchet 1 day ago
                        • Brian Hatchet
                          Brian Hatchet :speech_balloon: @brianhatchet started a thread on an old version of the diff 1 day ago
                          Resolved by Ben Hayward 1 day ago
                        • Ben Hayward @benhayward.ben added 1 commit 1 day ago

                          added 1 commit

                          • 587ee91b - Refactored

                          Compare with previous version

                        • Ben Hayward @benhayward.ben added 5 commits 1 day ago

                          added 5 commits

                          • 587ee91b...fa6047ce - 4 commits from branch master
                          • 3af064a0 - Merge branch 'master' of gitlab.com:minds/engine into fix/blog-media-nsfw-update-1936

                          Compare with previous version

                        • Ben Hayward @benhayward.ben added 1 commit 1 day ago

                          added 1 commit

                          • ace8426f - Minor adustments

                          Compare with previous version

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

                          added scoped label and automatically removed label

                        • Ben Hayward @benhayward.ben changed the description 1 day ago

                          changed the description

                        • Mark Harding @markeharding added MR::Ready to Merge scoped label and automatically removed MR::Awaiting Review label 9 hours ago

                          added scoped label and automatically removed label

                        • Mark Harding @markeharding approved this merge request 9 hours ago

                          approved this merge request

                        • Xander Miller @xander-miller merged 2 hours ago

                          merged

                        • Xander Miller @xander-miller mentioned in commit 6a88c337 2 hours ago

                          mentioned in commit 6a88c337

                        • Xander Miller
                          Xander Miller @xander-miller · 2 hours ago
                          Developer

                          Couldn't find a media post view for blogs but other than that testing instructions were easy to follow. :heavy_check_mark:

                        Please register or sign in to reply
                        Assignee
                        Xander Miller's avatar
                        Xander Miller @xander-miller
                        None
                        Milestone
                        None
                        Time tracking
                        No estimate or time spent
                        2
                        Labels
                        MR::Ready to Merge Squad::Yellow
                        Lock merge request
                        Unlocked
                        10
                        10 participants
                        user avatar
                        Rami Albatal
                        user avatar
                        Marcelo Rivera
                        user avatar
                        Emiliano Balbuena
                        user avatar
                        Brian Hatchet
                        user avatar
                        Guy Thouret
                        user avatar
                        Olivia Madrid
                        user avatar
                        Martin Santangelo
                        Reference: minds/engine!384