Merge branch 'main' of https://github.com/Nerimity/nerimity-web

package.json

@@ -14,6 +14,7 @@
     "@types/markdown-it-emoji": "^2.0.2",
     "@types/node": "^18.16.18",
     "@types/simple-peer": "^9.11.5",
+    "@types/voice-activity-detection": "^0.0.2",
     "events": "^3.3.0",
     "global": "^4.4.0",
     "process": "^0.11.10",
@@ -45,7 +46,8 @@
     "solid-js": "^1.7.6",
     "solid-sortablejs": "^2.0.9",
     "solid-styled-components": "^0.28.5",
-    "twemoji": "^14.0.2"
+    "twemoji": "^14.0.2",
+    "voice-activity-detection": "^0.0.5"
   },
   "engines": {
     "npm": "please-use-pnpm",

src/chat-api/EventNames.ts

@@ -16,6 +16,9 @@ export const ServerEvents = {
 
   USER_PRESENCE_UPDATE: 'user:presence_update',
 
+  USER_BLOCKED: 'user:blocked',
+  USER_UNBLOCKED: 'user:unblocked',
+
   FRIEND_REQUEST_SENT: 'friend:request_sent',
   FRIEND_REQUEST_PENDING: 'friend:request_pending',
   FRIEND_REQUEST_ACCEPTED: 'friend:request_accepted',

src/chat-api/RawData.ts

@@ -152,6 +152,7 @@ export enum FriendStatus {
   SENT = 0,
   PENDING = 1,
   FRIENDS = 2,
+  BLOCKED = 3,
 }
 
 export interface RawFriend {

src/chat-api/events/messageEvents.ts

@@ -43,7 +43,13 @@ export function onMessageCreated(payload: {socketId: string, message: RawMessage
     }
 
     const mentionCount = () => mentions.get(payload.message.channelId)?.count || 0;
-    const isMentioned = () => payload.message.mentions?.find(u => u.id === accountUser?.id)
+
+    const isMentioned = () => {
+      const mention = payload.message.mentions?.find(u => u.id === accountUser?.id);
+      if (mention) return true;
+      const quoteMention = payload.message.quotedMessages?.find(m => m.createdBy?.id === accountUser?.id);
+      return quoteMention;
+    }
 
     if (payload.message.createdBy.id !== accountUser?.id) {
 

src/chat-api/events/userEvents.ts

@@ -4,7 +4,9 @@ import useMention from "../store/useMention";
 import useStore from "../store/useStore";
 import useUsers, { UserStatus } from "../store/useUsers";
 import { SelfUser } from "./connectionEventTypes";
-import { RawServerSettings } from "../RawData";
+import { FriendStatus, RawServerSettings, RawUser } from "../RawData";
+import useFriends from "../store/useFriends";
+import useAccount from "../store/useAccount";
 
 export function onUserPresenceUpdate(payload: {status?: UserStatus, custom?: string; userId: string}) {
   const users = useUsers();
@@ -36,4 +38,20 @@ export function onUserUpdated(payload: Partial<SelfUser>) {
 export function onUserServerSettingsUpdate(payload: {serverId: string, updated: Partial<RawServerSettings>}) {
   const {account} = useStore();
   account.setServerSettings(payload.serverId, payload.updated)
+}
+
+
+export function onUserBlocked(payload: {user: RawUser}) {
+  const account = useAccount();
+  const friends = useFriends();
+  friends.set({
+    createdAt: Date.now(),
+    recipient: payload.user,
+    userId: account.user()?.id!,
+    status: FriendStatus.BLOCKED,
+  })
+}
+export function onUserUnblocked(payload: {userId: string}) {
+  const friends = useFriends();
+  friends.delete(payload.userId);
 }

src/chat-api/services/UserService.ts

@@ -1,5 +1,5 @@
 import env from "../../common/env";
-import { RawChannel, RawInboxWithoutChannel, RawPost, RawUser } from "../RawData";
+import { RawChannel, RawInboxWithoutChannel, RawMessage, RawPost, RawServer, RawUser } from "../RawData";
 import { Presence, UserStatus } from "../store/useUsers";
 import { request } from "./Request";
 import ServiceEndpoints from "./ServiceEndpoints";
@@ -65,6 +65,19 @@ export async function getUserDetailsRequest(userId?: string) {
   });
 }
 
+export interface RawNotification {
+  message: RawMessage;
+  server: RawServer
+}
+
+export async function getUserNotificationsRequest() {
+  return request<RawNotification[]>({
+    url: env.SERVER_URL + "/api" + ServiceEndpoints.user("notifications"),
+    method: "GET",
+    useToken: true
+  });
+}
+
 export async function getFollowers(userId?: string) {
   return request<RawUser[]>({
     url: env.SERVER_URL + "/api" + ServiceEndpoints.user(userId || "") + "/followers",
@@ -95,6 +108,22 @@ export async function closeDMChannelRequest(channelId: string) {
     useToken: true
   });
 }
+
+export async function blockUser(userId: string) {
+  return request({
+    url:  env.SERVER_URL + "/api" + ServiceEndpoints.user(userId) + "/block",
+    method: 'POST',
+    useToken: true
+  });
+}
+export async function unblockUser(userId: string) {
+  return request({
+    url:  env.SERVER_URL + "/api" + ServiceEndpoints.user(userId) + "/block",
+    method: 'DELETE',
+    useToken: true
+  });
+}
+
 export async function updatePresence(presence: Partial<Presence>) {
   return request<RawInboxWithoutChannel & {channel: RawChannel}>({
     url:  env.SERVER_URL + "/api" + ServiceEndpoints.updatePresence(),

src/chat-api/socketClient.ts

@@ -6,7 +6,7 @@ import { onFriendRemoved, onFriendRequestAccepted, onFriendRequestPending, onFri
 import { onInboxClosed, onInboxOpened } from './events/inboxEvents';
 import { onMessageCreated, onMessageDeleted, onMessageReactionAdded, onMessageReactionRemoved, onMessageUpdated } from './events/messageEvents';
 import { onServerChannelCreated, onServerChannelDeleted, onServerChannelOrderUpdated, onServerChannelUpdated, onServerEmojiAdd, onServerEmojiRemove, onServerEmojiUpdate, onServerJoined, onServerLeft, onServerMemberJoined, onServerMemberLeft, onServerMemberUpdated, onServerOrderUpdated, onServerRoleCreated, onServerRoleDeleted, onServerRoleOrderUpdated, onServerRoleUpdated, onServerUpdated } from './events/serverEvents';
-import { onNotificationDismissed, onUserPresenceUpdate, onUserServerSettingsUpdate, onUserUpdated } from './events/userEvents';
+import { onNotificationDismissed, onUserBlocked, onUserPresenceUpdate, onUserServerSettingsUpdate, onUserUnblocked, onUserUpdated } from './events/userEvents';
 import { onCleanup, onMount } from 'solid-js';
 import { onVoiceSignalReceived, onVoiceUserJoined, onVoiceUserLeft } from './events/voiceEvents';
 
@@ -47,6 +47,9 @@ socket.on(ServerEvents.USER_AUTHENTICATED, onAuthenticated);
 socket.on(ServerEvents.USER_UPDATED, onUserUpdated);
 socket.on(ServerEvents.USER_SERVER_SETTINGS_UPDATE, onUserServerSettingsUpdate);
 
+socket.on(ServerEvents.USER_BLOCKED, onUserBlocked);
+socket.on(ServerEvents.USER_UNBLOCKED, onUserUnblocked);
+
 
 socket.on(ServerEvents.USER_PRESENCE_UPDATE, onUserPresenceUpdate)