adjusted importHelper to properly test throwing of aggregate error

Removed export of token

.gitea/workflows/build-dev.yml

@@ -1,45 +0,0 @@
-name: nodeJS remote worker
-
-on:
-  push:
-    branches: ["develop"]
-  pull_request:
-    branches: ["develop"]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v3
-
-      - name: login to gitea registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ gitea.server_url }}
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.GITEA }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: |
-            engineering.sanya.gay/pluralflux/pluralflux:latest
-
-      - name: Deploy bot
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          port: 22
-          script: |
-            cd /root/pluralflux-dev/PluralFlux
-            docker compose up -d

.gitea/workflows/build-main.yml

@@ -1,46 +0,0 @@
-name: nodeJS remote worker
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-
-jobs: 
-
-  build: 
-    
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        
-      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v3
-
-      - name: login to gitea registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ gitea.server_url }}
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.GITEA }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with: 
-          context: .
-          push: true
-          tags: |
-            engineering.sanya.gay/pluralflux/pluralflux:latest
-        
-      - name: Deploy bot
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          port: 22
-          script: |
-            cd /root/pluralflux-prod/PluralFlux
-            docker compose up -d

compose.yaml

@@ -1,15 +1,17 @@
 services:
   main:
-    image: engineering.sanya.gay/pluralflux/pluralflux-dev
+    build: .
     container_name: pluralflux
     restart: unless-stopped
     networks:
       - pluralflux-net
-    env_file: "secrets.env"
   postgres:
     image: postgres:latest
     container_name: pluralflux-postgres
-    env_file: "secrets.env"
+    environment:
+      POSTGRES_PASSWORD_FILE: /run/secrets/postgres_pwd
+    secrets:
+      - postgres_pwd
     volumes:
       - pgdata:/var/lib/postgresql
     ports:
@@ -21,7 +23,13 @@ services:
     container_name: pluralflux-pgadmin
     ports:
       - "5050:80"
-    env_file: "secrets.env"
+    environment:
+      PGADMIN_DEFAULT_EMAIL: code@asterfialla.com
+      PGADMIN_DEFAULT_PASSWORD_FILE: /run/secrets/postgres_pwd
+      PGADMIN_CONFIG_SERVER_MODE: 'False'
+      PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: 'False'
+    secrets:
+      - postgres_pwd
     depends_on:
       - postgres
     networks:
@@ -32,4 +40,7 @@ networks:
 
 volumes:
   pgdata:
-  secrets:
+
+secrets:
+  postgres_pwd:
+    file: ./secrets/postgres-password.txt

secrets.env

@@ -1,6 +0,0 @@
-FLUXER_BOT_TOKEN=<your bot token here>
-POSTGRES_PASSWORD=<your postgres password here>
-PGADMIN_DEFAULT_EMAIL: <default postgres admin login>
-PGADMIN_DEFAULT_PASSWORD: <your postgres password here>
-PGADMIN_CONFIG_SERVER_MODE: 'False'
-PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: 'False'

src/enums.js

@@ -44,10 +44,7 @@ helperEnums.help = {
 }
 
 helperEnums.misc = {
-    ATTACHMENT_SENT_BY: "Attachment sent by:",
+    ATTACHMENT_SENT_BY: "Attachment sent by:"
-    ATTACHMENT_EXPIRATION_WARNING: "**NOTE:** Because this profile picture is hosted on Fluxer, it will expire. To avoid this, upload the picture to another website like <https://imgbb.com/> and link to it directly.",
-    FLUXER_ATTACHMENT_URL: "https://fluxerusercontent.com/attachments/"
-
 }
 
 export const enums = helperEnums;

src/helpers/memberHelper.js

