Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project overview
  • Repository
  • Issues 398
  • Merge Requests 65
  • CI / CD
  • Security & Compliance
  • Packages
  • Analytics
  • Wiki
  • Snippets
  • Members
  • Collapse sidebar
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds FrontendMinds Frontend
  • Merge Requests
  • !768

Open
Opened 6 days ago by Ben Hayward@benhayward.ben
Report abuse

Group explicit overlay #2402

  • Overview 7
  • Commits 20
  • Pipelines 6
  • Changes 9
1/5 threads resolved

Summary

Closes #2402 Depends on engine!458

Added in overlay for mature groups.

Steps to test

Quick test:

Test logged in and logged out that the overlay shows appropriately for these two groups.

NSFW

https://feat-group-mature-filter-2402.minds.io/groups/profile/1072258408465305612/feed

Non nsfw

https://feat-group-mature-filter-2402.minds.io/groups/profile/1072258496726044686/feed

Thorough test:

  1. Make a new user (User A)
  2. With User A, make 2 groups. Call one nsfw and one non-nsfw.
  3. Log out, and in as the Minds admin account.
  4. Mark the nsfw group as NSFW using the dropdown (remember to refresh if you don't see the option).
  5. Refresh, it should show the overlay. - note down the URL
  6. Go to User A's channel, mark it as NSFW for Pornography / Nudity - note down the channel URL.
  7. Refresh the channel, you should see the explicit overlay.
  8. Switch it back, and refresh; you should not see the explicit overlay.
  9. Turn it back on and log out
  10. Check the channel, it should show overlay and should say that it is a channel.
  11. Check the group, it should also show overlay and should say that it is a group.

Estimated Regression Scope

This change affects the mature overlay in groups and on channels. In the worst circumstance, it could error out and cause issues showing the channel or group. It's also possible it could error out more subtly and show at inappropriate times (of-course I've definitely aimed for this NOT to happen).

