cypress/integration/channel/channel-activities.spec.js

+context('Channel image upload', () => {
+ before(() => {
+ cy.getCookie('minds_sess')
+ .then((sessionCookie) => {
+ if (sessionCookie === null) {
+ return cy.login(true);
+ }
+ });
+ });
+
+ beforeEach(()=> {
+ cy.preserveCookies();
+ cy.server();
+ cy.route("POST", "**/api/v1/newsfeed").as("newsfeedPOST");
+ cy.route("POST", "**/api/v1/media").as("mediaPOST"); 
+ });
+
+ it('should post an activity with an image attachment', () => {
+ cy.get('minds-newsfeed-poster').should('be.visible');
+
+ cy.get('minds-newsfeed-poster textarea').type('This is a post with an image');
+
+ cy.uploadFile('#attachment-input-poster', '../fixtures/international-space-station-1776401_1920.jpg', 'image/jpg');
+
+ //upload image
+ cy.wait('@mediaPOST');
+
+ cy.get('.m-posterActionBar__PostButton').click(); 
+
+ //await response for activity
+ cy.wait('@newsfeedPOST').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ const uploadedImageGuid = xhr.response.body.activity.entity_guid
+ const activityGuid = xhr.response.body.guid;
+ 
+ 
+ cy.get('.minds-list > minds-activity:first-child .message').contains('This is a post with an image');
+
+ // assert image
+ cy.get('.minds-list > minds-activity:first-child .item-image img').should('be.visible');
+ 
+ cy.visit(`/${Cypress.env().username}`);
+
+ let mediaHref = `/media/${uploadedImageGuid}`;
+ cy.get("m-channels--sorted-module[title='Images']")
+ .find(`a[href='${mediaHref}']`);
+
+ cy.get(`[data-minds-activity-guid='${activityGuid}']`)
+ .find('m-post-menu .minds-more')
+ .click();
+
+ cy.get(`[data-minds-activity-guid='${activityGuid}']`)
+ .find("li:contains('Delete')")
+ .click();
+ 
+ cy.get(`[data-minds-activity-guid='${activityGuid}'] m-post-menu m-modal-confirm .mdl-button--colored`).click(); 
+ });
+ 
+ });
+
+});

cypress/integration/comments/comment-permissions.spec.js

+
+context('Comment Permissions', () => {
+
+ const postMenu = 'minds-activity:first > div > m-post-menu';
+ const deletePostOption = "m-post-menu > ul > li:visible:contains('Delete')";
+ const deletePostButton = ".m-modal-confirm-buttons > button:contains('Delete')";
+ 
+
+ before(() => {
+ //make a post new.
+ cy.getCookie('minds_sess')
+ .then((sessionCookie) => {
+ if (sessionCookie === null) {
+ return cy.login(true);
+ }
+ });
+
+ cy.visit('/newsfeed/subscriptions'); 
+ cy.location('pathname')
+ .should('eq', `/newsfeed/subscriptions`);
+ }); 
+
+ afterEach(() => {
+ //delete the post
+ cy.get(postMenu).click();
+ cy.get(deletePostOption).click();
+ cy.get(deletePostButton).click();
+ });
+
+ beforeEach(()=> {
+ cy.preserveCookies();
+ cy.post('test post');
+ });
+
+
+ it('should disable comments', () => {
+ cy.server();
+ cy.route("POST", "**/api/v2/permissions/comments/**").as("commentToggle");
+ cy.get(postMenu)
+ .click()
+ .find("li:visible:contains('Disable Comments')")
+ .click();
+
+ cy.wait('@commentToggle').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ expect(xhr.response.body.status).to.equal("success");
+ expect(xhr.response.body.allowed).to.equal(false);
+ });
+
+ //close menu
+ cy.get(postMenu)
+ .click();
+
+ cy.get('minds-activity:first')
+ .find("i:contains('speaker_notes_off')")
+ .click();
+ });
+
+ it('should allow comments', () => {
+ cy.server();
+ cy.route("POST", "**/api/v2/permissions/comments/**").as("commentToggle");
+ cy.get(postMenu)
+ .click()
+ .find("li:visible:contains('Disable Comments')")
+ .click();
+
+ cy.wait('@commentToggle').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ expect(xhr.response.body.status).to.equal("success");
+ expect(xhr.response.body.allowed).to.equal(false);
+ });
+
+ //Menu stays open 
+ cy.get("li:visible:contains('Allow Comments')")
+ .click();
+
+ cy.wait('@commentToggle').then((xhr) => {
+ expect(xhr.status).to.equal(200);
+ expect(xhr.response.body.status).to.equal("success");
+ expect(xhr.response.body.allowed).to.equal(true);
+ });
+
+ //close menu
+ cy.get(postMenu)
+ .click();
+
+ cy.get('minds-activity:first')
+ .find("i:contains('chat_bubble')");
+ });
+});
\ No newline at end of file

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/controllers/admin/boosts/boosts.html

@@ -102,6 +102,7 @@
  [object]="boost.entity"
  class="mdl-card mdl-shadow--8dp"
  *ngIf="boost.entity.type == 'activity'"
+ [attr.data-minds-activity-guid]="boost.entity.guid"
  ></minds-activity>
  <minds-card-group
  [group]="boost.entity"

src/app/controllers/admin/firehose/firehose.component.html

