cypress/integration/pro/page.spec.js

+/**
+ * @author Ben Hayward
+ * @desc E2E testing for Minds Pro's pages.
+ */
+
+context('Pro Page', () => {
+
+ const topBar = '.m-proChannel__topbar';
+
+ before(() => {
+ cy.clearCookies();
+ cy.getCookie('minds_sess')
+ .then((sessionCookie) => {
+ if (sessionCookie === null) {
+ return cy.login(true);
+ }
+ });
+ });
+
+ beforeEach(()=> {
+ cy.server();
+ cy.route("GET", "**/api/v2/pro/channel/*/content**").as("content");
+
+ cy.preserveCookies();
+ cy.visit(`/pro/${Cypress.env().username}`);
+ cy.get(topBar); 
+ });
+
+ it('should load the feed tab', () => {
+ cy.route("GET", "**/api/v2/feeds/channel/*/activities/top**").as("activities");
+ cy.contains('Feed')
+ .click()
+ .wait('@content').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ })
+ .wait('@activities').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ });
+ })
+
+ it('should load the videos tab', () => {
+ cy.route("GET", "**/api/v2/feeds/channel/*/videos/top**").as("videos");
+ cy.contains('Videos')
+ .click()
+ .wait('@content').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ })
+ .wait('@videos').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ });
+ })
+
+ it('should load the images tab', () => {
+ cy.route("GET", "**/api/v2/feeds/channel/*/images/top**").as("images");
+ cy.contains('Images')
+ .click()
+ .wait('@content').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ })
+ .wait('@images').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ });
+ })
+
+ it('should load the articles tab', () => {
+ cy.route("GET", "**/api/v2/feeds/channel/*/blogs/top**").as("blogs");
+ cy.contains('Articles')
+ .click()
+ .wait('@content').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ })
+ .wait('@blogs').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ });
+ })
+
+ it('should load the groups tab', () => {
+ cy.route("GET", "**/api/v2/feeds/channel/*/groups/top**").as("groups");
+ cy.contains('Groups')
+ .click()
+ .wait('@content').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ })
+ .wait('@groups').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ });
+ })
+})

src/app/common/components/editors/plugins/embed-image.plugin.ts

@@ -197,6 +197,10 @@ export class EmbedImage {
  '.' + imgClass
  );
 
+ if (!image) {
+ return;
+ }
+
  const overlay = image.parentElement.querySelector(
  '.m-blog--image--in-progress-overlay'
  );
@@ -243,9 +247,7 @@ export class EmbedImage {
 
  if ($image.tagName === 'SPAN') {
  $image = $image.parentNode.querySelector('img');
- }
-
- if ($image.tagName !== 'IMG') {
+ } else if ($image.tagName !== 'IMG') {
  return;
  }
 

src/app/controllers/admin/admin.html

@@ -38,7 +38,7 @@
  </a>
  <a
  class="m-topbar--navigation--item"
- routerLink="/admin/appeals"
+ routerLink="/moderation/juryduty/initial"
  routerLinkActive="m-topbar--navigation--item-active"
  >
  <span i18n="@@M__ADMIN_NAV__APPEALS">Appeals</span>

src/app/modules/boost/console/booster/booster.component.html

@@ -10,12 +10,13 @@
  <ng-container *ngIf="type == 'newsfeed' || type == 'offers'">
  <ng-container>
  <div class="m-boost-console--booster--posts-list">
- <minds-card
- [object]="entity | async"
- class="m-border"
- hostClass="mdl-card"
- *ngFor="let entity of feed$ | async"
- ></minds-card>
+ <ng-container *ngFor="let entity of feed$ | async">
+ <minds-card
+ [object]="entity | async"
+ class="m-border"
+ hostClass="mdl-card"
+ ></minds-card>
+ </ng-container>
  </div>
  </ng-container>
 
@@ -47,11 +48,13 @@
  class="mdl-cell mdl-cell--6-col"
  *ngFor="let entity of feed$ | async"
  >
- <minds-card
- [object]="entity | async"
- hostClass="mdl-shadow--2dp"
- ></minds-card>
- <minds-button type="boost" [object]="entity | async"></minds-button>
+ <ng-container *ngIf="(entity | async)?.thumbnail_src">
+ <minds-card
+ [object]="entity | async"
+ hostClass="mdl-shadow--2dp"
+ ></minds-card>
+ <minds-button type="boost" [object]="entity | async"></minds-button>
+ </ng-container>
  </div>
  </div>
  </ng-container>

src/app/modules/mobile/marketing/marketing.component.html

@@ -41,8 +41,10 @@
  </p>
  <p>In order to install this version you must:</p>
  <ul>
+ <li>Be running a minimum of Android 5 (Lollipop).</li>
  <li>
- Update Phone settings to "enable downloads from unverified source"
+ Update Phone settings to "Allow installation of apps from unknown
+ sources".
  </li>
  <li>Download and install!</li>
  </ul>

src/app/modules/notifications/flyout.component.scss

@@ -45,7 +45,6 @@ m-notifications--flyout {
  max-height: calc(95vh - 200px);
  overflow-y: scroll;
  padding: 0;
- white-space: pre-line;
 
  .mdl-cell--12-col {
  padding: 0;

src/app/modules/report/marketing/marketing.component.html

@@ -32,10 +32,16 @@
  <a href="https://santaclaraprinciples.org/" target="_blank"
  >Santa Clara Principles</a
  >
- to review appeals. The jury consists of 12 unique, active users whose
- objective is to vote on appeals. If 75% or more agree with the appeal, the
- administrative action is overturned. For more information about the jury
- system,
+ to review appeals. A Jury consists of 12 randomly selected unique active
+ Minds users who are not subscribed to the user under review. Each juror
+ selected is provided with the option to participate, pass or opt-out of
+ the Jury pool entirely. If 75% or more of the Jury members vote to accept
+ the appeal of a strike, the administrative action is overturned.
+ </p>
+ <p>
+ If less than 75% of the Jury members vote accept the appeal, the
+ administrative action is upheld. The decision of the Jury will be final.
+ For more information about the jury system,
  <a
  href="https://www.minds.com/minds/blog/power-to-the-people-the-minds-jury-system-975486713993859072"
  target="_blank"
@@ -76,6 +82,25 @@
  <li>Strike 3 = Ban</li>
  </ul>
 
+ <p>
+ NSFW (not safe for work) is defined as content containing nudity,
+ pornography, profanity, violence, gore, or sensitive commentary on race,
+ religion, or gender. In general terms, it is defined as content which a
+ reasonable viewer may not want to be seen accessing, in a public setting,
+ such as in a workplace. These tags can be applied to individual content or
+ any group or channel. The full channel will not be marked with a NSFW
+ category until it has received 3 strikes in a single NSFW category.
+ </p>
+
+ <p>
+ Spam on Minds is generally defined as repeated, unwanted, and/or
+ unsolicited actions, automated or manual, that negatively affect Minds
+ users, groups, and/or Minds itself. Spam also includes content that is
+ designed to further unlawful acts (such as phishing) or mislead recipients
+ as to the source of the material (such as spoofing). Spam may result in an
+ immediate ban if determined to be malicious or by use of a bot.
+ </p>
+
  <p>
  Spam may result in an immediate ban if determined to be malicious or by
  use of a bot.