Leahnaya/miiverse-api
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/miiverse-api.git synced 2026-08-19 23:24:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed drawing messages not working. Fixed incorrect handling of user message unread status. Added error for when message recipient has not set up Juxt yet.

Browse Source
This commit is contained in:
Jemma
2023-10-23 21:05:13 -05:00
parent 62c3d9f9ed
commit 2d450403e8
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/models/conversation.ts
View File

@@ -33,17 +33,12 @@ const ConversationSchema = new Schema<IConversation, ConversationModel, IConvers
});
ConversationSchema.method<HydratedConversationDocument>('newMessage', async function newMessage(message: string, senderPID: number) {
if (this.users[0].pid === senderPID) {
this.users[1].read = false;
this.markModified('users[1].read');
} else {
this.users[0].read = false;
this.markModified('users[0].read');
}
this.last_updated = new Date();
this.message_preview = message;
const sender = this.users.find(user => user.pid === senderPID);
if (sender) {
sender.read = false;
}
await this.save();
});

25
src/services/api/routes/friend_messages.ts
View File

@@ -13,11 +13,14 @@ import { Conversation } from '@/models/conversation';
import { FormattedMessage } from '@/types/common/formatted-message';
const sendMessageSchema = z.object({
message_to_pid: z.string().transform(Number),
body: z.string(),
body: z.string().optional(),
painting: z.string().optional(),
screenshot: z.string().optional(),
app_data: z.string().optional()
app_data: z.string().optional(),
feeling_id: z.string(),
is_autopost: z.string(),
number: z.string(),
message_to_pid: z.string().transform(Number),
});
const router = express.Router();
@@ -27,7 +30,6 @@ router.post('/', upload.none(), async function (request: express.Request, respon
response.type('application/xml');
// TODO - Better error codes, maybe do defaults?
// TODO - This fails with drawings. Need to investigate more
const bodyCheck = sendMessageSchema.safeParse(request.body);
if (!bodyCheck.success) {
@@ -38,7 +40,7 @@ router.post('/', upload.none(), async function (request: express.Request, respon
}
const recipientPID = bodyCheck.data.message_to_pid;
let messageBody = bodyCheck.data.body;
let messageBody = bodyCheck.data.body || '';
const painting = bodyCheck.data.painting?.replace(/\0/g, '').trim() || '';
const screenshot = bodyCheck.data.screenshot?.trim().replace(/\0/g, '').trim() || '';
const appData = bodyCheck.data.app_data?.replace(/[^A-Za-z0-9+/=\s]/g, '').trim() || '';
@@ -79,7 +81,18 @@ router.post('/', upload.none(), async function (request: express.Request, respon
// TODO - Log this error
response.status(422);
LOG_WARN('[Messages] Cannot find recipient');
response.sendStatus(400);
response.type('application/xml');
response.status(400);
response.send(xmlbuilder.create({
result: {
has_error: 1,
version: 1,
code: 400,
error_code: 11,
message: 'User not Found'
}
}).end({ pretty: true }));
return;
}