ALTERTABLE npwd_messages ADD COLUMN`is_system`tinyint(4)NOT NULL DEFAULT0;ALTERTABLE npwd_messages ADD COLUMN`system_type`varchar(48)NOT NULL DEFAULT'';ALTERTABLE npwd_messages ADD COLUMN`system_number`varchar(48)NOT NULL DEFAULT'';ALTERTABLE npwd_messages_conversations ADD COLUMN`owner`varchar(48)NOT NULL DEFAULT'';

#610

Pull Request Checklist:

Have you followed the guidelines in our Contributing document and Code of Conduct?
Have you checked to ensure there aren't other openPull Requests for the same update/change?
Have you built and tested NPWD in-game after the relevant change?

SamShanks1 added5 commits

June 5, 2022 22:57

feat(messages): Store user that created group/chat

c964432

fix(messages): createdBy errors

767d0e6

feat(messages): remove group member

7096ea5

fix(messages): get createdBy from db

dbae408

fix(files): delete accidental upload

c7b02e2

Copy link

ContributorAuthor

SamShanks1 commentedJun 6, 2022

One problem I just thought about will be groups that were created before this and don't have the "createdBy" defined, I could make it so any groups that don't have that will allow any member to remove another member. I also don't know if any errors will be created if "createdBy" is left blank

itschip self-assigned this

Jun 6, 2022

itschip added Awaiting Code Review

Awaiting code review.

Awaiting TestingAwaiting in-game testing. labels

Jun 6, 2022

feat(messages): leave group chats

64dd1ce

Copy link

ContributorAuthor

SamShanks1 commentedJun 6, 2022

Tested with no createBy date, everything still works however no one can remove people (may add it so everyone can remove in the future). Also just added leaving groups

SamShanks1 changed the title~~feat(messages): Remove Members from groups~~feat(messages): Remove Members & Leave Groups

Jun 6, 2022

LiamDormon requested changes

Jun 9, 2022

View reviewed changes

Copy link

Collaborator

LiamDormon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Looks good so far, only issue I have is that members cannot re-join a group and a few minor things

import.sql OutdatedShow resolvedHide resolved

resources/server/messages/messages.service.ts OutdatedShow resolvedHide resolved

TasoOneAsia requested changes

Jun 10, 2022

View reviewed changes

Copy link

Contributor

TasoOneAsia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

There are a couple small things I noticed that might need some cleanup but all in all good work, thank you for the PR :)

phone/src/apps/messages/components/form/NewMessageGroupForm.tsx OutdatedShow resolvedHide resolved

resources/server/messages/messages.service.tsShow resolvedHide resolved

resources/server/messages/messages.service.ts OutdatedShow resolvedHide resolved

typings/messages.ts OutdatedShow resolvedHide resolved

Copy link

Contributor

TasoOneAsia commentedJun 10, 2022

Also appears CI is failing for the frontend due to a couple small ESLint complaints.

SamShanks1 added5 commits

June 10, 2022 12:56

fix(messages): review changes

3168c0c

fix(messages): event typings

7bed1b7

fix(messages): nested if statement & error logging

ccf1274

fix(messages): created by defined on server

1cf33e3

fix(messages): removegroupmember endpoint validation

a9748cf

itschip reviewed

Jun 10, 2022

View reviewed changes

phone/src/apps/messages/components/modal/GroupDetailsModal.tsx OutdatedShow resolvedHide resolved

SamShanks1 added2 commits

June 10, 2022 20:20

chore(messages): cleanup

692fafa

chore(messages): cleanup

abd0155

Copy link

ContributorAuthor

SamShanks1 commentedJun 10, 2022

Just need to do some last testing but this should be finished, @Mojito-Fivem would you prefer I do a separate PR for adding members to groups or keep it here

Copy link

Collaborator

LiamDormon commentedJun 10, 2022

It's all under the same feature and I think it would create more issues having this without the adding members functionality

SamShanks1 marked this pull request as draft

June 11, 2022 00:06

SamShanks1 added2 commits

June 11, 2022 17:32

feat(messages): system messages

876a3dd

Merge branch 'master' into master

6873390

Copy link

ContributorAuthor

SamShanks1 commentedJun 11, 2022•
edited
Loading

Added system messages

Preview

The following SQL is now needed (added to the original message)

ALTERTABLE npwd_messages ADD COLUMN`is_system`tinyint(4)NOT NULL DEFAULT0;ALTERTABLE npwd_messages ADD COLUMN`system_type`varchar(48)NOT NULL DEFAULT'';ALTERTABLE npwd_messages ADD COLUMN`system_number`varchar(48)NOT NULL DEFAULT'';

fix(messages): errors

ac580da

SamShanks1 added2 commits

June 11, 2022 20:30

feat(messages): translations

1f6f048

feat(messages): use name for avatar

de9541e

SamShanks1 changed the title~~feat(messages): Remove Members & Leave Groups~~Refactor Group Chats

Jun 12, 2022

SamShanks1 added3 commits

July 2, 2022 18:00

refactor(messages): group chat rework

3083315

refactor(messages): if owner leaves then set new owner

e263c4f

feat: add participants

f4126dc

itschip assignedSamShanks1 and unassigneditschip

Aug 28, 2022

SamShanks1 added2 commits

September 26, 2022 11:11

Merge branch 'master' into master

831b92c

fix(message): merge mistakes

aea51e1

Copy link

AlamoRoleplayFiveM commentedDec 7, 2022

Will there not be any chance of group calling?

Copy link

stalebot commentedMar 7, 2023

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

stalebot added the wontfix label

Mar 7, 2023

Copy link

Contributor

TonybynMp4 commentedOct 23, 2023

this needs to be revived 😢

Copy link

MrWWee commentedJan 4, 2025

i have an idea. the owner can close the chat and only the owner him self can send message, or create a bol for chat user that can send message to chat.