@@ -283,8 +283,8 @@ mh.updatePropic = async function (authorId, memberName, values, attachmentUrl =
     const imgUrl = values ?? attachmentUrl;
     // Throws error if invalid
     await utils.checkImageFormatValidity(imgUrl);
-    const expirationWarning = utils.setExpirationWarning(imgUrl, attachmentExpiration);
+
-    return await mh.updateMemberField(authorId, memberName, "propic", imgUrl, expirationWarning);
+    return await mh.updateMemberField(authorId, memberName, "propic", imgUrl, attachmentExpiration);
 }
 
 /**
@@ -369,15 +369,15 @@ mh.addFullMember = async function (authorId, memberName, displayName = null, pro
     if (propic && propic.length > 0) {
         try {
             isValidPropic = await utils.checkImageFormatValidity(propic);
+
         }
         catch(e) {
             errors.push(`Tried to set profile picture to \"${propic}\". ${e.message}. ${enums.err.SET_TO_NULL}`);
             isValidPropic = false;
         }
     }
-    const expirationWarning = utils.setExpirationWarning(propic, attachmentExpiration);
+    if (isValidPropic && attachmentExpiration) {
-    if (expirationWarning) {
+        errors.push(mh.setExpirationWarning(attachmentExpiration));
-        errors.push(expirationWarning);
     }
     const member = await database.members.create({
         name: memberName, userid: authorId, displayname: isValidDisplayName ? displayName : null, proxy: isValidProxy ? proxy : null, propic: isValidPropic ? propic : null
@@ -394,11 +394,17 @@ mh.addFullMember = async function (authorId, memberName, displayName = null, pro
  * @param {string} memberName - The member to update
  * @param {string} columnName - The column name to update.
  * @param {string} value - The value to update to.
- * @param {string | null} [expirationWarning] - The attachment expiration warning (if any)
+ * @param {string | null} [attachmentExpiration] - The attachment expiration date (if any)
  * @returns {Promise<string>} A successful update.
  * @throws {Error} When no member row was updated.
  */
