updated dmca text

server/src/pages/shot/server.js

@@ -11,13 +11,12 @@ exports.app = app;
 app.get("/:id/:domain", csrf({cookie: true}), function(req, res) {
   let shotId = `${req.params.id}/${req.params.domain}`;
   Shot.get(req.backend, shotId).then((shot) => {
-    let noSuchShot = false;
-    if (!shot) {
-      noSuchShot = true;
-    } else if (shot.clipNames().length === 0 && !shot.deleted) {
+    let noSuchShot = !shot;
+    const nonOwnerAndBlocked = shot && shot.blockType !== 'none' && req.deviceId != shot.ownerId;
+    if (shot.clipNames().length === 0 && !shot.deleted) {
       // Deleted shots always appear to have no clips
     }
-    if (noSuchShot) {
+    if (noSuchShot || nonOwnerAndBlocked) {
       notFound(req, res);
       return;
     }

server/src/pages/shot/view.js

@@ -207,11 +207,11 @@ class Body extends React.Component {
     let message = null;
     let moreInfo = null;
     if (this.props.blockType === 'dmca') {
-      message = "This shot is no longer available due to an intellectual property claim.";
       if (this.props.isOwner) {
+        message = "This shot is no longer available due to an intellectual property claim.";
         moreInfo = (
           <span>
-            Please email <a href="mailto:dmcanotice@mozilla.com">dmcanotice@mozilla.com</a> to request further information.<br/>
+            Please email <a href="mailto:dmcanotice@mozilla.com">dmcanotice@mozilla.com</a> to request further information. If your Shots are subject to multiple claims, we may revoke your access to Firefox Screenshots.<br/>
             Please include the URL of this shot in your email: {this.props.backend}/{this.props.id}
           </span>
         );