From 01a77db0fd7aed51dbfeaf511fd940e731cf56d9 Mon Sep 17 00:00:00 2001
From: dank074 <torresefrain10@gmail.com>
Date: Wed, 23 Mar 2022 04:15:27 -0500
Subject: [PATCH 1/2] fix hex color string padding

---
 src/api/utils/ColorUtils.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/api/utils/ColorUtils.ts b/src/api/utils/ColorUtils.ts
index ccb6e27a..126d271d 100644
--- a/src/api/utils/ColorUtils.ts
+++ b/src/api/utils/ColorUtils.ts
@@ -7,7 +7,16 @@ export class ColorUtils
 
     public static makeColorNumberHex(color: number): string
     {
-        return ( '#' + color.toString(16));
+        let val = color.toString(16);
+        if(val.length < 6)
+        {
+            const diff = 6 - val.length;
+            for(let i = 0; i < diff; i++)
+            {
+                val =  '0' + val;
+            }
+        }
+        return ( '#' + val);
     }
 
     public static convertFromHex(color: string): number

From 831b41e503dc0cef253fbe30deb715b9edf89e29 Mon Sep 17 00:00:00 2001
From: Layne <laynebalsters@gmail.com>
Date: Wed, 23 Mar 2022 05:18:00 -0400
Subject: [PATCH 2/2] add frank to alerts, mod tool fixes

---
 src/assets/images/notifications/frank.gif     | Bin 0 -> 1204 bytes
 src/assets/styles/bootstrap/_reboot.scss      |   2 +-
 src/common/index.scss                         |   2 +-
 .../layout/LayoutNotificationAlertView.tsx    |   2 +-
 .../views/user/ModToolsUserModActionView.tsx  |  17 ++++----------
 .../NotificationCenterView.scss               |   6 +++++
 .../NotificationDefaultAlertView.tsx          |  22 +++++++++++-------
 7 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 src/assets/images/notifications/frank.gif

