Rearrange code (self-review)
This commit is contained in:
		
							
								
								
									
										82
									
								
								test/data.js
									
									
									
									
									
								
							
							
						
						
									
										82
									
								
								test/data.js
									
									
									
									
									
								
							| @@ -2662,6 +2662,88 @@ module.exports = { | ||||
| 				name: "pomu puff" | ||||
| 			}] | ||||
| 		}, | ||||
| 		edited_content_with_sticker_and_attachments_but_all_parts_equal_0: { | ||||
| 			id: "1106366167788044451", | ||||
| 			type: 0, | ||||
| 			content: "only the content can be edited", | ||||
| 			channel_id: "122155380120748034", | ||||
| 			author: { | ||||
| 				id: "113340068197859328", | ||||
| 				username: "Cookie 🍪", | ||||
| 				global_name: null, | ||||
| 				display_name: null, | ||||
| 				avatar: "b48302623a12bc7c59a71328f72ccb39", | ||||
| 				discriminator: "7766", | ||||
| 				public_flags: 128, | ||||
| 				avatar_decoration: null | ||||
| 			}, | ||||
| 			attachments: [{ | ||||
| 				id: "1106366167486038016", | ||||
| 				filename: "image.png", | ||||
| 				size: 127373, | ||||
| 				url: "https://cdn.discordapp.com/attachments/122155380120748034/1106366167486038016/image.png", | ||||
| 				proxy_url: "https://media.discordapp.net/attachments/122155380120748034/1106366167486038016/image.png", | ||||
| 				width: 333, | ||||
| 				height: 287, | ||||
| 				content_type: "image/png" | ||||
| 			}], | ||||
| 			embeds: [], | ||||
| 			mentions: [], | ||||
| 			mention_roles: [], | ||||
| 			pinned: false, | ||||
| 			mention_everyone: false, | ||||
| 			tts: false, | ||||
| 			timestamp: "2023-05-11T23:44:09.690000+00:00", | ||||
| 			edited_timestamp: "2023-05-11T23:44:19.690000+00:00", | ||||
| 			flags: 0, | ||||
| 			components: [], | ||||
| 			sticker_items: [{ | ||||
| 				id: "1106323941183717586", | ||||
| 				format_type: 1, | ||||
| 				name: "pomu puff" | ||||
| 			}] | ||||
| 		}, | ||||
| 		edited_content_with_sticker_and_attachments_but_all_parts_equal_1: { | ||||
| 			id: "1106366167788044452", | ||||
| 			type: 0, | ||||
| 			content: "only the content can be edited", | ||||
| 			channel_id: "122155380120748034", | ||||
| 			author: { | ||||
| 				id: "113340068197859328", | ||||
| 				username: "Cookie 🍪", | ||||
| 				global_name: null, | ||||
| 				display_name: null, | ||||
| 				avatar: "b48302623a12bc7c59a71328f72ccb39", | ||||
| 				discriminator: "7766", | ||||
| 				public_flags: 128, | ||||
| 				avatar_decoration: null | ||||
| 			}, | ||||
| 			attachments: [{ | ||||
| 				id: "1106366167486038016", | ||||
| 				filename: "image.png", | ||||
| 				size: 127373, | ||||
| 				url: "https://cdn.discordapp.com/attachments/122155380120748034/1106366167486038016/image.png", | ||||
| 				proxy_url: "https://media.discordapp.net/attachments/122155380120748034/1106366167486038016/image.png", | ||||
| 				width: 333, | ||||
| 				height: 287, | ||||
| 				content_type: "image/png" | ||||
| 			}], | ||||
| 			embeds: [], | ||||
| 			mentions: [], | ||||
| 			mention_roles: [], | ||||
| 			pinned: false, | ||||
| 			mention_everyone: false, | ||||
| 			tts: false, | ||||
| 			timestamp: "2023-05-11T23:44:09.690000+00:00", | ||||
| 			edited_timestamp: "2023-05-11T23:44:19.690000+00:00", | ||||
| 			flags: 0, | ||||
| 			components: [], | ||||
| 			sticker_items: [{ | ||||
| 				id: "1106323941183717586", | ||||
| 				format_type: 1, | ||||
| 				name: "pomu puff" | ||||
| 			}] | ||||
| 		}, | ||||
| 		edit_of_reply_to_skull_webp_attachment_with_content: { | ||||
| 			type: 19, | ||||
| 			tts: false, | ||||
|   | ||||
| @@ -33,6 +33,8 @@ INSERT INTO sim_member (mxid, room_id, hashed_profile_content) VALUES | ||||
|  | ||||
| INSERT INTO message_channel (message_id, channel_id) VALUES | ||||
| ('1106366167788044450', '122155380120748034'), | ||||
| ('1106366167788044451', '122155380120748034'), | ||||
| ('1106366167788044452', '122155380120748034'), | ||||
| ('1126786462646550579', '112760669178241024'), | ||||
| ('1128084748338741392', '112760669178241024'), | ||||
| ('1128084851279536279', '112760669178241024'), | ||||
| @@ -68,6 +70,12 @@ INSERT INTO event_message (event_id, event_type, event_subtype, message_id, part | ||||
| ('$lnAF9IosAECTnlv9p2e18FG8rHn-JgYKHEHIh5qdFv4', 'm.room.message', 'm.text', '1106366167788044450', 0, 1, 1), | ||||
| ('$Ijf1MFCD39ktrNHxrA-i2aKoRWNYdAV2ZXYQeiZIgEU', 'm.room.message', 'm.image', '1106366167788044450', 1, 1, 0), | ||||
| ('$f9cjKiacXI9qPF_nUAckzbiKnJEi0LM399kOkhdd8f8', 'm.sticker', NULL, '1106366167788044450', 1, 0, 0), | ||||
| ('$lnAF9IosAECTnlv9p2e18FG8rHn-JgYKHEHIh5qd999', 'm.room.message', 'm.text', '1106366167788044451', 0, 0, 1), | ||||
| ('$Ijf1MFCD39ktrNHxrA-i2aKoRWNYdAV2ZXYQeiZI999', 'm.room.message', 'm.image', '1106366167788044451', 0, 0, 1), | ||||
| ('$f9cjKiacXI9qPF_nUAckzbiKnJEi0LM399kOkhdd999', 'm.sticker', NULL, '1106366167788044451', 0, 0, 1), | ||||
| ('$lnAF9IosAECTnlv9p2e18FG8rHn-JgYKHEHIh5qd111', 'm.room.message', 'm.text', '1106366167788044452', 1, 1, 1), | ||||
| ('$Ijf1MFCD39ktrNHxrA-i2aKoRWNYdAV2ZXYQeiZI111', 'm.room.message', 'm.image', '1106366167788044452', 1, 1, 1), | ||||
| ('$f9cjKiacXI9qPF_nUAckzbiKnJEi0LM399kOkhdd111', 'm.sticker', NULL, '1106366167788044452', 1, 1, 1), | ||||
| ('$Fxy8SMoJuTduwReVkHZ1uHif9EuvNx36Hg79cltiA04', 'm.room.message', 'm.text', '1144865310588014633', 0, 0, 1), | ||||
| ('$v_Gtr-bzv9IVlSLBO5DstzwmiDd-GSFaNfHX66IupV8', 'm.room.message', 'm.text', '1144874214311067708', 0, 0, 0), | ||||
| ('$7LIdiJCEqjcWUrpzWzS8TELOlFfBEe4ytgS7zn2lbSs', 'm.room.message', 'm.text', '1145688633186193479', 0, 0, 0), | ||||
|   | ||||
| @@ -49,6 +49,7 @@ passthrough.from = orm.from | ||||
| passthrough.select = orm.select | ||||
|  | ||||
| const file = sync.require("../matrix/file") | ||||
| /* c8 ignore next */ | ||||
| file._actuallyUploadDiscordFileToMxc = function(url, res) { throw new Error(`Not allowed to upload files during testing.\nURL: ${url}`) } | ||||
|  | ||||
| ;(async () => { | ||||
| @@ -88,7 +89,7 @@ file._actuallyUploadDiscordFileToMxc = function(url, res) { throw new Error(`Not | ||||
| 				{url: "https://matrix.cadence.moe/_matrix/media/r0/download/cadence.moe/AYPpqXzVJvZdzMQJGjioIQBZ", to: "test/res/AYPpqXzVJvZdzMQJGjioIQBZ.png"}, | ||||
| 				{url: "https://matrix.cadence.moe/_matrix/media/r0/download/cadence.moe/UVuzvpVUhqjiueMxYXJiFEAj", to: "test/res/UVuzvpVUhqjiueMxYXJiFEAj.png"}, | ||||
| 				{url: "https://ezgif.com/images/format-demo/butterfly.gif", to: "test/res/butterfly.gif"}, | ||||
| 				{url: "https://ezgif.com/images/format-demo/butterfly.gif", to: "test/res/butterfly.png"}, | ||||
| 				{url: "https://ezgif.com/images/format-demo/butterfly.png", to: "test/res/butterfly.png"}, | ||||
| 			]) | ||||
| 		}, {timeout: 60000}) | ||||
| 	} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Cadence Ember
					Cadence Ember