@@ -19,6 +19,7 @@
  *ngIf="entity"
  [object]="entity"
  class="mdl-card m-border item"
+ [attr.data-minds-activity-guid]="entity.guid"
  ></minds-activity>
  </div>
  <div

src/app/controllers/admin/monetization/monetization.html

@@ -42,6 +42,7 @@
  [object]="entity"
  class="mdl-card"
  *ngIf="entity.type == 'activity'"
+ [attr.data-minds-activity-guid]="entity.guid"
  ></minds-activity>
 
  <div class="mdl-card__supporting-text m-action-buttons">

src/app/modules/channels/feed/feed.html

@@ -20,6 +20,7 @@
  class="mdl-card m-border item"
  (delete)="delete(activity)"
  [slot]="i + 1"
+ [attr.data-minds-activity-guid]="activity.guid"
  ></minds-activity>
  <minds-activity
  *ngFor="let activity of feed; let i = index"
@@ -28,6 +29,7 @@
  class="mdl-card m-border item"
  (delete)="delete(activity)"
  [slot]="i + (pinned?.length || 0) + 1"
+ [attr.data-minds-activity-guid]="activity.guid"
  ></minds-activity>
  <infinite-scroll
  distance="25%"

src/app/modules/groups/profile/feed/legacy.html

@@ -39,6 +39,7 @@
  [showRatingToggle]="true"
  [slot]="i + 1"
  class="mdl-card item"
+ [attr.data-minds-activity-guid]="activity.guid"
  >
  </minds-activity>
 
@@ -49,6 +50,7 @@
  [canDelete]="group['is:owner'] || group['is:moderator']"
  (delete)="delete(a)"
  [slot]="i + (pinned?.length || 0) + 1"
+ [attr.data-minds-activity-guid]="a.guid"
  >
  <!-- Menu Actions -->
  <li

src/app/modules/groups/profile/feed/sorted.component.html

@@ -52,6 +52,7 @@
  [canDelete]="group['is:owner'] || group['is:moderator']"
  (delete)="delete(entity)"
  [slot]="i + 1"
+ [attr.data-minds-activity-guid]="entity.guid"
  >
  <!-- Menu Actions -->
 

src/app/modules/groups/profile/review/review.component.html

@@ -8,6 +8,7 @@
  [canDelete]="group['is:owner'] || group['is:moderator']"
  (delete)="delete(entity)"
  [hideTabs]="true"
+ [attr.data-minds-activity-guid]="entity.guid"
  >
  <!-- Menu Actions -->
 

src/app/modules/helpdesk/questions/related/related.component.html

@@ -4,5 +4,6 @@
  *ngFor="let post of posts; let i = index"
  class="mdl-card item"
  [object]="post"
+ [attr.data-minds-activity-guid]="post.guid"
  ></minds-activity>
 </div>

src/app/modules/newsfeed/boost-rotator/boost-rotator.component.html

@@ -48,6 +48,7 @@
  [showBoostMenuOptions]="true"
  [slot]="i + 1"
  [visibilityEvents]="false"
+ [attr.data-minds-activity-guid]="boost.guid"
  #activities
  ></minds-activity>
 </ng-container>

src/app/modules/newsfeed/feeds/boost.component.html

@@ -17,6 +17,7 @@
  (delete)="delete(activity)"
  [slot]="i + 1"
  class="mdl-card m-border item"
+ [attr.data-minds-activity-guid]="activity.guid"
  >
  </minds-activity>
  </ng-container>

src/app/modules/newsfeed/feeds/entity.component.html

@@ -14,6 +14,7 @@
  [showRatingToggle]="true"
  [slot]="slot"
  class="mdl-card m-border item"
+ [attr.data-minds-activity-guid]="entity.guid"
  ></minds-activity>
  </ng-container>
 </ng-container>

src/app/modules/newsfeed/feeds/subscribed.component.html

@@ -21,6 +21,7 @@
  (delete)="delete(preActivity)"
  [showRatingToggle]="true"
  class="mdl-card m-border item"
+ [attr.minds-data-activity-guid]="preActivity.guid"
  ></minds-activity>
 
  <m-newsfeed--boost-rotator
@@ -46,6 +47,7 @@
  (delete)="delete(activity)"
  [showRatingToggle]="true"
  [slot]="i + 1"
+ [attr.data-minds-activity-guid]="activity.guid"
  ></minds-activity>
  </ng-container>
 

src/app/modules/newsfeed/feeds/tags/tags.component.html

@@ -7,6 +7,7 @@
  [showRatingToggle]="true"
  class="mdl-card m-border item"
  [slot]="i + 1"
+ [attr.data-minds-activity-guid]="activity.guid"
  ></minds-activity>
  <infinite-scroll
  distance="25%"

src/app/modules/newsfeed/feeds/top.component.html

@@ -9,6 +9,7 @@
  [showRatingToggle]="true"
  [slot]="i + 1"
  class="mdl-card m-border item"
+ [attr.data-minds-activity-guid]="activity.guid"
  ></minds-activity>
  <infinite-scroll
  distance="25%"

src/app/modules/newsfeed/single/single.component.html

@@ -36,6 +36,7 @@
  [showRatingToggle]="true"
  [slot]="1"
  class="mdl-card mdl-shadow--2dp item"
+ [attr.data-minds-activity-guid]="activity.guid"
  >
  </minds-activity>
  </div>

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.