2017-04-17 11:32:30 +09:00
import os from 'os' ;
2017-05-28 23:25:26 +09:00
import throng from 'throng' ;
2017-05-21 00:31:47 +09:00
import dotenv from 'dotenv' ;
import express from 'express' ;
import http from 'http' ;
import redis from 'redis' ;
import pg from 'pg' ;
import log from 'npmlog' ;
import url from 'url' ;
import WebSocket from 'uws' ;
import uuid from 'uuid' ;
const env = process . env . NODE _ENV || 'development' ;
2017-02-03 00:11:36 +09:00
dotenv . config ( {
2017-05-21 00:31:47 +09:00
path : env === 'production' ? '.env.production' : '.env' ,
} ) ;
2017-02-02 09:31:09 +09:00
2017-05-28 23:25:26 +09:00
log . level = process . env . LOG _LEVEL || 'verbose' ;
2017-05-04 06:18:13 +09:00
const dbUrlToConfig = ( dbUrl ) => {
if ( ! dbUrl ) {
2017-05-21 00:31:47 +09:00
return { } ;
2017-05-04 06:18:13 +09:00
}
2017-05-21 00:31:47 +09:00
const params = url . parse ( dbUrl ) ;
const config = { } ;
2017-05-04 22:53:44 +09:00
if ( params . auth ) {
2017-05-21 00:31:47 +09:00
[ config . user , config . password ] = params . auth . split ( ':' ) ;
2017-05-04 22:53:44 +09:00
}
if ( params . hostname ) {
2017-05-21 00:31:47 +09:00
config . host = params . hostname ;
2017-05-04 22:53:44 +09:00
}
if ( params . port ) {
2017-05-21 00:31:47 +09:00
config . port = params . port ;
2017-05-04 06:18:13 +09:00
}
2017-05-04 22:53:44 +09:00
if ( params . pathname ) {
2017-05-21 00:31:47 +09:00
config . database = params . pathname . split ( '/' ) [ 1 ] ;
2017-05-04 22:53:44 +09:00
}
2017-05-21 00:31:47 +09:00
const ssl = params . query && params . query . ssl ;
2017-05-21 04:06:09 +09:00
2017-05-04 22:53:44 +09:00
if ( ssl ) {
2017-05-21 00:31:47 +09:00
config . ssl = ssl === 'true' || ssl === '1' ;
2017-05-04 22:53:44 +09:00
}
2017-05-21 00:31:47 +09:00
return config ;
} ;
2017-05-04 06:18:13 +09:00
2017-05-21 04:06:09 +09:00
const redisUrlToClient = ( defaultConfig , redisUrl ) => {
const config = defaultConfig ;
if ( ! redisUrl ) {
return redis . createClient ( config ) ;
}
if ( redisUrl . startsWith ( 'unix://' ) ) {
return redis . createClient ( redisUrl . slice ( 7 ) , config ) ;
}
return redis . createClient ( Object . assign ( config , {
url : redisUrl ,
} ) ) ;
} ;
2017-05-28 23:25:26 +09:00
const numWorkers = + process . env . STREAMING _CLUSTER _NUM || ( env === 'development' ? 1 : Math . max ( os . cpus ( ) . length - 1 , 1 ) ) ;
2017-05-04 06:18:13 +09:00
2017-05-28 23:25:26 +09:00
const startMaster = ( ) => {
log . info ( ` Starting streaming API server master with ${ numWorkers } workers ` ) ;
} ;
2017-05-04 06:18:13 +09:00
2017-05-28 23:25:26 +09:00
const startWorker = ( workerId ) => {
log . info ( ` Starting worker ${ workerId } ` ) ;
2017-04-17 11:32:30 +09:00
const pgConfigs = {
development : {
2017-06-26 01:13:31 +09:00
user : process . env . DB _USER || pg . defaults . user ,
password : process . env . DB _PASS || pg . defaults . password ,
database : process . env . DB _NAME || 'mastodon_development' ,
host : process . env . DB _HOST || pg . defaults . host ,
port : process . env . DB _PORT || pg . defaults . port ,
2017-05-21 00:31:47 +09:00
max : 10 ,
2017-04-17 11:32:30 +09:00
} ,
production : {
user : process . env . DB _USER || 'mastodon' ,
password : process . env . DB _PASS || '' ,
database : process . env . DB _NAME || 'mastodon_production' ,
host : process . env . DB _HOST || 'localhost' ,
port : process . env . DB _PORT || 5432 ,
2017-05-21 00:31:47 +09:00
max : 10 ,
} ,
} ;
2017-02-02 09:31:09 +09:00
2017-05-21 00:31:47 +09:00
const app = express ( ) ;
const pgPool = new pg . Pool ( Object . assign ( pgConfigs [ env ] , dbUrlToConfig ( process . env . DATABASE _URL ) ) ) ;
const server = http . createServer ( app ) ;
const redisNamespace = process . env . REDIS _NAMESPACE || null ;
2017-02-07 22:37:12 +09:00
2017-05-08 02:42:32 +09:00
const redisParams = {
2017-04-17 11:32:30 +09:00
host : process . env . REDIS _HOST || '127.0.0.1' ,
port : process . env . REDIS _PORT || 6379 ,
2017-05-17 22:36:34 +09:00
db : process . env . REDIS _DB || 0 ,
2017-05-04 06:18:13 +09:00
password : process . env . REDIS _PASSWORD ,
2017-05-21 00:31:47 +09:00
} ;
2017-05-08 02:42:32 +09:00
if ( redisNamespace ) {
2017-05-21 00:31:47 +09:00
redisParams . namespace = redisNamespace ;
2017-05-08 02:42:32 +09:00
}
2017-05-21 04:06:09 +09:00
2017-05-21 00:31:47 +09:00
const redisPrefix = redisNamespace ? ` ${ redisNamespace } : ` : '' ;
2017-05-08 02:42:32 +09:00
2017-06-04 03:50:53 +09:00
const redisSubscribeClient = redisUrlToClient ( redisParams , process . env . REDIS _URL ) ;
2017-05-21 04:06:09 +09:00
const redisClient = redisUrlToClient ( redisParams , process . env . REDIS _URL ) ;
2017-02-07 22:37:12 +09:00
2017-05-21 00:31:47 +09:00
const subs = { } ;
2017-02-07 22:37:12 +09:00
2017-06-21 03:41:41 +09:00
redisSubscribeClient . on ( 'message' , ( channel , message ) => {
2017-05-21 00:31:47 +09:00
const callbacks = subs [ channel ] ;
2017-02-07 22:37:12 +09:00
2017-05-21 00:31:47 +09:00
log . silly ( ` New message on channel ${ channel } ` ) ;
2017-02-07 22:37:12 +09:00
2017-04-17 11:32:30 +09:00
if ( ! callbacks ) {
2017-05-21 00:31:47 +09:00
return ;
2017-04-17 11:32:30 +09:00
}
2017-05-28 23:25:26 +09:00
2017-05-21 00:31:47 +09:00
callbacks . forEach ( callback => callback ( message ) ) ;
} ) ;
2017-02-07 22:37:12 +09:00
2017-06-04 03:50:53 +09:00
const subscriptionHeartbeat = ( channel ) => {
const interval = 6 * 60 ;
const tellSubscribed = ( ) => {
redisClient . set ( ` ${ redisPrefix } subscribed: ${ channel } ` , '1' , 'EX' , interval * 3 ) ;
} ;
tellSubscribed ( ) ;
const heartbeat = setInterval ( tellSubscribed , interval * 1000 ) ;
return ( ) => {
clearInterval ( heartbeat ) ;
} ;
} ;
2017-02-07 22:37:12 +09:00
2017-04-17 11:32:30 +09:00
const subscribe = ( channel , callback ) => {
2017-05-21 00:31:47 +09:00
log . silly ( ` Adding listener for ${ channel } ` ) ;
subs [ channel ] = subs [ channel ] || [ ] ;
2017-06-21 03:41:41 +09:00
if ( subs [ channel ] . length === 0 ) {
log . verbose ( ` Subscribe ${ channel } ` ) ;
redisSubscribeClient . subscribe ( channel ) ;
}
2017-05-21 00:31:47 +09:00
subs [ channel ] . push ( callback ) ;
} ;
2017-02-04 02:27:42 +09:00
2017-04-17 11:32:30 +09:00
const unsubscribe = ( channel , callback ) => {
2017-05-21 00:31:47 +09:00
log . silly ( ` Removing listener for ${ channel } ` ) ;
subs [ channel ] = subs [ channel ] . filter ( item => item !== callback ) ;
2017-06-21 03:41:41 +09:00
if ( subs [ channel ] . length === 0 ) {
log . verbose ( ` Unsubscribe ${ channel } ` ) ;
redisSubscribeClient . unsubscribe ( channel ) ;
}
2017-05-21 00:31:47 +09:00
} ;
2017-02-04 02:27:42 +09:00
2017-04-17 11:32:30 +09:00
const allowCrossDomain = ( req , res , next ) => {
2017-05-21 00:31:47 +09:00
res . header ( 'Access-Control-Allow-Origin' , '*' ) ;
res . header ( 'Access-Control-Allow-Headers' , 'Authorization, Accept, Cache-Control' ) ;
res . header ( 'Access-Control-Allow-Methods' , 'GET, OPTIONS' ) ;
2017-02-06 07:37:25 +09:00
2017-05-21 00:31:47 +09:00
next ( ) ;
} ;
2017-02-06 07:37:25 +09:00
2017-04-17 11:32:30 +09:00
const setRequestId = ( req , res , next ) => {
2017-05-21 00:31:47 +09:00
req . requestId = uuid . v4 ( ) ;
res . header ( 'X-Request-Id' , req . requestId ) ;
2017-02-02 09:31:09 +09:00
2017-05-21 00:31:47 +09:00
next ( ) ;
} ;
2017-02-02 09:31:09 +09:00
2017-04-17 11:32:30 +09:00
const accountFromToken = ( token , req , next ) => {
pgPool . connect ( ( err , client , done ) => {
2017-02-02 09:31:09 +09:00
if ( err ) {
2017-05-21 00:31:47 +09:00
next ( err ) ;
return ;
2017-02-02 09:31:09 +09:00
}
2017-05-28 06:27:54 +09:00
client . query ( 'SELECT oauth_access_tokens.resource_owner_id, users.account_id, users.filtered_languages FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1' , [ token ] , ( err , result ) => {
2017-05-21 00:31:47 +09:00
done ( ) ;
2017-02-02 09:31:09 +09:00
2017-04-17 11:32:30 +09:00
if ( err ) {
2017-05-21 00:31:47 +09:00
next ( err ) ;
return ;
2017-04-17 11:32:30 +09:00
}
2017-02-02 09:31:09 +09:00
2017-04-17 11:32:30 +09:00
if ( result . rows . length === 0 ) {
2017-05-21 00:31:47 +09:00
err = new Error ( 'Invalid access token' ) ;
err . statusCode = 401 ;
2017-02-04 08:34:31 +09:00
2017-05-21 00:31:47 +09:00
next ( err ) ;
return ;
2017-04-17 11:32:30 +09:00
}
2017-02-04 08:34:31 +09:00
2017-05-21 00:31:47 +09:00
req . accountId = result . rows [ 0 ] . account _id ;
2017-05-27 07:53:48 +09:00
req . filteredLanguages = result . rows [ 0 ] . filtered _languages ;
2017-02-04 08:34:31 +09:00
2017-05-21 00:31:47 +09:00
next ( ) ;
} ) ;
} ) ;
} ;
2017-02-04 08:34:31 +09:00
2017-05-30 01:20:53 +09:00
const accountFromRequest = ( req , next ) => {
const authorization = req . headers . authorization ;
const location = url . parse ( req . url , true ) ;
const accessToken = location . query . access _token ;
2017-02-04 08:34:31 +09:00
2017-05-22 04:13:11 +09:00
if ( ! authorization && ! accessToken ) {
2017-05-21 00:31:47 +09:00
const err = new Error ( 'Missing access token' ) ;
err . statusCode = 401 ;
2017-02-02 09:31:09 +09:00
2017-05-21 00:31:47 +09:00
next ( err ) ;
return ;
2017-04-17 11:32:30 +09:00
}
2017-02-03 01:10:59 +09:00
2017-05-22 04:13:11 +09:00
const token = authorization ? authorization . replace ( /^Bearer / , '' ) : accessToken ;
2017-02-02 21:56:14 +09:00
2017-05-21 00:31:47 +09:00
accountFromToken ( token , req , next ) ;
} ;
2017-02-05 11:19:04 +09:00
2017-05-30 01:20:53 +09:00
const wsVerifyClient = ( info , cb ) => {
accountFromRequest ( info . req , err => {
if ( ! err ) {
cb ( true , undefined , undefined ) ;
} else {
log . error ( info . req . requestId , err . toString ( ) ) ;
cb ( false , 401 , 'Unauthorized' ) ;
}
} ) ;
} ;
const authenticationMiddleware = ( req , res , next ) => {
if ( req . method === 'OPTIONS' ) {
next ( ) ;
return ;
}
accountFromRequest ( req , next ) ;
} ;
2017-06-24 02:22:02 +09:00
const errorMiddleware = ( err , req , res , next ) => { // eslint-disable-line no-unused-vars
2017-05-28 23:25:26 +09:00
log . error ( req . requestId , err . toString ( ) ) ;
2017-05-21 00:31:47 +09:00
res . writeHead ( err . statusCode || 500 , { 'Content-Type' : 'application/json' } ) ;
2017-05-28 23:25:26 +09:00
res . end ( JSON . stringify ( { error : err . statusCode ? err . toString ( ) : 'An unexpected error occurred' } ) ) ;
2017-05-21 00:31:47 +09:00
} ;
2017-02-05 11:19:04 +09:00
2017-04-17 11:32:30 +09:00
const placeholders = ( arr , shift = 0 ) => arr . map ( ( _ , i ) => ` $ ${ i + 1 + shift } ` ) . join ( ', ' ) ;
2017-02-02 09:31:09 +09:00
2017-06-04 03:50:53 +09:00
const streamFrom = ( id , req , output , attachCloseHandler , needsFiltering = false , notificationOnly = false ) => {
const streamType = notificationOnly ? ' (notification)' : '' ;
log . verbose ( req . requestId , ` Starting stream from ${ id } for ${ req . accountId } ${ streamType } ` ) ;
2017-04-17 11:32:30 +09:00
const listener = message => {
2017-05-21 00:31:47 +09:00
const { event , payload , queued _at } = JSON . parse ( message ) ;
2017-02-02 21:56:14 +09:00
2017-04-17 11:32:30 +09:00
const transmit = ( ) => {
2017-05-21 00:31:47 +09:00
const now = new Date ( ) . getTime ( ) ;
2017-04-17 11:32:30 +09:00
const delta = now - queued _at ;
2017-02-02 21:56:14 +09:00
2017-05-21 00:31:47 +09:00
log . silly ( req . requestId , ` Transmitting for ${ req . accountId } : ${ event } ${ payload } Delay: ${ delta } ms ` ) ;
output ( event , payload ) ;
} ;
2017-02-02 21:56:14 +09:00
2017-06-04 03:50:53 +09:00
if ( notificationOnly && event !== 'notification' ) {
return ;
}
2017-04-17 11:32:30 +09:00
// Only messages that may require filtering are statuses, since notifications
// are already personalized and deletes do not matter
if ( needsFiltering && event === 'update' ) {
pgPool . connect ( ( err , client , done ) => {
2017-02-02 21:56:14 +09:00
if ( err ) {
2017-05-21 00:31:47 +09:00
log . error ( err ) ;
return ;
2017-02-02 21:56:14 +09:00
}
2017-05-21 00:31:47 +09:00
const unpackedPayload = JSON . parse ( payload ) ;
2017-05-30 01:01:08 +09:00
const targetAccountIds = [ unpackedPayload . account . id ] . concat ( unpackedPayload . mentions . map ( item => item . id ) ) ;
2017-05-21 00:31:47 +09:00
const accountDomain = unpackedPayload . account . acct . split ( '@' ) [ 1 ] ;
2017-04-17 11:32:30 +09:00
2017-06-10 02:46:33 +09:00
if ( Array . isArray ( req . filteredLanguages ) && req . filteredLanguages . indexOf ( unpackedPayload . language ) !== - 1 ) {
2017-05-27 07:53:48 +09:00
log . silly ( req . requestId , ` Message ${ unpackedPayload . id } filtered by language ( ${ unpackedPayload . language } ) ` ) ;
2017-05-28 23:25:26 +09:00
done ( ) ;
2017-05-27 07:53:48 +09:00
return ;
}
Account domain blocks (#2381)
* Add <ostatus:conversation /> tag to Atom input/output
Only uses ref attribute (not href) because href would be
the alternate link that's always included also.
Creates new conversation for every non-reply status. Carries
over conversation for every reply. Keeps remote URIs verbatim,
generates local URIs on the fly like the rest of them.
* Conversation muting - prevents notifications that reference a conversation
(including replies, favourites, reblogs) from being created. API endpoints
/api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute
Currently no way to tell when a status/conversation is muted, so the web UI
only has a "disable notifications" button, doesn't work as a toggle
* Display "Dismiss notifications" on all statuses in notifications column, not just own
* Add "muted" as a boolean attribute on statuses JSON
For now always false on contained reblogs, since it's only relevant for
statuses returned from the notifications endpoint, which are not nested
Remove "Disable notifications" from detailed status view, since it's
only relevant in the notifications column
* Up max class length
* Remove pending test for conversation mute
* Add tests, clean up
* Rename to "mute conversation" and "unmute conversation"
* Raise validation error when trying to mute/unmute status without conversation
* Adding account domain blocks that filter notifications and public timelines
* Add tests for domain blocks in notifications, public timelines
Filter reblogs of blocked domains from home
* Add API for listing and creating account domain blocks
* API for creating/deleting domain blocks, tests for Status#ancestors
and Status#descendants, filter domain blocks from them
* Filter domains in streaming API
* Update account_domain_block_spec.rb
2017-05-19 08:14:30 +09:00
const queries = [
2017-05-30 01:01:08 +09:00
client . query ( ` SELECT 1 FROM blocks WHERE (account_id = $ 1 AND target_account_id IN ( ${ placeholders ( targetAccountIds , 2 ) } )) OR (account_id = $ 2 AND target_account_id = $ 1) UNION SELECT 1 FROM mutes WHERE account_id = $ 1 AND target_account_id IN ( ${ placeholders ( targetAccountIds , 2 ) } ) ` , [ req . accountId , unpackedPayload . account . id ] . concat ( targetAccountIds ) ) ,
2017-05-21 00:31:47 +09:00
] ;
2017-04-17 11:32:30 +09:00
Account domain blocks (#2381)
* Add <ostatus:conversation /> tag to Atom input/output
Only uses ref attribute (not href) because href would be
the alternate link that's always included also.
Creates new conversation for every non-reply status. Carries
over conversation for every reply. Keeps remote URIs verbatim,
generates local URIs on the fly like the rest of them.
* Conversation muting - prevents notifications that reference a conversation
(including replies, favourites, reblogs) from being created. API endpoints
/api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute
Currently no way to tell when a status/conversation is muted, so the web UI
only has a "disable notifications" button, doesn't work as a toggle
* Display "Dismiss notifications" on all statuses in notifications column, not just own
* Add "muted" as a boolean attribute on statuses JSON
For now always false on contained reblogs, since it's only relevant for
statuses returned from the notifications endpoint, which are not nested
Remove "Disable notifications" from detailed status view, since it's
only relevant in the notifications column
* Up max class length
* Remove pending test for conversation mute
* Add tests, clean up
* Rename to "mute conversation" and "unmute conversation"
* Raise validation error when trying to mute/unmute status without conversation
* Adding account domain blocks that filter notifications and public timelines
* Add tests for domain blocks in notifications, public timelines
Filter reblogs of blocked domains from home
* Add API for listing and creating account domain blocks
* API for creating/deleting domain blocks, tests for Status#ancestors
and Status#descendants, filter domain blocks from them
* Filter domains in streaming API
* Update account_domain_block_spec.rb
2017-05-19 08:14:30 +09:00
if ( accountDomain ) {
2017-05-21 00:31:47 +09:00
queries . push ( client . query ( 'SELECT 1 FROM account_domain_blocks WHERE account_id = $1 AND domain = $2' , [ req . accountId , accountDomain ] ) ) ;
Account domain blocks (#2381)
* Add <ostatus:conversation /> tag to Atom input/output
Only uses ref attribute (not href) because href would be
the alternate link that's always included also.
Creates new conversation for every non-reply status. Carries
over conversation for every reply. Keeps remote URIs verbatim,
generates local URIs on the fly like the rest of them.
* Conversation muting - prevents notifications that reference a conversation
(including replies, favourites, reblogs) from being created. API endpoints
/api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute
Currently no way to tell when a status/conversation is muted, so the web UI
only has a "disable notifications" button, doesn't work as a toggle
* Display "Dismiss notifications" on all statuses in notifications column, not just own
* Add "muted" as a boolean attribute on statuses JSON
For now always false on contained reblogs, since it's only relevant for
statuses returned from the notifications endpoint, which are not nested
Remove "Disable notifications" from detailed status view, since it's
only relevant in the notifications column
* Up max class length
* Remove pending test for conversation mute
* Add tests, clean up
* Rename to "mute conversation" and "unmute conversation"
* Raise validation error when trying to mute/unmute status without conversation
* Adding account domain blocks that filter notifications and public timelines
* Add tests for domain blocks in notifications, public timelines
Filter reblogs of blocked domains from home
* Add API for listing and creating account domain blocks
* API for creating/deleting domain blocks, tests for Status#ancestors
and Status#descendants, filter domain blocks from them
* Filter domains in streaming API
* Update account_domain_block_spec.rb
2017-05-19 08:14:30 +09:00
}
2017-02-02 21:56:14 +09:00
Account domain blocks (#2381)
* Add <ostatus:conversation /> tag to Atom input/output
Only uses ref attribute (not href) because href would be
the alternate link that's always included also.
Creates new conversation for every non-reply status. Carries
over conversation for every reply. Keeps remote URIs verbatim,
generates local URIs on the fly like the rest of them.
* Conversation muting - prevents notifications that reference a conversation
(including replies, favourites, reblogs) from being created. API endpoints
/api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute
Currently no way to tell when a status/conversation is muted, so the web UI
only has a "disable notifications" button, doesn't work as a toggle
* Display "Dismiss notifications" on all statuses in notifications column, not just own
* Add "muted" as a boolean attribute on statuses JSON
For now always false on contained reblogs, since it's only relevant for
statuses returned from the notifications endpoint, which are not nested
Remove "Disable notifications" from detailed status view, since it's
only relevant in the notifications column
* Up max class length
* Remove pending test for conversation mute
* Add tests, clean up
* Rename to "mute conversation" and "unmute conversation"
* Raise validation error when trying to mute/unmute status without conversation
* Adding account domain blocks that filter notifications and public timelines
* Add tests for domain blocks in notifications, public timelines
Filter reblogs of blocked domains from home
* Add API for listing and creating account domain blocks
* API for creating/deleting domain blocks, tests for Status#ancestors
and Status#descendants, filter domain blocks from them
* Filter domains in streaming API
* Update account_domain_block_spec.rb
2017-05-19 08:14:30 +09:00
Promise . all ( queries ) . then ( values => {
2017-05-21 00:31:47 +09:00
done ( ) ;
Account domain blocks (#2381)
* Add <ostatus:conversation /> tag to Atom input/output
Only uses ref attribute (not href) because href would be
the alternate link that's always included also.
Creates new conversation for every non-reply status. Carries
over conversation for every reply. Keeps remote URIs verbatim,
generates local URIs on the fly like the rest of them.
* Conversation muting - prevents notifications that reference a conversation
(including replies, favourites, reblogs) from being created. API endpoints
/api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute
Currently no way to tell when a status/conversation is muted, so the web UI
only has a "disable notifications" button, doesn't work as a toggle
* Display "Dismiss notifications" on all statuses in notifications column, not just own
* Add "muted" as a boolean attribute on statuses JSON
For now always false on contained reblogs, since it's only relevant for
statuses returned from the notifications endpoint, which are not nested
Remove "Disable notifications" from detailed status view, since it's
only relevant in the notifications column
* Up max class length
* Remove pending test for conversation mute
* Add tests, clean up
* Rename to "mute conversation" and "unmute conversation"
* Raise validation error when trying to mute/unmute status without conversation
* Adding account domain blocks that filter notifications and public timelines
* Add tests for domain blocks in notifications, public timelines
Filter reblogs of blocked domains from home
* Add API for listing and creating account domain blocks
* API for creating/deleting domain blocks, tests for Status#ancestors
and Status#descendants, filter domain blocks from them
* Filter domains in streaming API
* Update account_domain_block_spec.rb
2017-05-19 08:14:30 +09:00
if ( values [ 0 ] . rows . length > 0 || ( values . length > 1 && values [ 1 ] . rows . length > 0 ) ) {
2017-05-21 00:31:47 +09:00
return ;
2017-04-17 11:32:30 +09:00
}
2017-05-21 00:31:47 +09:00
transmit ( ) ;
Account domain blocks (#2381)
* Add <ostatus:conversation /> tag to Atom input/output
Only uses ref attribute (not href) because href would be
the alternate link that's always included also.
Creates new conversation for every non-reply status. Carries
over conversation for every reply. Keeps remote URIs verbatim,
generates local URIs on the fly like the rest of them.
* Conversation muting - prevents notifications that reference a conversation
(including replies, favourites, reblogs) from being created. API endpoints
/api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute
Currently no way to tell when a status/conversation is muted, so the web UI
only has a "disable notifications" button, doesn't work as a toggle
* Display "Dismiss notifications" on all statuses in notifications column, not just own
* Add "muted" as a boolean attribute on statuses JSON
For now always false on contained reblogs, since it's only relevant for
statuses returned from the notifications endpoint, which are not nested
Remove "Disable notifications" from detailed status view, since it's
only relevant in the notifications column
* Up max class length
* Remove pending test for conversation mute
* Add tests, clean up
* Rename to "mute conversation" and "unmute conversation"
* Raise validation error when trying to mute/unmute status without conversation
* Adding account domain blocks that filter notifications and public timelines
* Add tests for domain blocks in notifications, public timelines
Filter reblogs of blocked domains from home
* Add API for listing and creating account domain blocks
* API for creating/deleting domain blocks, tests for Status#ancestors
and Status#descendants, filter domain blocks from them
* Filter domains in streaming API
* Update account_domain_block_spec.rb
2017-05-19 08:14:30 +09:00
} ) . catch ( err => {
2017-05-28 23:25:26 +09:00
done ( ) ;
2017-05-21 00:31:47 +09:00
log . error ( err ) ;
} ) ;
} ) ;
2017-04-17 11:32:30 +09:00
} else {
2017-05-21 00:31:47 +09:00
transmit ( ) ;
2017-04-17 11:32:30 +09:00
}
2017-05-21 00:31:47 +09:00
} ;
2017-04-17 11:32:30 +09:00
2017-05-21 00:31:47 +09:00
subscribe ( ` ${ redisPrefix } ${ id } ` , listener ) ;
attachCloseHandler ( ` ${ redisPrefix } ${ id } ` , listener ) ;
} ;
2017-02-02 09:31:09 +09:00
2017-04-17 11:32:30 +09:00
// Setup stream output to HTTP
const streamToHttp = ( req , res ) => {
2017-05-21 00:31:47 +09:00
res . setHeader ( 'Content-Type' , 'text/event-stream' ) ;
res . setHeader ( 'Transfer-Encoding' , 'chunked' ) ;
2017-02-04 08:34:31 +09:00
2017-05-21 00:31:47 +09:00
const heartbeat = setInterval ( ( ) => res . write ( ':thump\n' ) , 15000 ) ;
2017-02-04 08:34:31 +09:00
2017-04-17 11:32:30 +09:00
req . on ( 'close' , ( ) => {
2017-05-21 00:31:47 +09:00
log . verbose ( req . requestId , ` Ending stream for ${ req . accountId } ` ) ;
clearInterval ( heartbeat ) ;
} ) ;
2017-02-02 23:20:31 +09:00
2017-04-17 11:32:30 +09:00
return ( event , payload ) => {
2017-05-21 00:31:47 +09:00
res . write ( ` event: ${ event } \n ` ) ;
res . write ( ` data: ${ payload } \n \n ` ) ;
} ;
} ;
2017-02-02 09:31:09 +09:00
2017-04-17 11:32:30 +09:00
// Setup stream end for HTTP
2017-06-04 03:50:53 +09:00
const streamHttpEnd = ( req , closeHandler = false ) => ( id , listener ) => {
2017-04-17 11:32:30 +09:00
req . on ( 'close' , ( ) => {
2017-05-21 00:31:47 +09:00
unsubscribe ( id , listener ) ;
2017-06-04 03:50:53 +09:00
if ( closeHandler ) {
closeHandler ( ) ;
}
2017-05-21 00:31:47 +09:00
} ) ;
} ;
2017-02-04 08:34:31 +09:00
2017-04-17 11:32:30 +09:00
// Setup stream output to WebSockets
2017-05-28 23:25:26 +09:00
const streamToWs = ( req , ws ) => ( event , payload ) => {
if ( ws . readyState !== ws . OPEN ) {
log . error ( req . requestId , 'Tried writing to closed socket' ) ;
return ;
}
2017-02-04 08:34:31 +09:00
2017-05-28 23:25:26 +09:00
ws . send ( JSON . stringify ( { event , payload } ) ) ;
2017-05-21 00:31:47 +09:00
} ;
2017-02-02 09:31:09 +09:00
2017-04-17 11:32:30 +09:00
// Setup stream end for WebSockets
2017-06-04 03:50:53 +09:00
const streamWsEnd = ( req , ws , closeHandler = false ) => ( id , listener ) => {
2017-04-17 11:32:30 +09:00
ws . on ( 'close' , ( ) => {
2017-05-29 02:14:44 +09:00
log . verbose ( req . requestId , ` Ending stream for ${ req . accountId } ` ) ;
2017-05-21 00:31:47 +09:00
unsubscribe ( id , listener ) ;
2017-06-04 03:50:53 +09:00
if ( closeHandler ) {
closeHandler ( ) ;
}
2017-05-21 00:31:47 +09:00
} ) ;
2017-04-03 04:27:14 +09:00
2017-06-23 23:05:04 +09:00
ws . on ( 'error' , ( ) => {
2017-05-29 02:14:44 +09:00
log . verbose ( req . requestId , ` Ending stream for ${ req . accountId } ` ) ;
2017-05-21 00:31:47 +09:00
unsubscribe ( id , listener ) ;
2017-06-04 03:50:53 +09:00
if ( closeHandler ) {
closeHandler ( ) ;
}
2017-05-21 00:31:47 +09:00
} ) ;
} ;
2017-02-04 08:34:31 +09:00
2017-05-21 00:31:47 +09:00
app . use ( setRequestId ) ;
app . use ( allowCrossDomain ) ;
app . use ( authenticationMiddleware ) ;
app . use ( errorMiddleware ) ;
2017-02-02 09:31:09 +09:00
2017-04-17 11:32:30 +09:00
app . get ( '/api/v1/streaming/user' , ( req , res ) => {
2017-06-04 03:50:53 +09:00
const channel = ` timeline: ${ req . accountId } ` ;
streamFrom ( channel , req , streamToHttp ( req , res ) , streamHttpEnd ( req , subscriptionHeartbeat ( channel ) ) ) ;
} ) ;
app . get ( '/api/v1/streaming/user/notification' , ( req , res ) => {
streamFrom ( ` timeline: ${ req . accountId } ` , req , streamToHttp ( req , res ) , streamHttpEnd ( req ) , false , true ) ;
2017-05-21 00:31:47 +09:00
} ) ;
2017-02-04 08:34:31 +09:00
2017-04-17 11:32:30 +09:00
app . get ( '/api/v1/streaming/public' , ( req , res ) => {
2017-05-21 00:31:47 +09:00
streamFrom ( 'timeline:public' , req , streamToHttp ( req , res ) , streamHttpEnd ( req ) , true ) ;
} ) ;
2017-02-04 08:34:31 +09:00
2017-04-17 11:32:30 +09:00
app . get ( '/api/v1/streaming/public/local' , ( req , res ) => {
2017-05-21 00:31:47 +09:00
streamFrom ( 'timeline:public:local' , req , streamToHttp ( req , res ) , streamHttpEnd ( req ) , true ) ;
} ) ;
2017-02-07 07:46:14 +09:00
2017-04-17 11:32:30 +09:00
app . get ( '/api/v1/streaming/hashtag' , ( req , res ) => {
2017-05-21 00:31:47 +09:00
streamFrom ( ` timeline:hashtag: ${ req . query . tag } ` , req , streamToHttp ( req , res ) , streamHttpEnd ( req ) , true ) ;
} ) ;
2017-02-02 21:56:14 +09:00
2017-04-17 11:32:30 +09:00
app . get ( '/api/v1/streaming/hashtag/local' , ( req , res ) => {
2017-05-21 00:31:47 +09:00
streamFrom ( ` timeline:hashtag: ${ req . query . tag } :local ` , req , streamToHttp ( req , res ) , streamHttpEnd ( req ) , true ) ;
} ) ;
2017-02-07 07:46:14 +09:00
2017-05-30 01:20:53 +09:00
const wss = new WebSocket . Server ( { server , verifyClient : wsVerifyClient } ) ;
2017-04-17 11:32:30 +09:00
wss . on ( 'connection' , ws => {
2017-05-30 01:20:53 +09:00
const req = ws . upgradeReq ;
const location = url . parse ( req . url , true ) ;
req . requestId = uuid . v4 ( ) ;
2017-02-02 09:31:09 +09:00
2017-05-28 23:25:26 +09:00
ws . isAlive = true ;
ws . on ( 'pong' , ( ) => {
ws . isAlive = true ;
} ) ;
2017-05-30 01:20:53 +09:00
switch ( location . query . stream ) {
case 'user' :
2017-06-04 03:50:53 +09:00
const channel = ` timeline: ${ req . accountId } ` ;
streamFrom ( channel , req , streamToWs ( req , ws ) , streamWsEnd ( req , ws , subscriptionHeartbeat ( channel ) ) ) ;
break ;
case 'user:notification' :
streamFrom ( ` timeline: ${ req . accountId } ` , req , streamToWs ( req , ws ) , streamWsEnd ( req , ws ) , false , true ) ;
2017-05-30 01:20:53 +09:00
break ;
case 'public' :
streamFrom ( 'timeline:public' , req , streamToWs ( req , ws ) , streamWsEnd ( req , ws ) , true ) ;
break ;
case 'public:local' :
streamFrom ( 'timeline:public:local' , req , streamToWs ( req , ws ) , streamWsEnd ( req , ws ) , true ) ;
break ;
case 'hashtag' :
streamFrom ( ` timeline:hashtag: ${ location . query . tag } ` , req , streamToWs ( req , ws ) , streamWsEnd ( req , ws ) , true ) ;
break ;
case 'hashtag:local' :
streamFrom ( ` timeline:hashtag: ${ location . query . tag } :local ` , req , streamToWs ( req , ws ) , streamWsEnd ( req , ws ) , true ) ;
break ;
default :
ws . close ( ) ;
}
2017-05-21 00:31:47 +09:00
} ) ;
2017-02-04 08:34:31 +09:00
2017-06-23 23:05:04 +09:00
setInterval ( ( ) => {
2017-05-28 23:25:26 +09:00
wss . clients . forEach ( ws => {
if ( ws . isAlive === false ) {
ws . terminate ( ) ;
return ;
}
ws . isAlive = false ;
ws . ping ( '' , false , true ) ;
} ) ;
} , 30000 ) ;
2017-04-17 11:32:30 +09:00
server . listen ( process . env . PORT || 4000 , ( ) => {
2017-05-28 23:25:26 +09:00
log . info ( ` Worker ${ workerId } now listening on ${ server . address ( ) . address } : ${ server . address ( ) . port } ` ) ;
2017-05-21 00:31:47 +09:00
} ) ;
2017-04-22 02:24:31 +09:00
2017-05-28 23:25:26 +09:00
const onExit = ( ) => {
log . info ( ` Worker ${ workerId } exiting, bye bye ` ) ;
2017-05-21 00:31:47 +09:00
server . close ( ) ;
2017-05-28 23:25:26 +09:00
} ;
const onError = ( err ) => {
log . error ( err ) ;
} ;
process . on ( 'SIGINT' , onExit ) ;
process . on ( 'SIGTERM' , onExit ) ;
process . on ( 'exit' , onExit ) ;
process . on ( 'error' , onError ) ;
} ;
throng ( {
workers : numWorkers ,
lifetime : Infinity ,
start : startWorker ,
master : startMaster ,
} ) ;