Merge pull request #221 from XDKRGL/xdktc-chatdefault

Adds ChatDefault resolves issue #131
CybertownRevival · Feb 7, 2024 · a5c9d3a · a5c9d3a
2 parents a51ecf7 + fbd5021
commit a5c9d3a
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 18 deletions.
diff --git a/api/db/migrations/202401170126_member_chatdefault_field.ts b/api/db/migrations/202401170126_member_chatdefault_field.ts
@@ -0,0 +1,26 @@
+import { Knex } from 'knex';
+
+const columnName = 'chatdefault';
+
+export async function up(knex: Knex): Promise<void> {
+  if (!await knex.schema.hasColumn('member', columnName)) {
+    console.log(`Adding ${columnName} column to member table`);
+    await knex.schema.alterTable('member', table => {
+      table.integer(columnName)
+        .unsigned()
+        .notNullable()
+        .defaultTo(0);
+    });  
+  }
+}
+
+
+export async function down(knex: Knex): Promise<void> {
+  if (await knex.schema.hasColumn('member', columnName)) {
+    console.log(`Dropping ${columnName} column from member table`);
+    await knex.schema.alterTable('member', table => {
+      table.dropColumn(columnName);
+    });  
+  }
+}
+
diff --git a/api/src/controllers/member.controller.ts b/api/src/controllers/member.controller.ts
@@ -100,21 +100,20 @@ class MemberController {
       response.status(400).json({error});
     }
   }
-  
-  public async updateName(request: Request, response: Response): Promise<void> {
+
+  public async updateInfo(request: Request, response: Response): Promise<void> {
     const session = this.memberService.decryptSession(request, response);
     if (!session) return;
     const { id } = session;
-    const { firstName, lastName } = request.body;
+    const { firstName, lastName, chatdefault } = request.body;
     try {
-      await this.memberService.updateName(id, firstName, lastName);
+      await this.memberService.updateInfo(id, firstName, lastName, chatdefault);
       response.status(200).json({message: 'success'});
-    }catch (error) {
+    } catch (error) {
       response.status(400).json({
         error: 'Error on Updating',
       });
-    }
-
+    }  
   }
 
   /** isBanned results based on member status
@@ -212,7 +211,9 @@ class MemberController {
         if (!banned) {
           await this.memberService.maybeGiveDailyCredits(session.id);
           const homeInfo = await this.homeService.getHome(session.id);
+	  const chatdefault = await this.memberService.getMemberChat(session.id);
           session.hasHome = !!homeInfo;
+	  session.chatdefault = chatdefault;
         }
         response.status(200).json({
           message: 'success',

diff --git a/api/src/routes/member.routes.ts b/api/src/routes/member.routes.ts
@@ -23,8 +23,8 @@ memberRoutes.post('/update_password',
   (request, response) => memberController.updatePassword(request, response));
 memberRoutes.post('/update_role',
   (request, response) => memberController.updatePrimaryRoleId(request, response));
-memberRoutes.post('/updatename',
-  (request, response) => memberController.updateName(request, response));
+memberRoutes.post('/updateinfo',
+  (request, response) => memberController.updateInfo(request, response));
 memberRoutes.post('/update_avatar',
   (request, response) => memberController.updateAvatar(request, response));
 memberRoutes.post('/send_password_reset',

diff --git a/api/src/services/member/member.service.ts b/api/src/services/member/member.service.ts
@@ -176,9 +176,15 @@ export class MemberService {
       xp: member.xp,
       firstName: member.firstname,
       lastName: member.lastname,
+      chatdefault: member.chatdefault,
       primary_role_id: member.primary_role_id,
     };
   }
+
+  public async getMemberChat(memberId: number): Promise<number> {
+    const member = await this.find({ id: memberId });
+    return member.chatdefault;
+  }
 
   /**
    * Builds a member info public view.
@@ -193,6 +199,7 @@ export class MemberService {
       immigrationDate: member.created_at,
       username: member.username,
       xp: member.xp,
+      chatdefault: member.chatdefault,
     };
   }
 
@@ -212,6 +219,7 @@ export class MemberService {
       xp: member.xp,
       firstName: member.firstname,
       lastName: member.lastname,
+      chatdefault: member.chatdefault,
       last_daily_login_credit: member.last_daily_login_credit,
       last_weekly_role_credit: member.last_weekly_role_credit,
     };
@@ -381,17 +389,26 @@ export class MemberService {
   private encryptPassword(password: string): Promise<string> {
     return bcrypt.hash(password, MemberService.SALT_ROUNDS);
   }
-
+  
   /**
-   * Updates a members first and last name
+   * Updates a members default chat choice firstname and lastname
    * @param memberId id of the member
    * @param firstName string of the first name
    * @param lastName string of the last name
+   * @param chatdefault string of the chatdefault
+   * Must retain updateName here for first time home creation firstname/lastname addition
    */
   public async updateName(memberId: number, firstName: string, lastName: string): Promise<void> {
     await this.memberRepository.update(memberId, {
-      firstname: firstName,
-      lastname: lastName,
+	  firstname: firstName,
+	  lastname: lastName,
+    });
+  }
+  public async updateInfo(memberId: number, firstName: string, lastName: string, chatdefault: number): Promise<void> {
+    await this.memberRepository.update(memberId, {
+	  firstname: firstName,
+	  lastname: lastName,
+          chatdefault: chatdefault,
     });
   }
 

