Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

strictNullChecks (#4666)

Browse source 
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip
This commit is contained in:
syuilo 2019-04-13 01:43:22 +09:00 • committed by GitHub
parent 4ee40c3345
commit 987168b863
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
214 changed files with 939 additions and 785 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/services/note/polls/update.ts
View file

@ -7,8 +7,10 @@ import { Note } from '../../../models/entities/note';
export async function deliverQuestionUpdate(noteId: Note['id']) {
const note = await Notes.findOne(noteId);
if (note == null) throw 'note not found';
const user = await Users.findOne(note.userId);
if (user == null) throw 'note not found';
const followers = await Followings.find({
followeeId: user.id
@ -19,13 +21,8 @@ export async function deliverQuestionUpdate(noteId: Note['id']) {
// フォロワーがリモートユーザーかつ投稿者がローカルユーザーならUpdateを配信
if (Users.isLocalUser(user)) {
for (const following of followers) {
const follower = {
inbox: following.followerInbox,
sharedInbox: following.followerSharedInbox
};
if (following.followerHost !== null) {
const inbox = follower.sharedInbox || follower.inbox;
if (Followings.isRemoteFollower(following)) {
const inbox = following.followerSharedInbox || following.followerInbox;
if (!queue.includes(inbox)) queue.push(inbox);
}
}

16
src/services/note/polls/vote.ts
View file

@ -7,11 +7,13 @@ import { Not } from 'typeorm';
import { genId } from '../../../misc/gen-id';
import { createNotification } from '../../create-notification';
export default (user: User, note: Note, choice: number) => new Promise(async (res, rej) => {
export default async function(user: User, note: Note, choice: number) {
const poll = await Polls.findOne({ noteId: note.id });
if (poll == null) throw 'poll not found';
// Check whether is valid choice
if (poll.choices[choice] == null) return rej('invalid choice param');
if (poll.choices[choice] == null) throw new Error('invalid choice param');
// if already voted
const exist = await PollVotes.find({
@ -21,10 +23,10 @@ export default (user: User, note: Note, choice: number) => new Promise(async (re
if (poll.multiple) {
if (exist.some(x => x.choice === choice)) {
return rej('already voted');
throw new Error('already voted');
}
} else if (exist.length !== 0) {
return rej('already voted');
throw new Error('already voted');
}
// Create vote
@ -36,8 +38,6 @@ export default (user: User, note: Note, choice: number) => new Promise(async (re
choice: choice
});
res();
// Increment votes count
const index = choice + 1; // In SQL, array index is 1 based
await Polls.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE noteId = '${poll.noteId}'`);
@ -70,7 +70,7 @@ export default (user: User, note: Note, choice: number) => new Promise(async (re
const profile = await UserProfiles.findOne({ userId: user.id });
// ローカルユーザーが投票した場合この投稿をWatchする
if (Users.isLocalUser(user) && profile.autoWatch) {
if (Users.isLocalUser(user) && profile!.autoWatch) {
watch(user.id, note);
}
});
}