From a5fac975f3951e954f8a1685150e716250a16a78 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 29 Mar 2018 21:13:47 +0200
Subject: [Glitch] Feature: Direct message from menu

Port d1f34151aee564bb1e60ee48107797681c869a81 to glitch-soc
---
 .../features/composer/direct_warning/index.js      | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 app/javascript/flavours/glitch/features/composer/direct_warning/index.js

(limited to 'app/javascript/flavours/glitch/features/composer/direct_warning')

diff --git a/app/javascript/flavours/glitch/features/composer/direct_warning/index.js b/app/javascript/flavours/glitch/features/composer/direct_warning/index.js
new file mode 100644
index 000000000..947096aed
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/composer/direct_warning/index.js
@@ -0,0 +1,49 @@
+import React from 'react';
+import Motion from 'flavours/glitch/util/optional_motion';
+import spring from 'react-motion/lib/spring';
+import { defineMessages, FormattedMessage } from 'react-intl';
+
+//  This is the spring used with our motion.
+const motionSpring = spring(1, { damping: 35, stiffness: 400 });
+
+//  Messages.
+const messages = defineMessages({
+  disclaimer: {
+    defaultMessage: 'This toot will only be visible to all the mentioned users.',
+    id: 'compose_form.direct_message_warning',
+  },
+});
+
+//  The component.
+export default function ComposerDirectWarning () {
+  return (
+    <Motion
+      defaultStyle={{
+        opacity: 0,
+        scaleX: 0.85,
+        scaleY: 0.75,
+      }}
+      style={{
+        opacity: motionSpring,
+        scaleX: motionSpring,
+        scaleY: motionSpring,
+      }}
+    >
+      {({ opacity, scaleX, scaleY }) => (
+        <div
+          className='composer--warning'
+          style={{
+            opacity: opacity,
+            transform: `scale(${scaleX}, ${scaleY})`,
+          }}
+        >
+          <FormattedMessage
+            {...messages.disclaimer}
+          />
+        </div>
+      )}
+    </Motion>
+  );
+}
+
+ComposerDirectWarning.propTypes = {};
-- 
cgit 


From 784712791da8c7d21afa62a3bf6a8fdac8c27a80 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 16 May 2018 19:45:02 +0200
Subject: [Glitch] Reword the direct message warning

Port 53c2164e9c8e2538de386a526a97db187ecae470 to glitch-soc
---
 .../flavours/glitch/features/composer/direct_warning/index.js           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/javascript/flavours/glitch/features/composer/direct_warning')

diff --git a/app/javascript/flavours/glitch/features/composer/direct_warning/index.js b/app/javascript/flavours/glitch/features/composer/direct_warning/index.js
index 947096aed..804c6538b 100644
--- a/app/javascript/flavours/glitch/features/composer/direct_warning/index.js
+++ b/app/javascript/flavours/glitch/features/composer/direct_warning/index.js
@@ -9,7 +9,7 @@ const motionSpring = spring(1, { damping: 35, stiffness: 400 });
 //  Messages.
 const messages = defineMessages({
   disclaimer: {
-    defaultMessage: 'This toot will only be visible to all the mentioned users.',
+    defaultMessage: 'This toot will only be sent to all the mentioned users. However, the operators of your instance and any receiving instances may see this message.',
     id: 'compose_form.direct_message_warning',
   },
 });
-- 
cgit 


From d959d04133e619955100c58bc21e157f18db1fb1 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 24 May 2018 18:11:43 +0200
Subject: Change direct message warning to match upstream

---
 .../glitch/features/composer/direct_warning/index.js         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'app/javascript/flavours/glitch/features/composer/direct_warning')

diff --git a/app/javascript/flavours/glitch/features/composer/direct_warning/index.js b/app/javascript/flavours/glitch/features/composer/direct_warning/index.js
index 804c6538b..d1febdd1b 100644
--- a/app/javascript/flavours/glitch/features/composer/direct_warning/index.js
+++ b/app/javascript/flavours/glitch/features/composer/direct_warning/index.js
@@ -9,9 +9,13 @@ const motionSpring = spring(1, { damping: 35, stiffness: 400 });
 //  Messages.
 const messages = defineMessages({
   disclaimer: {
-    defaultMessage: 'This toot will only be sent to all the mentioned users. However, the operators of your instance and any receiving instances may see this message.',
+    defaultMessage: 'This toot will only be sent to all the mentioned users.',
     id: 'compose_form.direct_message_warning',
   },
+  learn_more: {
+    defaultMessage: 'Learn more',
+    id: 'compose_form.direct_message_warning_learn_more'
+  }
 });
 
 //  The component.
@@ -37,9 +41,9 @@ export default function ComposerDirectWarning () {
             transform: `scale(${scaleX}, ${scaleY})`,
           }}
         >
-          <FormattedMessage
-            {...messages.disclaimer}
-          />
+          <span>
+            <FormattedMessage {...messages.disclaimer} /> <a href='/terms' target='_blank'><FormattedMessage {...messages.learn_more} /></a>
+          </span>
         </div>
       )}
     </Motion>
-- 
cgit