Enhance poll (#4409)
* Start working * WIP: Enhance poll * Fix bug * Use `name` in voting note refs: https://github.com/syuilo/misskey/issues/4407#issuecomment-469057296 * Fix style * Refactor Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com> * WIP: Update poll editor * Fix bug * Fix bug refs: https://github.com/syuilo/misskey/pull/4409#discussion_r * Fix typo * Better design * Beautify poll editor * Fix UI * Fix bug refs: https://github.com/syuilo/misskey/pull/4409#discussion_r262217524 * Add debug logging * Fix bug * Log deliver * fix vote * Update ap/show refs: https://github.com/syuilo/misskey/pull/4409#issuecomment-469652386 * Update poll view * Maybe done * Add tests * Fix path * Fix test * Fix test * Fix test * Fix expired check on AP * Update note.ts * Squashed commit of the following: commit d9a4beabf851893b8992a0f4568265eb9d4f0b8e Author: mei23 <m@m544.net> Date: Wed Mar 6 05:16:14 2019 +0900 tune commit 83ff421a6e978243f80ba9ec820189bc897e6e3b Author: mei23 <m@m544.net> Date: Wed Mar 6 05:01:14 2019 +0900 fallback commit 0b566af973b115ade9e75ea4b8094ee2b329dabc Author: mei23 <m@m544.net> Date: Wed Mar 6 04:40:12 2019 +0900 Note commit cc0296dd6127580ac584c40398db3f762a311f8b Author: mei23 <m@m544.net> Date: Wed Mar 6 04:33:58 2019 +0900 createで送る * Squashed commit of the following: commit ae696b1ed12568b27c27367ac5a77035c97c9a1f Author: mei23 <m@m544.net> Date: Wed Mar 6 06:11:17 2019 +0900 fix commit b735e354e7a9e64534c4f17d04ecbc65fb735c21 Author: mei23 <m@m544.net> Date: Wed Mar 6 06:08:33 2019 +0900 messge commit d9a4beabf851893b8992a0f4568265eb9d4f0b8e Author: mei23 <m@m544.net> Date: Wed Mar 6 05:16:14 2019 +0900 tune commit 83ff421a6e978243f80ba9ec820189bc897e6e3b Author: mei23 <m@m544.net> Date: Wed Mar 6 05:01:14 2019 +0900 fallback commit 0b566af973b115ade9e75ea4b8094ee2b329dabc Author: mei23 <m@m544.net> Date: Wed Mar 6 04:40:12 2019 +0900 Note commit cc0296dd6127580ac584c40398db3f762a311f8b Author: mei23 <m@m544.net> Date: Wed Mar 6 04:33:58 2019 +0900 createで送る * Fix typo * Update vote.ts * Update vote.ts * Update poll-editor.vue * Update tslint.json * Fix layout * Add note * Fix bug * Rename text key * 投票するときに投稿として扱わないように (#4425) * wip * 形式をMastodonと合わせた * Bye something * Use - instead of ~ * Redundancy * Yes! * Refactor * Use moment instead of Date * Fix indent * Refactor if (votes.length) は必要なさそう * Clean up * Bye Date * Clean * Fix timer is not displayed * Fix リモートから無期限pollにvoteできない * Fix vote actor
This commit is contained in:
		
							parent
							
								
									f74a32ed9b
								
							
						
					
					
						commit
						725600da8f
					
				
					 34 changed files with 505 additions and 86 deletions
				
			
		
							
								
								
									
										91
									
								
								test/api.ts
									
										
									
									
									
								
							
							
						
						
									
										91
									
								
								test/api.ts
									
										
									
									
									
								
							|  | @ -450,6 +450,97 @@ describe('API', () => { | |||
| 			expect(res).have.status(400); | ||||
| 		})); | ||||
| 
 | ||||
| 		it('投票できる', async(async () => { | ||||
| 			const me = await signup(); | ||||
| 
 | ||||
| 			const { body } = await request('/notes/create', { | ||||
| 				text: 'test', | ||||
| 				poll: { | ||||
| 					choices: ['sakura', 'izumi', 'ako'] | ||||
| 				} | ||||
| 			}, me); | ||||
| 
 | ||||
| 			const res = await request('/notes/polls/vote', { | ||||
| 				noteId: body.createdNote.id, | ||||
| 				choice: 1 | ||||
| 			}, me); | ||||
| 
 | ||||
| 			expect(res).have.status(204); | ||||
| 		})); | ||||
| 
 | ||||
| 		it('複数投票できない', async(async () => { | ||||
| 			const me = await signup(); | ||||
| 
 | ||||
| 			const { body } = await request('/notes/create', { | ||||
| 				text: 'test', | ||||
| 				poll: { | ||||
| 					choices: ['sakura', 'izumi', 'ako'] | ||||
| 				} | ||||
| 			}, me); | ||||
| 
 | ||||
| 			await request('/notes/polls/vote', { | ||||
| 				noteId: body.createdNote.id, | ||||
| 				choice: 0 | ||||
| 			}, me); | ||||
| 
 | ||||
| 			const res = await request('/notes/polls/vote', { | ||||
| 				noteId: body.createdNote.id, | ||||
| 				choice: 2 | ||||
| 			}, me); | ||||
| 
 | ||||
| 			expect(res).have.status(400); | ||||
| 		})); | ||||
| 
 | ||||
| 		it('許可されている場合は複数投票できる', async(async () => { | ||||
| 			const me = await signup(); | ||||
| 
 | ||||
| 			const { body } = await request('/notes/create', { | ||||
| 				text: 'test', | ||||
| 				poll: { | ||||
| 					choices: ['sakura', 'izumi', 'ako'], | ||||
| 					multiple: true | ||||
| 				} | ||||
| 			}, me); | ||||
| 
 | ||||
| 			await request('/notes/polls/vote', { | ||||
| 				noteId: body.createdNote.id, | ||||
| 				choice: 0 | ||||
| 			}, me); | ||||
| 
 | ||||
| 			await request('/notes/polls/vote', { | ||||
| 				noteId: body.createdNote.id, | ||||
| 				choice: 1 | ||||
| 			}, me); | ||||
| 
 | ||||
| 			const res = await request('/notes/polls/vote', { | ||||
| 				noteId: body.createdNote.id, | ||||
| 				choice: 2 | ||||
| 			}, me); | ||||
| 
 | ||||
| 			expect(res).have.status(204); | ||||
| 		})); | ||||
| 
 | ||||
| 		it('締め切られている場合は投票できない', async(async () => { | ||||
| 			const me = await signup(); | ||||
| 
 | ||||
| 			const { body } = await request('/notes/create', { | ||||
| 				text: 'test', | ||||
| 				poll: { | ||||
| 					choices: ['sakura', 'izumi', 'ako'], | ||||
| 					expiredAfter: 1 | ||||
| 				} | ||||
| 			}, me); | ||||
| 
 | ||||
| 			await new Promise(x => setTimeout(x, 2)); | ||||
| 
 | ||||
| 			const res = await request('/notes/polls/vote', { | ||||
| 				noteId: body.createdNote.id, | ||||
| 				choice: 1 | ||||
| 			}, me); | ||||
| 
 | ||||
| 			expect(res).have.status(400); | ||||
| 		})); | ||||
| 
 | ||||
| 		it('同じユーザーに複数メンションしても内部的にまとめられる', async(async () => { | ||||
| 			const alice = await signup({ username: 'alice' }); | ||||
| 			const bob = await signup({ username: 'bob' }); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue