update workflow to put branch references into quotes and add Develop branch

fix: update dockerfile to run npm start (which runs ts-node) instead of node

Co-authored-by: Aster Fialla <asterfialla@gmail.com>

.gitea/workflows/build-main.yml

@@ -6,8 +6,6 @@ on:
   pull_request:
     branches: ["main"]
 
-  workflow_dispatch:
-
 jobs: 
 
   build: 

.gitea/workflows/sync-from-mirror.yaml

@@ -2,7 +2,7 @@ name: Auto-Sync from Mirror
 on:
   push:
     repository: "Pluralflux/Pluralflux"
-    branches: [main,develop]
+    branches: ['main', 'Develop', 'develop']
 
   workflow_dispatch:
 

README.md

@@ -7,6 +7,8 @@ PluralFlux is a proxybot akin to PluralKit and Tupperbox, but for [Fluxer](https
 
 [Sponsor the project](https://github.com/sponsors/pieartsy)
 
+If it's not running at the moment, it's because my computer crashed or something. I'm looking to move running it to a somewhat more permanent solution.
+
 ## Commands
 All commands are prefixed by `pf;`. Currently only a few are implemented.
 

compose.yaml

@@ -22,5 +22,4 @@ services:
     volumes:
       - pgadmindata:/var/lib/pgadmin
 volumes:
-  pgdata:
+  pgdata:
-  pgadmindata:

database/entity/Member.ts

@@ -1,7 +1,6 @@
-import {Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, Unique} from "typeorm"
+import {Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn} from "typeorm"
 
 @Entity({name: "Member", synchronize: true})
-@Unique("UQ_Member_userid_name", ['userid', 'name'])
 export class Member {
 
     @PrimaryGeneratedColumn()

database/migrations/1772825438973-delete-duplicates.ts

@@ -1,17 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class DeleteDuplicates1772825438973 implements MigrationInterface {
-    name= "DeleteDuplicates1772825438973"
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`DELETE
-                                 FROM "Member" a USING "Member" b
-                                 WHERE a.id
-                                     > b.id
-                                   AND a.name = b.name
-                                   AND a.userid = b.userid;`)
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-    }
-
-}

database/migrations/1772830252670-update.ts

@@ -1,14 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class Update1772830252670 implements MigrationInterface {
-    name = 'Update1772830252670'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "Member" ADD CONSTRAINT "UQ_Member_userid_name" UNIQUE ("userid", "name")`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "Member" DROP CONSTRAINT "UQ_Member_userid_name"`);
-    }
-
-}

package.json

@@ -35,7 +35,7 @@
   "scripts": {
     "test": "jest",
     "start": "ts-node src/bot.js",
-    "new-migration": "typeorm-ts-node-commonjs migration:create database/migrations/update",
+    "build-db": "tsc",
     "generate-db": "typeorm-ts-node-commonjs migration:generate -d database/data-source.ts database/migrations/update",
     "run-migration": "typeorm-ts-node-commonjs migration:run -d database/data-source.ts"
   }

src/bot.js

@@ -10,7 +10,6 @@ const { AppDataSource } = require("../database/data-source");
 env.config();
 
 const token = process.env.FLUXER_BOT_TOKEN;
-const debug = process.env.debug;
 
 if (!token) {
     console.error("Missing FLUXER_BOT_TOKEN environment variable.");
@@ -64,15 +63,12 @@ module.exports.handleMessageCreate = async function(message) {
         }
     }
     catch(error) {
-        if(debug){console.error("An error occurred at unix timestamp " + Date.now() + "while processing the command: " + message + " with error:" + error);}
+        console.error(error);
-        else{console.error(error);}
-        process.exit(2); //need this for now just to make sure the bot continues to restart on errors, since it would seem that fluxer.js doesn't define custom error types. TODO: map out some exit codes
     }
 }
 
 client.on(Events.Ready, () => {
     console.log(`Logged in as ${client.user?.username}`);
-    if(debug){console.log(Date.now() + `: Currently running in debug mode!`)}
 });
 
 let guildCount = 0;

src/helpers/memberHelper.js

@@ -403,7 +403,7 @@ memberHelper.updateMemberField = async function (authorId, memberName, columnNam
 /**
  * Gets the details for a member.
  *
- * @param {{Member, string[]}} member - The member object
+ * @param {{Members, string[]}} member - The member object
  * @returns {EmbedBuilder} The member's info.
  */
 memberHelper.getMemberInfo = function (member) {

src/repositories/memberRepo.js

@@ -36,7 +36,12 @@ memberRepo.getMembersByAuthor = async function (authorId) {
  * @returns {Promise<number>} Number of results removed.
  */
 memberRepo.removeMember = async function (authorId, memberName) {
-    const deleted = await members.delete({ name: ILike(memberName), userid: authorId })
+    const deleted = await members.delete({
+        where: {
+            name: ILike(memberName),
+            userid: authorId
+        }
+    })
     return deleted.affected;
 }
 
@@ -48,8 +53,8 @@ memberRepo.removeMember = async function (authorId, memberName) {
  * @returns {Promise<Member>} A successful inserted object.
  */
 memberRepo.createMember = async function (createObj) {
-    return await members.save({
+    return members.insert({
-        name: createObj.name, userid: createObj.userid, displayname: createObj.displayname, proxy: createObj.proxy, propic: createObj.propic
+        name: createObj.name, userid: createObj.authorId, displayname: createObj.displayName, proxy: createObj.proxy, propic: createObj.propic
     });
 }
 
@@ -64,10 +69,12 @@ memberRepo.createMember = async function (createObj) {
  * @returns {Promise<number>} A successful update.
  */
 memberRepo.updateMemberField = async function (authorId, memberName, columnName, value) {
-    const updated = await members.update({
+    const updated = await members.update({[columnName]: value}, {
-        name: ILike(memberName),
+        where: {
-        userid: authorId
+            name: ILike(memberName),
-    }, {[columnName]: value})
+            userid: authorId
+        }
+    })
     return updated.affected;
 }
 

variables.env

@@ -1,7 +0,0 @@
-FLUXER_BOT_TOKEN=<>
-POSTGRES_PASSWORD=<>
-POSTGRES_ENDPOINT=postgres
-PGADMIN_DEFAULT_EMAIL: <>
-PGADMIN_DEFAULT_PASSWORD: <>
-PGADMIN_CONFIG_SERVER_MODE: 'False'
-PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: 'False'