diff --git a/src/assets/images/notifications/frank.gif b/src/assets/images/notifications/frank.gif
new file mode 100644
index 0000000000000000000000000000000000000000..211634f74533f4dd21c474dbdbcde385ee3d675e
GIT binary patch
literal 1204
zcmV;l1WWrzNk%w1VJ`qx0K@<Q_4W1b?f>uZ@1>>G|IVEM%b57XjJ>_Ru&=NG0RR8Y
zX3U~_v6gI_h<4+V9GrVvhhsX{I5?vsB9<Q?dwY9kW@bi1KzkY*Wfc`)6cktz5=#&e
zGcz*)0000000000A^8Le2mlEHEC2ui051Sl000I4U?Ps>*qvzFm2B&}=QYiAjlMV@
zUvlm9ms4(N0`h!6<BF);7<<UsbF*Z!Ivb}kN}E!x*X)xkHD;^e1XjEyd%tOQR;yI)
z%;&g#4m>ITfPZ&$a3m>Bd>w*ziV7VUglHli29!cDk&Yb|oSmG0Yk4J>m6e!hj-INW
zilLHfrIs&P9S$8Fo(Q@Ko*cEbSCkB~v%eh26}l<97014|ucQXUuO_z6${hvU1t+@B
zzgLyR2Bs~)y9g)T?A;yd;fB=Z=7uO1Dee01C-~9y<)Src(2wB0eH|M3J4bF>G<@9*
z^3%pGUqo%yIt*iQV^oI)2{A$d0008T4kP|cVk8Li9Et!iGb*GA-~<46H9OqwW`Q6K
zm_P#v>;SPq&YjziZX+5p8lzD&XBxGMlPXbyJ)=3`fuXCU6a*<AWOpL03KI%|c!eRA
z?9z5u8v(L4Y3qfq7^<mZTCr)^ivAQh5G*)FTCRC@7)&^@@xYZQY&n=Lxt3tWiHohY
zz`66{6I7s~uw?|p-OMgG+sWE(PUK&X)SlM+^4`Y<xN$Q@;kxo8)4<ny6eLt3z6I<+
zawcdCRV%#EQBRUfJOy%YAW>w`lDB*Gyk7%NCN4C)b=|+BGm18MFf>~+bIS)Q)E3@L
zLlljFUpZz60sscsL4CjJb&f5C{r&>lFF>6jU`(VLc;INiL;_!fCo~u#7{65J2pgdd
z*q{U%{t^U-j`+q$9~X9@K?D+L@Y;zSwh{^(EDq?R1QF<HO9m32^C2NC<|vem5CX%Y
z14I(31biJtAft(eFri43kvw@qkI?W?B@wlF*`$t7df34PkOX<fVPg(3fKYV=@e7(?
z=4aO#XSnGf53K|dgcNn=pa>9DoRI=)K}6UJoobF^mzT6q)+L{O&Y5N!gPLIn8+|@<
zCZm{c@F=06(UGX9i(bkhB$rKb2c>e_0xG7EY|tv7aP|?Kr+_wkg_xI#nCq!>Ix=e<
zJDh>xBe1?UL!eg1AmRxR{uJ<lr@K-?1GHcoDpa-Z@Y!4~Sv>3OIgu>ItQJ`C=i0fW
zM3O8WqB0v9W$+r}WUXc(+DAuv+(^h2q?JLJ9+O~cDkRX<aDgKTC#*0b5khgn!3f_d
z>Bf&t(6JN{XPgDT>-F$4niwNnuOAB^F~i9Z=WEEg7%<s}4Hl=o<Qg4dpa30Fz#KBN
zuG9=P5-{t`p=&-L?Ss%Vo4~ZqE<c@f)DoZ2G!Q{UfnUZe^h`ArID6cI00MlS@zzz_
zaDo5_zzsLnCK%22(`U;a_W^v<tp<2^zl;I}6!2}h;eK~eIJ1JI-8bQf^PP6YYCxWX
z<8VJ-xa4UkPWa|Ehi8sB;b^NJ@ByDg9{J&Cn;vloe5by8+?`Vn1MH})&bjNh+Y@`?
SrTbl@<h=K;L-Bfq0029-s~)%j

literal 0
HcmV?d00001

diff --git a/src/assets/styles/bootstrap/_reboot.scss b/src/assets/styles/bootstrap/_reboot.scss
index 7abee7e0..4345886d 100644
--- a/src/assets/styles/bootstrap/_reboot.scss
+++ b/src/assets/styles/bootstrap/_reboot.scss
@@ -65,7 +65,7 @@ body {
 hr {
     margin: $hr-margin-y 0;
     color: $hr-color; // 1
-    background-color: currentColor;
+    background-color: rgba(black,.2);
     border: 0;
     opacity: $hr-opacity;
 }
diff --git a/src/common/index.scss b/src/common/index.scss
index e6740af7..f143ea85 100644
--- a/src/common/index.scss
+++ b/src/common/index.scss
@@ -193,7 +193,7 @@
 .nitro-alert {
     width: 350px;
     min-height: 150px;
-    max-height: 350px;
+    max-height: 550px;
 }
 
 .nitro-notification-bubble {
diff --git a/src/common/layout/LayoutNotificationAlertView.tsx b/src/common/layout/LayoutNotificationAlertView.tsx
index b534d37d..4f1a11a0 100644
--- a/src/common/layout/LayoutNotificationAlertView.tsx
+++ b/src/common/layout/LayoutNotificationAlertView.tsx
@@ -23,7 +23,7 @@ export const LayoutNotificationAlertView: FC<LayoutNotificationAlertViewProps> =
     return (
         <NitroCardView classNames={ getClassNames } theme="primary-slim" { ...rest }>
             <NitroCardHeaderView headerText={ title } onCloseClick={ close } />
-            <NitroCardContentView grow justifyContent="between" overflow="hidden" className="text-black">
+            <NitroCardContentView grow justifyContent="between" overflow="hidden" className="text-black" gap={0}>
                 { children }
             </NitroCardContentView>
         </NitroCardView>
diff --git a/src/components/mod-tools/views/user/ModToolsUserModActionView.tsx b/src/components/mod-tools/views/user/ModToolsUserModActionView.tsx
index 8700bd54..e460cceb 100644
--- a/src/components/mod-tools/views/user/ModToolsUserModActionView.tsx
+++ b/src/components/mod-tools/views/user/ModToolsUserModActionView.tsx
@@ -15,8 +15,8 @@ interface ModToolsUserModActionViewProps
 const MOD_ACTION_DEFINITIONS = [
     new ModActionDefinition(1, 'Alert', ModActionDefinition.ALERT, 1, 0),
     new ModActionDefinition(2, 'Mute 1h', ModActionDefinition.MUTE, 2, 0),
-    new ModActionDefinition(4, 'Ban 7 days', ModActionDefinition.BAN, 4, 0),
     new ModActionDefinition(3, 'Ban 18h', ModActionDefinition.BAN, 3, 0),
+    new ModActionDefinition(4, 'Ban 7 days', ModActionDefinition.BAN, 4, 0),
     new ModActionDefinition(5, 'Ban 30 days (step 1)', ModActionDefinition.BAN, 5, 0),
     new ModActionDefinition(7, 'Ban 30 days (step 2)', ModActionDefinition.BAN, 7, 0),
     new ModActionDefinition(6, 'Ban 100 years', ModActionDefinition.BAN, 6, 0),
@@ -98,14 +98,7 @@ export const ModToolsUserModActionView: FC<ModToolsUserModActionViewProps> = pro
                     return;
                 }
 
-                if(message.trim().length === 0)
-                {
-                    sendAlert('Please write a message to user');
-
-                    return;
-                }
-
-                SendMessageComposer(new ModAlertMessageComposer(user.userId, message, category.id));
+                SendMessageComposer(new ModAlertMessageComposer(user.userId, messageOrDefault, category.id));
                 break;
             }
             case ModActionDefinition.MUTE: 
@@ -172,9 +165,9 @@ export const ModToolsUserModActionView: FC<ModToolsUserModActionViewProps> = pro
                     <Text small>Optional message type, overrides default</Text>
                     <textarea className="form-control" value={ message } onChange={ event => setMessage(event.target.value) }/>
                 </Column>
-                <Flex justifyContent="between" gap={ 1 }>
-                    <Button variant="danger" onClick={ sendSanction }>Sanction</Button>
-                    <Button variant="success" onClick={ sendDefaultSanction }>Default Sanction</Button>
+                <Flex justifyContent="between" gap={1}>
+                    <Button variant="primary" onClick={ sendDefaultSanction }>Default Sanction</Button>
+                    <Button variant="success" onClick={ sendSanction }>Sanction</Button>
                 </Flex>
             </NitroCardContentView>
         </NitroCardView>
diff --git a/src/components/notification-center/NotificationCenterView.scss b/src/components/notification-center/NotificationCenterView.scss
index 671ea3e7..1c765f73 100644
--- a/src/components/notification-center/NotificationCenterView.scss
+++ b/src/components/notification-center/NotificationCenterView.scss
@@ -13,3 +13,9 @@
         pointer-events: all;
     }
 }
+
+.notification-frank {
+    background-image: url('../../assets/images/notifications/frank.gif');
+    width:47px;
+    height: 85px;
+}
diff --git a/src/components/notification-center/views/alert-layouts/NotificationDefaultAlertView.tsx b/src/components/notification-center/views/alert-layouts/NotificationDefaultAlertView.tsx
index 3187faa9..d56f21b2 100644
--- a/src/components/notification-center/views/alert-layouts/NotificationDefaultAlertView.tsx
+++ b/src/components/notification-center/views/alert-layouts/NotificationDefaultAlertView.tsx
@@ -1,6 +1,6 @@
 import { FC, useCallback } from 'react';
-import { LocalizeText, NotificationAlertItem, NotificationUtilities } from '../../../../api';
-import { Base, Button, Column, LayoutNotificationAlertView, LayoutNotificationAlertViewProps } from '../../../../common';
+import { LocalizeText, NotificationAlertItem, NotificationAlertType, NotificationUtilities } from '../../../../api';
+import { Base, Button, Column, Flex, LayoutNotificationAlertView, LayoutNotificationAlertViewProps } from '../../../../common';
 
 interface NotificationDefaultAlertViewProps extends LayoutNotificationAlertViewProps
 {
@@ -20,20 +20,24 @@ export const NotificationDefaultAlertView: FC<NotificationDefaultAlertViewProps>
 
     const isAction = (item.clickUrl && item.clickUrl.startsWith('event:'));
 
+    const hasFrank = item.alertType === NotificationAlertType.DEFAULT || item.alertType === NotificationAlertType.MODERATION;
+
     return (
-        <LayoutNotificationAlertView title={ title } close={ close } { ...rest }>
-            { (item.messages.length > 0) && item.messages.map((message, index) =>
+        <LayoutNotificationAlertView title={title} close={close} {...rest}>
+            <Flex fullHeight overflow="auto" gap={ 2 }>
+                { hasFrank && <Base className="notification-frank flex-shrink-0" /> }
+                { (item.messages.length > 0) && item.messages.map((message, index) =>
                 {
                     const htmlText = message.replace(/\r\n|\r|\n/g, '<br />');
 
                     return <Base grow fullHeight overflow="auto" key={ index } dangerouslySetInnerHTML={ { __html: htmlText } } />;
-                }) }
+                })}
+            </Flex>
+            <hr className="my-2"/>
             <Column alignItems="center" center gap={ 1 }>
-                { !isAction &&
+                { !isAction && !item.clickUrl &&
                     <Button onClick={ close }>{ LocalizeText('generic.close') }</Button> }
-                { !isAction && item.clickUrl && (item.clickUrl.length > 0) &&
-                    <Button variant="link" onClick={ visitUrl }>{ LocalizeText(item.clickUrlText) }</Button> }
-                { isAction && item.clickUrl && (item.clickUrl.length > 0) &&
+                { item.clickUrl && (item.clickUrl.length > 0) &&
                     <Button onClick={ visitUrl }>{ LocalizeText(item.clickUrlText) }</Button> }
             </Column>
         </LayoutNotificationAlertView>