diff --git a/api/src/types/models/member.model.ts b/api/src/types/models/member.model.ts
@@ -28,6 +28,8 @@ export interface Member extends Model {
   firstname: string;
   /** the real last name */
   lastname: string;
+  /** default chat choice */
+  chatdefault: number;
   /** the role they wish to display in chat */
   primary_role_id?: number;
   /** this last time they received role based credits */

diff --git a/api/src/types/views/member-info.view.interface.ts b/api/src/types/views/member-info.view.interface.ts
@@ -19,6 +19,8 @@ export interface MemberInfoView {
   lastName?: string;
   /**primary role id that the member wants displayed in chat**/
   primary_role_id?: number;
+  /**add chatdefault */
+  chatdefault?: number;
 }
 
 export interface MemberAdminView {

diff --git a/spa/src/App.vue b/spa/src/App.vue
@@ -37,6 +37,7 @@
        </div>
        <div class="flex flex-row justify-center" v-if="$store.data.place.name">
         <span class="inline" style="color:lime;">{{ $store.data.place.name }}</span> 
+
 	</div>
           <div class="flex flex-row justify-center">
             <img src="/assets/img/b2dchat.gif" @click="$store.methods.setView3d(false)"
@@ -91,7 +92,6 @@
             <br />
             <router-link to="/logout" class="btn-ui">Logout</router-link>
             <br />
-            <br />
             <p align="center">
               <a
                 href="https://kdaws.com/"
@@ -346,7 +346,6 @@ export default Vue.extend({
   },
   mounted() {
     //todo populate jumpgate with worlds
-
     X3D(
       () => {
         console.log("starting X3d");

diff --git a/spa/src/appStore.ts b/spa/src/appStore.ts
@@ -13,6 +13,8 @@ export interface User {
     token?: string;
     admin?: boolean;
     hasHome?: boolean;
+    chatdefault?: number;
+    firstname?: string;
 }
 
 export interface Place {
@@ -88,6 +90,9 @@ const appStore = Vue.observable<AppStore>({
                 userData.avatar.gestures = JSON.parse(userData.avatar.gestures);
             }
             appStore.data.user = { ...appStore.data.user, ...userData };
+            if (appStore.data.user.chatdefault === 1) {
+	        appStore.data.view3d = true;
+	    }
         },
     },
 });

diff --git a/spa/src/components/modals/PersonalInfoModal.vue b/spa/src/components/modals/PersonalInfoModal.vue
@@ -50,7 +50,14 @@
               </select>
               </td>
             </tr>
+            <tr>
+              <td><b>Default Chat</b></td>
+              <td><b>2D</b> <input type="radio" v-model="info.chatdefault" value="0">&nbsp;
+	      <b>3D</b> <input type="radio" v-model="info.chatdefault" value="1">
+	      </td>
+            </tr>
         </table>
+	<center>Note: You must refresh/reload CTR after changing default chat value for it to take effect</center>
         <div class="text-center flex-1">
           <p>
           <button class="btn" v-on:click="update">
@@ -88,11 +95,12 @@ export default Vue.extend({
       info: {
         username: undefined,
         email: undefined,
-		firstName: undefined,
-		lastName: undefined,
+	firstName: undefined,
+	lastName: undefined,
         immigrationDate: undefined,
         walletBalance: undefined,
         xp: undefined,
+	chatdefault: undefined,
         primary_role_id: undefined,
       },
       roles: [],
@@ -109,9 +117,10 @@ export default Vue.extend({
         this.$http.post("/member/update_role", {
           primaryRoleId: this.selectedRoleId,
         });
-        this.$http.post("/member/updatename", {
+        this.$http.post("/member/updateinfo", {
 	  firstName: this.info.firstName,
 	  lastName: this.info.lastName,
+	  chatdefault: this.info.chatdefault,
         });
         this.error = null;
         this.success = "Information Updated";