diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | application.rb (renamed from activitypub.rb) | 0 | ||||
| -rw-r--r-- | client.rb | 6 | ||||
| -rw-r--r-- | create.rb | 32 | ||||
| -rw-r--r-- | helpers.rb | 6 | ||||
| -rw-r--r-- | server.rb | 15 |
6 files changed, 40 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore index 6911852..da487b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +generate-digest.rb +watch *.pem .usr .pwd diff --git a/activitypub.rb b/application.rb index 8a62fdd..8a62fdd 100644 --- a/activitypub.rb +++ b/application.rb diff --git a/client.rb b/client.rb index c2995f5..bc153f5 100644 --- a/client.rb +++ b/client.rb @@ -82,12 +82,6 @@ helpers do halt 403 unless session['client'] end - def find_file(id) - Dir[File.join('*', 'object', '*', '*.json')].find do |f| - JSON.parse(File.read(f))['id'] == id - end - end - def public recipients = ['https://www.w3.org/ns/activitystreams#Public'] recipients += JSON.parse(File.read(FOLLOWERS))['orderedItems'] diff --git a/create.rb b/create.rb index 301417f..b418c5b 100644 --- a/create.rb +++ b/create.rb @@ -9,7 +9,7 @@ post '/create' do # TODO attachment = [] url_regexp = %r{\Ahttps?://\S+\Z} - mention_regexp = /\A@?\w+@\S+\Z/ + mention_regexp = /\A@\w+@\S+\Z/ hashtag_regexp = /\A#\w+\Z/ lines = request.body.read.each_line.to_a @@ -40,10 +40,11 @@ post '/create' do # TODO } end break - elsif line.match(url_regexp) - # single quotes in html invalidate digest, reason unknown - content << line.gsub(Regexp.last_match(0), "<a href=\"#{Regexp.last_match(0)}\">#{Regexp.last_match(0)}</a>") else + # create links + # single quotes in html invalidate digest, reason unknown + line.split(/\s+/).grep(url_regexp).each { |u| line.gsub!(u, "<a href=\"#{u}\">#{u}</a>") } + line.split(/\s+/).grep(URI::MailTo::EMAIL_REGEXP).each { |m| line.gsub!(m, "<a href=\"mailto:#{m}\">#{m}</a>") } tags = line.split(/\s+/).grep(hashtag_regexp) tags.each do |name| tag_url = File.join(TAGS[:url], name.sub('#', '')) @@ -81,21 +82,26 @@ post '/create' do # TODO object['tag'] = tag unless tag.empty? activity = outbox 'Create', object, to + if activity['object']['tag'] activity['object']['tag'].each do |tag| next unless tag['type'] == 'Hashtag' tag_path = File.join(TAGS[:dir], tag['name'].sub('#', '')) + '.json' - next if File.exist? tag_path - + tag_collection = if File.exist? tag_path + JSON.parse(File.read(tag_path)) + else + { + '@context' => 'https://www.w3.org/ns/activitystreams', + 'id' => tag['href'], + 'type' => 'OrderedCollection', + 'totalItems' => 0, + 'orderedItems' => [] + } + end + tag_collection['orderedItems'] << activity['object']['id'] + tag_collection['totalItems'] = tag_collection['orderedItems'].size File.open(tag_path, 'w+') do |f| - tag_collection = { - '@context' => 'https://www.w3.org/ns/activitystreams', - 'id' => tag['href'], - 'type' => 'OrderedCollection', - 'totalItems' => 0, - 'orderedItems' => [] - } f.puts tag_collection.to_json end end diff --git a/helpers.rb b/helpers.rb index 4940b34..bb43303 100644 --- a/helpers.rb +++ b/helpers.rb @@ -135,4 +135,10 @@ helpers do type = extensions.find { |_k, v| v.include? ext } "#{type[0]}/#{ext}" end + + def find_file(id) + Dir[File.join('*', 'object', '*', '*.json')].find do |f| + JSON.parse(File.read(f))['id'] == id + end + end end diff --git a/server.rb b/server.rb index fd14356..4eae86b 100644 --- a/server.rb +++ b/server.rb @@ -54,6 +54,10 @@ end end end +get '/tags/:tag' do |tag| + send_file(File.join(PUBLIC_DIR, 'tags', tag) + '.json', type: CONTENT_TYPE) +end + helpers do def create @object ||= @activity['object'] @@ -79,8 +83,15 @@ helpers do end def undo - halt 501 unless @activity['object']['type'] == 'Follow' - update_collection FOLLOWERS, @activity['object']['actor'], true + case @activity['object']['type'] + when 'Follow' + update_collection FOLLOWERS, @activity['object']['actor'], true + when 'Create', 'Announce' + file = find_file @activity['object']['id'] + FileUtils.rm(file) if File.exist? file + else + halt 501 + end end def update |