merge master

Author: e-jigsaw

index.coffee

@@ -1,7 +1,21 @@
 express = require 'express'
 bodyParser = require 'body-parser'
+cors = require 'cors'
+
 app = express()
 
+app.use(cors(
+  origin: (origin, callback) ->
+    if origin
+      allow = origin.match(/\.kosendj-bu\.in\//) != null
+      if app.get('env') == "development"
+        allow = allow || origin.match(/localhost/) != null
+
+      callback(null, allow)
+    else
+      callback(null, false)
+))
+
 http = require('http').Server app
 io = require('socket.io')(http)
 

lib/gif.coffee

@@ -4,7 +4,7 @@ request = require 'request'
 io      = process.globals.io
 
 check = (url, callback)->
-  if url.match(/^http:\/\/sorah-gif/)
+  if url.match(/\.kosendj-bu\.in\//)
     callback(null, true)
     return
 

lib/twitter.coffee

@@ -2,15 +2,15 @@ Twit = require 'twit'
 
 io = process.globals.io
 
-twitter = new Twit
-  consumer_key: process.env.CONSUMER_KEY
-  consumer_secret: process.env.CONSUMER_SECRET
-  access_token: process.env.ACCESS_TOKEN
-  access_token_secret: process.env.ACCESS_TOKEN_SECRET
+unless process.env.DISABLE_TWITTER == '1'
+  twitter = new Twit
+    consumer_key: process.env.CONSUMER_KEY
+    consumer_secret: process.env.CONSUMER_SECRET
+    access_token: process.env.ACCESS_TOKEN
+    access_token_secret: process.env.ACCESS_TOKEN_SECRET
 
-replaceHashtag = new RegExp process.env.HASH_TAG, 'g'
+  replaceHashtag = new RegExp "##{process.env.HASH_TAG}", 'g'
 
-unless process.env.DISABLE_TWITTER == '1'
   stream = twitter.stream 'statuses/filter',
     track: "##{process.env.HASH_TAG}"
 

package.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "body-parser": "^1.13.1",
     "coffee-script": "^1.9.3",
+    "cors": "^2.7.1",
     "express": "^4.12.4",
     "jade": "^1.11.0",
     "livescript": "^1.4.0",

src/screen.ls

@@ -44,9 +44,8 @@ change = ->
   setTimeout change, (main.$data.bpm / 60) * 1000
 
 processUrls = (urls) ->
-  for x in urls
-    url = x.replace /^https?:\/\/img\.sorah\.jp/, \http://sorah-pub.s3.amazonaws.com
-    if url.match /^https?:\/\/(?:sorah-pub\.s3\.amazonaws\.com|192\.168|10\.|sorah-gif)/
+  for url in urls
+    if url.match /\.kosendj-bu\.in\//
       url
     else
       "/gifs/retrieve/#{url}"