-mh.updateMemberField = async function (authorId, memberName, columnName, value, expirationWarning = null) {
+mh.updateMemberField = async function (authorId, memberName, columnName, value, attachmentExpiration = null) {
+    let fluxerPropicWarning;
+
+    // indicates that an attachment was uploaded on Fluxer directly
+    if (columnName === "propic" && attachmentExpiration) {
+        fluxerPropicWarning = mh.setExpirationWarning(value);
+    }
     const res = await database.members.update({[columnName]: value}, {
         where: {
             name: {[Op.iLike]: memberName},
@@ -408,7 +414,21 @@ mh.updateMemberField = async function (authorId, memberName, columnName, value,
     if (res[0] === 0) {
         throw new Error(`Can't update ${memberName}. ${enums.err.NO_MEMBER}.`);
     } else {
-        return `Updated ${columnName} for ${memberName} to ${value}${expirationWarning ? `. ${expirationWarning}.` : '.'}`;
+        return `Updated ${columnName} for ${memberName} to ${value}${fluxerPropicWarning ?? ''}.`;
+    }
+}
+
+/**
+ * Sets the warning for an expiration date.
+ *
+ * @param {string} expirationString - An expiration date string.
+ * @returns {string} A description of the expiration, interpolating the expiration string.
+ */
+mh.setExpirationWarning = function (expirationString) {
+    let expirationDate = new Date(expirationString);
+    if (!isNaN(expirationDate.valueOf())) {
+        expirationDate = expirationDate.toDateString();
+        return `\n**NOTE:** Because this profile picture was uploaded via Fluxer, it will currently expire on *${expirationDate}*. To avoid this, upload the picture to another website like <https://imgbb.com/> and link to it directly`
     }
 }
 

src/helpers/utils.js

@@ -34,24 +34,4 @@ u.checkImageFormatValidity = async function (imageUrl) {
     return true;
 }
 
-/**
- * Sets the warning that a Fluxer-uploaded image will expire.
- *
- * @param {string | null} [imgUrl] - An image URL.
- * @param {string | null} [expirationString] - An expiration date string.
- * @returns {string | null} A description of the expiration, or null.
- */
-u.setExpirationWarning = function (imgUrl = null, expirationString = null) {
-    if (imgUrl && imgUrl.startsWith(enums.misc.FLUXER_ATTACHMENT_URL)) {
-        return enums.misc.ATTACHMENT_EXPIRATION_WARNING;
-    }
-    else if (expirationString) {
-        let expirationDate = new Date(expirationString);
-        if (!isNaN(expirationDate.valueOf())) {
-            return `${enums.misc.ATTACHMENT_EXPIRATION_WARNING}. Expiration date: *${expirationString}*.`;
-        }
-    }
-    return null;
-}
-
 export const utils = u;

tests/helpers/memberHelper.test.js

@@ -39,7 +39,7 @@ describe('MemberHelper', () => {
         name: "somePerson",
         displayname: "Some Person",
         proxy: "--text",
-        propic: 'ono.png'
+        propic: attachmentUrl
     }
 
     beforeEach(() => {
@@ -446,13 +446,14 @@ describe('MemberHelper', () => {
 
     describe('updatePropic', () => {
         test.each([
-            [null, attachmentUrl, undefined, attachmentUrl],
+            [null, attachmentUrl, null, attachmentUrl],
-            [mockMember.propic, null, undefined, mockMember.propic],
+            [mockMember.propic, null, null, mockMember.propic],
-            [mockMember.propic, attachmentUrl, undefined, mockMember.propic],
+            [mockMember.propic, attachmentUrl, null, attachmentUrl],
+            [null, attachmentUrl, attachmentExpiration, attachmentUrl]
         ])('calls checkImageFormatValidity and updateMemberField and returns string', async (imgUrl, attachmentUrl, attachmentExpiration, expected) => {
             // Arrange
+
             jest.spyOn(memberHelper, 'updateMemberField').mockResolvedValue("Updated");
-            utils.setExpirationWarning = jest.fn().mockReturnValue(undefined);
             // Act
             const result = await memberHelper.updatePropic(authorId, mockMember.name, imgUrl, attachmentUrl, attachmentExpiration);
             // Assert
@@ -460,21 +461,7 @@ describe('MemberHelper', () => {
             expect(utils.checkImageFormatValidity).toHaveBeenCalledTimes(1);
             expect(utils.checkImageFormatValidity).toHaveBeenCalledWith(expected);
             expect(memberHelper.updateMemberField).toHaveBeenCalledTimes(1);
-            expect(memberHelper.updateMemberField).toHaveBeenCalledWith(authorId, mockMember.name, "propic", expected, undefined);
+            expect(memberHelper.updateMemberField).toHaveBeenCalledWith(authorId, mockMember.name, "propic", expected, attachmentExpiration);
-        })
-
-        test('calls setExpirationWarning', async() => {
-            // Arrange
-            jest.spyOn(memberHelper, 'updateMemberField').mockResolvedValue("Updated");
-            utils.setExpirationWarning = jest.fn().mockReturnValue(enums.misc.ATTACHMENT_EXPIRATION_WARNING);
-            // Act
-            const result = await memberHelper.updatePropic(authorId, mockMember.name, null, attachmentUrl, attachmentExpiration);
-            // Assert
-            expect(result).toEqual("Updated");
-            expect(utils.setExpirationWarning).toHaveBeenCalledTimes(1);
-            expect(utils.setExpirationWarning).toHaveBeenCalledWith(attachmentUrl, attachmentExpiration);
-            expect(memberHelper.updateMemberField).toHaveBeenCalledTimes(1);
-            expect(memberHelper.updateMemberField).toHaveBeenCalledWith(authorId, mockMember.name, "propic", attachmentUrl, enums.misc.ATTACHMENT_EXPIRATION_WARNING);
         })
     })
 
@@ -625,17 +612,6 @@ describe('MemberHelper', () => {
             expect(database.members.create).toHaveBeenCalledTimes(1);
         })
 
-        test('calls setExpirationWarning if attachmentExpiration exists', async () => {
-            // Arrange
-            utils.checkImageFormatValidity = jest.fn().mockResolvedValue(true);
-            jest.spyOn(memberHelper, 'setExpirationWarning').mockReturnValue(`${enums.misc.ATTACHMENT_EXPIRATION_WARNING}`);
-            // Act
-            await memberHelper.addFullMember(authorId, mockMember.name, null, null, mockMember.propic, attachmentExpiration)
-            // Assert
-            expect(memberHelper.setExpirationWarning).toHaveBeenCalledTimes(1);
-            expect(memberHelper.setExpirationWarning).toHaveBeenCalledWith(mockMember.propic, attachmentExpiration);
-        })
-
         test('if all values are valid, call database.members.create', async () => {
             // Arrange
             jest.spyOn(memberHelper, 'checkIfProxyExists').mockResolvedValue(false);
@@ -668,18 +644,22 @@ describe('MemberHelper', () => {
             };
         })
 
+        test('calls setExpirationWarning if attachmentExpiration', async () => {
+            await memberHelper.updateMemberField(authorId, mockMember.name, "propic", mockMember.propic, attachmentExpiration)
+            expect(memberHelper.setExpirationWarning).toHaveBeenCalledTimes(1);
+            expect(memberHelper.setExpirationWarning).toHaveBeenCalledWith(mockMember.propic);
+        })
+
         test.each([
-            ['name', mockMember.name, undefined, `Updated name for ${mockMember.name} to ${mockMember.name}.`],
+            ['name', mockMember.name, null, `Updated name for ${mockMember.name} to ${mockMember.name}`],
-            ['displayname', mockMember.displayname, undefined, `Updated displayname for ${mockMember.name} to ${mockMember.displayname}.`],
+            ['displayname', mockMember.displayname, null, `Updated name for ${mockMember.name} to ${mockMember.displayname}`],
-            ['proxy', mockMember.proxy, undefined, `Updated proxy for ${mockMember.name} to ${mockMember.proxy}.`],
+            ['proxy', mockMember.proxy, null, `Updated name for ${mockMember.name} to ${mockMember.proxy}`],
-            ['propic', mockMember.propic, undefined, `Updated propic for ${mockMember.name} to ${mockMember.propic}.`],
+            ['propic', mockMember.propic, null, `Updated name for ${mockMember.name} to ${mockMember.propic}`],
-            ['propic', mockMember.propic,
+            ['propic', mockMember.propic, attachmentExpiration, `Updated name for ${mockMember.name} to ${mockMember.propic} warning}`]
-                'warning', `Updated propic for ${mockMember.name} to ${mockMember.propic}. warning.`]
+        ])('calls database.members.update with correct column and value and return string', async (columnName, value, attachmentExpiration) => {
-        ])('calls database.members.update with correct column and value and return string', async (columnName, value, attachmentExpiration, expected) => {
             // Act
-            const res = await memberHelper.updateMemberField(authorId, mockMember.name, columnName, value, attachmentExpiration)
+            await memberHelper.updateMemberField(authorId, mockMember.name, columnName, value, attachmentExpiration)
             // Assert
-            expect(res).toEqual(expected);
             expect(database.members.update).toHaveBeenCalledTimes(1);
             expect(database.members.update).toHaveBeenCalledWith({[columnName]: value}, {
                 where: {

tests/helpers/utils.test.js

@@ -5,7 +5,6 @@ const {utils} = require("../../src/helpers/utils.js");
 describe('utils', () => {
 
     const attachmentUrl = 'oya.png';
-    const expirationString = new Date("2026-01-01").toDateString();
     let blob;
 
     beforeEach(() => {
@@ -61,28 +60,6 @@ describe('utils', () => {
         })
     })
 
-    describe('setExpirationWarning', () => {
-        test('sets warning if image Url starts with Fluxer host', () => {
-            // Act
-            const result = utils.setExpirationWarning(`${enums.misc.FLUXER_ATTACHMENT_URL}${attachmentUrl}`);
-            // Assert
-            expect(result).toEqual(enums.misc.ATTACHMENT_EXPIRATION_WARNING);
-        })
-
-        test('sets warning if expiration string exists', () => {
-            const result = utils.setExpirationWarning(null, expirationString);
-            // Assert
-            expect(result).toEqual(`${enums.misc.ATTACHMENT_EXPIRATION_WARNING}. Expiration date: *${expirationString}*.`);
-        })
-
-       test('returns null if img url does not start iwth fluxer host and no expiration', () => {
-           // Act
-           const result = utils.setExpirationWarning(attachmentUrl);
-           // Assert
-           expect(result).toBeNull();
-       })
-    })
-
     afterEach(() => {
         // restore the spy created with spyOn
         jest.restoreAllMocks();