Edited 14 hours ago by Ben Hayward
Request to merge feat/group-mature-filter-2402 into master
The source branch is 8 commits behind the target branch
Open in Web IDE
Pipeline #117358784 passed with warnings for f27e0f95 on feat/group-mature-filter-2402
              Requires 3 more approvals from Devs, Deployers, and QA.
              Emiliano Balbuena Rami Albatal Xander Miller Juan Manuel Solaro Marcelo Rivera
              Ready to be merged automatically. Ask someone with write access to this repository to merge this request

              Deletes source branch

              • Ben Hayward
                Ben Hayward @benhayward.ben started a thread on an old version of the diff 6 days ago
                Resolved by Emiliano Balbuena 32 minutes ago
              • Ben Hayward @benhayward.ben added 2 commits 6 days ago

                added 2 commits

                • 6aa592e8 - Reverting package.json
                • 2c98c6a6 - Fixed spec tests

                Compare with previous version

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

                added 1 commit

                • e45fe9d0 - Unneeded additon

                Compare with previous version

              • Ben Hayward @benhayward.ben changed the description 6 days ago

                changed the description

              • Ben Hayward @benhayward.ben added Squad::Yellow Status::Awaiting Review scoped labels 6 days ago

                added scoped labels

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

                added 1 commit

                • 7c81e856 - Missed a file

                Compare with previous version

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

                Feel free to use an existing user if Captcha is not working.

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

                Looks like I didn't push the updates to channel

              • Ben Hayward @benhayward.ben added 24 commits 5 days ago

                added 24 commits

                • 7c81e856...14445689 - 15 commits from branch master
                • dfb73b7d - (wip): Containerized live server (not live, yet)
                • f0f5d529 - (feat): Front live server
                • b246238e - (refactor): Separate SSR live server and compiler
                • ba9aef3f - (feat): Change deploy url
                • fe2f400d - (chore): Add nodemon to front packages
                • e8cbdbc1 - Merge branch 'master' of gitlab.com:minds/front into feat/group-mature-filter-2402
                • 796a1d06 - Merge branch 'goal/local-infra' of gitlab.com:minds/front into feat/group-mature-filter-2402
                • 2897c3b8 - Merge branch 'master' of gitlab.com:minds/front into feat/group-mature-filter-2402
                • 7f8d2e32 - Missing parts

                Compare with previous version

                Toggle commit list
                • Brian Hatchet
                  Brian Hatchet :speech_balloon: @brianhatchet · 21 hours ago
                  Developer

                  @benhayward.ben We have merged in @edgebal 's changes. This has merge conflicts that need updating.

                • Please register or sign in to reply
              • Ben Hayward @benhayward.ben added 12 commits 18 hours ago

                added 12 commits

                • 7f8d2e32...745769a5 - 11 commits from branch master
                • f27e0f95 - Merge branch 'master' of gitlab.com:minds/front into feat/group-mature-filter-2402

                Compare with previous version

              • Ben Hayward @benhayward.ben changed the description 15 hours ago

                changed the description

              • Ben Hayward @benhayward.ben changed the description 14 hours ago

                changed the description

              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on the diff 32 minutes ago
                containers/live-server/monitor.sh
                2 2 set -e
                3 3
                4 4 cd /var/www/Minds/front
                5 <<<<<<< HEAD
                • Emiliano Balbuena
                  Emiliano Balbuena @edgebal · 32 minutes ago
                  Developer

                  Merge artifacts here, I suggest rolling back this file.

                • Please register or sign in to reply
              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on the diff 32 minutes ago
                src/app/common/components/explicit-overlay/overlay.component.html
                1 <div class="m-channel--explicit-overlay--container" *ngIf="!hidden">
                2 <div class="m-channel--explicit-overlay--content">
                3 <h3>This {{ type }} contains content that is NSFW</h3>
                • Emiliano Balbuena
                  Emiliano Balbuena @edgebal · 32 minutes ago
                  Developer

                  Let's pass this message as a whole on a translatable attribute. Check overlay.component.ts comment.

                • Please register or sign in to reply
              • Emiliano Balbuena
                Emiliano Balbuena @edgebal started a thread on the diff 32 minutes ago
                src/app/common/components/explicit-overlay/overlay.component.ts
                5 import { ConfigsService } from '../../services/configs.service';
                6
                7 @Component({
                8 selector: 'm-explicit-overlay',
                9 templateUrl: 'overlay.component.html',
                10 })
                11 export class ExplicitOverlayComponent {
                12 readonly siteUrl: string;
                13 public hidden = true;
                14 public _entity: any;
                15 public type: string;
                16
                17 @Input() set entity(value: any) {
                18 if (value) {
                19 // change wording for entity label
                20 this.type = value.type === 'user' ? 'channel' : value.type;
                • Emiliano Balbuena
                  Emiliano Balbuena @edgebal · 32 minutes ago
                  Developer

                  For i18n efforts, it will be way better if we pass the whole string via @Input binding, something like:

                  @Input() message: string;

                  Usage:

                  <m-explicit-overlay [entity]="user" message="This channel contains NSFW etc etc" i18n-message></m-explicit-overlay>

                  Please, note the i18n-message attribute, which tells Angular that the attribute value is translatable.

                • Please register or sign in to reply
              • Emiliano Balbuena @edgebal added Status::Requires Changes scoped label and automatically removed Status::Awaiting Review label 31 minutes ago

                added scoped label and automatically removed label

              Please register or sign in to reply
              0 Assignees
              None
              None
              Milestone
              None
              Time tracking
              No estimate or time spent
              2
              Labels
              Squad::Yellow Status::Requires Changes
              Lock merge request
              Unlocked
              10
              10 participants
              user avatar
              user avatar
              user avatar
              user avatar
              user avatar
              user avatar
              user avatar
              Reference: minds/front!768