update private channel attachment message & allow google drive attachments in private channels

Author: SupertigerDev

src/common/nerimitySupporterCdnMessage.ts

@@ -0,0 +1 @@
+export const nerimitySupporterCdnMessage = 'To ensure a safe and verified environment, sending attachments in private channels requires a [Nerimity supporter badge](https://nerimity.com/app/settings/badges).';

src/routes/channels/ChannelCdnGenerateToken.ts

@@ -7,6 +7,7 @@ import { channelVerification } from '@src/middleware/channelVerification';
 import { hasBit, USER_BADGES } from '@src/common/Bitwise';
 import { ServerCache } from '@src/cache/ServerCache';
 import { ChannelType } from '@src/types/Channel';
+import { nerimitySupporterCdnMessage } from '@src/common/nerimitySupporterCdnMessage';
 
 export function ChannelCdnGenerateToken(Router: Router) {
   Router.post(
@@ -28,12 +29,12 @@ async function route(req: Request, res: Response) {
   const isServerNotPublicAndNotSupporter = req.serverCache && !isServerPublic(req.serverCache) && !isSupporterOrModerator(req.userCache);
 
   if (!isMod && isServerNotPublicAndNotSupporter) {
-    return res.status(400).json(generateError('You must be a Nerimity supporter to send attachment messages to a private server.'));
+    return res.status(400).json(generateError(nerimitySupporterCdnMessage));
   }
   const isPrivateChannelAndNotSupporter = req.channelCache.type === ChannelType.SERVER_TEXT && !req.channelCache.canBePublic && !isSupporterOrModerator(req.userCache);
 
   if (!isMod && isPrivateChannelAndNotSupporter) {
-    return res.status(400).json(generateError('You must be a Nerimity supporter to send attachment messages to a private channel.'));
+    return res.status(400).json(generateError(nerimitySupporterCdnMessage));
   }
 
   const [genRes, error] = await generateToken({

src/routes/channels/channelMessageCreate.ts

@@ -24,6 +24,7 @@ import { checkAndUpdateRateLimit } from '../../cache/RateLimitCache';
 import { ServerMemberCache } from '../../cache/ServerMemberCache';
 import env from '../../common/env';
 import { generateId } from '../../common/flakeId';
+import { nerimitySupporterCdnMessage } from '@src/common/nerimitySupporterCdnMessage';
 
 export function channelMessageCreate(Router: Router) {
   Router.post(
@@ -187,17 +188,19 @@ async function route(req: Request, res: Response) {
       return res.status(400).json(generateError('You must confirm your email to send attachment messages.'));
     }
 
-    const isMod = hasBit(req.userCache.badges, USER_BADGES.MOD.bit);
+    if (body.nerimityCdnFileId) {
+      const isMod = hasBit(req.userCache.badges, USER_BADGES.MOD.bit);
 
-    const isServerNotPublicAndNotSupporter = req.serverCache && !isServerPublic(req.serverCache) && !isSupporterOrModerator(req.userCache);
+      const isServerNotPublicAndNotSupporter = req.serverCache && !isServerPublic(req.serverCache) && !isSupporterOrModerator(req.userCache);
 
-    if (!isMod && isServerNotPublicAndNotSupporter) {
-      return res.status(400).json(generateError('You must be a Nerimity supporter to send attachment messages to a private server.'));
-    }
-    const isPrivateChannelAndNotSupporter = req.channelCache.type === ChannelType.SERVER_TEXT && !req.channelCache.canBePublic && !isSupporterOrModerator(req.userCache);
+      if (!isMod && isServerNotPublicAndNotSupporter) {
+        return res.status(400).json(generateError(nerimitySupporterCdnMessage));
+      }
+      const isPrivateChannelAndNotSupporter = req.channelCache.type === ChannelType.SERVER_TEXT && !req.channelCache.canBePublic && !isSupporterOrModerator(req.userCache);
 
-    if (!isMod && isPrivateChannelAndNotSupporter) {
-      return res.status(400).json(generateError('You must be a Nerimity supporter to send attachment messages to a private channel.'));
+      if (!isMod && isPrivateChannelAndNotSupporter) {
+        return res.status(400).json(generateError(nerimitySupporterCdnMessage));
+      }
     }
   }